sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

c2 fixes

Browse Source
This commit is contained in:
Sander Roosendaal
2023-03-04 14:26:51 +01:00
parent 76bdc36b0a
commit 2f41551df2
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/integrations/c2.py
View File

@@ -327,7 +327,7 @@ class C2Integration(SyncIntegration):
if not c2userid: # pragma: no cover if not c2userid: # pragma: no cover
raise NoTokenError("User has no token") raise NoTokenError("User has no token")
dologging('debuglog.log', dologging('c2_log.log',
'Upload to C2 user {userid}'.format(userid=user.id)) 'Upload to C2 user {userid}'.format(userid=user.id))
data = self.createworkoutdata(workout) data = self.createworkoutdata(workout)
dologging('c2_log.log', json.dumps(data)) dologging('c2_log.log', json.dumps(data))

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.

38
rowers/views/importviews.py
View File

@@ -14,12 +14,27 @@ from rowers.utils import NoTokenError
import numpy import numpy
importauthorizeviews = {
'c2': 'rower_integration_authorize',
'strava': 'rower_integration_authorize',
'polar': 'rower_polar_authorize',
'ownapi': 'workout_view',
'sporttracks': 'rower_integration_authorize',
'trainingpeaks': 'rower_integration_authorize',
'nk': 'rower_integration_authorize',
'rp3': 'rower_integration_authorize',
'garmin': 'rower_garmin_authorize',
}
def default(o): # pragma: no cover def default(o): # pragma: no cover
if isinstance(o, numpy.int64): if isinstance(o, numpy.int64):
return int(o) return int(o)
raise TypeError raise TypeError
@login_required()
def workout_export_view(request, id=0, source='c2'): def workout_export_view(request, id=0, source='c2'):
r = getrower(request.user) r = getrower(request.user)
w = get_workout_by_opaqueid(request, id) w = get_workout_by_opaqueid(request, id)
@@ -351,9 +366,13 @@ def workout_import_view(request, source='c2'):
try: try:
_ = integration.open() _ = integration.open()
except NoTokenError: # pragma: no cover except NoTokenError: # pragma: no cover
return HttpResponseRedirect("/rowers/me/nkauthorize/") try:
url = importauthorizeviews[source]
return HttpResponseRedirect(url)
except KeyError:
messages.error(request,'Sorry, an error occurred. Please reauthorize')
url = reverse('rower_export_settings_view')
return HttpResponseRedirect(url)
if request.method == 'POST': # pragma: no cover if request.method == 'POST': # pragma: no cover
@@ -963,19 +982,6 @@ def garmin_details_view(request):
importauthorizeviews = {
'c2': 'rower_integration_authorize',
'strava': 'rower_integration_authorize',
'polar': 'rower_polar_authorize',
'ownapi': 'workout_view',
'sporttracks': 'rower_integration_authorize',
'trainingpeaks': 'rower_integration_authorize',
'nk': 'rower_integration_authorize',
'rp3': 'rower_integration_authorize',
'garmin': 'rower_garmin_authorize',
}
@login_required() @login_required()
def workout_getimportview(request, externalid, source='c2', do_async=True): def workout_getimportview(request, externalid, source='c2', do_async=True):
try: try: