Pre-Expansion Update for 5.0 Changes

src/main/java/com/ffxivcensus/gatherer/player/PlayerBean.java

@@ -47,6 +47,8 @@ public class PlayerBean {
     private int levelRedmage;
     private int levelSamurai;
     private int levelBluemage;
+    private int levelGunbreaker;
+    private int levelDancer;
     private int levelCarpenter;
     private int levelBlacksmith;
     private int levelArmorer;
@@ -341,20 +343,30 @@ public void setLevelSamurai(final int lvlSamurai) {
         this.levelSamurai = lvlSamurai;
     }
 
-    /**
-     * @return the levelBluemage
-     */
     public int getLevelBluemage() {
         return levelBluemage;
     }
 
-    /**
-     * @param levelBluemage the levelBluemage to set
-     */
     public void setLevelBluemage(int levelBluemage) {
         this.levelBluemage = levelBluemage;
     }
 
+    public int getLevelGunbreaker() {
+        return levelGunbreaker;
+    }
+
+    public void setLevelGunbreaker(int levelGunbreaker) {
+        this.levelGunbreaker = levelGunbreaker;
+    }
+
+    public int getLevelDancer() {
+        return levelDancer;
+    }
+
+    public void setLevelDancer(int levelDancer) {
+        this.levelDancer = levelDancer;
+    }
+
     public int getLevelCarpenter() {
         return levelCarpenter;
     }

src/main/java/com/ffxivcensus/gatherer/player/PlayerBuilder.java

@@ -64,7 +64,7 @@ public class PlayerBuilder {
 
     /**
      * Set player class levels.
-     * As of 4.0, this is now parsed in the order:
+     * As of 4.5, this is now parsed in the order:
      * - Gladiator
      * - Marauder
      * - Dark Knight
@@ -80,13 +80,16 @@ public class PlayerBuilder {
      * - Black Mage
      * - Summoner
      * - Red Mage
+     * - Blue Mage
      *
      * @param arrLevels integer array of classes in order displayed on lodestone.
      */
     public void setLevels(final PlayerBean player, final int[] arrLevels) {
         player.setLevelGladiator(arrLevels[0]);
         player.setLevelMarauder(arrLevels[1]);
         player.setLevelDarkknight(arrLevels[2]);
+        // TODO: Update for 5.0 job changes on the lodestone
+        //player.setLevelGunbreaker(arrLevels[gnb]);
         player.setLevelPugilist(arrLevels[3]);
         player.setLevelLancer(arrLevels[4]);
         player.setLevelRogue(arrLevels[5]);
@@ -96,6 +99,7 @@ public void setLevels(final PlayerBean player, final int[] arrLevels) {
         player.setLevelAstrologian(arrLevels[9]);
         player.setLevelArcher(arrLevels[10]);
         player.setLevelMachinist(arrLevels[11]);
+        //player.setLevelDancer(arrLevels[dnc]);
         player.setLevelThaumaturge(arrLevels[12]);
         player.setLevelArcanist(arrLevels[13]);
         player.setLevelRedmage(arrLevels[14]);

src/main/resources/db/changelog/db.changelog-master.yaml

@@ -578,6 +578,27 @@ databaseChangeLog:
                     constraints:
                       nullable: false
                     afterColumn: sbartbook
+  - changeSet:
+      id: 11
+      author: matthewhillier
+      changes:
+          - addColumn:
+              tableName: tblplayers
+              columns:
+                - column:
+                    name: level_gunbreaker
+                    type: int(3)
+                    defaultValueNumeric: 0
+                    constraints:
+                      nullable: false
+                    afterColumn: level_bluemage
+                - column:
+                    name: level_dancer
+                    type: int(3)
+                    defaultValueNumeric: 0
+                    constraints:
+                      nullable: false
+                    afterColumn: level_gunbreaker
 
 
 

src/test/java/com/ffxivcensus/gatherer/player/PlayerBuilderIT.java

@@ -54,6 +54,7 @@ public void testGetPlayer() throws Exception {
         assertTrue(playerOne.getLevelGladiator() >= 60);
         assertTrue(playerOne.getLevelMarauder() >= 60);
         assertTrue(playerOne.getLevelDarkknight() >= 60);
+        assertTrue(playerOne.getLevelGunbreaker() >= 0);
 
         // Melee DPS
         assertTrue(playerOne.getLevelPugilist() >= 60);
@@ -64,6 +65,7 @@ public void testGetPlayer() throws Exception {
         // Ranged Physical DPS
         assertTrue(playerOne.getLevelArcher() >= 52);
         assertTrue(playerOne.getLevelMachinist() >= 60);
+        assertTrue(playerOne.getLevelDancer() >= 0);
 
         // Ranged Magical DPS
         assertTrue(playerOne.getLevelThaumaturge() >= 60);
@@ -92,7 +94,7 @@ public void testGetPlayer() throws Exception {
         assertTrue(playerOne.getLevelFisher() >= 60);
 
         // The Forbidden Land, Eureka
-        assertTrue(playerOne.getLevelEureka() == 20);
+        assertTrue(playerOne.getLevelEureka() >= 48);
 
         // Test boolean values
         // Subscription periods

src/test/java/com/ffxivcensus/gatherer/player/PlayerBuilderTest.java

@@ -42,6 +42,7 @@ public void testLoadFrom2256025() throws Exception {
         assertEquals(0, player.getLevelGladiator());
         assertEquals(0, player.getLevelMarauder());
         assertEquals(70, player.getLevelDarkknight());
+        assertEquals(0, player.getLevelGunbreaker());
 
         // Melee DPS
         assertEquals(70, player.getLevelPugilist());
@@ -52,6 +53,7 @@ public void testLoadFrom2256025() throws Exception {
         // Ranged Physical DPS
         assertEquals(70, player.getLevelArcher());
         assertEquals(70, player.getLevelMachinist());
+        assertEquals(0, player.getLevelDancer());
 
         // Ranged Magical DPS
         assertEquals(70, player.getLevelThaumaturge());
@@ -165,6 +167,7 @@ public void testLoadFrom22763008() throws Exception {
         assertEquals(0, player.getLevelGladiator());
         assertEquals(28, player.getLevelMarauder());
         assertEquals(0, player.getLevelDarkknight());
+        assertEquals(0, player.getLevelGunbreaker());
 
         // Melee DPS
         assertEquals(0, player.getLevelPugilist());
@@ -175,6 +178,7 @@ public void testLoadFrom22763008() throws Exception {
         // Ranged Physical DPS
         assertEquals(0, player.getLevelArcher());
         assertEquals(0, player.getLevelMachinist());
+        assertEquals(0, player.getLevelDancer());
 
         // Ranged Magical DPS
         assertEquals(0, player.getLevelThaumaturge());