Incorporate pyteamsnap changes

.idea/vcs.xml

@@ -2,6 +2,8 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/gamescrapyr" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/pyteamsnap" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/../gamescrapyr" vcs="Git" />
   </component>
 </project>

gamecard/views.py

@@ -1,7 +1,7 @@
 from django.shortcuts import render
 
 import gamechanger.models as GcModels
-import gamechanger.utils.gamechanger
+from gamechanger.utils.gamechanger import get_gamechanger_client
 from teamsnap.models import Opponent, Team
 from teamsnap.utils import get_teamsnap_client
 
@@ -9,7 +9,7 @@ from teamsnap.utils import get_teamsnap_client
 def gamecard(request, team_id, event_id):
     import re
 
-    from pyteamsnap.api import (
+    from pyteamsnap.objects import (
         Availability,
         AvailabilitySummary,
         Event,
@@ -61,7 +61,8 @@ def gamecard(request, team_id, event_id):
     ts_availability_lookup = {m.data["id"]: m for m in ts_availabilities}
     ts_lineup_entries_lookup = {m.data["member_id"]: m for m in ts_lineup_entries}
 
-    stats = gamechanger.utils.gamechanger.stats(request)
+    gc_client = get_gamechanger_client(request)
+    stats = gc_client.get_stats()
     stats_lookup = {
         GcModels.Player.objects.filter(id=k).first().teamsnap_member_id: stat_row
         for k, stat_row in stats.items()

instagen/views.py

@@ -13,7 +13,8 @@ def image_generator(request, team_id, event_id):
 
     TOKEN = current_teamsnap_user.socialtoken_set.order_by("-expires_at").first().token
 
-    from pyteamsnap.api import Event, TeamSnap
+    from pyteamsnap.client import TeamSnap
+    from pyteamsnap.objects import Event
 
     client = TeamSnap(token=TOKEN)
 
@@ -24,7 +25,7 @@ def image_generator(request, team_id, event_id):
 def get_matchup_image(request, team_id, event_id, dimensions=None, background=None):
     import io
 
-    from pyteamsnap.api import Location, Opponent, Team
+    from pyteamsnap.objects import Location, Opponent, Team
 
     from .utils.gen_image import Location as ImagegenLocation
     from .utils.gen_image import Team as ImagegenTeam
@@ -43,7 +44,8 @@ def get_matchup_image(request, team_id, event_id, dimensions=None, background=No
         current_teamsnap_user.socialtoken_set.order_by("-expires_at").first().token
     )
 
-    from pyteamsnap.api import Event, TeamSnap
+    from pyteamsnap.client import TeamSnap
+    from pyteamsnap.objects import Event
 
     teamsnap = TeamSnap(token=ts_token)
 

teamsnap/views.py

@@ -282,11 +282,11 @@ class OpponentFormView(FormView):
         return form
 
     def get_context_data(self, **kwargs):
-        import pyteamsnap
+        import pyteamsnap.objects
 
         ts_client = get_teamsnap_client(self.request)
         context = super().get_context_data(**kwargs)
-        opponent = pyteamsnap.api.Opponent.get(
+        opponent = pyteamsnap.objects.Opponent.get(
             ts_client, self.kwargs.get("opponent_id")
         )
         context["opponent"] = opponent
@@ -299,11 +299,11 @@ class Opponents(ListView):
     pass
 
     def get_queryset(self):
-        import pyteamsnap
+        from pyteamsnap.objects import Opponent as TsOpponent
 
         ts_client = get_teamsnap_client(self.request)
         team_id = self.kwargs.get("team_id")
-        ts_opponents = pyteamsnap.api.Opponent.search(ts_client, team_id=team_id)
+        ts_opponents = TsOpponent.search(ts_client, team_id=team_id)
         ts_opponents.sort(key=lambda t: t.data.get("name"))
         opponents = []
         for opponent in ts_opponents: