new connection

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

@@ -73,6 +73,12 @@ public class Bill implements ModelInterface {
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     private User user;
     private User user;
 
 
+    
+    @ManyToOne
+    @JoinColumn(name = "events_id", referencedColumnName = "events_id")
+    private Event event;
+
+
     @Override
     @Override
     public Integer getId() {
     public Integer getId() {
         return id;
         return id;
@@ -83,6 +89,8 @@ public class Bill implements ModelInterface {
         this.id = id;
         this.id = id;
     }
     }
 
 
+
+
     @Version
     @Version
     @Column(nullable = false)
     @Column(nullable = false)
     private int jpaVersionField;
     private int jpaVersionField;
@@ -186,4 +194,18 @@ public class Bill implements ModelInterface {
     public int getJpaVersionField() {
     public int getJpaVersionField() {
         return jpaVersionField;
         return jpaVersionField;
     }
     }
+
+    /**
+     * @return the event
+     */
+    public Event getEvent() {
+        return event;
+    }
+
+    /**
+     * @param event the event to set
+     */
+    public void setEvent(Event event) {
+        this.event = event;
+    }
 }
 }

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

@@ -86,6 +86,9 @@ public class Event implements ModelInterface {
     @Column(nullable = false)
     @Column(nullable = false)
     private int jpaVersionField;
     private int jpaVersionField;
     
     
+    @OneToMany(mappedBy = "event")
+    private List<Bill> bills;
+
     public Event() {
     public Event() {
     }
     }
 
 
@@ -246,4 +249,18 @@ public class Event implements ModelInterface {
     public void setJpaVersionField(int jpaVersionField) {
     public void setJpaVersionField(int jpaVersionField) {
         this.jpaVersionField = jpaVersionField;
         this.jpaVersionField = jpaVersionField;
     }
     }
+
+    /**
+     * @return the bills
+     */
+    public List<Bill> getBills() {
+        return bills;
+    }
+
+    /**
+     * @param bills the bills to set
+     */
+    public void setBills(List<Bill> bills) {
+        this.bills = bills;
+    }
 }
 }