Skip to content

Riina Antikainen / Moya

Go to a project
Commit 57f87311 by jkj
Options

model cleanup 

git-svn-id: https://dev.intra.insomnia.fi/svn/trunk@58 8cf89bec-f6a3-4178-919f-364fb3449fe5
1 parent 3cc07666
Inline Side-by-side
Showing with 160 additions and 135 deletions
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Event.java
......@@ -29,7 +29,7 @@ import javax.persistence.Version;
@Table(name = "events")
@NamedQueries( {
@NamedQuery(name = "Event.findAll", query = "SELECT e FROM Event e"),
@NamedQuery(name = "Event.findByEventsId", query = "SELECT e FROM Event e WHERE e.eventsId = :eventsId"),
@NamedQuery(name = "Event.findById", query = "SELECT e FROM Event e WHERE e.id = :id"),
@NamedQuery(name = "Event.findByStartTime", query = "SELECT e FROM Event e WHERE e.startTime = :startTime"),
@NamedQuery(name = "Event.findByEndTime", query = "SELECT e FROM Event e WHERE e.endTime = :endTime"),
@NamedQuery(name = "Event.findByName", query = "SELECT e FROM Event e WHERE e.name = :name"),
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap.java
......@@ -21,30 +21,34 @@ import javax.persistence.Version;
/**
*
* @author jkj
*/
@Entity
@Table(name = "maps")
@NamedQueries( {
@NamedQuery(name = "EventMap.findAll", query = "SELECT e FROM EventMap e"),
@NamedQuery(name = "EventMap.findByMapsId", query = "SELECT e FROM EventMap e WHERE e.mapsId = :mapsId"),
@NamedQuery(name = "EventMap.findByMapName", query = "SELECT e FROM EventMap e WHERE e.mapName = :mapName") })
@NamedQuery(name = "EventMap.findById", query = "SELECT e FROM EventMap e WHERE id = :id"),
@NamedQuery(name = "EventMap.findByName", query = "SELECT e FROM EventMap e WHERE e.name = :name") })
public class EventMap implements ModelInterface {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "maps_id", nullable = false)
private Integer id;
@Lob
@Column(name = "map_data")
private byte[] mapData;
@Column(name = "map_name")
private String mapName;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "mapsId")
private List<Place> placeList;
private String name;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "map")
private List<Place> places;
@JoinColumn(name = "events_id", referencedColumnName = "events_id", nullable = false)
@ManyToOne(optional = false)
private Event eventsId;
private Event event;
@Version
@Column(nullable = false)
private int jpaVersionField;
......@@ -64,28 +68,28 @@ public class EventMap implements ModelInterface {
this.mapData = mapData;
}
public String getMapName() {
return mapName;
public String getName() {
return name;
}
public void setMapName(String mapName) {
this.mapName = mapName;
public void setName(String mapName) {
this.name = mapName;
}
public List<Place> getPlaceList() {
return placeList;
public List<Place> getPlaces() {
return places;
}
public void setPlaceList(List<Place> placeList) {
this.placeList = placeList;
public void setPlaces(List<Place> placeList) {
this.places = placeList;
}
public Event getEventsId() {
return eventsId;
public Event getEvent() {
return event;
}
public void setEventsId(Event eventsId) {
this.eventsId = eventsId;
public void setEvent(Event eventsId) {
this.event = eventsId;
}
@Override
......@@ -112,7 +116,7 @@ public class EventMap implements ModelInterface {
@Override
public String toString() {
return "fi.insomnia.bortal.model.EventMap[mapsId=" + getId() + "]";
return "fi.insomnia.bortal.model.EventMap[id=" + getId() + "]";
}
/**
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventSettings.java
......@@ -24,7 +24,7 @@ import javax.persistence.Version;
@NamedQueries( {
@NamedQuery(name = "EventSettings.findAll", query = "SELECT e FROM EventSettings e"),
@NamedQuery(name = "EventSettings.findById", query = "SELECT e FROM EventSettings e WHERE e.id = :id"),
@NamedQuery(name = "EventSettings.findByResourceBundle", query = "SELECT e FROM EventSettings e WHERE e.resourceBundle = :baseName"),
@NamedQuery(name = "EventSettings.findByBaseName", query = "SELECT e FROM EventSettings e WHERE e.baseName = :baseName"),
@NamedQuery(name = "EventSettings.findByStyleSheet", query = "SELECT e FROM EventSettings e WHERE e.styleSheet = :styleSheet") })
public class EventSettings implements ModelInterface {
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventStatus.java
......@@ -19,25 +19,27 @@ import javax.persistence.Version;
/**
*
* @author jkj
*/
@Entity
@Table(name = "event_status", uniqueConstraints = { @UniqueConstraint(columnNames = { "status_name" }) })
@NamedQueries( {
@NamedQuery(name = "EventStatus.findAll", query = "SELECT e FROM EventStatus e"),
@NamedQuery(name = "EventStatus.findByEventStatusId", query = "SELECT e FROM EventStatus e WHERE e.eventStatusId = :eventStatusId"),
@NamedQuery(name = "EventStatus.findById", query = "SELECT e FROM EventStatus e WHERE e.id = :id"),
@NamedQuery(name = "EventStatus.findByStatusName", query = "SELECT e FROM EventStatus e WHERE e.statusName = :statusName") })
public class EventStatus implements ModelInterface {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "event_status_id", nullable = false)
private Integer id;
@Column(name = "status_name", nullable = false)
private String statusName;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "status")
private List<Event> eventList;
private List<Event> events;
@Version
@Column(nullable = false)
private int jpaVersionField;
......@@ -62,12 +64,12 @@ public class EventStatus implements ModelInterface {
this.statusName = statusName;
}
public List<Event> getEventList() {
return eventList;
public List<Event> getEvents() {
return events;
}
public void setEventList(List<Event> eventList) {
this.eventList = eventList;
public void setEvents(List<Event> eventList) {
this.events = eventList;
}
@Override
......@@ -94,8 +96,7 @@ public class EventStatus implements ModelInterface {
@Override
public String toString() {
return "fi.insomnia.bortal.model.EventStatus[eventStatusId=" + getId()
+ "]";
return "fi.insomnia.bortal.model.EventStatus[id=" + getId() + "]";
}
/**
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave.java
......@@ -20,17 +20,16 @@ import javax.persistence.Version;
/**
*
* @author jkj
*/
@Entity
@Table(name = "food_waves")
@NamedQueries( {
@NamedQuery(name = "FoodWave.findAll", query = "SELECT f FROM FoodWave f"),
@NamedQuery(name = "FoodWave.findByFoodWavesId", query = "SELECT f FROM FoodWave f WHERE f.foodWavesId = :foodWavesId"),
@NamedQuery(name = "FoodWave.findByWaveName", query = "SELECT f FROM FoodWave f WHERE f.waveName = :waveName"),
@NamedQuery(name = "FoodWave.findByWaveDescription", query = "SELECT f FROM FoodWave f WHERE f.waveDescription = :waveDescription"),
@NamedQuery(name = "FoodWave.findByWaveTime", query = "SELECT f FROM FoodWave f WHERE f.waveTime = :waveTime"),
@NamedQuery(name = "FoodWave.findByWaveClosed", query = "SELECT f FROM FoodWave f WHERE f.waveClosed = :waveClosed") })
@NamedQuery(name = "FoodWave.findById", query = "SELECT f FROM FoodWave f WHERE f.id = :id"),
@NamedQuery(name = "FoodWave.findByName", query = "SELECT f FROM FoodWave f WHERE f.name = :name"),
@NamedQuery(name = "FoodWave.findByDescription", query = "SELECT f FROM FoodWave f WHERE f.description = :description"),
@NamedQuery(name = "FoodWave.findByTime", query = "SELECT f FROM FoodWave f WHERE f.time = :time"),
@NamedQuery(name = "FoodWave.findByClosed", query = "SELECT f FROM FoodWave f WHERE f.closed = :closed") })
public class FoodWave implements ModelInterface {
private static final long serialVersionUID = 1L;
......@@ -39,17 +38,21 @@ public class FoodWave implements ModelInterface {
private Integer id;
@Column(name = "wave_name", nullable = false)
private String waveName;
private String name;
@Column(name = "wave_description")
private String waveDescription;
private String description;
@Column(name = "wave_time")
@Temporal(TemporalType.TIMESTAMP)
private Date waveTime;
private Date time;
@Column(name = "wave_closed", nullable = false, columnDefinition = "boolean default false")
private boolean closed = false;
@OneToMany(mappedBy = "foodWave")
private List<AccountEvent> accountEvents;
@Column(name = "wave_closed", nullable = false)
private boolean waveClosed;
@OneToMany(mappedBy = "foodWavesId")
private List<AccountEvent> accountEventList;
@Version
@Column(nullable = false)
private int jpaVersionField;
......@@ -63,48 +66,48 @@ public class FoodWave implements ModelInterface {
public FoodWave(Integer foodWavesId, String waveName, boolean waveClosed) {
this.id = foodWavesId;
this.waveName = waveName;
this.waveClosed = waveClosed;
this.name = waveName;
this.closed = waveClosed;
}
public String getWaveName() {
return waveName;
public String getName() {
return name;
}
public void setWaveName(String waveName) {
this.waveName = waveName;
public void setName(String waveName) {
this.name = waveName;
}
public String getWaveDescription() {
return waveDescription;
public String getDescription() {
return description;
}
public void setWaveDescription(String waveDescription) {
this.waveDescription = waveDescription;
public void setDescription(String waveDescription) {
this.description = waveDescription;
}
public Date getWaveTime() {
return waveTime;
public Date getTime() {
return time;
}
public void setWaveTime(Date waveTime) {
this.waveTime = waveTime;
public void setTime(Date waveTime) {
this.time = waveTime;
}
public boolean getWaveClosed() {
return waveClosed;
public boolean getClosed() {
return closed;
}
public void setWaveClosed(boolean waveClosed) {
this.waveClosed = waveClosed;
public void setClosed(boolean waveClosed) {
this.closed = waveClosed;
}
public List<AccountEvent> getAccountEventList() {
return accountEventList;
public List<AccountEvent> getAccountEvents() {
return accountEvents;
}
public void setAccountEventList(List<AccountEvent> accountEventList) {
this.accountEventList = accountEventList;
public void setAccountEvents(List<AccountEvent> accountEventList) {
this.accountEvents = accountEventList;
}
@Override
......@@ -116,7 +119,8 @@ public class FoodWave implements ModelInterface {
@Override
public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are
// TODO: Warning - this method won't work in the case the id
// fields are
// not set
if (!(object instanceof FoodWave)) {
return false;
......@@ -131,7 +135,7 @@ public class FoodWave implements ModelInterface {
@Override
public String toString() {
return "fi.insomnia.bortal.model.FoodWave[foodWavesId=" + getId() + "]";
return "fi.insomnia.bortal.model.FoodWave[id=" + getId() + "]";
}
/**
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate.java
......@@ -17,15 +17,14 @@ import javax.persistence.Version;
/**
*
* @author jkj
*/
@Entity
@Table(name = "food_wave_templates")
@NamedQueries( {
@NamedQuery(name = "FoodWaveTemplate.findAll", query = "SELECT f FROM FoodWaveTemplate f"),
@NamedQuery(name = "FoodWaveTemplate.findByFoodWaveTemplatesId", query = "SELECT f FROM FoodWaveTemplate f WHERE f.foodWaveTemplatesId = :foodWaveTemplatesId"),
@NamedQuery(name = "FoodWaveTemplate.findByTemplateName", query = "SELECT f FROM FoodWaveTemplate f WHERE f.templateName = :templateName"),
@NamedQuery(name = "FoodWaveTemplate.findByTemplateDescription", query = "SELECT f FROM FoodWaveTemplate f WHERE f.templateDescription = :templateDescription") })
@NamedQuery(name = "FoodWaveTemplate.findById", query = "SELECT f FROM FoodWaveTemplate f WHERE f.id = :id"),
@NamedQuery(name = "FoodWaveTemplate.findByName", query = "SELECT f FROM FoodWaveTemplate f WHERE f.name = :name"),
@NamedQuery(name = "FoodWaveTemplate.findByDescription", query = "SELECT f FROM FoodWaveTemplate f WHERE f.description = :description") })
public class FoodWaveTemplate implements ModelInterface {
private static final long serialVersionUID = 1L;
......@@ -34,11 +33,14 @@ public class FoodWaveTemplate implements ModelInterface {
private Integer id;
@Column(name = "template_name", nullable = false)
private String templateName;
private String name;
@Column(name = "template_description")
private String templateDescription;
private String description;
@ManyToMany(mappedBy = "foodWaveTemplate")
private List<Product> products;
@Version
@Column(nullable = false)
private int jpaVersionField;
......@@ -52,23 +54,23 @@ public class FoodWaveTemplate implements ModelInterface {
public FoodWaveTemplate(Integer foodWaveTemplatesId, String templateName) {
this.id = foodWaveTemplatesId;
this.templateName = templateName;
this.name = templateName;
}
public String getTemplateName() {
return templateName;
public String getName() {
return name;
}
public void setTemplateName(String templateName) {
this.templateName = templateName;
public void setName(String templateName) {
this.name = templateName;
}
public String getTemplateDescription() {
return templateDescription;
public String getDescription() {
return description;
}
public void setTemplateDescription(String templateDescription) {
this.templateDescription = templateDescription;
public void setDescription(String templateDescription) {
this.description = templateDescription;
}
@Override
......@@ -95,8 +97,7 @@ public class FoodWaveTemplate implements ModelInterface {
@Override
public String toString() {
return "fi.insomnia.bortal.model.FoodWaveTemplate[foodWaveTemplatesId="
+ getId() + "]";
return "fi.insomnia.bortal.model.FoodWaveTemplate[id=" + getId() + "]";
}
/**
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership.java
......@@ -13,6 +13,7 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
......@@ -21,14 +22,13 @@ import javax.persistence.Version;
/**
*
* @author jkj
*/
@Entity
@Table(name = "group_memberships", uniqueConstraints = { @UniqueConstraint(columnNames = {
"users_id", "groups_id" }) })
@NamedQueries( {
@NamedQuery(name = "GroupMembership.findAll", query = "SELECT g FROM GroupMembership g"),
@NamedQuery(name = "GroupMembership.findByGroupMembershipsId", query = "SELECT g FROM GroupMembership g WHERE g.groupMembershipsId = :groupMembershipsId"),
@NamedQuery(name = "GroupMembership.findById", query = "SELECT g FROM GroupMembership g WHERE g.id = :id"),
@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") })
......@@ -38,22 +38,29 @@ public class GroupMembership implements ModelInterface {
@Id
@Column(name = "group_memberships_id", nullable = false)
private Integer id;
@Column(name = "invite_accepted")
@Temporal(TemporalType.TIMESTAMP)
private Date inviteAccepted;
@Column(name = "invite_email")
private String inviteEmail;
@Column(name = "invite_name")
private String inviteName;
@JoinColumn(name = "groups_id", referencedColumnName = "groups_id", nullable = false)
@ManyToOne(optional = false)
private PlaceGroup groupsId;
private PlaceGroup placeGroup;
@JoinColumn(name = "place_reservation", referencedColumnName = "places_id", nullable = false)
@ManyToOne(optional = false)
@OneToOne(optional = false)
private Place placeReservation;
@JoinColumn(name = "users_id", referencedColumnName = "users_id")
@ManyToOne
private User usersId;
private User user;
@Version
@Column(nullable = false)
private int jpaVersionField;
......@@ -89,12 +96,12 @@ public class GroupMembership implements ModelInterface {
this.inviteName = inviteName;
}
public PlaceGroup getGroupsId() {
return groupsId;
public PlaceGroup getPlaceGroup() {
return placeGroup;
}
public void setGroupsId(PlaceGroup groupsId) {
this.groupsId = groupsId;
public void setPlaceGroup(PlaceGroup groupsId) {
this.placeGroup = groupsId;
}
public Place getPlaceReservation() {
......@@ -105,12 +112,12 @@ public class GroupMembership implements ModelInterface {
this.placeReservation = placeReservation;
}
public User getUsersId() {
return usersId;
public User getUser() {
return user;
}
public void setUsersId(User usersId) {
this.usersId = usersId;
public void setUser(User usersId) {
this.user = usersId;
}
@Override
......@@ -137,8 +144,7 @@ public class GroupMembership implements ModelInterface {
@Override
public String toString() {
return "fi.insomnia.bortal.model.GroupMembership[groupMembershipsId="
+ getId() + "]";
return "fi.insomnia.bortal.model.GroupMembership[id=" + getId() + "]";
}
/**
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place.java
......@@ -4,9 +4,6 @@
*/
package fi.insomnia.bortal.model;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
......@@ -14,7 +11,7 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Version;
......@@ -51,14 +48,16 @@ public class Place implements ModelInterface {
private String placeDetails;
@Column(name = "place_code")
private String placeCode;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "placeReservation")
private List<GroupMembership> groupMembershipList;
@OneToOne(mappedBy = "placeReservation")
private GroupMembership placeReserver;
@JoinColumn(name = "groups_id", referencedColumnName = "groups_id")
@ManyToOne
private PlaceGroup groupsId;
@JoinColumn(name = "maps_id", referencedColumnName = "maps_id", nullable = false)
@ManyToOne(optional = false)
private EventMap mapsId;
private EventMap map;
@JoinColumn(name = "products_id", referencedColumnName = "products_id", nullable = false)
@ManyToOne(optional = false)
private Product productsId;
......@@ -124,14 +123,6 @@ public class Place implements ModelInterface {
this.placeCode = placeCode;
}
public List<GroupMembership> getGroupMembershipList() {
return groupMembershipList;
}
public void setGroupMembershipList(List<GroupMembership> groupMembershipList) {
this.groupMembershipList = groupMembershipList;
}
public PlaceGroup getGroupsId() {
return groupsId;
}
......@@ -140,12 +131,12 @@ public class Place implements ModelInterface {
this.groupsId = groupsId;
}
public EventMap getMapsId() {
return mapsId;
public EventMap getMap() {
return map;
}
public void setMapsId(EventMap mapsId) {
this.mapsId = mapsId;
public void setMap(EventMap mapsId) {
this.map = mapsId;
}
public Product getProductsId() {
......@@ -220,4 +211,12 @@ public class Place implements ModelInterface {
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
public void setPlaceReserver(GroupMembership placeReserver) {
this.placeReserver = placeReserver;
}
public GroupMembership getPlaceReserver() {
return placeReserver;
}
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup.java
......@@ -50,22 +50,29 @@ public class PlaceGroup implements ModelInterface {
@Column(name = "group_edited", nullable = false)
@Temporal(TemporalType.TIMESTAMP)
private Date groupEdited;
@Column(name = "group_code")
private String groupCode;
@Column(name = "group_name")
private String groupName;
@Column(name = "group_active", nullable = false)
private boolean groupActive;
@Column(name = "group_details")
private String groupDetails;
@JoinColumn(name = "group_creator", referencedColumnName = "users_id")
@ManyToOne
private User groupCreator;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "groupsId")
private List<GroupMembership> groupMembershipList;
@OneToMany(mappedBy = "groupsId")
private List<Place> placeList;
@OneToMany(mappedBy = "placeGroup")
private List<Place> places;
@Version
@Column(nullable = false)
private int jpaVersionField;
......@@ -149,12 +156,12 @@ public class PlaceGroup implements ModelInterface {
this.groupMembershipList = groupMembershipList;
}
public List<Place> getPlaceList() {
return placeList;
public List<Place> getPlaces() {
return places;
}
public void setPlaceList(List<Place> placeList) {
this.placeList = placeList;
public void setPlaces(List<Place> placeList) {
this.places = placeList;
}
@Override
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/User.java
......@@ -94,19 +94,22 @@ public class User implements ModelInterface {
private List<CompoEntryParticipant> compoEntryParticipantList;
@OneToMany(mappedBy = "creator")
private List<CompoEntry> compoEntryList;
@OneToMany(mappedBy = "groupCreator")
private List<PlaceGroup> placeGroupList;
@OneToMany(mappedBy = "usersId")
private List<GroupMembership> groupMembershipList;
@OneToMany(mappedBy = "user")
private List<GroupMembership> groupMemberships;
@OneToMany(mappedBy = "usersId")
private List<Place> placeList;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "usersId")
@OneToMany(cascade = CascadeType.ALL, mappedBy = "user")
private List<PrintedCard> printedCardList;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "usersId")
@OneToMany(cascade = CascadeType.ALL, mappedBy = "user")
private List<AccountEvent> accountEventList;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "usersId")
@OneToMany(cascade = CascadeType.ALL, mappedBy = "user")
private List<DiscountInstance> discountInstanceList;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "usersId")
@OneToMany(cascade = CascadeType.ALL, mappedBy = "user")
private List<Bill> billList;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "seller")
private List<AccountEvent> soldItems;
......@@ -307,12 +310,12 @@ public class User implements ModelInterface {
this.placeGroupList = placeGroupList;
}
public List<GroupMembership> getGroupMembershipList() {
return groupMembershipList;
public List<GroupMembership> getGroupMemberships() {
return groupMemberships;
}
public void setGroupMembershipList(List<GroupMembership> groupMembershipList) {
this.groupMembershipList = groupMembershipList;
public void setGroupMemberships(List<GroupMembership> groupMembershipList) {
this.groupMemberships = groupMembershipList;
}
public List<Place> getPlaceList() {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!