Skip to content

Max Mecklin / Moya

Go to a project
Commit 7df098f7 by Tuukka Kivilahti
Options

Merge branch 'cardgiver' into 'master' 

Cardgiver

Add field to groupmembership

See merge request !203
2 parents ceabdea2 00b9aeba
Inline Side-by-side
Showing with 135 additions and 117 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java
...@@ -241,6 +241,12 @@ public class BootstrapBean implements BootstrapBeanLocal { ...@@ -241,6 +241,12 @@ public class BootstrapBean implements BootstrapBeanLocal {
"ALTER TABLE maps ADD COLUMN mime_type TEXT default 'image/png'", "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() { public BootstrapBean() {
......
code/moya-database/src/main/java/fi/codecrew/moya/model/GroupMembership.java
...@@ -43,138 +43,150 @@ import javax.persistence.TemporalType; ...@@ -43,138 +43,150 @@ import javax.persistence.TemporalType;
// GroupMembership.EVENTUSER_ID, GroupMembership.GROUP_ID }) }) // GroupMembership.EVENTUSER_ID, GroupMembership.GROUP_ID }) })
public class GroupMembership extends GenericEntity { public class GroupMembership extends GenericEntity {
/** /**
* *
*/ */
private static final long serialVersionUID = 2195875306960651526L; private static final long serialVersionUID = 2195875306960651526L;
protected static final String EVENTUSER_ID = "eventuser_id"; protected static final String EVENTUSER_ID = "eventuser_id";
protected static final String GROUP_ID = "group_id"; protected static final String GROUP_ID = "group_id";
@Column(name = "invite_token", unique = true, nullable = false) @Column(name = "invite_token", unique = true, nullable = false)
private String inviteToken; private String inviteToken;
@Column(name = "invite_accepted") @Column(name = "invite_accepted")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Calendar inviteAccepted; private Calendar inviteAccepted;
@Column(name = "invite_email") @Column(name = "invite_email")
private String inviteEmail; private String inviteEmail;
@Column(name = "invite_name") @Column(name = "invite_name")
private String inviteName; private String inviteName;
@ManyToOne(optional = false, cascade = CascadeType.PERSIST) @ManyToOne(optional = false, cascade = CascadeType.PERSIST)
@JoinColumn(name = GROUP_ID, referencedColumnName = "id", nullable = false) @JoinColumn(name = GROUP_ID, referencedColumnName = "id", nullable = false)
private PlaceGroup placeGroup; private PlaceGroup placeGroup;
@OneToOne(optional = false) @OneToOne(optional = false)
@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 @ManyToOne
@JoinColumn(name = "place_product") @JoinColumn(name = "place_product")
private Product placeProduct; 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;
@Column(name = "entered_event") /**
@Temporal(TemporalType.TIMESTAMP) * When user has redeemed ticket at the door
private Calendar enteredEvent; */
@Column(name = "entered_event")
public GroupMembership() { @Temporal(TemporalType.TIMESTAMP)
} private Calendar enteredEvent;
public GroupMembership(PlaceGroup pg, Place p, String token) { /**
super(); * User who has given the entrance to the event (ie who has set the
this.setPlaceGroup(pg); * enteredEvent field to not null)
this.setPlaceReservation(p); *
this.inviteToken = token; */
} @ManyToOne()
@JoinColumn(name = "entered_event_admin_id")
public Calendar getInviteAccepted() { private EventUser enteredEventAdmin;
return inviteAccepted;
} public GroupMembership() {
}
public void setInviteAccepted(Calendar inviteAccepted) {
this.inviteAccepted = inviteAccepted;
}
public String getInviteEmail() {
return inviteEmail;
}
public void setInviteEmail(String inviteEmail) {
this.inviteEmail = inviteEmail;
}
public String getInviteName() {
return inviteName;
}
public void setInviteName(String inviteName) {
this.inviteName = inviteName;
}
public PlaceGroup getPlaceGroup() {
return placeGroup;
}
public void setPlaceGroup(PlaceGroup groupsId) {
this.placeGroup = groupsId;
}
/**
* When user has selected place from map, it will be put on this.
* @return
*/
public Place getPlaceReservation() {
return placeReservation;
}
public void setPlaceReservation(Place placeReservation) { public GroupMembership(PlaceGroup pg, Place p, String token) {
this.placeReservation = placeReservation; super();
} this.setPlaceGroup(pg);
this.setPlaceReservation(p);
this.inviteToken = token;
}
public EventUser getUser() { public Calendar getInviteAccepted() {
return user; return inviteAccepted;
} }
public void setUser(EventUser usersId) { public void setInviteAccepted(Calendar inviteAccepted) {
this.user = usersId; this.inviteAccepted = inviteAccepted;
} }
/** public String getInviteEmail() {
* @return the enteredEvent return inviteEmail;
*/ }
public Calendar getEnteredEvent() {
return enteredEvent;
}
/** public void setInviteEmail(String inviteEmail) {
* @param enteredEvent this.inviteEmail = inviteEmail;
* the enteredEvent to set }
*/
public void setEnteredEvent(Calendar enteredEvent) { public String getInviteName() {
this.enteredEvent = enteredEvent; return inviteName;
} }
public void setInviteToken(String inviteToken) { public void setInviteName(String inviteName) {
this.inviteToken = inviteToken; this.inviteName = inviteName;
} }
public String getInviteToken() { public PlaceGroup getPlaceGroup() {
return inviteToken; return placeGroup;
} }
public void setPlaceGroup(PlaceGroup groupsId) {
/** this.placeGroup = groupsId;
* }
* PlaceProduct is part of membership BEFORE user has selected place.
* @return /**
*/ * When user has selected place from map, it will be put on this.
*
* @return
*/
public Place getPlaceReservation() {
return placeReservation;
}
public void setPlaceReservation(Place placeReservation) {
this.placeReservation = placeReservation;
}
public EventUser getUser() {
return user;
}
public void setUser(EventUser usersId) {
this.user = usersId;
}
/**
* @return the enteredEvent
*/
public Calendar getEnteredEvent() {
return enteredEvent;
}
/**
* @param enteredEvent
* the enteredEvent to set
*/
public void setEnteredEvent(Calendar enteredEvent) {
this.enteredEvent = enteredEvent;
}
public void setInviteToken(String inviteToken) {
this.inviteToken = inviteToken;
}
public String getInviteToken() {
return inviteToken;
}
/**
*
* PlaceProduct is part of membership BEFORE user has selected place.
*
* @return
*/
public Product getPlaceProduct() { public Product getPlaceProduct() {
return placeProduct; return placeProduct;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!