Self hosted FLOSS fitness/workout, nutrition and weight tracker
Expose a different view than the pure data structure
Roland Geidera98ed5b61043
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex d5024d5e0..1b70b5bff 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -19,12 +19,7 @@from rest_framework import serializers# wger-from wger.core.api.serializers import DaysOfWeekSerializerfrom wger.core.models import DaysOfWeek-from wger.exercises.api.serializers import (- ExerciseBaseInfoSerializer,- MuscleSerializer,-)from wger.manager.models import (Day,DayNg,@@ -299,6 +294,7 @@ class SetConfigDataSerializer(serializers.Serializer):SetData serializer"""+ exercise = serializers.IntegerField()sets = serializers.IntegerField()weight = serializers.DecimalField(max_digits=5, decimal_places=2)weight_unit = serializers.IntegerField()@@ -315,18 +311,18 @@ class SetExerciseDataSerializer(serializers.Serializer):SetData serializer"""- # exercise = ExerciseBaseInfoSerializer()data = SetConfigDataSerializer()config = SetConfigSerializer()-class SetDataSerializer(serializers.Serializer):+class SlotDataSerializer(serializers.Serializer):"""- SetData serializer+ Slot Data serializer"""- slot = SlotSerializer()- exercise_data = SetExerciseDataSerializer(many=True)+ comment = serializers.CharField()+ exercises = serializers.ListSerializer(child=serializers.IntegerField())+ sets = SetConfigDataSerializer(many=True)class WorkoutDayDataSerializer(serializers.Serializer):@@ -338,7 +334,7 @@ class WorkoutDayDataSerializer(serializers.Serializer):date = serializers.DateField()label = serializers.CharField()day = DayNgSerializer()- slots = SetDataSerializer(many=True)+ slots = SlotDataSerializer(many=True)class WorkoutSerializer(serializers.ModelSerializer):diff --git a/wger/manager/config_calculations/dummy.py b/wger/manager/config_calculations/dummy.pyindex 09bcbf701..4e38e8d36 100644--- a/wger/manager/config_calculations/dummy.py+++ b/wger/manager/config_calculations/dummy.py@@ -23,6 +23,7 @@ class SetCalculations(AbstractSetCalculations):def calculate(self):if self.iteration == 1:return SetConfigData(+ exercise=1,sets=2,weight=24,reps=1,@@ -31,6 +32,7 @@ class SetCalculations(AbstractSetCalculations):)else:return SetConfigData(+ exercise=2,sets=4,weight=42,reps=10,diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.pyindex 613fd2d76..579b0e1cf 100644--- a/wger/manager/dataclasses.py+++ b/wger/manager/dataclasses.py@@ -22,11 +22,16 @@ from dataclasses import (field,)from decimal import Decimal-from typing import List+from typing import (+ Any,+ List,+)@dataclassclass SetConfigData:+ exercise: int # 'ExerciseBase'+weight: Decimal | int | Nonereps: Decimal | int | Nonerir: Decimal | int | None@@ -41,7 +46,7 @@ class SetConfigData:@dataclassclass SetExerciseData:- config: 'SlotConfig'+ config: Any # 'SlotConfig'data: SetConfigData@property@@ -51,13 +56,14 @@ class SetExerciseData:@dataclassclass SlotData:- slot: 'Slot'- exercise_data: List[SetExerciseData] = field(default_factory=list)+ comment: str+ exercises: List[int] = field(default_factory=list)+ sets: List[SetConfigData] = field(default_factory=list)@dataclassclass WorkoutDayData:- day: 'DayNg'+ day: Any # 'DayNg'date: datetime.dateiteration: int | Nonelabel: str | None = Nonediff --git a/wger/manager/models/day.py b/wger/manager/models/day.pyindex fc6ffd735..a3fc38774 100644--- a/wger/manager/models/day.py+++ b/wger/manager/models/day.py@@ -113,7 +113,10 @@ class DayNg(models.Model):"""Return the sets for this day"""- return [SlotData(slot=s, exercise_data=s.set_data(iteration)) for s in self.slots.all()]+ return [+ SlotData(comment=s.comment, exercises=s.get_exercises(), sets=s.get_sets(iteration))+ for s in self.slots.all()+ ]class Day(models.Model):diff --git a/wger/manager/models/slot.py b/wger/manager/models/slot.pyindex 82ff37d42..180266c41 100644--- a/wger/manager/models/slot.py+++ b/wger/manager/models/slot.py@@ -59,3 +59,44 @@ class Slot(models.Model):"""Calculates the set data for a specific iteration"""return [SetExerciseData(data=s.get_config(iteration), config=s) for s in self.configs.all()]++ def get_sets(self, iteration: int) -> list[SetExerciseData]:+ """+ Calculates the sets as they would be performed in the gym++ Note that this is only different from the list of sets supersets, since+ they will be "interleaved". E.g.:+ - Exercise 1, 4 Sets+ - Exercise 2, 3 Sets+ - Exercise 3, 2 Sets+ (the other weight, reps, etc. settings are not important)++ Would result in:+ - Exercise 1+ - Exercise 2+ - Exercise 3+ - Exercise 1+ - Exercise 2+ - Exercise 3+ - Exercise 1+ - Exercise 2+ - Exercise 1+ """++ result = []+ set_data = self.set_data(iteration)++ sets = [slot.data.sets for slot in set_data] # Create a list of sets++ while any(repeat > 0 for repeat in sets):+ for i, slot in enumerate(set_data):+ if sets[i] > 0:+ result.append(slot.data)+ sets[i] -= 1+ return result++ def get_exercises(self) -> List[int]:+ """+ Returns the list of distinct exercises in the configs+ """+ return [slot.exercise.id for slot in self.configs.all()]diff --git a/wger/manager/models/slot_config.py b/wger/manager/models/slot_config.pyindex b30a6ee5d..52e84bff3 100644--- a/wger/manager/models/slot_config.py+++ b/wger/manager/models/slot_config.py@@ -209,6 +209,7 @@ class SlotConfig(models.Model):sets = self.get_sets(iteration)return SetConfigData(+ exercise=self.exercise.id,sets=sets if sets is not None else 1,weight=weight,weight_rounding=self.weight_rounding if weight is not None else None,diff --git a/wger/manager/tests/test_routine.py b/wger/manager/tests/test_routine.pyindex 9ef9e7356..bd59a9193 100644--- a/wger/manager/tests/test_routine.py+++ b/wger/manager/tests/test_routine.py@@ -339,7 +339,7 @@ class RoutineApiTestCase(ApiBaseResourceTestCase):pk = 1resource = Routineprivate_resource = True- special_endpoints = ('day-sequence',)+ # special_endpoints = ('day-sequence',)data = {'name': 'A new comment','start': '2024-03-11',diff --git a/wger/manager/tests/test_slot.py b/wger/manager/tests/test_slot.pynew file mode 100644index 000000000..b1ebf68db--- /dev/null+++ b/wger/manager/tests/test_slot.py@@ -0,0 +1,77 @@+# This file is part of wger Workout Manager.+#+# wger Workout Manager is free software: you can redistribute it and/or modify+# it under the terms of the GNU Affero General Public License as published by+# the Free Software Foundation, either version 3 of the License, or+# (at your option) any later version.+#+# wger Workout Manager is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# You should have received a copy of the GNU Affero General Public License++# wger+from wger.core.tests.base_testcase import WgerTestCase+from wger.manager.models import (+ SetsConfig,+ Slot,+)+from wger.manager.models.slot_config import SlotConfig+++class SlotTestCase(WgerTestCase):+ """+ Test the slot calculations+ """++ slot: Slot++ def setUp(self):+ super().setUp()++ self.slot = Slot(day_id=1, order=1)+ self.slot.save()++ config1 = SlotConfig(slot=self.slot, exercise_id=1, order=1)+ config1.save()+ SetsConfig(slot_config=config1, iteration=1, value=4).save()++ config2 = SlotConfig(slot=self.slot, exercise_id=2, order=2)+ config2.save()+ SetsConfig(slot_config=config2, iteration=1, value=3).save()++ config3 = SlotConfig(slot=self.slot, exercise_id=3, order=3)+ config3.save()+ SetsConfig(slot_config=config3, iteration=1, value=2).save()++ def test_get_sets(self):+ """+ Test that the correct sets are returned for supersets+ """++ result = self.slot.get_sets(1)++ self.assertEqual(result[0].exercise.pk, 1)+ self.assertEqual(result[1].exercise.pk, 2)+ self.assertEqual(result[2].exercise.pk, 3)++ self.assertEqual(result[3].exercise.pk, 1)+ self.assertEqual(result[4].exercise.pk, 2)+ self.assertEqual(result[5].exercise.pk, 3)++ self.assertEqual(result[6].exercise.pk, 1)+ self.assertEqual(result[7].exercise.pk, 2)+ self.assertEqual(result[8].exercise.pk, 1)++ def test_get_exercises(self):+ """+ Test that the correct exercises are returned for supersets+ """++ result = self.slot.get_exercises()++ self.assertEqual(result[0].pk, 1)+ self.assertEqual(result[1].pk, 2)+ self.assertEqual(result[2].pk, 3)diff --git a/wger/manager/tests/test_slot_config.py b/wger/manager/tests/test_slot_config.pyindex a33fbf802..9bc224e2b 100644--- a/wger/manager/tests/test_slot_config.py+++ b/wger/manager/tests/test_slot_config.py@@ -43,7 +43,11 @@ class SlotConfigTestCase(WgerTestCase):def setUp(self):super().setUp()- self.slot_config = SlotConfig(slot_id=1, exercise_id=1, order=1)+ self.slot_config = SlotConfig(+ slot_id=1,+ exercise_id=1,+ order=1,+ )self.slot_config.save()def test_weight_config(self):@@ -153,6 +157,7 @@ class SlotConfigTestCase(WgerTestCase):self.assertEqual(self.slot_config.get_config(1),SetConfigData(+ exercise=1,sets=4,weight=80,weight_rounding=Decimal('2.5'),@@ -166,6 +171,7 @@ class SlotConfigTestCase(WgerTestCase):self.assertEqual(self.slot_config.get_config(2),SetConfigData(+ exercise=1,sets=4,weight=80,weight_rounding=Decimal('2.5'),@@ -179,6 +185,7 @@ class SlotConfigTestCase(WgerTestCase):self.assertEqual(self.slot_config.get_config(3),SetConfigData(+ exercise=1,sets=4,weight=80,weight_rounding=Decimal('2.5'),@@ -192,6 +199,7 @@ class SlotConfigTestCase(WgerTestCase):self.assertEqual(self.slot_config.get_config(4),SetConfigData(+ exercise=1,sets=4,weight=Decimal(82.5),weight_rounding=Decimal('2.5'),@@ -205,6 +213,7 @@ class SlotConfigTestCase(WgerTestCase):self.assertEqual(self.slot_config.get_config(5),SetConfigData(+ exercise=1,sets=4,weight=42,weight_rounding=Decimal('2.5'),@@ -218,6 +227,7 @@ class SlotConfigTestCase(WgerTestCase):self.assertEqual(self.slot_config.get_config(6),SetConfigData(+ exercise=1,sets=4,weight=42,weight_rounding=Decimal('2.5'),@@ -245,15 +255,15 @@ class SlotConfigTestCase(WgerTestCase):self.assertEqual(self.slot_config.get_config(1),- SetConfigData(sets=2, weight=24, reps=1, rir=2, rest=120),+ SetConfigData(exercise=1, sets=2, weight=24, reps=1, rir=2, rest=120),)self.assertEqual(self.slot_config.get_config(2),- SetConfigData(sets=4, weight=42, reps=10, rir=1, rest=90),+ SetConfigData(exercise=2, sets=4, weight=42, reps=10, rir=1, rest=90),)self.assertEqual(self.slot_config.get_config(3),- SetConfigData(sets=4, weight=42, reps=10, rir=1, rest=90),+ SetConfigData(exercise=2, sets=4, weight=42, reps=10, rir=1, rest=90),)def test_empty_configs(self):@@ -261,9 +271,11 @@ class SlotConfigTestCase(WgerTestCase):Test that the correct config is calculated if there are no configs at all"""+ print(self.slot_config.get_config(1))self.assertEqual(self.slot_config.get_config(1),SetConfigData(+ exercise=1,sets=1,weight=None,weight_rounding=None,