references to users table fixed

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

@@ -91,14 +91,14 @@ public class AccountEvent implements EventChildInterface {
     /**
     /**
      * The user that bought the products.
      * The user that bought the products.
      */
      */
-    @JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = "user_id", referencedColumnName = "user_id", nullable = false)
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     private User user;
     private User user;
 
 
     /**
     /**
      * Who sold the items to the user.
      * Who sold the items to the user.
      */
      */
-    @JoinColumn(name = "seller_user_id", referencedColumnName = "id")
+    @JoinColumn(name = "seller_user_id", referencedColumnName = "user_id")
     @ManyToOne(optional = true)
     @ManyToOne(optional = true)
     private User seller;
     private User seller;
 
 

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

@@ -33,7 +33,7 @@ import javax.persistence.Version;
 @Table(name = "bills")
 @Table(name = "bills")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "Bill.findAll", query = "SELECT b FROM Bill b"),
         @NamedQuery(name = "Bill.findAll", query = "SELECT b FROM Bill b"),
-        
+
         @NamedQuery(name = "Bill.findByDueDate", query = "SELECT b FROM Bill b WHERE b.dueDate = :dueDate"),
         @NamedQuery(name = "Bill.findByDueDate", query = "SELECT b FROM Bill b WHERE b.dueDate = :dueDate"),
         @NamedQuery(name = "Bill.findByPaidDate", query = "SELECT b FROM Bill b WHERE b.paidDate = :paidDate"),
         @NamedQuery(name = "Bill.findByPaidDate", query = "SELECT b FROM Bill b WHERE b.paidDate = :paidDate"),
         @NamedQuery(name = "Bill.findByReferenceNumber", query = "SELECT b FROM Bill b WHERE b.referenceNumber = :referenceNumber"),
         @NamedQuery(name = "Bill.findByReferenceNumber", query = "SELECT b FROM Bill b WHERE b.referenceNumber = :referenceNumber"),
@@ -93,7 +93,7 @@ public class Bill implements EventChildInterface {
     /**
     /**
      * User who should pay this bill.
      * User who should pay this bill.
      */
      */
-    @JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = "user_id", referencedColumnName = "user_id", nullable = false)
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     private User user;
     private User user;
 
 

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

@@ -84,7 +84,7 @@ public class CompoEntry implements EventChildInterface {
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     private Compo compo;
     private Compo compo;
 
 
-    @JoinColumn(name = "creator_user_id", referencedColumnName = "id")
+    @JoinColumn(name = "creator_user_id", referencedColumnName = "user_id")
     @ManyToOne
     @ManyToOne
     private User creator;
     private User creator;
 
 

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

@@ -51,7 +51,7 @@ public class CompoEntryParticipant implements EventChildInterface {
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     private CompoEntry entry;
     private CompoEntry entry;
 
 
-    @JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false, updatable = false)
+    @JoinColumn(name = "user_id", referencedColumnName = "user_id", nullable = false, updatable = false)
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     private User user;
     private User user;
 
 

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

@@ -47,7 +47,7 @@ public class DiscountInstance implements EventChildInterface {
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     private Discount discount;
     private Discount discount;
 
 
-    @JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = "user_id", referencedColumnName = "user_id", nullable = false)
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     private User user;
     private User user;
 
 

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

@@ -47,7 +47,7 @@ public class EventSettings implements ModelInterface<Integer> {
     private List<Event> events;
     private List<Event> events;
 
 
     @ManyToOne
     @ManyToOne
-    @JoinColumn(name = "admin_user_id", referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = "admin_user_id", referencedColumnName = "user_is", nullable = false)
     private User admin;
     private User admin;
 
 
     @Version
     @Version

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

@@ -61,7 +61,7 @@ public class GroupMembership implements EventChildInterface {
     @OneToOne(optional = false)
     @OneToOne(optional = false)
     private Place placeReservation;
     private Place placeReservation;
 
 
-    @JoinColumn(name = "user_id", referencedColumnName = "id")
+    @JoinColumn(name = "user_id", referencedColumnName = "user_id")
     @ManyToOne
     @ManyToOne
     private User user;
     private User user;
 
 

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

@@ -48,7 +48,7 @@ public class LogEntry implements EventChildInterface {
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     private LogEntryType type;
     private LogEntryType type;
 
 
-    @JoinColumn(name = "user_id", referencedColumnName = "id")
+    @JoinColumn(name = "user_id", referencedColumnName = "user_id")
     @ManyToOne
     @ManyToOne
     private User user;
     private User user;
 
 

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

@@ -8,6 +8,7 @@ import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.awt.image.BufferedImage;
+
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
@@ -85,7 +86,7 @@ public class Place implements EventChildInterface {
      * Who is the current currentUser (mapped with code printed on the place) of
      * Who is the current currentUser (mapped with code printed on the place) of
      * the place. Used in Vectorama currentUser tracking.
      * the place. Used in Vectorama currentUser tracking.
      */
      */
-    @JoinColumn(name = "current_user_id", referencedColumnName = "id")
+    @JoinColumn(name = "current_user_id", referencedColumnName = "user_id")
     @ManyToOne
     @ManyToOne
     private User currentUser;
     private User currentUser;
     @Version
     @Version

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

@@ -31,7 +31,8 @@ import javax.persistence.Version;
         @NamedQuery(name = "PlaceGroup.findAll", query = "SELECT p FROM PlaceGroup p"),
         @NamedQuery(name = "PlaceGroup.findAll", query = "SELECT p FROM PlaceGroup p"),
 
 
         @NamedQuery(name = "PlaceGroup.findByCreated", query = "SELECT p FROM PlaceGroup p WHERE p.created = :created"),
         @NamedQuery(name = "PlaceGroup.findByCreated", query = "SELECT p FROM PlaceGroup p WHERE p.created = :created"),
-        //@NamedQuery(name = "PlaceGroup.findByEdited", query = "SELECT p FROM PlaceGroup p WHERE p.edited = :edited"),
+        // @NamedQuery(name = "PlaceGroup.findByEdited", query =
+        // "SELECT p FROM PlaceGroup p WHERE p.edited = :edited"),
         @NamedQuery(name = "PlaceGroup.findByCode", query = "SELECT p FROM PlaceGroup p WHERE p.code = :code"),
         @NamedQuery(name = "PlaceGroup.findByCode", query = "SELECT p FROM PlaceGroup p WHERE p.code = :code"),
         @NamedQuery(name = "PlaceGroup.findByName", query = "SELECT p FROM PlaceGroup p WHERE p.name = :name"),
         @NamedQuery(name = "PlaceGroup.findByName", query = "SELECT p FROM PlaceGroup p WHERE p.name = :name"),
         @NamedQuery(name = "PlaceGroup.findByActive", query = "SELECT p FROM PlaceGroup p WHERE p.active = :active"),
         @NamedQuery(name = "PlaceGroup.findByActive", query = "SELECT p FROM PlaceGroup p WHERE p.active = :active"),
@@ -63,7 +64,7 @@ public class PlaceGroup implements EventChildInterface {
     @Column(name = "group_details")
     @Column(name = "group_details")
     private String details;
     private String details;
 
 
-    @JoinColumn(name = "creator_user_id", referencedColumnName = "id")
+    @JoinColumn(name = "creator_user_id", referencedColumnName = "user_id")
     @ManyToOne
     @ManyToOne
     private User creator;
     private User creator;
 
 

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

@@ -62,7 +62,7 @@ public class PrintedCard implements EventChildInterface {
     @ManyToOne
     @ManyToOne
     private Location currentLocation;
     private Location currentLocation;
 
 
-    @JoinColumn(name = "users_id", referencedColumnName = "users_id", nullable = false)
+    @JoinColumn(name = "user_id", referencedColumnName = "user_id", nullable = false)
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     private User user;
     private User user;
 
 

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

@@ -42,10 +42,8 @@ public class Role implements EventChildInterface {
 
 
     @ManyToMany(cascade = CascadeType.ALL)
     @ManyToMany(cascade = CascadeType.ALL)
     @JoinTable(name = "role_memberships", joinColumns = {
     @JoinTable(name = "role_memberships", joinColumns = {
-            @JoinColumn(name = "role_id", referencedColumnName = "id"),
-            @JoinColumn(name = "event_id", referencedColumnName = "event_id") }, inverseJoinColumns = {
-            @JoinColumn(name = "user_id", referencedColumnName = "id"),
-            @JoinColumn(name = "event_id", referencedColumnName = "event_id") })
+                @JoinColumn(name = "role_id", referencedColumnName = "id"),
+                @JoinColumn(name = "event_id", referencedColumnName = "event_id") }, inverseJoinColumns = { @JoinColumn(name = "user_id", referencedColumnName = "user_id") })
     private List<User> users;
     private List<User> users;
 
 
     @ManyToMany
     @ManyToMany

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

@@ -35,6 +35,7 @@ import fi.insomnia.bortal.utilities.PasswordFunctions;
 @Table(name = "users")
 @Table(name = "users")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "User.findAll", query = "SELECT u FROM User u"),
         @NamedQuery(name = "User.findAll", query = "SELECT u FROM User u"),
+        @NamedQuery(name = "User.findById", query = "SELECT u FROM User u WHERE u.id = :id"),
         @NamedQuery(name = "User.findByCreated", query = "SELECT u FROM User u WHERE u.created = :created"),
         @NamedQuery(name = "User.findByCreated", query = "SELECT u FROM User u WHERE u.created = :created"),
         @NamedQuery(name = "User.findByActive", query = "SELECT u FROM User u WHERE u.active = :active"),
         @NamedQuery(name = "User.findByActive", query = "SELECT u FROM User u WHERE u.active = :active"),
         @NamedQuery(name = "User.findByPassword", query = "SELECT u FROM User u WHERE u.password = :password"),
         @NamedQuery(name = "User.findByPassword", query = "SELECT u FROM User u WHERE u.password = :password"),
@@ -55,7 +56,7 @@ public class User implements ModelInterface<Integer> {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
-    @Column(name = "users_id", nullable = false)
+    @Column(name = "user_id", nullable = false)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
     private Integer id;
 
 

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

@@ -5,7 +5,6 @@
 package fi.insomnia.bortal.model;
 package fi.insomnia.bortal.model;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.GenerationType;
@@ -52,7 +51,7 @@ public class UserImage implements ModelInterface<Integer> {
     @Column(name = "image_data")
     @Column(name = "image_data")
     private byte[] imageData;
     private byte[] imageData;
 
 
-    @JoinColumn(name = "user_id", referencedColumnName = "id")
+    @JoinColumn(name = "user_id", referencedColumnName = "user_id")
     @ManyToOne
     @ManyToOne
     private User user;
     private User user;
 
 

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

@@ -50,7 +50,7 @@ public class Vote implements EventChildInterface {
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     private CompoEntry compoEntry;
     private CompoEntry compoEntry;
 
 
-    @JoinColumn(name = "voter_user_id", referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = "voter_user_id", referencedColumnName = "user_id", nullable = false)
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     private User voter;
     private User voter;