Skip to content

Codecrew / Moya

Go to a project
Commit 1f7c655b by Juho Juopperi
Options

user reference does not include events_id

1 parent 2d62fde0
Inline Side-by-side
Showing with 22 additions and 30 deletions
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant.java
...@@ -29,7 +29,7 @@ import javax.persistence.Version; ...@@ -29,7 +29,7 @@ import javax.persistence.Version;
@NamedQuery(name = "CompoEntryParticipant.findAll", query = "SELECT c FROM CompoEntryParticipant c"), @NamedQuery(name = "CompoEntryParticipant.findAll", query = "SELECT c FROM CompoEntryParticipant c"),
@NamedQuery(name = "CompoEntryParticipant.findByRole", query = "SELECT c FROM CompoEntryParticipant c WHERE c.role = :role") }) @NamedQuery(name = "CompoEntryParticipant.findByRole", query = "SELECT c FROM CompoEntryParticipant c WHERE c.role = :role") })
public class CompoEntryParticipant implements EventChildInterface{ public class CompoEntryParticipant implements EventChildInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@EmbeddedId @EmbeddedId
...@@ -41,24 +41,19 @@ public class CompoEntryParticipant implements EventChildInterface{ ...@@ -41,24 +41,19 @@ public class CompoEntryParticipant implements EventChildInterface{
@Column(name = "nick") @Column(name = "nick")
private String nick; private String nick;
@Column(name = "confirmed") @Column(name = "confirmed")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Calendar confirmed; private Calendar confirmed;
@JoinColumns({ @JoinColumns( {
@JoinColumn(name = "entries_id", referencedColumnName = "entity_id", nullable = false, updatable = false, insertable = false), @JoinColumn(name = "entries_id", referencedColumnName = "entity_id", nullable = false, updatable = false, insertable = false),
@JoinColumn(name="entries_event_id",referencedColumnName = "events_pk_id", nullable = false, updatable = false, insertable = false) @JoinColumn(name = "entries_event_id", referencedColumnName = "events_pk_id", nullable = false, updatable = false, insertable = false)
}) })
@ManyToOne(optional = false) @ManyToOne(optional = false)
private CompoEntry entry; private CompoEntry entry;
@JoinColumns({ @JoinColumn(name = "users_id", referencedColumnName = "users_id", nullable = false, updatable = false, insertable = false)
@JoinColumn(name = "users_id", referencedColumnName = "entity_id", nullable = false, updatable = false, insertable = false),
@JoinColumn(name="users_event_id",referencedColumnName = "events_pk_id", nullable = false, updatable = false, insertable = false)
})
@ManyToOne(optional = false) @ManyToOne(optional = false)
private User users; private User users;
...@@ -169,7 +164,8 @@ public class CompoEntryParticipant implements EventChildInterface{ ...@@ -169,7 +164,8 @@ public class CompoEntryParticipant implements EventChildInterface{
} }
/** /**
* @param nick the nick to set * @param nick
* the nick to set
*/ */
public void setNick(String nick) { public void setNick(String nick) {
this.nick = nick; this.nick = nick;
...@@ -183,7 +179,8 @@ public class CompoEntryParticipant implements EventChildInterface{ ...@@ -183,7 +179,8 @@ public class CompoEntryParticipant implements EventChildInterface{
} }
/** /**
* @param confirmed the confirmed to set * @param confirmed
* the confirmed to set
*/ */
public void setConfirmed(Calendar confirmed) { public void setConfirmed(Calendar confirmed) {
this.confirmed = confirmed; this.confirmed = confirmed;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership.java
...@@ -33,7 +33,7 @@ import javax.persistence.Version; ...@@ -33,7 +33,7 @@ import javax.persistence.Version;
@NamedQuery(name = "GroupMembership.findByInviteAccepted", query = "SELECT g FROM GroupMembership g WHERE g.inviteAccepted = :inviteAccepted"), @NamedQuery(name = "GroupMembership.findByInviteAccepted", query = "SELECT g FROM GroupMembership g WHERE g.inviteAccepted = :inviteAccepted"),
@NamedQuery(name = "GroupMembership.findByInviteEmail", query = "SELECT g FROM GroupMembership g WHERE g.inviteEmail = :inviteEmail"), @NamedQuery(name = "GroupMembership.findByInviteEmail", query = "SELECT g FROM GroupMembership g WHERE g.inviteEmail = :inviteEmail"),
@NamedQuery(name = "GroupMembership.findByInviteName", query = "SELECT g FROM GroupMembership g WHERE g.inviteName = :inviteName") }) @NamedQuery(name = "GroupMembership.findByInviteName", query = "SELECT g FROM GroupMembership g WHERE g.inviteName = :inviteName") })
public class GroupMembership implements EventChildInterface{ public class GroupMembership implements EventChildInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@EmbeddedId @EmbeddedId
...@@ -49,35 +49,29 @@ public class GroupMembership implements EventChildInterface{ ...@@ -49,35 +49,29 @@ public class GroupMembership implements EventChildInterface{
@Column(name = "invite_name") @Column(name = "invite_name")
private String inviteName; private String inviteName;
@JoinColumns({ @JoinColumns( {
@JoinColumn(name = "groups_id", referencedColumnName = "entity_id", nullable = false, updatable = false, insertable = false), @JoinColumn(name = "groups_id", referencedColumnName = "entity_id", nullable = false, updatable = false, insertable = false),
@JoinColumn(name="groups_event_id",referencedColumnName = "events_pk_id", nullable = false, updatable = false, insertable = false) @JoinColumn(name = "groups_event_id", referencedColumnName = "events_pk_id", nullable = false, updatable = false, insertable = false)
}) })
@ManyToOne(optional = false) @ManyToOne(optional = false)
private PlaceGroup placeGroup; private PlaceGroup placeGroup;
@JoinColumns({ @JoinColumns( {
@JoinColumn(name = "place_reservation_id", referencedColumnName = "entity_id", nullable = false, updatable = false, insertable = false), @JoinColumn(name = "place_reservation_id", referencedColumnName = "entity_id", nullable = false, updatable = false, insertable = false),
@JoinColumn(name="place_reservation_event_id",referencedColumnName = "events_pk_id", nullable = false, updatable = false, insertable = false) @JoinColumn(name = "place_reservation_event_id", referencedColumnName = "events_pk_id", nullable = false, updatable = false, insertable = false)
}) })
@OneToOne(optional = false) @OneToOne(optional = false)
private Place placeReservation; private Place placeReservation;
@JoinColumns({ @JoinColumn(name = "users_id", referencedColumnName = "users_id", nullable = false, updatable = false, insertable = false)
@JoinColumn(name = "users_id", referencedColumnName = "entity_id", nullable = false, updatable = false, insertable = false),
@JoinColumn(name="users_id",referencedColumnName = "events_pk_id", nullable = false, updatable = false, insertable = false)
})
@ManyToOne @ManyToOne
private User user; private User user;
@Column(name = "entered_event") @Column(name = "entered_event")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Calendar enteredEvent; private Calendar enteredEvent;
@Version @Version
@Column(nullable = false) @Column(nullable = false)
...@@ -207,7 +201,8 @@ public class GroupMembership implements EventChildInterface{ ...@@ -207,7 +201,8 @@ public class GroupMembership implements EventChildInterface{
} }
/** /**
* @param enteredEvent the enteredEvent to set * @param enteredEvent
* the enteredEvent to set
*/ */
public void setEnteredEvent(Calendar enteredEvent) { public void setEnteredEvent(Calendar enteredEvent) {
this.enteredEvent = enteredEvent; this.enteredEvent = enteredEvent;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!