Merge branch 'release/v13.22'

rowers/garmin_stuff.py

@@ -177,7 +177,14 @@ def garmin_getworkout(garminid,r,activity):
 
 def garmin_workouts_from_details(activities):
     for activity in activities:
-        garmintoken = activity['userAccessToken']
+        try:
+            garmintoken = activity['userAccessToken']
+        except KeyError:
+            print(activity)
+            return 0
+        except TypeError:
+            print(activity)
+            return 0
         try:
             r = Rower.objects.get(garmintoken=garmintoken)
             garminid = activity['summaryId'][:-7]
@@ -205,7 +212,7 @@ def garmin_workouts_from_details(activities):
             df[' DriveLength (meters)'] = 0
             df[' PeakDriveForce (lbs)'] = 1
             df[' DriveTime (ms)'] = 0
-            
+
             rowdata = rowingdata(df=df)
             rowdata.write_csv(w.csvfilename,gzip=True)
             data = dataprep.dataprep(rowdata.df,id=w.id)

rowers/views/importviews.py

@@ -1053,10 +1053,6 @@ def garmin_details_view(request):
     data = json.loads(request.body)
     result = garmin_stuff.garmin_workouts_from_details(data)
 
-
-    if result:
-        return HttpResponse(status=200)
-
     return HttpResponse(status=200)