Add support for xbox players

ExcuseMi · Aug 26, 2016 · 7bbfe1d · 7bbfe1d
1 parent b547255
commit 7bbfe1d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/com/excuseme/rocketleaguelivestats/model/GamingSystem.java b/src/main/java/com/excuseme/rocketleaguelivestats/model/GamingSystem.java
@@ -1,7 +1,7 @@
 package com.excuseme.rocketleaguelivestats.model;
 
 public enum GamingSystem {
-    STEAM("steam","gamingsystem/steam.png", 3), PS4("ps4","gamingsystem/Ps4.png",2), XBOX("xbox","",3), BOT("other", "", null);
+    STEAM("steam","gamingsystem/steam.png", 3), PS4("ps4","gamingsystem/Ps4.png",2), XBOX("xbox","",1), BOT("other", "", null);
 
     private String qualifier;
     private String iconPath;

diff --git a/src/main/java/com/excuseme/rocketleaguelivestats/repository/GameMapper.java b/src/main/java/com/excuseme/rocketleaguelivestats/repository/GameMapper.java
@@ -31,17 +31,21 @@ public static Game map(GameData gameData) {
         final List<Player> players = new ArrayList<Player>();
 
         for (PlayerName playerName : playerNames) {
+
             PlayerId playerId = findPlayerId(playerIds, playerName.getNumber());
             if (playerId == null) {
                 final PlayerName extensionPlayer = findExtensionPlayer(playerNames, playerName.getName());
                 if (extensionPlayer != null) {
                     playerId = findPlayerId(playerIds, extensionPlayer.getNumber());
                 }
             }
-            int number = playerId != null ? playerId.getNumber() : -1;
             String system = playerId != null ? playerId.getSystem() : null;
             GamingSystem gamingSystem = mapSystem(system);
-            String id = playerId != null ? playerId.getId() : null;
+
+            int number = playerId != null ? playerId.getNumber() : -1;
+
+            String id = GamingSystem.XBOX.equals(gamingSystem) ? playerName.getName() : playerId != null ? playerId.getId() : null;
+
             boolean ownPlayer = calculateOwnPlayer(playerId, gameData.getOwnPlayer(), gamingSystem);
             String nickName = playerName.getName();
             int row = 0;
@@ -102,7 +106,7 @@ private static GamingSystem mapSystem(String system) {
             return GamingSystem.STEAM;
         } else if ("PS4".equalsIgnoreCase(system)) {
             return GamingSystem.PS4;
-        } else if ("XBOX".equalsIgnoreCase(system)) {
+        } else if ("XboxOne".equalsIgnoreCase(system)) {
             return GamingSystem.XBOX;
         } else {
             return GamingSystem.BOT;