Commit 6eb96c40 by Tuomas Riihimäki

Remove product refrerence from GroupMembership

This was added in anticipation of place reservation rework.
This was not actually used, but PlaceSlot was created instead
1 parent 2e166ee9
...@@ -244,7 +244,10 @@ public class BootstrapBean implements BootstrapBeanLocal { ...@@ -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",
}); });
} }
......
...@@ -71,10 +71,6 @@ public class GroupMembership extends GenericEntity { ...@@ -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 { ...@@ -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;
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!