Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Riina Antikainen
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit c4974a16
authored
Jan 30, 2015
by
Tuomas Riihimäki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Place give logging
1 parent
c8fb5f0a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
3 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceGroupBean.java
code/moya-database/src/main/java/fi/codecrew/moya/model/GroupMembership.java
code/moya-utils/src/main/java/fi/codecrew/moya/utilities/moyamessage/MoyaEventType.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceGroupBean.java
View file @
c4974a1
...
@@ -305,15 +305,25 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
...
@@ -305,15 +305,25 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
@Override
@Override
public
GroupMembership
markGroupMembershipEntered
(
GroupMembership
membership
)
{
public
GroupMembership
markGroupMembershipEntered
(
GroupMembership
membership
)
{
membership
.
setEnteredEvent
(
Calendar
.
getInstance
());
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
);
membership
=
gmemfacade
.
merge
(
membership
);
return
membership
;
return
membership
;
}
}
@Override
@Override
public
GroupMembership
markGroupMembershipNotEntered
(
GroupMembership
membership
)
{
public
GroupMembership
markGroupMembershipNotEntered
(
GroupMembership
membership
)
{
membership
.
setEnteredEvent
(
null
);
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
);
membership
=
gmemfacade
.
merge
(
membership
);
return
membership
;
return
membership
;
}
}
}
}
code/moya-database/src/main/java/fi/codecrew/moya/model/GroupMembership.java
View file @
c4974a1
...
@@ -177,4 +177,12 @@ public class GroupMembership extends GenericEntity {
...
@@ -177,4 +177,12 @@ public class GroupMembership extends GenericEntity {
return
inviteToken
;
return
inviteToken
;
}
}
public
EventUser
getEnteredEventAdmin
()
{
return
enteredEventAdmin
;
}
public
void
setEnteredEventAdmin
(
EventUser
enteredEventAdmin
)
{
this
.
enteredEventAdmin
=
enteredEventAdmin
;
}
}
}
code/moya-utils/src/main/java/fi/codecrew/moya/utilities/moyamessage/MoyaEventType.java
View file @
c4974a1
...
@@ -10,10 +10,11 @@ public enum MoyaEventType {
...
@@ -10,10 +10,11 @@ public enum MoyaEventType {
BANKING_ERROR
(
MoyaEventSource
.
SHOP
),
BANKING_ERROR
(
MoyaEventSource
.
SHOP
),
BANKING_MESSAGE
(
MoyaEventSource
.
SHOP
),
BANKING_MESSAGE
(
MoyaEventSource
.
SHOP
),
PLACE_ERROR
(
MoyaEventSource
.
PLACEMAP
),
PLACE_ERROR
(
MoyaEventSource
.
PLACEMAP
),
ACCOUNTEVENT_INFO
(
MoyaEventSource
.
USER
),
ACCOUNTEVENT_INFO
(
MoyaEventSource
.
USER
),
INVITE_ACCEPTED
(
MoyaEventSource
.
USER
),
INVITE_ACCEPTED
(
MoyaEventSource
.
USER
),
USER_PERMISSION_VIOLATION
(
MoyaEventSource
.
USER
),
USER_PERMISSION_VIOLATION
(
MoyaEventSource
.
USER
),
LOGIN_SUCCESSFULL
(
MoyaEventSource
.
USER
),
LOGIN_SUCCESSFULL
(
MoyaEventSource
.
USER
),
PLACE_ACTION
(
MoyaEventSource
.
PLACEMAP
),
;
;
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment