From 2079961b761af86b8685b4db838865c51aee884b Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Sun, 15 Dec 2024 18:08:29 +0100
Subject: [PATCH 1/7] excluding strava from API calls

---
 rowers/urls.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rowers/urls.py b/rowers/urls.py
index 06047059..8d673423 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -80,7 +80,8 @@ class WorkoutViewSet(viewsets.ModelViewSet):
     def get_queryset(self):  # pragma: no cover
         try:
             r = Rower.objects.get(user=self.request.user)
-            return Workout.objects.filter(user=r).order_by("-date", "-starttime")
+            #return Workout.objects.filter(user=r).order_by("-date", "-starttime")
+            return Workout.objects.filter(user=r).exclude(workoutsource='strava').order_by("-date", "-starttime")
         except TypeError:
             return []
 

From 4c3dfccad673251ced3c8a021096f0d773a3717e Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Sun, 15 Dec 2024 19:04:09 +0100
Subject: [PATCH 2/7] fe

---
 rowers/tests/testdata/testdata.tcx.gz | Bin 3999 -> 4001 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index eca15abb16d9035b8d6b2a4d682b2567cff2466b..5c4f915d39460c7e965ff03b969ce83453b005cb 100644
GIT binary patch
literal 4001
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
H#DD<+QU*Ul

literal 3999
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
F0RWJwKh6LE


From aee01a1a4aee9001ee384ebf4e2bbd60034dcfa9 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Sun, 15 Dec 2024 19:27:11 +0100
Subject: [PATCH 3/7] fix

---
 rowers/integrations/trainingpeaks.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rowers/integrations/trainingpeaks.py b/rowers/integrations/trainingpeaks.py
index 8dbefd35..93a73089 100644
--- a/rowers/integrations/trainingpeaks.py
+++ b/rowers/integrations/trainingpeaks.py
@@ -67,7 +67,10 @@ class TPIntegration(SyncIntegration):
         except TypeError:
             newnotes = 'from '+w.workoutsource+' via rowsandall.com'
 
-        row.exporttotcx(tcxfilename, notes=newnotes, sport=tpmapping[w.workouttype])
+        try:
+            row.exporttotcx(tcxfilename, notes=newnotes, sport=tpmapping[w.workouttype])
+        except KeyError:
+            row.exporttotcx(tcxfilename, notes=newnotes, sport='other')
 
         return tcxfilename
 

From f5cc332a885064dca2e19713d208e4ae1ca59770 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Mon, 16 Dec 2024 08:07:14 +0100
Subject: [PATCH 4/7] fixing check factor schema errors

---
 rowers/dataroutines.py | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py
index d34a1a3e..a47521d5 100644
--- a/rowers/dataroutines.py
+++ b/rowers/dataroutines.py
@@ -1648,10 +1648,14 @@ def read_data(columns, ids=[], doclean=True, workstrokesonly=True, debug=False,
         datadf = pl.concat(data)
         existing_columns = [col for col in columns if col in datadf.columns]
         datadf = datadf.select(existing_columns)
-    except (ShapeError, SchemaError, ColumnNotFoundError):
-        data = [
-            df.select(columns)
-            for df in data]
+    except (ShapeError, SchemaError):
+        try:
+            data = [
+                df.select(columns)
+                for df in data]
+        except ColumnNotFoundError:
+            existing_columns = [col for col in columns if col in df.columns]
+            df = df.select(existing_columns)
 
         # float columns
         floatcolumns = []
@@ -1686,14 +1690,19 @@ def read_data(columns, ids=[], doclean=True, workstrokesonly=True, debug=False,
             ]
         except ComputeError:
             pass
+        except ColumnNotFoundError:
+            pass
 
         try:
             datadf = pl.concat(data)
         except SchemaError:
-            data = [
-                df.with_columns(cs.integer().cast(pl.Float64)) for df in data
-            ]
-            datadf = pl.concat(data)
+            try:
+                data = [
+                    df.with_columns(cs.integer().cast(pl.Float64)) for df in data
+                ]
+                datadf = pl.concat(data)
+            except ShapeError:
+                return pl.DataFrame()
 
         
 

From 4ae3f34eec5d55ecca1f12695ae197a2594a9dde Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Mon, 16 Dec 2024 15:57:01 +0100
Subject: [PATCH 5/7] support for external_id on intervals.icu

---
 rowers/integrations/intervals.py      |   2 ++
 rowers/tests/testdata/testdata.tcx.gz | Bin 4001 -> 3999 bytes
 2 files changed, 2 insertions(+)

diff --git a/rowers/integrations/intervals.py b/rowers/integrations/intervals.py
index e0692a57..66fdb0d5 100644
--- a/rowers/integrations/intervals.py
+++ b/rowers/integrations/intervals.py
@@ -18,6 +18,7 @@ from uuid import uuid4
 from django.utils import timezone
 from datetime import timedelta
 import rowers.dataprep as dataprep
+from rowers.opaque import encoder
 
 from rowsandall_app.settings import (
     INTERVALS_CLIENT_ID, INTERVALS_REDIRECT_URI, INTERVALS_CLIENT_SECRET, SITE_URL
@@ -171,6 +172,7 @@ class IntervalsIntegration(SyncIntegration):
         params = {
             'name': workout.name,
             'description': workout.notes,
+            'external_id': encoder.encode_hex(workout.id),
             }
 
 
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 5c4f915d39460c7e965ff03b969ce83453b005cb..3a360014e9c5a18ce48318a53c9853f7c09325d9 100644
GIT binary patch
literal 3999
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
F0RZ{uCaC}b

literal 4001
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
H#DD<+QU*Ul


From 64d47a1cc090916860da4aa5eeff9e493f6b80fc Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Mon, 16 Dec 2024 18:27:14 +0100
Subject: [PATCH 6/7] fix c2 import

---
 rowers/tasks.py                       |   6 ++++--
 rowers/tests/testdata/testdata.tcx.gz | Bin 3999 -> 4000 bytes
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rowers/tasks.py b/rowers/tasks.py
index a43a225d..ebadcfee 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -3695,7 +3695,8 @@ def handle_c2_async_workout(alldata, userid, c2token, c2id, delaysec,
         code=uuid4().hex[:16], c2id=c2id)
 
     startdatetime, starttime, workoutdate, duration, starttimeunix, timezone = utils.get_startdatetime_from_c2data(
-        data)
+        data
+    )
 
     s = 'Time zone {timezone}, startdatetime {startdatetime}, duration {duration}'.format(
         timezone=timezone, startdatetime=startdatetime,
@@ -3755,6 +3756,7 @@ def handle_c2_async_workout(alldata, userid, c2token, c2id, delaysec,
             strokelength = np.zeros(nr_rows)
 
         dist2 = 0.1*strokedata.loc[:, 'd']
+        cumdist, intervals = make_cumvalues(dist2)
 
         try:
             spm = strokedata.loc[:, 'spm']
@@ -3796,7 +3798,7 @@ def handle_c2_async_workout(alldata, userid, c2token, c2id, delaysec,
                            ' lapIdx': lapidx,
                            ' WorkoutState': 4,
                            ' ElapsedTime (sec)': seconds,
-                           'cum_dist': dist2
+                           'cum_dist': cumdist
                            })
 
     df.sort_values(by='TimeStamp (sec)', ascending=True)
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 3a360014e9c5a18ce48318a53c9853f7c09325d9..1d35a89516fb6593ac599f54857c2b02232fadfe 100644
GIT binary patch
literal 4000
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
GfB^tKcR{QG

literal 3999
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
F0RZ{uCaC}b


From 6abc5680c2911ddf2bb18644e675485041249f26 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Mon, 16 Dec 2024 18:42:17 +0100
Subject: [PATCH 7/7] fi

---
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 3998 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 1d35a89516fb6593ac599f54857c2b02232fadfe..7c4266eaeae9532ad1251eccd487b50f91d9ee0e 100644
GIT binary patch
literal 3998
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
E0Py`cO8@`>

literal 4000
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
GfB^tKcR{QG