Ranking system

.gitignore

@@ -4,4 +4,5 @@
 /Database-Storage/target/
 /TrueSkill/target/
 /TournamentManagerWeb/target/
-/MTG/target/
+/MTG/target/
+/target/

Database-Storage/pom.xml

@@ -57,5 +57,11 @@
             <version>2.3.1</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

Database-Storage/src/main/java/com/github/javydreamercsw/database/storage/db/Format.java

@@ -44,7 +44,9 @@ public class Format implements Serializable
   @Size(max = 255)
   @Column(name = "description")
   private String description;
-  private static final long serialVersionUID = 1L;
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "format")
+  private List<TeamHasFormatRecord> teamHasFormatRecordList;
+  private static final long serialVersionUID = -6764484082819653225L;
   @EmbeddedId
   protected FormatPK formatPK;
   @JoinColumn(name = "game_id", referencedColumnName = "id", insertable = false, 
@@ -53,6 +55,8 @@ public class Format implements Serializable
   private Game game;
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "format")
   private List<MatchEntry> matchEntryList;
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "format")
+  private List<Tournament> tournamentList;
 
   public Format()
   {
@@ -105,6 +109,17 @@ public void setMatchEntryList(List<MatchEntry> matchEntryList)
     this.matchEntryList = matchEntryList;
   }
 
+  @XmlTransient
+  public List<Tournament> getTournamentList()
+  {
+    return tournamentList;
+  }
+
+  public void setTournamentList(List<Tournament> tournamentList)
+  {
+    this.tournamentList = tournamentList;
+  }
+
   @Override
   public int hashCode()
   {
@@ -129,8 +144,40 @@ public boolean equals(Object object)
   @Override
   public String toString()
   {
-    return "com.github.javydreamercsw.database.storage.db.Format[ formatPK=" + 
-            formatPK + " ]";
+    return "com.github.javydreamercsw.database.storage.db.Format[ formatPK=" 
+            + formatPK + " ]";
+  }
+
+
+  @XmlTransient
+  public List<TeamHasFormatRecord> getTeamHasFormatRecordList()
+  {
+    return teamHasFormatRecordList;
+  }
+
+  public void setTeamHasFormatRecordList(List<TeamHasFormatRecord> teamHasFormatRecordList)
+  {
+    this.teamHasFormatRecordList = teamHasFormatRecordList;
+  }
+
+  public String getName()
+  {
+    return name;
+  }
+
+  public void setName(String name)
+  {
+    this.name = name;
+  }
+
+  public String getDescription()
+  {
+    return description;
+  }
+
+  public void setDescription(String description)
+  {
+    this.description = description;
   }
 
   public String getName()

Database-Storage/src/main/java/com/github/javydreamercsw/database/storage/db/Game.java

@@ -35,6 +35,14 @@
         })
 public class Game implements Serializable
 {
+  @Basic(optional = false)
+  @NotNull
+  @Size(min = 1, max = 45)
+  @Column(name = "name")
+  private String name;
+  @Size(max = 255)
+  @Column(name = "description")
+  private String description;
   private static final long serialVersionUID = -6267533299417173163L;
   @Id
   @Basic(optional = false)
@@ -48,14 +56,6 @@ public class Game implements Serializable
           initialValue = 1)
   @Column(name = "id")
   private Integer id;
-  @Basic(optional = false)
-  @NotNull
-  @Size(min = 1, max = 45)
-  @Column(name = "name")
-  private String name;
-  @Size(max = 255)
-  @Column(name = "description")
-  private String description;
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "game")
   private List<Format> formatList;
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "game")
@@ -80,25 +80,6 @@ public void setId(Integer id)
     this.id = id;
   }
 
-  public String getName()
-  {
-    return name;
-  }
-
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-
-  public String getDescription()
-  {
-    return description;
-  }
-
-  public void setDescription(String description)
-  {
-    this.description = description;
-  }
 
   @XmlTransient
   public List<Format> getFormatList()
@@ -148,4 +129,24 @@ public void setRecordList(List<Record> recordList)
   {
     this.recordList = recordList;
   }
+
+  public String getName()
+  {
+    return name;
+  }
+
+  public void setName(String name)
+  {
+    this.name = name;
+  }
+
+  public String getDescription()
+  {
+    return description;
+  }
+
+  public void setDescription(String description)
+  {
+    this.description = description;
+  }
 }

Database-Storage/src/main/java/com/github/javydreamercsw/database/storage/db/MatchResult.java

@@ -128,23 +128,23 @@ public String toString()
             + matchResultPK + " ]";
   }
 
-  public boolean getLocked()
+  public boolean getRanked()
   {
-    return locked;
+    return ranked;
   }
 
-  public void setLocked(boolean locked)
+  public void setRanked(boolean ranked)
   {
-    this.locked = locked;
+    this.ranked = ranked;
   }
 
-  public boolean getRanked()
+  public boolean getLocked()
   {
-    return ranked;
+    return locked;
   }
 
-  public void setRanked(boolean ranked)
+  public void setLocked(boolean locked)
   {
-    this.ranked = ranked;
+    this.locked = locked;
   }
 }

Database-Storage/src/main/java/com/github/javydreamercsw/database/storage/db/Record.java

@@ -38,6 +38,9 @@
 })
 public class Record implements Serializable
 {
+  private static final long serialVersionUID = -893880954416960217L;
+  @EmbeddedId
+  protected RecordPK recordPK;
   @Basic(optional = false)
   @NotNull
   @Column(name = "wins")
@@ -65,9 +68,6 @@ public class Record implements Serializable
   })
   @ManyToMany
   private List<TournamentHasTeam> tournamentHasTeamList;
-  private static final long serialVersionUID = 1L;
-  @EmbeddedId
-  protected RecordPK recordPK;
   @JoinColumn(name = "game_id", referencedColumnName = "id", insertable = false, 
           updatable = false)
   @ManyToOne(optional = false)

Database-Storage/src/main/java/com/github/javydreamercsw/database/storage/db/Round.java

@@ -4,15 +4,19 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.persistence.Basic;
 import javax.persistence.CascadeType;
+import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
@@ -33,12 +37,22 @@ public class Round implements Serializable
   private static final long serialVersionUID = 1L;
   @EmbeddedId
   protected RoundPK roundPK;
-  @JoinColumn(name = "tournament_id", referencedColumnName = "id",
-          insertable = false, updatable = false)
+  @JoinColumns(
+          {
+            @JoinColumn(name = "tournament_id", referencedColumnName = "id",
+                    insertable = false, updatable = false),
+            @JoinColumn(name = "tournament_tournament_format_id",
+                    referencedColumnName = "tournament_format_id",
+                    insertable = false, updatable = false)
+          })
   @ManyToOne(optional = false)
   private Tournament tournament;
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "round")
   private List<MatchEntry> matchEntryList;
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "roundNumber")
+  private int roundNumber;
 
   public Round()
   {
@@ -103,7 +117,7 @@ public boolean equals(Object object)
       return false;
     }
     Round other = (Round) object;
-    return !((this.roundPK == null && other.roundPK != null) 
+    return !((this.roundPK == null && other.roundPK != null)
             || (this.roundPK != null && !this.roundPK.equals(other.roundPK)));
   }
 
@@ -113,4 +127,14 @@ public String toString()
     return "com.github.javydreamercsw.database.storage.db.Round[ roundPK="
             + roundPK + " ]";
   }
+
+  public int getRoundNumber()
+  {
+    return roundNumber;
+  }
+
+  public void setRoundNumber(int roundNumber)
+  {
+    this.roundNumber = roundNumber;
+  }
 }

Database-Storage/src/main/java/com/github/javydreamercsw/database/storage/db/Team.java

@@ -37,6 +37,8 @@ public class Team implements Serializable
   @Size(max = 245)
   @Column(name = "name")
   private String name;
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "team")
+  private List<TeamHasFormatRecord> teamHasFormatRecordList;
   private static final long serialVersionUID = 1L;
   @Id
   @Basic(optional = false)
@@ -61,6 +63,7 @@ public Team()
     matchHasTeamList = new ArrayList<>();
     playerList = new ArrayList<>();
     tournamentHasTeamList = new ArrayList<>();
+    teamHasFormatRecordList = new ArrayList<>();
   }
 
   public Team(String name)
@@ -79,7 +82,6 @@ public void setId(Integer id)
     this.id = id;
   }
 
-
   @XmlTransient
   public List<Player> getPlayerList()
   {
@@ -140,6 +142,17 @@ public String toString()
     return "com.github.javydreamercsw.database.storage.db.Team[ id=" + id + " ]";
   }
 
+  @XmlTransient
+  public List<TeamHasFormatRecord> getTeamHasFormatRecordList()
+  {
+    return teamHasFormatRecordList;
+  }
+
+  public void setTeamHasFormatRecordList(List<TeamHasFormatRecord> teamHasFormatRecordList)
+  {
+    this.teamHasFormatRecordList = teamHasFormatRecordList;
+  }
+
   public String getName()
   {
     return name;