Merge branch 'cardgiver' into 'master'

Cardgiver

Add field to groupmembership

See merge request !203

code/moya-beans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java

@@ -241,6 +241,12 @@ public class BootstrapBean implements BootstrapBeanLocal {
 				"ALTER TABLE maps ADD COLUMN mime_type TEXT default 'image/png'",
 		});
 
+		dbUpdates.add(new String[] {
+				"ALTER TABLE group_memberships ADD COLUMN entered_event_admin_id INTEGER",
+				"ALTER TABLE group_memberships ADD CONSTRAINT FK_group_memberships_entered_event_admin_id FOREIGN KEY (entered_event_admin_id) REFERENCES event_users (id)",
+
+		});
+
 	}
 
 	public BootstrapBean() {

code/moya-database/src/main/java/fi/codecrew/moya/model/GroupMembership.java

@@ -79,10 +79,22 @@ public class GroupMembership extends GenericEntity {
 	@ManyToOne
 	private EventUser user;
 
+	/**
+	 * When user has redeemed ticket at the door
+	 */
 	@Column(name = "entered_event")
 	@Temporal(TemporalType.TIMESTAMP)
 	private Calendar enteredEvent;
 
+	/**
+	 * User who has given the entrance to the event (ie who has set the
+	 * enteredEvent field to not null)
+	 * 
+	 */
+	@ManyToOne()
+	@JoinColumn(name = "entered_event_admin_id")
+	private EventUser enteredEventAdmin;
+
 	public GroupMembership() {
 	}
 
@@ -125,9 +137,9 @@ public class GroupMembership extends GenericEntity {
 		this.placeGroup = groupsId;
 	}
 
-
 	/**
 	 * When user has selected place from map, it will be put on this.
+	 * 
 	 * @return
 	 */
 	public Place getPlaceReservation() {
@@ -169,10 +181,10 @@ public class GroupMembership extends GenericEntity {
 		return inviteToken;
 	}
 
-
 	/**
 	 *
 	 * PlaceProduct is part of membership BEFORE user has selected place.
+	 * 
 	 * @return
 	 */
 	public Product getPlaceProduct() {