From 8ab568944daaacda0d7b18749237ee6831e4e4f6 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Wed, 5 Feb 2025 18:00:21 +0100
Subject: [PATCH] unrestricting planned session api

---
 rowers/dataprep.py                    |   8 ++++----
 rowers/tests/testdata/testdata.tcx.gz | Bin 3989 -> 3989 bytes
 rowers/urls.py                        |   5 +----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index e055f8ef..aa7abed5 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -458,7 +458,7 @@ def calculate_goldmedalstandard(rower, workout, recurrance=True):
         if settings.TESTING:
             background = False
         if recurrance:
-            df, delta, cpvalues = setcp(workout, background=background)
+            df, delta, cpvalues, cpvalues_spm = setcp(workout, background=background)
             if df.is_empty():
                 return 0, 0
         else:
@@ -466,7 +466,7 @@ def calculate_goldmedalstandard(rower, workout, recurrance=True):
 
 
     if df.is_empty() and recurrance:  # pragma: no cover
-        df, delta, cpvalues = setcp(workout, recurrance=False, background=True)
+        df, delta, cpvalues, cpvalues_spm = setcp(workout, recurrance=False, background=True)
         if df.is_empty():
             return 0, 0
 
@@ -818,7 +818,7 @@ def update_rolling_cp(r, types, mode='water', dosend=False):
         user=r
     )
 
-    delta, cp, avgpower, workoutnames, urls = fetchcp_new(r, workouts)
+    delta, cp, cr, avgpower, workoutnames, urls = fetchcp_new(r, workouts)
 
     powerdf = pl.DataFrame({
         'Delta': delta,
@@ -1071,7 +1071,7 @@ def checkbreakthrough(w, r):
     ishard = False
     workouttype = w.workouttype
     if workouttype in rowtypes:
-        cpdf, delta, cpvalues = setcp(w)
+        cpdf, delta, cpvalues, cpvalues_spm = setcp(w)
         if not cpdf.is_empty():
             if workouttype in otwtypes:
                 try:
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 973c7a13cd083ebec67aa0d4dde3ff5fa6f83faa..d52a12a0162465a25e30f099464d7a06013387c6 100644
GIT binary patch
delta 16
XcmbO#KUJPxzMF$XJ7>{G_C9_9Cu{_`

delta 16
XcmbO#KUJPxzMF$XSbyP0_C9_9B~b)o

diff --git a/rowers/urls.py b/rowers/urls.py
index ef8bacbc..d8d3451d 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -59,10 +59,7 @@ class PlannedSessionViewSet(viewsets.ModelViewSet):
     def get_queryset(self):  # pragma: no cover
         try:
             r = Rower.objects.get(user=self.request.user)
-            if r.rowerplan not in ['basic', 'pro']:
-                return PlannedSession.objects.filter(rower=r).order_by("-preferreddate")
-            else:
-                return []
+            return PlannedSession.objects.filter(rower=r).order_by("-preferreddate")
         except TypeError:
             return []