jpa bugfixes

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

@@ -38,7 +38,7 @@ public class AccessRight implements ModelInterface {
     @Column(name = "right_description")
     @Column(name = "right_description")
     private String description;
     private String description;
 
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "id")
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "accessRight")
     private List<NewsGroup> newsGroups;
     private List<NewsGroup> newsGroups;
 
 
     @OneToMany(mappedBy = "id")
     @OneToMany(mappedBy = "id")

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

@@ -75,7 +75,7 @@ public class CompoEntry implements ModelInterface {
 
 
     @JoinColumn(name = "compos_id", referencedColumnName = "compos_id", nullable = false)
     @JoinColumn(name = "compos_id", referencedColumnName = "compos_id", nullable = false)
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
-    private Compo composId;
+    private Compo compo;
 
 
     @JoinColumn(name = "creator", referencedColumnName = "users_id")
     @JoinColumn(name = "creator", referencedColumnName = "users_id")
     @ManyToOne
     @ManyToOne
@@ -171,12 +171,12 @@ public class CompoEntry implements ModelInterface {
         this.participants = compoEntryParticipantList;
         this.participants = compoEntryParticipantList;
     }
     }
 
 
-    public Compo getComposId() {
-	return composId;
+    public Compo getCompo() {
+        return compo;
     }
     }
 
 
-    public void setComposId(Compo composId) {
-	this.composId = composId;
+    public void setCompo(Compo composId) {
+        this.compo = composId;
     }
     }
 
 
     public User getCreator() {
     public User getCreator() {

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

@@ -14,6 +14,8 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import javax.persistence.Version;
 import javax.persistence.Version;
 
 
 /**
 /**
@@ -32,6 +34,7 @@ public class DiscountInstance implements ModelInterface {
     private Integer id;
     private Integer id;
 
 
     @Column(name = "create_time", nullable = false, columnDefinition = "timestamptz default now()")
     @Column(name = "create_time", nullable = false, columnDefinition = "timestamptz default now()")
+    @Temporal(TemporalType.TIMESTAMP)
     private Date createTime = new Date();
     private Date createTime = new Date();
 
 
     @JoinColumn(name = "account_events_id", referencedColumnName = "account_events_id")
     @JoinColumn(name = "account_events_id", referencedColumnName = "account_events_id")

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

@@ -104,7 +104,7 @@ public class User implements ModelInterface {
     @ManyToMany(cascade = CascadeType.ALL, mappedBy = "users")
     @ManyToMany(cascade = CascadeType.ALL, mappedBy = "users")
     private List<Role> roles;
     private List<Role> roles;
 
 
-    @OneToMany(mappedBy = "id")
+    @OneToMany(mappedBy = "user")
     private List<LogEntry> logEntryList;
     private List<LogEntry> logEntryList;
 
 
     @OneToMany(mappedBy = "user")
     @OneToMany(mappedBy = "user")
@@ -116,7 +116,7 @@ public class User implements ModelInterface {
     @OneToMany(mappedBy = "creator")
     @OneToMany(mappedBy = "creator")
     private List<CompoEntry> compoEntryList;
     private List<CompoEntry> compoEntryList;
 
 
-    @OneToMany(mappedBy = "groupCreator")
+    @OneToMany(mappedBy = "creator")
     private List<PlaceGroup> placeGroupList;
     private List<PlaceGroup> placeGroupList;
 
 
     @OneToMany(mappedBy = "user")
     @OneToMany(mappedBy = "user")