Commit 1d11e26a by Tuukka Kivilahti

Merge branch 'placefetch' into 'master'

Logging for place s

See merge request !243
2 parents cb29725f c4974a16
......@@ -305,15 +305,25 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
@Override
public GroupMembership markGroupMembershipEntered(GroupMembership membership) {
membership.setEnteredEvent(Calendar.getInstance());
membership.setEnteredEventAdmin(permbean.getCurrentUser());
loggerbean.sendMessage(MoyaEventType.PLACE_ACTION,
(membership.getUser() != null ? membership.getUser() : membership.getPlaceGroup().getCreator()),
"Place given as entered event");
membership = gmemfacade.merge(membership);
return membership;
}
@Override
public GroupMembership markGroupMembershipNotEntered(GroupMembership membership) {
membership.setEnteredEvent(null);
membership.setEnteredEventAdmin(null);
loggerbean.sendMessage(MoyaEventType.PLACE_ACTION,
(membership.getUser() != null ? membership.getUser() : membership.getPlaceGroup().getCreator()),
"Place ungiven");
membership = gmemfacade.merge(membership);
return membership;
}
}
......@@ -177,4 +177,12 @@ public class GroupMembership extends GenericEntity {
return inviteToken;
}
public EventUser getEnteredEventAdmin() {
return enteredEventAdmin;
}
public void setEnteredEventAdmin(EventUser enteredEventAdmin) {
this.enteredEventAdmin = enteredEventAdmin;
}
}
......@@ -10,10 +10,11 @@ public enum MoyaEventType {
BANKING_ERROR(MoyaEventSource.SHOP),
BANKING_MESSAGE(MoyaEventSource.SHOP),
PLACE_ERROR(MoyaEventSource.PLACEMAP),
ACCOUNTEVENT_INFO(MoyaEventSource.USER),
ACCOUNTEVENT_INFO(MoyaEventSource.USER),
INVITE_ACCEPTED(MoyaEventSource.USER),
USER_PERMISSION_VIOLATION(MoyaEventSource.USER),
USER_PERMISSION_VIOLATION(MoyaEventSource.USER),
LOGIN_SUCCESSFULL(MoyaEventSource.USER),
PLACE_ACTION(MoyaEventSource.PLACEMAP),
;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!