Merge branch 'eventuser' of dev.insomnia.fi:/data/bortal into eventuser

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java

@@ -107,6 +107,8 @@ public class UserBean implements UserBeanLocal {
 	@EJB
 	@EJB
 	private PlaceGroupFacade pgfacade;
 	private PlaceGroupFacade pgfacade;
 
 
+	private EventUserFacade eventUserFacade;
+
 	@Override
 	@Override
 	@RolesAllowed(UserPermission.S_VIEW_ALL)
 	@RolesAllowed(UserPermission.S_VIEW_ALL)
 	public List<User> getUsers() {
 	public List<User> getUsers() {
@@ -241,13 +243,12 @@ public class UserBean implements UserBeanLocal {
 
 
 	@Override
 	@Override
 	@RolesAllowed(UserPermission.S_CREATE_NEW)
 	@RolesAllowed(UserPermission.S_CREATE_NEW)
-	public IUser createNewUser(User user, String password) {
+	public void createNewUser(User user, String password) {
 
 
 		user.resetPassword(password);
 		user.resetPassword(password);
 		// Tallennetaan olio kantaan...
 		// Tallennetaan olio kantaan...
 		userFacade.create(user);
 		userFacade.create(user);
 		em.flush();
 		em.flush();
-		return user;
 	}
 	}
 
 
 	@Override
 	@Override
@@ -323,7 +324,7 @@ public class UserBean implements UserBeanLocal {
 		if (usercheck.size() > 0) {
 		if (usercheck.size() > 0) {
 			return false;
 			return false;
 		}
 		}
-		User creator = permbean.getCurrentUser();
+		EventUser creator = permbean.getCurrentUser();
 		LanEvent ev = eventBean.getCurrentEvent();
 		LanEvent ev = eventBean.getCurrentEvent();
 		PlaceGroup pg = new PlaceGroup(ev, Calendar.getInstance(), Calendar.getInstance(), false);
 		PlaceGroup pg = new PlaceGroup(ev, Calendar.getInstance(), Calendar.getInstance(), false);
 		pg.setCreator(creator);
 		pg.setCreator(creator);
@@ -350,7 +351,9 @@ public class UserBean implements UserBeanLocal {
 	@PermitAll
 	@PermitAll
 	public void createFromToken(User user, String token) {
 	public void createFromToken(User user, String token) {
 		GroupMembership gm = findToken(token);
 		GroupMembership gm = findToken(token);
-		gm.setUser(user);
+		EventUser eventuser = new EventUser(user, eventBean.getCurrentEvent());
+
+		gm.setUser(eventuser);
 		gm.setInviteAccepted(Calendar.getInstance());
 		gm.setInviteAccepted(Calendar.getInstance());
 
 
 		userFacade.create(user);
 		userFacade.create(user);
@@ -394,8 +397,9 @@ public class UserBean implements UserBeanLocal {
 	@Override
 	@Override
 	@RolesAllowed(UserPermission.S_CREATE_NEW)
 	@RolesAllowed(UserPermission.S_CREATE_NEW)
 	public void createNewUser(User usr) {
 	public void createNewUser(User usr) {
-		userFacade.create(usr);
-
+		EventUser evu = new EventUser(usr, eventBean.getCurrentEvent());
+		eventUserFacade.create(evu);
+		return evu;
 	}
 	}
 
 
 	@Override
 	@Override

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/UserBeanLocal.java

@@ -7,7 +7,6 @@ import javax.ejb.Local;
 
 
 import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.GroupMembership;
 import fi.insomnia.bortal.model.GroupMembership;
-import fi.insomnia.bortal.model.IUser;
 import fi.insomnia.bortal.model.Role;
 import fi.insomnia.bortal.model.Role;
 import fi.insomnia.bortal.model.User;
 import fi.insomnia.bortal.model.User;
 import fi.insomnia.bortal.model.UserImage;
 import fi.insomnia.bortal.model.UserImage;
@@ -26,7 +25,7 @@ public interface UserBeanLocal {
 
 
 	UserImage findUserImage(int id);
 	UserImage findUserImage(int id);
 
 
-	IUser createNewUser(User user, String password);
+	void createNewUser(User user, String password);
 
 
 	User findPasswordResetUser(Integer id, String hash);
 	User findPasswordResetUser(Integer id, String hash);
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser.java

 package fi.insomnia.bortal.model;
 package fi.insomnia.bortal.model;
 
 
+import static javax.persistence.CascadeType.PERSIST;
+
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Calendar;
 import java.util.List;
 import java.util.List;
@@ -28,7 +30,7 @@ public class EventUser extends GenericEntity implements IUser {
     protected static final String USER_ID_COLUMN = "user_id";
     protected static final String USER_ID_COLUMN = "user_id";
     protected static final String EVENT_ID_COLUMN = "event_id";
     protected static final String EVENT_ID_COLUMN = "event_id";
 
 
-    @ManyToOne
+    @ManyToOne(cascade = PERSIST)
     @JoinColumn(nullable = false, name = USER_ID_COLUMN)
     @JoinColumn(nullable = false, name = USER_ID_COLUMN)
     private User user;
     private User user;
     @ManyToOne
     @ManyToOne
@@ -84,6 +86,17 @@ public class EventUser extends GenericEntity implements IUser {
     @OneToMany(mappedBy = "user")
     @OneToMany(mappedBy = "user")
     private List<PollAnswer> pollAnswers;
     private List<PollAnswer> pollAnswers;
 
 
+    public EventUser()
+    {
+        super();
+    }
+
+    public EventUser(User usr, LanEvent evnt) {
+        super();
+        this.user = usr;
+        this.event = evnt;
+    }
+
     public User getUser() {
     public User getUser() {
         return user;
         return user;
     }
     }
@@ -204,8 +217,6 @@ public class EventUser extends GenericEntity implements IUser {
         this.pollAnswers = pollAnswers;
         this.pollAnswers = pollAnswers;
     }
     }
 
 
-}
-
     @Override
     @Override
     public void setCreated(Calendar created) {
     public void setCreated(Calendar created) {
         user.setCreated(created);
         user.setCreated(created);
@@ -421,4 +432,9 @@ public class EventUser extends GenericEntity implements IUser {
         return user.isAnonymous();
         return user.isAnonymous();
     }
     }
 
 
+    @Override
+    public Calendar getCreated() {
+        return user.getCreated();
+    }
+
 }
 }