Self hosted FLOSS fitness/workout, nutrition and weight tracker
Expose the full routine structure over the API
Roland Geider13bbffaba391
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex ae3dea16d..64157ea21 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -35,6 +35,7 @@ from wger.manager.models import (Schedule,ScheduleStep,Set,+ SetsConfig,Setting,Slot,SlotConfig,@@ -63,7 +64,7 @@ class RoutineSerializer(serializers.ModelSerializer):)-class DayNgSerializer(serializers.ModelSerializer):+class DayNgDataSerializer(serializers.ModelSerializer):"""Day serializer"""@@ -81,51 +82,35 @@ class DayNgSerializer(serializers.ModelSerializer):)-class SlotSerializer(serializers.ModelSerializer):+class WeightConfigSerializer(serializers.ModelSerializer):"""- Slot+ Weight Config serializer"""class Meta:- model = Slot+ model = WeightConfigfields = ('id',- 'day',- 'order',- 'comment',+ 'slot_config',+ 'iteration',+ 'trigger',+ 'value',+ 'operation',+ 'step',+ 'replace',+ 'need_log_to_apply',)-class SetConfigSerializer(serializers.ModelSerializer):+class RepsConfigSerializer(serializers.ModelSerializer):"""- Day serializer+ Repetition Config serializer"""class Meta:- model = SlotConfig+ model = RepsConfigfields = ('id',- 'slot',- 'exercise',- 'is_dropset',- 'repetition_unit',- 'repetition_rounding',- 'weight_unit',- 'weight_rounding',- 'order',- 'comment',- 'class_name',- )---class WeightConfigSerializer(serializers.ModelSerializer):- """- Weight Config serializer- """-- class Meta:- model = WeightConfig- fields = ('slot_config','iteration','trigger',@@ -137,14 +122,15 @@ class WeightConfigSerializer(serializers.ModelSerializer):)-class RepetitionConfigSerializer(serializers.ModelSerializer):+class SetNrConfigSerializer(serializers.ModelSerializer):"""- Repetition Config serializer+ Set Nr config serializer"""class Meta:- model = RepsConfig+ model = SetsConfigfields = (+ 'id','slot_config','iteration','trigger',@@ -152,7 +138,6 @@ class RepetitionConfigSerializer(serializers.ModelSerializer):'operation','step','replace',- 'need_log_to_apply',)@@ -164,6 +149,7 @@ class RiRConfigSerializer(serializers.ModelSerializer):class Meta:model = RiRConfigfields = (+ 'id','slot_config','iteration','trigger',@@ -171,7 +157,6 @@ class RiRConfigSerializer(serializers.ModelSerializer):'operation','step','replace',- 'need_log_to_apply',)@@ -183,6 +168,7 @@ class RestConfigSerializer(serializers.ModelSerializer):class Meta:model = RestConfigfields = (+ 'id','slot_config','iteration','trigger',@@ -190,7 +176,121 @@ class RestConfigSerializer(serializers.ModelSerializer):'operation','step','replace',- 'need_log_to_apply',+ )+++class SlotConfigSerializer(serializers.ModelSerializer):+ """+ Slot configuration+ """++ weight_configs = WeightConfigSerializer(source='weightconfig_set', many=True)+ reps_configs = RepsConfigSerializer(source='repsconfig_set', many=True)+ set_nr_configs = SetNrConfigSerializer(source='setsconfig_set', many=True)+ rir_configs = RiRConfigSerializer(source='rirconfig_set', many=True)+ rest_configs = RestConfigSerializer(source='restconfig_set', many=True)++ class Meta:+ model = SlotConfig+ fields = (+ 'id',+ 'slot',+ 'exercise',+ 'repetition_unit',+ 'repetition_rounding',+ 'weight_unit',+ 'weight_rounding',+ 'order',+ 'comment',+ 'is_dropset',+ 'class_name',+ 'weight_configs',+ 'reps_configs',+ 'set_nr_configs',+ 'rir_configs',+ 'rest_configs',+ )+++class SlotSerializer(serializers.ModelSerializer):+ """+ Slot+ """++ configs = SlotConfigSerializer(many=True)++ class Meta:+ model = Slot+ fields = (+ 'id',+ 'day',+ 'order',+ 'comment',+ 'configs',+ )+++class DayStructureSerializer(serializers.ModelSerializer):+ """+ Day serializer+ """++ slots = SlotSerializer(many=True)++ class Meta:+ model = DayNg+ fields = (+ 'id',+ 'next_day',+ 'name',+ 'description',+ 'is_rest',+ 'last_day_in_week',+ 'need_logs_to_advance',+ 'slots',+ )+++class RoutineStructureSerializer(serializers.ModelSerializer):+ """+ Routine structure serializer+ """++ days = DayStructureSerializer(many=True)++ class Meta:+ model = Routine+ fields = (+ 'id',+ 'name',+ 'description',+ 'first_day',+ 'created',+ 'start',+ 'end',+ 'days',+ )+++class SetConfigSerializer(serializers.ModelSerializer):+ """+ Day serializer+ """++ class Meta:+ model = SlotConfig+ fields = (+ 'id',+ 'slot',+ 'exercise',+ 'is_dropset',+ 'repetition_unit',+ 'repetition_rounding',+ 'weight_unit',+ 'weight_rounding',+ 'order',+ 'comment',+ 'class_name',)@@ -236,7 +336,7 @@ class WorkoutDayDataSerializer(serializers.Serializer):iteration = serializers.IntegerField()date = serializers.DateField()- day = DayNgSerializer()+ day = DayNgDataSerializer()slots = SetDataSerializer(many=True)diff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex d58294149..07801175d 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -29,9 +29,11 @@ from rest_framework.response import Response# wgerfrom wger.exercises.models import ExerciseBasefrom wger.manager.api.serializers import (- DayNgSerializer,+ DayNgDataSerializer,DaySerializer,+ DayStructureSerializer,RoutineSerializer,+ RoutineStructureSerializer,ScheduleSerializer,ScheduleStepSerializer,SetSerializer,@@ -94,7 +96,7 @@ class RoutineViewSet(viewsets.ModelViewSet):"""Return the day sequence of the routine"""- return Response(DayNgSerializer(self.get_object().day_sequence, many=True).data)+ return Response(DayNgDataSerializer(self.get_object().day_sequence, many=True).data)@action(detail=True, url_path='date-sequence')def date_sequence(self, request, pk):@@ -110,6 +112,13 @@ class RoutineViewSet(viewsets.ModelViewSet):"""return Response(WorkoutDayDataSerializer(self.get_object().current_day()).data)+ @action(detail=True)+ def structure(self, request, pk):+ """+ Return full object structure of the routine.+ """+ return Response(RoutineStructureSerializer(self.get_object()).data)+class WorkoutViewSet(viewsets.ModelViewSet):"""diff --git a/wger/manager/models/day.py b/wger/manager/models/day.pyindex 913e0ff6a..3c978b17b 100644--- a/wger/manager/models/day.py+++ b/wger/manager/models/day.py@@ -36,6 +36,7 @@ class DayNg(models.Model):'Routine',verbose_name=_('Routine'),on_delete=models.CASCADE,+ related_name='days',)next_day = models.ForeignKey(diff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.pyindex e1347cf70..9e6cc25b3 100644--- a/wger/manager/models/routine.py+++ b/wger/manager/models/routine.py@@ -166,11 +166,10 @@ class Routine(models.Model):return outwhile current_date <= self.end:-# Fill all days till the end of the week with empty workout daysif skip_til_date:out.append(WorkoutDayData(iteration=None, date=current_date, day=None))- current_date += delta+ # current_date += deltaif current_date == skip_til_date:skip_til_date = Nonecontinuediff --git a/wger/manager/models/slot.py b/wger/manager/models/slot.pyindex b8c70283d..50735105d 100644--- a/wger/manager/models/slot.py+++ b/wger/manager/models/slot.py@@ -22,6 +22,7 @@ class Slot(models.Model):DayNg,verbose_name=_('Exercise day'),on_delete=models.CASCADE,+ related_name='slots',)order = models.IntegerField(diff --git a/wger/manager/models/slot_config.py b/wger/manager/models/slot_config.pyindex bd0ae02ac..b30a6ee5d 100644--- a/wger/manager/models/slot_config.py+++ b/wger/manager/models/slot_config.py@@ -41,10 +41,7 @@ class SlotConfig(models.Model):Set configuration for an exercise (weight, reps, etc.)"""- slot = models.ForeignKey(- 'Slot',- on_delete=models.CASCADE,- )+ slot = models.ForeignKey('Slot', on_delete=models.CASCADE, related_name='configs')exercise = models.ForeignKey(ExerciseBase,diff --git a/wger/manager/tests/test_routine.py b/wger/manager/tests/test_routine.pyindex d240e4ee8..89953f63d 100644--- a/wger/manager/tests/test_routine.py+++ b/wger/manager/tests/test_routine.py@@ -118,7 +118,6 @@ class RoutineTestCase(WgerTestCase):WorkoutDayData(day=None, iteration=None, date=datetime.date(2024, 1, 5)),WorkoutDayData(day=None, iteration=None, date=datetime.date(2024, 1, 6)),WorkoutDayData(day=None, iteration=None, date=datetime.date(2024, 1, 7)),-# MondayWorkoutDayData(day=self.day1, iteration=2, date=datetime.date(2024, 1, 8)),WorkoutDayData(day=self.day2, iteration=2, date=datetime.date(2024, 1, 9)),