Self hosted FLOSS fitness/workout, nutrition and weight tracker
Start exposing the routine data over the API
Roland Geider93138f8dcfa9
diff --git a/wger/core/tests/base_testcase.py b/wger/core/tests/base_testcase.pyindex 8ba556ab0..81912ac90 100644--- a/wger/core/tests/base_testcase.py+++ b/wger/core/tests/base_testcase.py@@ -132,6 +132,7 @@ class BaseTestCase:'test-workout-data','test-workout-session','test-schedules',+ 'test-routine-data','test-gallery-images','test-measurement-categories','test-measurements',diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex cae87e09d..0c1ec483f 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -23,11 +23,12 @@ from wger.core.api.serializers import DaysOfWeekSerializerfrom wger.core.models import DaysOfWeekfrom wger.exercises.api.serializers import (ExerciseBaseInfoSerializer,- ExerciseSerializer,MuscleSerializer,)from wger.manager.models import (Day,+ DayNg,+ Routine,Schedule,ScheduleStep,Set,@@ -38,6 +39,39 @@ from wger.manager.models import ()+class RoutineSerializer(serializers.ModelSerializer):+ """+ Routine serializer+ """++ class Meta:+ model = Routine+ fields = (+ 'id',+ 'name',+ 'description',+ 'created',+ 'start',+ 'end',+ )+++class DayNgSerializer(serializers.ModelSerializer):+ """+ Routine serializer+ """++ class Meta:+ model = DayNg+ fields = (+ 'id',+ 'description',+ 'is_rest',+ 'need_logs_to_advance',+ 'next_day',+ )++class WorkoutSerializer(serializers.ModelSerializer):"""Workout serializerdiff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex 3026f2503..e802cb7ba 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -19,7 +19,6 @@import json# Django-from django.http import HttpResponseNotFoundfrom django.shortcuts import get_object_or_404# Third Party@@ -28,12 +27,11 @@ from rest_framework.decorators import actionfrom rest_framework.response import Response# wger-from wger.exercises.models import (- Exercise,- ExerciseBase,-)+from wger.exercises.models import ExerciseBasefrom wger.manager.api.serializers import (+ DayNgSerializer,DaySerializer,+ RoutineSerializer,ScheduleSerializer,ScheduleStepSerializer,SetSerializer,@@ -46,6 +44,7 @@ from wger.manager.api.serializers import ()from wger.manager.models import (Day,+ Routine,Schedule,ScheduleStep,Set,@@ -58,6 +57,46 @@ from wger.utils.viewsets import WgerOwnerObjectModelViewSetfrom wger.weight.helpers import process_log_entries+class RoutineViewSet(viewsets.ModelViewSet):+ """+ API endpoint for routine objects+ """++ serializer_class = RoutineSerializer+ is_private = True+ ordering_fields = '__all__'+ filterset_fields = (+ 'name',+ 'description',+ 'created',+ 'start',+ 'end',+ )++ def get_queryset(self):+ """+ Only allow access to appropriate objects+ """+ # REST API generation+ if getattr(self, 'swagger_fake_view', False):+ return Routine.objects.none()++ return Routine.objects.filter(user=self.request.user)++ def perform_create(self, serializer):+ """+ Set the owner+ """+ serializer.save(user=self.request.user)++ @action(detail=True)+ def day_sequence(self, request, pk):+ """+ Return the day sequence of the routine+ """+ return Response(DayNgSerializer(self.get_object().day_sequence, many=True).data)++class WorkoutViewSet(viewsets.ModelViewSet):"""API endpoint for routine objectsdiff --git a/wger/manager/fixtures/test-routine-data.json b/wger/manager/fixtures/test-routine-data.jsonnew file mode 100644index 000000000..7feaa6dc5--- /dev/null+++ b/wger/manager/fixtures/test-routine-data.json@@ -0,0 +1,53 @@+[+ {+ "pk": 1,+ "model": "manager.routine",+ "fields": {+ "user": 2,+ "name": "A test routine",+ "description": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna",+ "created": "2024-03-01T23:34:30",+ "start": "2024-03-01",+ "end": "2024-06-01"+ }+ },+ {+ "pk": 2,+ "model": "manager.routine",+ "fields": {+ "user": 2,+ "name": "Empty routine",+ "description": "",+ "created": "2024-03-01T23:34:30",+ "start": "2024-03-01",+ "end": "2024-03-01"+ }+ },+ {+ "pk": 1,+ "model": "manager.dayng",+ "fields": {+ "routine": 1,+ "next_day": 2,+ "is_rest": false+ }+ },+ {+ "pk": 2,+ "model": "manager.dayng",+ "fields": {+ "routine": 1,+ "next_day": 3,+ "is_rest": false+ }+ },+ {+ "pk": 3,+ "model": "manager.dayng",+ "fields": {+ "routine": 1,+ "next_day": 1,+ "is_rest": false+ }+ }+]diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.pyindex da675615e..2e7345453 100644--- a/wger/manager/migrations/0018_flexible_routines.py+++ b/wger/manager/migrations/0018_flexible_routines.py@@ -151,7 +151,7 @@ class Migration(migrations.Migration):models.TextField(blank=True, max_length=1000, verbose_name='Description'),),(- 'creation_date',+ 'created',models.DateTimeField(auto_now_add=True, verbose_name='Creation date'),),('start', models.DateField(verbose_name='Start date')),diff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.pyindex 8ea9ad212..b6758aed9 100644--- a/wger/manager/models/routine.py+++ b/wger/manager/models/routine.py@@ -36,7 +36,7 @@ class Routine(models.Model):class Meta:ordering = [- '-creation_date',+ '-created',]user = models.ForeignKey(@@ -63,7 +63,7 @@ class Routine(models.Model):blank=True,)- creation_date = models.DateTimeField(+ created = models.DateTimeField(_('Creation date'),auto_now_add=True,)@@ -128,7 +128,7 @@ class Routine(models.Model):"""Return a dictionary with specific dates and routine days- If a day needs logs to continue it will be repeated will the user adds one.+ If a day needs logs to continue it will be repeated until the user adds one."""delta = datetime.timedelta(days=1)diff --git a/wger/manager/models/set_config.py b/wger/manager/models/set_config.pyindex 8f44aeb85..f6c2ac2e6 100644--- a/wger/manager/models/set_config.py+++ b/wger/manager/models/set_config.py@@ -103,7 +103,8 @@ class SetConfig(models.Model):"""return self.set.exerciseday.training- def calculate_config_value(self, configs: list[AbstractChangeConfig]):+ @staticmethod+ def calculate_config_value(configs: list[AbstractChangeConfig]):out = 0for config in configs:diff --git a/wger/manager/tests/test_routine.py b/wger/manager/tests/test_routine.pyindex f94386c63..390effbd2 100644--- a/wger/manager/tests/test_routine.py+++ b/wger/manager/tests/test_routine.py@@ -16,6 +16,7 @@import datetime# wger+from wger.core.tests.api_base_test import ApiBaseResourceTestCasefrom wger.core.tests.base_testcase import WgerTestCasefrom wger.manager.dataclasses import WorkoutDayDatafrom wger.manager.models import (@@ -139,3 +140,18 @@ class RoutineTestCase(WgerTestCase):datetime.date(2024, 1, 10): WorkoutDayData(day=self.day1, iteration=6),},)+++class RoutineApiTestCase(ApiBaseResourceTestCase):+ """+ Tests the routine api endpoint+ """++ pk = 1+ resource = Routine+ private_resource = True+ data = {+ 'name': 'A new comment',+ 'start': '2024-03-11',+ 'end': '2024-06-20',+ }diff --git a/wger/urls.py b/wger/urls.pyindex 2568999dc..1bf79a0e6 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -67,6 +67,7 @@ router.register(r'day', manager_api_views.DayViewSet, basename='day')router.register(r'set', manager_api_views.SetViewSet, basename='Set')router.register(r'setting', manager_api_views.SettingViewSet, basename='Setting')router.register(r'workout', manager_api_views.WorkoutViewSet, basename='workout')+router.register(r'routine', manager_api_views.RoutineViewSet, basename='routine')router.register(r'templates', manager_api_views.UserWorkoutTemplateViewSet, basename='templates')router.register(r'public-templates',