Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/java/com/cpjd/requests/EventRequest.java
widavies · Feb 5, 2018 · 277ac0e · 277ac0e
2 parents a39a78a + 85290b4
commit 277ac0e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules/TBA-API-V3.iml b/.idea/modules/TBA-API-V3.iml
diff --git a/src/main/java/com/cpjd/models/simple/SMatch.java b/src/main/java/com/cpjd/models/simple/SMatch.java
@@ -11,7 +11,7 @@
  * @author Will Davies
  */
 @Data
-public class SMatch implements Serializable, Comparable<Match> {
+public class SMatch implements Serializable, Comparable<SMatch> {
     /**
      * TBA event key with the format yyyy[EVENT_CODE]_[COMP_LEVEL]m[MATCH_NUMBER], where yyyy is the year, and EVENT_CODE is the event code of the event, COMP_LEVEL is (qm, ef, qf, sf, f), and MATCH_NUMBER is the match number in the competition level. A set number may append the competition level if more than one match in required per set.
      *
@@ -67,7 +67,7 @@ public class SMatch implements Serializable, Comparable<Match> {
      */
 
     @Override
-    public int compareTo(Match o) {
+    public int compareTo(SMatch o) {
         long localScore = matchNumber;
         if(compLevel.equals("qf")) localScore += 1000;
         else if(compLevel.equals("sf")) localScore += 10000;

diff --git a/src/main/java/com/cpjd/utils/Parser.java b/src/main/java/com/cpjd/utils/Parser.java
@@ -194,10 +194,11 @@ protected Match parseMatch(Object object) {
         JSONObject allies = (JSONObject) hash.get("alliances");
         if(allies != null) {
             JSONObject blue = (JSONObject) allies.get("blue");
-            JSONObject red = (JSONObject) allies.get("blue");
+            JSONObject red = (JSONObject) allies.get("red");
             MatchAlliance redAlly = new MatchAlliance();
             MatchAlliance blueAlly = new MatchAlliance();
             redAlly.setScore(Utils.cleanLong(red.get("score")));
+            blueAlly.setScore(Utils.cleanLong(blue.get("score")));
             JSONArray redTeamKeys = (JSONArray) red.get("team_keys");
             JSONArray blueTeamKeys = (JSONArray) blue.get("team_keys");
             redAlly.setTeamKeys(Utils.jsonArrayToStringArray(redTeamKeys));
@@ -231,10 +232,11 @@ protected SMatch parseSMatch(Object object) {
         JSONObject allies = (JSONObject) hash.get("alliances");
         if(allies != null) {
             JSONObject blue = (JSONObject) allies.get("blue");
-            JSONObject red = (JSONObject) allies.get("blue");
+            JSONObject red = (JSONObject) allies.get("red");
             MatchAlliance redAlly = new MatchAlliance();
             MatchAlliance blueAlly = new MatchAlliance();
             redAlly.setScore(Utils.cleanLong(red.get("score")));
+            blueAlly.setScore(Utils.cleanLong(blue.get("score")));
             JSONArray redTeamKeys = (JSONArray) red.get("team_keys");
             JSONArray blueTeamKeys = (JSONArray) blue.get("team_keys");
             redAlly.setTeamKeys(Utils.jsonArrayToStringArray(redTeamKeys));