Create a model and DAO for DDR 16 shops

src/main/java/com/buttongames/butterfly/hibernate/dao/impl/Ddr16FacilityDao.java

@@ -0,0 +1,24 @@
+package com.buttongames.butterfly.hibernate.dao.impl;
+
+import com.buttongames.butterfly.hibernate.dao.AbstractHibernateDao;
+import com.buttongames.butterfly.model.Ddr16Facility;
+import org.hibernate.SessionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Repository;
+
+/**
+ * DAO for interacting with <code>Ddr16Facility</code> objects in the database.
+ * @author skogaby (skogabyskogaby@gmail.com)
+ */
+@Scope(BeanDefinition.SCOPE_PROTOTYPE)
+@Repository
+public class Ddr16FacilityDao extends AbstractHibernateDao<Ddr16Facility> {
+
+    @Autowired
+    public Ddr16FacilityDao(final SessionFactory sessionFactory) {
+        super(sessionFactory);
+        setClazz(Ddr16Facility.class);
+    }
+}

src/main/java/com/buttongames/butterfly/model/Ddr16Facility.java

@@ -0,0 +1,236 @@
+package com.buttongames.butterfly.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+/**
+ * Model class that represents a facility housing a DDR 16 machine.
+ * @author skogaby (skogabyskogaby@gmail.com)
+ */
+@Entity
+@Table(name = "ddr_16_facilities")
+public class Ddr16Facility implements Externalizable {
+
+    private static final long serialVersionUID = 1L;
+
+    /** ID of the event, primary key. */
+    @Id
+    @GeneratedValue
+    @Column(name = "id")
+    private long id;
+
+    /** The user who owns the machine this event occurred on. */
+    @ManyToOne
+    @JoinColumn(name = "user_id")
+    private ButterflyUser machineOwner;
+
+    /** The PCBID for this facility. */
+    @Column(name = "pcb_id")
+    private String pcbId;
+
+    /** The location ID for this facility. */
+    @Column(name = "location_id")
+    private String locationId;
+
+    /** The name of the facility. */
+    @Column(name = "name")
+    private String name;
+
+    /** The country of the facility. */
+    @Column(name = "country")
+    private String country;
+
+    /** The region of the facility. */
+    @Column(name = "region")
+    private String region;
+
+    /** Is the facility public. */
+    @Column(name = "is_public")
+    private boolean isPublic;
+
+    /** The latitude of the facility. */
+    @Column(name = "latitude")
+    private String latitude;
+
+    /** The longitude of the facility. */
+    @Column(name = "longitude")
+    private String longitude;
+
+    /** The notch amount for the facility. */
+    @Column(name = "notch_amount")
+    private int notchAmount;
+
+    /** The notch count for the facility. */
+    @Column(name = "notch_count")
+    private int notchCount;
+
+    /** The supply limit for the facility. */
+    @Column(name = "supply_limit")
+    private int supplyLimit;
+
+    public Ddr16Facility() { }
+
+    public Ddr16Facility(final ButterflyUser machineOwner, final String pcbId, final String locationId, final String name,
+                         final String country, final String region, final boolean isPublic, final String latitude, final String longitude,
+                         final int notchAmount, final int notchCount, final int supplyLimit) {
+        this.machineOwner = machineOwner;
+        this.pcbId = pcbId;
+        this.locationId = locationId;
+        this.name = name;
+        this.country = country;
+        this.region = region;
+        this.isPublic = isPublic;
+        this.latitude = latitude;
+        this.longitude = longitude;
+        this.notchAmount = notchAmount;
+        this.notchCount = notchCount;
+        this.supplyLimit = supplyLimit;
+    }
+
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+        out.writeLong(this.id);
+        out.writeObject(this.machineOwner);
+        out.writeUTF(this.pcbId);
+        out.writeUTF(this.locationId);
+        out.writeUTF(this.name);
+        out.writeUTF(this.country);
+        out.writeUTF(this.region);
+        out.writeBoolean(this.isPublic);
+        out.writeUTF(this.latitude);
+        out.writeUTF(this.longitude);
+        out.writeInt(this.notchAmount);
+        out.writeInt(this.notchCount);
+        out.writeInt(this.supplyLimit);
+    }
+
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+        this.setId(in.readLong());
+        this.setMachineOwner((ButterflyUser) in.readObject());
+        this.setPcbId(in.readUTF());
+        this.setLocationId(in.readUTF());
+        this.setName(in.readUTF());
+        this.setCountry(in.readUTF());
+        this.setRegion(in.readUTF());
+        this.setPublic(in.readBoolean());
+        this.setLatitude(in.readUTF());
+        this.setLongitude(in.readUTF());
+        this.setNotchAmount(in.readInt());
+        this.setNotchCount(in.readInt());
+        this.setSupplyLimit(in.readInt());
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    private void setId(long id) {
+        this.id = id;
+    }
+
+    public ButterflyUser getMachineOwner() {
+        return machineOwner;
+    }
+
+    public void setMachineOwner(ButterflyUser machineOwner) {
+        this.machineOwner = machineOwner;
+    }
+
+    public String getPcbId() {
+        return pcbId;
+    }
+
+    public void setPcbId(String pcbId) {
+        this.pcbId = pcbId;
+    }
+
+    public String getLocationId() {
+        return locationId;
+    }
+
+    public void setLocationId(String locationId) {
+        this.locationId = locationId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public boolean isPublic() {
+        return isPublic;
+    }
+
+    public void setPublic(boolean aPublic) {
+        isPublic = aPublic;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public int getNotchAmount() {
+        return notchAmount;
+    }
+
+    public void setNotchAmount(int notchAmount) {
+        this.notchAmount = notchAmount;
+    }
+
+    public int getNotchCount() {
+        return notchCount;
+    }
+
+    public void setNotchCount(int notchCount) {
+        this.notchCount = notchCount;
+    }
+
+    public int getSupplyLimit() {
+        return supplyLimit;
+    }
+
+    public void setSupplyLimit(int supplyLimit) {
+        this.supplyLimit = supplyLimit;
+    }
+}

src/main/java/com/buttongames/butterfly/model/Ddr16GameplayEventLog.java

@@ -78,16 +78,16 @@ public class Ddr16GameplayEventLog implements Externalizable {
     private long numData2;
 
     /** The location ID for the facility of the machine. */
-    // TODO: Make this a real Facility reference
-    @Column(name = "location_id")
-    private String locationId;
+    @ManyToOne
+    @JoinColumn(name = "facility_id")
+    private Ddr16Facility facility;
 
     public Ddr16GameplayEventLog() { }
 
     public Ddr16GameplayEventLog(final ButterflyUser machineOwner, final String pcbId, final String model, final int retryCount,
                                  final String eventId, final int eventOrder, final long pcbTime, final long gameSession,
                                  final String stringData1, final String stringData2, final long numData1, final long numData2,
-                                 final String locationId) {
+                                 final Ddr16Facility facility) {
         this.machineOwner = machineOwner;
         this.pcbId = pcbId;
         this.model = model;
@@ -100,7 +100,7 @@ public class Ddr16GameplayEventLog implements Externalizable {
         this.stringData2 = stringData2;
         this.numData1 = numData1;
         this.numData2 = numData2;
-        this.locationId = locationId;
+        this.facility = facility;
     }
 
     @Override
@@ -118,7 +118,7 @@ public class Ddr16GameplayEventLog implements Externalizable {
         out.writeUTF(this.stringData2);
         out.writeLong(this.numData1);
         out.writeLong(this.numData2);
-        out.writeUTF(this.locationId);
+        out.writeObject(this.facility);
     }
 
     @Override
@@ -136,7 +136,7 @@ public class Ddr16GameplayEventLog implements Externalizable {
         this.setStringData2(in.readUTF());
         this.setNumData1(in.readLong());
         this.setNumData2(in.readLong());
-        this.setLocationId(in.readUTF());
+        this.setFacility((Ddr16Facility) in.readObject());
     }
 
     public long getId() {
@@ -243,11 +243,11 @@ public class Ddr16GameplayEventLog implements Externalizable {
         this.numData2 = numData2;
     }
 
-    public String getLocationId() {
-        return locationId;
+    public Ddr16Facility getFacility() {
+        return facility;
     }
 
-    public void setLocationId(String locationId) {
-        this.locationId = locationId;
+    public void setFacility(Ddr16Facility facility) {
+        this.facility = facility;
     }
 }

src/main/java/com/buttongames/butterfly/spring/configuration/HibernateConfiguration.java

@@ -2,6 +2,7 @@ package com.buttongames.butterfly.spring.configuration;
 
 import com.buttongames.butterfly.hibernate.dao.impl.ButterflyPcbDao;
 import com.buttongames.butterfly.hibernate.dao.impl.ButterflyUserDao;
+import com.buttongames.butterfly.hibernate.dao.impl.Ddr16FacilityDao;
 import com.buttongames.butterfly.hibernate.dao.impl.Ddr16GameplayEventLogDao;
 import com.buttongames.butterfly.hibernate.dao.impl.Ddr16PcbEventLogDao;
 import com.buttongames.butterfly.hibernate.dao.impl.UserPhasesDao;
@@ -104,4 +105,9 @@ public class HibernateConfiguration {
     public Ddr16PcbEventLogDao ddr16PcbEventLogDao(final SessionFactory sessionFactory) {
         return new Ddr16PcbEventLogDao(sessionFactory);
     }
+
+    @Bean
+    public Ddr16FacilityDao ddr16FacilityDao(final SessionFactory sessionFactory) {
+        return new Ddr16FacilityDao(sessionFactory);
+    }
 }