Merge pull request #132 from Vauhtijuoksu/develop

use participants instead of players

Author: jiisloth

vj_cms/client.py

@@ -33,9 +33,19 @@ def games(self):
         return games
 
     def players(self):
-        players = self.get('players')
-        return players
-
+        participants = self.get('participants')
+        particing_players = []
+        for participant in participants:
+            player = {"id":participant['id'],
+                      "display_name":participant['display_name'],
+                      "twitch_channel":"",
+                      "discord_nick":""
+                      }
+            for social in participant['social_medias']:
+                if social['platform'] == 'TWITCH':
+                    player['twitch_channel'] = social['username']
+            particing_players.append(player)
+        return particing_players
 
     def donations(self):
         donations = self.get('donations')

vj_cms/views.py

@@ -25,8 +25,13 @@ def update_timetable(request):
     GameInfo.objects.all().delete()
     for game in games:
         api_id = game.pop('id')
-        game_players = game.pop('players')
+        if "players" in game:
+            game.pop('players')
+        game_players = []
         game_participants = game.pop('participants')
+        for participant in game_participants:
+            if participant['role'] == "PLAYER":
+                game_players.append(participant['participant_id'])
         game_, _ = GameInfo.objects.update_or_create(
             api_id=api_id,
             defaults=game