From adede66906960d14a335efbced2adb5393ad41ab Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 23 Jun 2021 16:10:58 +0200
Subject: [PATCH 1/3] coverage exclusion statements

---
 rowers/c2stuff.py  | 2 +-
 rowers/dataprep.py | 6 +++---
 rowers/utils.py    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py
index 3001cd8c..a041ec3a 100644
--- a/rowers/c2stuff.py
+++ b/rowers/c2stuff.py
@@ -700,7 +700,7 @@ def createc2workoutdata(w):
     if workouttype in otwtypes:
         workouttype = 'water'
 
-    if w.timezone == 'tzutc()':
+    if w.timezone == 'tzutc()': # pragma: no cover
         w.timezone = 'UTC'
         w.save()
 
diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index c911b4d3..438ee7f1 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1844,7 +1844,7 @@ def get_startdate_time_zone(r,row,startdatetime=None):
     if startdatetime is not None and startdatetime != '':
         try:
             timezone_str = pendulum.instance(startdatetime).timezone.name
-        except ValueError:
+        except ValueError: # pragma: no cover
             timezone_str = 'Ect/GMT'
     elif startdatetime == '':
         startdatetime = row.rowdatetime
@@ -1853,7 +1853,7 @@ def get_startdate_time_zone(r,row,startdatetime=None):
 
     try:
         tz = startdatetime.tzinfo
-    except AttributeError:
+    except AttributeError: # pragma: no cover
         startdatetime = row.rowdatetime
 
     partofday = getpartofday(row,r)
@@ -1899,7 +1899,7 @@ def get_startdate_time_zone(r,row,startdatetime=None):
     starttime = startdatetime.strftime('%H:%M:%S')
 
     if timezone_str == 'tzutc()':
-        timezone_str = 'UTC'
+        timezone_str = 'UTC' # pragma: no cover
 
 
     return startdatetime,startdate,starttime,timezone_str,partofday
diff --git a/rowers/utils.py b/rowers/utils.py
index f9d138c6..3d26097c 100644
--- a/rowers/utils.py
+++ b/rowers/utils.py
@@ -547,7 +547,7 @@ def get_strava_stream(r,metric,stravaid,series_type='time',fetchresolution='high
                     return  np.array(data['data'])
             except TypeError: # pragma: no cover
                 return None
-    except:
+    except: # pragma: no cover
         return None
 
     return None # pragma: no cover

From 89b141c61630e80bf07458e769f78fda3f353933 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 23 Jun 2021 19:08:44 +0200
Subject: [PATCH 2/3] fixed nk summary error

---
 rowers/nkimportutils.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/rowers/nkimportutils.py b/rowers/nkimportutils.py
index 6d3a0bc7..ac23d076 100644
--- a/rowers/nkimportutils.py
+++ b/rowers/nkimportutils.py
@@ -192,6 +192,24 @@ def get_nk_summary(workoutdata,strokedata):
     maxhr = strokedata['heartRate'].max()
     pwr = workoutdata['avgPower']
 
+    if dist is None: # pragma: no cover
+        dist = 0
+
+    if spm is None: # pragma: no cover
+        spm = 0
+
+    if avghr is None: # pragma: no cover
+        avghr = 0
+
+    if avgdps is None: # pragma: no cover
+        avgdps = 0
+
+    if maxhr is None: # pragma: no cover
+        maxhr = 0
+
+    if pwr is None: # pragma: no cover
+        pwr = 0
+
     sep = "|"
 
 

From 9ce10f4f66fa904787a660f084674ffc56874a3d Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 30 Jun 2021 19:14:28 +0200
Subject: [PATCH 3/3] shorter strava interval

---
 rowers/tasks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rowers/tasks.py b/rowers/tasks.py
index c676f6fb..2e4cb120 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -327,7 +327,7 @@ def handle_strava_sync(stravatoken,workoutid,filename,name,activity_type,descrip
         try:
             act = client.upload_activity(f,'tcx.gz',name=name)
             try:
-                res = act.wait(poll_interval=5.0, timeout=60)
+                res = act.wait(poll_interval=1.0, timeout=60)
             except stravalib.exc.ActivityUploadFailed: # pragma: no cover
                 failed = True
             except JSONDecodeError: # pragma: no cover
@@ -338,6 +338,7 @@ def handle_strava_sync(stravatoken,workoutid,filename,name,activity_type,descrip
             failed = True
 
     if not failed:
+        result = update_workout_field_sql(workoutid,'uploadedtostrava',res.id,debug=debug)
         try:
             act = client.update_activity(res.id,activity_type=activity_type,
                                         description=description,device_name='Rowsandall.com')
@@ -353,7 +354,6 @@ def handle_strava_sync(stravatoken,workoutid,filename,name,activity_type,descrip
                 f.write(timestamp)
                 f.write(str(e))
 
-        result = update_workout_field_sql(workoutid,'uploadedtostrava',res.id,debug=debug)
     try:
         os.remove(filename)
     except: # pragma: no cover