Merge branch 'v2-gamecard' into v2

# Conflicts:
#	config/settings/base.py

teamsnap/views.py

@@ -1,6 +1,5 @@
 import datetime
 
-import pyteamsnap.api
 import requests
 from allauth.socialaccount.providers.oauth2.views import (
     OAuth2Adapter,
@@ -19,6 +18,7 @@ from django.views.generic.edit import FormView
 from .forms import PreferencesForm
 from .models import Preferences
 from .provider import TeamsnapProvider
+from .utils import get_teamsnap_client
 
 
 class TeamsnapAdapter(OAuth2Adapter):
@@ -53,19 +53,6 @@ oauth2_login = OAuth2LoginView.adapter_view(TeamsnapAdapter)
 oauth2_callback = OAuth2CallbackView.adapter_view(TeamsnapAdapter)
 
 
-def get_teamsnap_client(request):
-    request.user.socialaccount_set.filter(provider="teamsnap").first()
-    current_teamsnap_user = request.user.socialaccount_set.filter(
-        provider="teamsnap"
-    ).first()
-
-    ts_token = (
-        current_teamsnap_user.socialtoken_set.order_by("-expires_at").first().token
-    )
-
-    return pyteamsnap.api.TeamSnap(token=ts_token)
-
-
 class PreferencesFormView(FormView):
     template_name = "preferences.html"
     form_class = PreferencesForm
@@ -395,8 +382,7 @@ def submit_lineup(request, team_id, event_id):
                         try:
                             r.append(event_lineup_entry.put())
                         except Exception as e:
-                            e
-                            pass
+                            raise e
                     pass
                 elif data.get("sequence") is not None and data.get("label"):
                     event_lineup_entry = EventLineupEntry.new(client)