Merge branch 'gmcleanup' into 'master'

Group membership cleanup

Remove unused field from GroupMembership

See merge request !209

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

@@ -244,7 +244,10 @@ public class BootstrapBean implements BootstrapBeanLocal {
 		dbUpdates.add(new String[] {
 		dbUpdates.add(new String[] {
 				"ALTER TABLE group_memberships ADD COLUMN entered_event_admin_id INTEGER",
 				"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)",
 				"ALTER TABLE group_memberships ADD CONSTRAINT FK_group_memberships_entered_event_admin_id FOREIGN KEY (entered_event_admin_id) REFERENCES event_users (id)",
+		});
 
 
+		dbUpdates.add(new String[] {
+				"ALTER TABLE group_memberships DROP COLUMN place_product",
 		});
 		});
 
 
 	}
 	}

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

@@ -71,10 +71,6 @@ public class GroupMembership extends GenericEntity {
 	@JoinColumn(name = "place_reservation_id", referencedColumnName = "id", nullable = true, unique = true)
 	@JoinColumn(name = "place_reservation_id", referencedColumnName = "id", nullable = true, unique = true)
 	private Place placeReservation;
 	private Place placeReservation;
 
 
-	@ManyToOne
-	@JoinColumn(name = "place_product")
-	private Product placeProduct;
-
 	@JoinColumn(name = EVENTUSER_ID, referencedColumnName = EventUser.ID_COLUMN)
 	@JoinColumn(name = EVENTUSER_ID, referencedColumnName = EventUser.ID_COLUMN)
 	@ManyToOne
 	@ManyToOne
 	private EventUser user;
 	private EventUser user;
@@ -181,17 +177,4 @@ public class GroupMembership extends GenericEntity {
 		return inviteToken;
 		return inviteToken;
 	}
 	}
 
 
-	/**
-	 *
-	 * PlaceProduct is part of membership BEFORE user has selected place.
-	 * 
-	 * @return
-	 */
-	public Product getPlaceProduct() {
-		return placeProduct;
-	}
-
-	public void setPlaceProduct(Product placeProduct) {
-		this.placeProduct = placeProduct;
-	}
 }
 }