user reference does not include events_id

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant.java

@@ -29,7 +29,7 @@ import javax.persistence.Version;
         @NamedQuery(name = "CompoEntryParticipant.findAll", query = "SELECT c FROM CompoEntryParticipant c"),
 
         @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;
 
     @EmbeddedId
@@ -41,24 +41,19 @@ public class CompoEntryParticipant implements EventChildInterface{
     @Column(name = "nick")
     private String nick;
 
-
     @Column(name = "confirmed")
     @Temporal(TemporalType.TIMESTAMP)
     private Calendar confirmed;
 
-    @JoinColumns({
-        @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)
-        
+    @JoinColumns( {
+            @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)
+
     })
     @ManyToOne(optional = false)
     private CompoEntry entry;
 
-    @JoinColumns({
-        @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)
-        
-    })
+    @JoinColumn(name = "users_id", referencedColumnName = "users_id", nullable = false, updatable = false, insertable = false)
     @ManyToOne(optional = false)
     private User users;
 
@@ -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) {
         this.nick = nick;
@@ -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) {
         this.confirmed = confirmed;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership.java

@@ -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.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") })
-public class GroupMembership implements EventChildInterface{
+public class GroupMembership implements EventChildInterface {
 
     private static final long serialVersionUID = 1L;
     @EmbeddedId
@@ -49,35 +49,29 @@ public class GroupMembership implements EventChildInterface{
     @Column(name = "invite_name")
     private String inviteName;
 
-    @JoinColumns({
-        @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)
-        
+    @JoinColumns( {
+            @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)
+
     })
     @ManyToOne(optional = false)
     private PlaceGroup placeGroup;
 
-    @JoinColumns({
-        @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)
-        
+    @JoinColumns( {
+            @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)
+
     })
     @OneToOne(optional = false)
     private Place placeReservation;
 
-    @JoinColumns({
-        @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)
-        
-    })
+    @JoinColumn(name = "users_id", referencedColumnName = "users_id", nullable = false, updatable = false, insertable = false)
     @ManyToOne
     private User user;
 
-    
     @Column(name = "entered_event")
     @Temporal(TemporalType.TIMESTAMP)
     private Calendar enteredEvent;
-    
 
     @Version
     @Column(nullable = false)
@@ -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) {
         this.enteredEvent = enteredEvent;