Eventuser entitymuutokset

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

@@ -64,7 +64,7 @@ public class AccountEvent extends GenericEntity {
      * to that foodwave.
      */
 
-    @JoinColumn(name = "food_wave_id", referencedColumnName = "id")
+    @JoinColumn(name = "food_wave_id", referencedColumnName = FoodWave.ID_COLUMN)
     @ManyToOne
     private FoodWave foodWave;
 
@@ -72,23 +72,23 @@ public class AccountEvent extends GenericEntity {
      * The product user has acquired and this this AccountEvent is a reference
      * to.
      */
-    @JoinColumn(name = "product_id", referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = "product_id", referencedColumnName = Product.ID_COLUMN, nullable = false)
     @ManyToOne(optional = false)
     private Product product;
 
     /**
      * The user that bought the products.
      */
-    @JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = "eventuser_id", referencedColumnName = EventUser.ID_COLUMN, nullable = false)
     @ManyToOne(optional = false)
-    private User user;
+    private EventUser user;
 
     /**
      * Who sold the items to the user.
      */
-    @JoinColumn(name = "seller_user_id", referencedColumnName = "id")
+    @JoinColumn(name = "seller_eventuser_id", referencedColumnName = EventUser.ID_COLUMN)
     @ManyToOne(optional = true)
-    private User seller;
+    private EventUser seller;
 
     /**
      * What discounts user has for this account event. Some magic is applied to
@@ -111,8 +111,7 @@ public class AccountEvent extends GenericEntity {
     public AccountEvent() {
     }
 
-    public AccountEvent(User u, Product prod, BigDecimal unitPrice, BigDecimal quantity, Calendar eventTime) {
-
+    public AccountEvent(EventUser u, Product prod, BigDecimal unitPrice, BigDecimal quantity, Calendar eventTime) {
         this.setUnitPrice(unitPrice);
         this.setQuantity(quantity);
         this.product = prod;
@@ -136,11 +135,11 @@ public class AccountEvent extends GenericEntity {
         this.delivered = delivered;
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 
-    public void setUser(User usersId) {
+    public void setUser(EventUser usersId) {
         this.user = usersId;
     }
 
@@ -168,11 +167,11 @@ public class AccountEvent extends GenericEntity {
         return product;
     }
 
-    public void setSeller(User seller) {
+    public void setSeller(EventUser seller) {
         this.seller = seller;
     }
 
-    public User getSeller() {
+    public EventUser getSeller() {
         return seller;
     }
 

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

@@ -129,8 +129,8 @@ public class Bill extends GenericEntity {
      * User who should pay this bill.
      */
     @ManyToOne(optional = false)
-    @JoinColumn(updatable = false)
-    private User user;
+    @JoinColumn(updatable = false, name = "eventuser_id")
+    private EventUser user;
 
     private static final Logger logger = LoggerFactory.getLogger(Bill.class);
 
@@ -180,7 +180,7 @@ public class Bill extends GenericEntity {
         return total;
     }
 
-    public Bill(LanEvent event, User user) {
+    public Bill(LanEvent event, EventUser user) {
         this(event);
         this.setUser(user);
         this.setAddr1(user.getFirstnames() + " " + user.getLastname());
@@ -228,11 +228,11 @@ public class Bill extends GenericEntity {
         this.accountEvent = accoutEventsId;
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 
-    public void setUser(User usersId) {
+    public void setUser(EventUser usersId) {
         this.user = usersId;
     }
 

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

@@ -72,9 +72,9 @@ public class CompoEntry extends GenericEntity {
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "entry")
     private List<CompoEntryParticipant> participants;
 
-    @JoinColumn(name = "creator_user_id", referencedColumnName = "id")
+    @JoinColumn(name = "creator_eventuser_id", referencedColumnName = EventUser.ID_COLUMN)
     @ManyToOne
-    private User creator;
+    private EventUser creator;
 
     public CompoEntry() {
         super();
@@ -159,11 +159,11 @@ public class CompoEntry extends GenericEntity {
         this.compo = composId;
     }
 
-    public User getCreator() {
+    public EventUser getCreator() {
         return creator;
     }
 
-    public void setCreator(User creator) {
+    public void setCreator(EventUser creator) {
         this.creator = creator;
     }
 

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

@@ -36,9 +36,9 @@ public class CompoEntryParticipant extends GenericEntity {
     @Temporal(TemporalType.TIMESTAMP)
     private Calendar confirmed;
 
-    @JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false, updatable = false)
+    @JoinColumn(name = "eventuser_id", referencedColumnName = EventUser.ID_COLUMN, nullable = false, updatable = false)
     @ManyToOne(optional = false)
-    private User user;
+    private EventUser user;
 
     public CompoEntry getEntry() {
         return entry;
@@ -48,7 +48,7 @@ public class CompoEntryParticipant extends GenericEntity {
         this.entry = entry;
     }
 
-    public CompoEntryParticipant(CompoEntry entry, User participant) {
+    public CompoEntryParticipant(CompoEntry entry, EventUser participant) {
         super();
         this.entry = entry;
         this.user = participant;
@@ -66,11 +66,11 @@ public class CompoEntryParticipant extends GenericEntity {
         this.role = role;
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 
-    public void setUser(User user) {
+    public void setUser(EventUser user) {
         this.user = user;
     }
 

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

@@ -7,7 +7,6 @@ import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
@@ -26,6 +25,62 @@ public class EventUser extends GenericEntity {
     protected static final String USER_ID_COLUMN = "user_id";
     protected static final String EVENT_ID_COLUMN = "event_id";
 
+    @ManyToOne
+    @JoinColumn(nullable = false, name = USER_ID_COLUMN)
+    private User user;
+    @ManyToOne
+    @JoinColumn(nullable = false, name = EVENT_ID_COLUMN)
+    private LanEvent event;
+
+    private static final long serialVersionUID = 6042691271548196815L;
+
+    @OneToMany(mappedBy = "voter", cascade = CascadeType.ALL)
+    private List<Vote> votes;
+
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
+    private List<UserNote> notes;
+
+    @ManyToMany(cascade = CascadeType.ALL)
+    private List<Role> roles = new ArrayList<Role>();
+
+    @OneToMany(mappedBy = "user")
+    private List<CompoEntryParticipant> compoEntryParticipants;
+
+    @OneToMany(mappedBy = "creator")
+    @OrderBy("id")
+    private List<CompoEntry> compoEntries;
+
+    @OneToMany(mappedBy = "creator", cascade = CascadeType.ALL)
+    private List<PlaceGroup> placeGroups = new ArrayList<PlaceGroup>();
+
+    @OneToMany(mappedBy = "user")
+    private List<GroupMembership> groupMemberships;
+
+    /**
+     * The places this user has registered into.
+     */
+    @OneToMany(mappedBy = "currentUser", fetch = FetchType.LAZY)
+    @OrderBy(Place.ID_COLUMN)
+    private List<Place> currentPlaces;
+
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "user")
+    private List<PrintedCard> printedCards;
+
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "user")
+    @OrderBy(AccountEvent.ID_COLUMN)
+    private List<AccountEvent> accountEvents;
+
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "user")
+    @OrderBy(Bill.ID_COLUMN)
+    private List<Bill> bills;
+
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "seller")
+    @OrderBy(AccountEvent.ID_COLUMN)
+    private List<AccountEvent> soldItems;
+
+    @OneToMany(mappedBy = "user")
+    private List<PollAnswer> pollAnswers;
+
     public User getUser() {
         return user;
     }
@@ -66,14 +121,6 @@ public class EventUser extends GenericEntity {
         this.roles = roles;
     }
 
-    public List<LogEntry> getLogEntryList() {
-        return logEntryList;
-    }
-
-    public void setLogEntryList(List<LogEntry> logEntryList) {
-        this.logEntryList = logEntryList;
-    }
-
     public List<CompoEntryParticipant> getCompoEntryParticipants() {
         return compoEntryParticipants;
     }
@@ -146,14 +193,6 @@ public class EventUser extends GenericEntity {
         this.soldItems = soldItems;
     }
 
-    public List<EventOrganiser> getEventOrganiser() {
-        return eventOrganiser;
-    }
-
-    public void setEventOrganiser(List<EventOrganiser> eventOrganiser) {
-        this.eventOrganiser = eventOrganiser;
-    }
-
     public List<PollAnswer> getPollAnswers() {
         return pollAnswers;
     }
@@ -162,70 +201,4 @@ public class EventUser extends GenericEntity {
         this.pollAnswers = pollAnswers;
     }
 
-    @ManyToOne
-    @JoinColumn(nullable = false, name = USER_ID_COLUMN)
-    private User user;
-    @ManyToOne
-    @JoinColumn(nullable = false, name = EVENT_ID_COLUMN)
-    private LanEvent event;
-
-    private static final long serialVersionUID = 6042691271548196815L;
-
-    @OneToMany(mappedBy = "voter", cascade = CascadeType.ALL)
-    private List<Vote> votes;
-
-    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
-    private List<UserNote> notes;
-
-    @ManyToMany()
-    @JoinTable(name = "role_memberships", inverseJoinColumns = {
-            @JoinColumn(name = "role_id", referencedColumnName = Role.ID_COLUMN) },
-            joinColumns = { @JoinColumn(name = "user_id", referencedColumnName =
-                    "id") })
-    private List<Role> roles = new ArrayList<Role>();
-
-    @OneToMany(mappedBy = "user")
-    private List<LogEntry> logEntryList;
-
-    @OneToMany(mappedBy = "user")
-    private List<CompoEntryParticipant> compoEntryParticipants;
-
-    @OneToMany(mappedBy = "creator")
-    @OrderBy("id")
-    private List<CompoEntry> compoEntries;
-
-    @OneToMany(mappedBy = "creator", cascade = CascadeType.ALL)
-    private List<PlaceGroup> placeGroups = new ArrayList<PlaceGroup>();
-
-    @OneToMany(mappedBy = "user")
-    private List<GroupMembership> groupMemberships;
-
-    /**
-     * The places this user has registered into.
-     */
-    @OneToMany(mappedBy = "currentUser", fetch = FetchType.LAZY)
-    @OrderBy("id")
-    private List<Place> currentPlaces;
-
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "user")
-    private List<PrintedCard> printedCards;
-
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "user")
-    @OrderBy("id")
-    private List<AccountEvent> accountEvents;
-
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "user")
-    @OrderBy("id")
-    private List<Bill> bills;
-
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "seller")
-    @OrderBy("id")
-    private List<AccountEvent> soldItems;
-
-    @OneToMany(mappedBy = "admin")
-    private List<EventOrganiser> eventOrganiser;
-
-    @OneToMany(mappedBy = "user")
-    private List<PollAnswer> pollAnswers;
-
 }

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

@@ -53,9 +53,9 @@ public class GroupMembership extends GenericEntity {
     @JoinColumn(name = "place_reservation_id", referencedColumnName = "id", nullable = true)
     private Place placeReservation;
 
-    @JoinColumn(name = "user_id", referencedColumnName = "id")
+    @JoinColumn(name = "eventuser_id", referencedColumnName = EventUser.ID_COLUMN)
     @ManyToOne
-    private User user;
+    private EventUser user;
 
     @Column(name = "entered_event")
     @Temporal(TemporalType.TIMESTAMP)
@@ -111,11 +111,11 @@ public class GroupMembership extends GenericEntity {
         this.placeReservation = placeReservation;
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 
-    public void setUser(User usersId) {
+    public void setUser(EventUser usersId) {
         this.user = usersId;
     }
 

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

@@ -13,8 +13,6 @@ import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 
@@ -26,10 +24,6 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
  */
 @Entity
 @Table(name = "event_log")
-@NamedQueries({
-        @NamedQuery(name = "LogEntry.findAll", query = "SELECT l FROM LogEntry l"),
-        @NamedQuery(name = "LogEntry.findByTime", query = "SELECT l FROM LogEntry l WHERE l.time = :time"),
-        @NamedQuery(name = "LogEntry.findByDescription", query = "SELECT l FROM LogEntry l WHERE l.description = :description") })
 @OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
 public class LogEntry extends GenericEntity {
 

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

@@ -21,20 +21,6 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
  */
 @Entity
 @Table(name = "places")
-// @NamedQueries({
-// @NamedQuery(name = "Place.findAll", query = "SELECT p FROM Place p"),
-// @NamedQuery(name = "Place.findByDescription", query =
-// "SELECT p FROM Place p WHERE p.description = :description"),
-// @NamedQuery(name = "Place.findByName", query =
-// "SELECT p FROM Place p WHERE p.name = :name"),
-// @NamedQuery(name = "Place.findByMapX", query =
-// "SELECT p FROM Place p WHERE p.mapX = :mapX"),
-// @NamedQuery(name = "Place.findByMapY", query =
-// "SELECT p FROM Place p WHERE p.mapY = :mapY"),
-// @NamedQuery(name = "Place.findByDetails", query =
-// "SELECT p FROM Place p WHERE p.details = :details"),
-// @NamedQuery(name = "Place.findByCode", query =
-// "SELECT p FROM Place p WHERE p.code = :code") })
 @OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
 public class Place extends GenericEntity {
 
@@ -80,25 +66,25 @@ public class Place extends GenericEntity {
     private PlaceGroup group;
 
     @ManyToOne
-    @JoinColumn(name = "provided_role_id", referencedColumnName = "id")
+    @JoinColumn(name = "provided_role_id", referencedColumnName = Role.ID_COLUMN)
     private Role providesRole;
 
-    @JoinColumn(name = "map_id", referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = "map_id", referencedColumnName = EventMap.ID_COLUMN, nullable = false)
     @ManyToOne(optional = false, cascade = CascadeType.ALL)
     private EventMap map;
     /**
      * Which ticket type is this place sold as
      */
-    @JoinColumn(name = "products_id", referencedColumnName = "id")
+    @JoinColumn(name = "products_id", referencedColumnName = Product.ID_COLUMN)
     @ManyToOne()
     private Product product;
     /**
      * Who is the current currentUser (mapped with code printed on the place) of
      * the place. Used in Vectorama currentUser tracking.
      */
-    @JoinColumn(name = "current_user_id", referencedColumnName = "id")
+    @JoinColumn(name = "current_eventuser_id", referencedColumnName = EventUser.ID_COLUMN)
     @ManyToOne
-    private User currentUser;
+    private EventUser currentUser;
 
     public Place() {
         super();
@@ -184,11 +170,11 @@ public class Place extends GenericEntity {
         this.product = productsId;
     }
 
-    public User getCurrentUser() {
+    public EventUser getCurrentUser() {
         return currentUser;
     }
 
-    public void setCurrentUser(User usersId) {
+    public void setCurrentUser(EventUser usersId) {
         this.currentUser = usersId;
     }
 

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

@@ -14,8 +14,6 @@ import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.OrderBy;
 import javax.persistence.Table;
@@ -30,16 +28,6 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
  */
 @Entity
 @Table(name = "groups")
-@NamedQueries({
-        @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.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.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.findByDetails", query = "SELECT p FROM PlaceGroup p WHERE p.details = :details") })
 @OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
 public class PlaceGroup extends GenericEntity {
 
@@ -72,9 +60,9 @@ public class PlaceGroup extends GenericEntity {
     @Column(name = "group_details")
     private String details;
 
-    @JoinColumn(name = "creator_user_id", referencedColumnName = "id")
+    @JoinColumn(name = "creator_eventuser_id", referencedColumnName = EventUser.ID_COLUMN)
     @ManyToOne
-    private User creator;
+    private EventUser creator;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "placeGroup")
     private List<GroupMembership> members = new ArrayList<GroupMembership>();
@@ -143,11 +131,11 @@ public class PlaceGroup extends GenericEntity {
         this.details = groupDetails;
     }
 
-    public User getCreator() {
+    public EventUser getCreator() {
         return creator;
     }
 
-    public void setCreator(User groupCreator) {
+    public void setCreator(EventUser groupCreator) {
         this.creator = groupCreator;
     }
 

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

@@ -30,12 +30,12 @@ public class PollAnswer extends GenericEntity implements Serializable {
     private Boolean answerBoolean = false;
 
     @ManyToOne
-    @JoinColumn(name = "possible_answer_id", referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = "possible_answer_id", referencedColumnName = PossibleAnswer.ID_COLUMN, nullable = false)
     private PossibleAnswer choice;
 
     @ManyToOne
-    @JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false)
-    private User user;
+    @JoinColumn(name = "eventuser_id", referencedColumnName = EventUser.ID_COLUMN, nullable = false)
+    private EventUser user;
 
     public PollAnswer() {
         super();
@@ -83,11 +83,11 @@ public class PollAnswer extends GenericEntity implements Serializable {
         return choice;
     }
 
-    public void setUser(User user) {
+    public void setUser(EventUser user) {
         this.user = user;
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 

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

@@ -66,15 +66,15 @@ public class PrintedCard extends GenericEntity {
     @ManyToOne
     private Location currentLocation;
 
-    @JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = "eventuser_id", referencedColumnName = EventUser.ID_COLUMN, nullable = false)
     @ManyToOne(optional = false)
-    private User user;
+    private EventUser user;
 
     @JoinColumn(nullable = false, name = "card_template_id", referencedColumnName = CardTemplate.ID_COLUMN)
     @ManyToOne(optional = false)
     private CardTemplate template;
 
-    public PrintedCard(User usr, CardTemplate templ, Calendar printTime, boolean cardEnabled) {
+    public PrintedCard(EventUser usr, CardTemplate templ, Calendar printTime, boolean cardEnabled) {
         super();
         this.event = templ.getEvent();
         this.template = templ;
@@ -144,11 +144,11 @@ public class PrintedCard extends GenericEntity {
         this.currentLocation = currentLocation;
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 
-    public void setUser(User usersId) {
+    public void setUser(EventUser usersId) {
         this.user = usersId;
     }
 
@@ -173,9 +173,9 @@ public class PrintedCard extends GenericEntity {
         @Override
         public int compare(PrintedCard o1, PrintedCard o2) {
             int ret = o2.getGamepoints().compareTo(o1.getGamepoints());
-            if (ret == 0 && o1.getUser().getNick() != null && o2.getUser().getNick() != null)
+            if (ret == 0 && o1.getUser().getUser().getNick() != null && o2.getUser().getUser().getNick() != null)
             {
-                ret = o1.getUser().getNick().compareTo(o2.getUser().getNick());
+                ret = o1.getUser().getUser().getNick().compareTo(o2.getUser().getUser().getNick());
             }
             return ret;
         }

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

@@ -40,8 +40,8 @@ public class Role extends GenericEntity {
     @ManyToMany()
     @JoinTable(name = "role_memberships",
             joinColumns = { @JoinColumn(name = "role_id", referencedColumnName = Role.ID_COLUMN) },
-            inverseJoinColumns = { @JoinColumn(name = "user_id", referencedColumnName = User.ID_COLUMN) })
-    private List<User> users;
+            inverseJoinColumns = { @JoinColumn(name = "eventuser_id", referencedColumnName = EventUser.ID_COLUMN) })
+    private List<EventUser> users;
 
     @ManyToMany(mappedBy = "parents")
     private List<Role> children = new ArrayList<Role>();
@@ -109,14 +109,6 @@ public class Role extends GenericEntity {
         this.cardTemplate = cardTemplatesId;
     }
 
-    public void setUsers(List<User> users) {
-        this.users = users;
-    }
-
-    public List<User> getUsers() {
-        return users;
-    }
-
     public void setDiscounts(List<Discount> discounts) {
         this.discounts = discounts;
     }
@@ -190,4 +182,12 @@ public class Role extends GenericEntity {
         return permissions;
     }
 
+    public List<EventUser> getUsers() {
+        return users;
+    }
+
+    public void setUsers(List<EventUser> users) {
+        this.users = users;
+    }
+
 }

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

@@ -14,13 +14,11 @@ public class UserNote extends GenericEntity {
 
     private static final long serialVersionUID = 6128095532481826770L;
 
-    @ManyToOne
-    @JoinColumn(nullable = false)
-    private User user;
+    private static final String EVENTUSER_ID_COLUMN = "eventuser_id";
 
     @ManyToOne
-    @JoinColumn(nullable = false)
-    private LanEvent event;
+    @JoinColumn(nullable = false, name = EVENTUSER_ID_COLUMN)
+    private EventUser user;
 
     @Lob
     private String content;
@@ -30,22 +28,6 @@ public class UserNote extends GenericEntity {
     @Enumerated(EnumType.STRING)
     private UserNoteType notetype;
 
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public LanEvent getEvent() {
-        return event;
-    }
-
-    public void setEvent(LanEvent event) {
-        this.event = event;
-    }
-
     public String getContent() {
         return content;
     }
@@ -62,4 +44,12 @@ public class UserNote extends GenericEntity {
         this.notetype = notetype;
     }
 
+    public EventUser getUser() {
+        return user;
+    }
+
+    public void setUser(EventUser user) {
+        this.user = user;
+    }
+
 }

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

@@ -27,7 +27,7 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
 @OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
 public class Vote extends GenericEntity {
 
-    protected static final String VOTER_USER_ID = "voter_user_id";
+    protected static final String VOTER_USER_ID = "voter_userevent_id";
     protected static final String ENTRY_ID = "entry_id";
 
     private static final long serialVersionUID = 2L;
@@ -42,13 +42,13 @@ public class Vote extends GenericEntity {
     @Temporal(TemporalType.TIMESTAMP)
     private Calendar time;
 
-    @JoinColumn(name = ENTRY_ID, referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = ENTRY_ID, referencedColumnName = CompoEntry.ID_COLUMN, nullable = false)
     @ManyToOne(optional = false)
     private CompoEntry compoEntry;
 
-    @JoinColumn(name = VOTER_USER_ID, referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = VOTER_USER_ID, referencedColumnName = EventUser.ID_COLUMN, nullable = false)
     @ManyToOne(optional = false)
-    private User voter;
+    private EventUser voter;
 
     public Vote(LanEvent event, Calendar voteTime) {
         super();
@@ -90,21 +90,6 @@ public class Vote extends GenericEntity {
         this.compoEntry = compoEntry;
     }
 
-    /**
-     * @return the voter
-     */
-    public User getVoter() {
-        return voter;
-    }
-
-    /**
-     * @param voter
-     *            the voter to set
-     */
-    public void setVoter(User voter) {
-        this.voter = voter;
-    }
-
     public String getMessage() {
         return message;
     }
@@ -112,4 +97,13 @@ public class Vote extends GenericEntity {
     public void setMessage(String message) {
         this.message = message;
     }
+
+    public EventUser getVoter() {
+        return voter;
+    }
+
+    public void setVoter(EventUser voter) {
+        this.voter = voter;
+    }
+
 }