Merge branch 'develop' into feature/icu_sessions

rowers/integrations/intervals.py

@@ -17,6 +17,7 @@ import os
 from uuid import uuid4
 from django.utils import timezone
 from datetime import timedelta
+import rowers.dataprep as dataprep
 
 from rowsandall_app.settings import (
     INTERVALS_CLIENT_ID, INTERVALS_REDIRECT_URI, INTERVALS_CLIENT_SECRET, SITE_URL
@@ -101,7 +102,16 @@ class IntervalsIntegration(SyncIntegration):
 
     def createworkoutdata(self, w, *args, **kwargs) -> str:
         dozip = kwargs.get('dozip', True)
-        filename = w.csvfilename
+        # resample if wanted by user, not tested
+        if w.user.intervals_resample_to_1s:
+            datadf, id, msgs = dataprep.resample(
+                w.id, w.user, w, overwrite=False
+            )
+            w_resampled = Workout.objects.get(id=id)
+            filename = w_resampled.csvfilename
+        else:
+            w_resampled = None
+            filename = w.csvfilename
         try:
             row = rowingdata(csvfile=filename)
         except IOError: # pragma: no cover
@@ -128,6 +138,8 @@ class IntervalsIntegration(SyncIntegration):
         except TypeError:
             newnotes = 'from'+w.workoutsource+' via rowsandall.com'
 
+        if w.user.intervals_resample_to_1s and w_resampled:
+            w_resampled.delete()
         row.exporttotcx(tcxfilename, notes=newnotes, sport=mytypes.intervalsmapping[w.workouttype])
         if dozip:
             gzfilename = tcxfilename + '.gz'
@@ -230,25 +242,29 @@ class IntervalsIntegration(SyncIntegration):
         workouts = []
         
         for item in data:
-            i = item['id']
-            r = item['type']
-            d = item['distance']
-            ttot = seconds_to_duration(item['moving_time'])
-            s = item['start_date']
-            s2 = ''
-            c = item['name']
-            if i in known_interval_ids:
-                nnn = ''
-            else:
-                nnn = 'NEW'
+            try:
+                i = item['id']
+                r = item['type']
+                d = item['distance']
+                ttot = seconds_to_duration(item['moving_time'])
+                s = item['start_date']
+                s2 = ''
+                c = item['name']
+                if i in known_interval_ids:
+                    nnn = ''
+                else:
+                    nnn = 'NEW'
 
-            keys = ['id','distance','duration','starttime',
-                    'rowtype','source','name','new']
+                keys = ['id','distance','duration','starttime',
+                        'rowtype','source','name','new']
 
-            values = [i, d, ttot, s, r, s2, c, nnn]
+                values = [i, d, ttot, s, r, s2, c, nnn]
+
+                ress = dict(zip(keys, values))
+                workouts.append(ress)
+            except KeyError:
+                dologging('intervals.icu.log', item)
 
-            ress = dict(zip(keys, values))
-            workouts.append(ress)
 
         return workouts