Self hosted FLOSS fitness/workout, nutrition and weight tracker
Expose remaining clot config objects over the API
Roland Geider4005375bc16a
diff --git a/wger/manager/api/consts.py b/wger/manager/api/consts.pynew file mode 100644index 000000000..eb870d8ae--- /dev/null+++ b/wger/manager/api/consts.py@@ -0,0 +1,10 @@+CONFIG_FIELDS = (+ 'id',+ 'slot_config',+ 'iteration',+ 'value',+ 'operation',+ 'step',+ 'replace',+ 'need_log_to_apply',+)diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex cf3825b93..9c8fb0c64 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -19,9 +19,12 @@from rest_framework import serializers# wger-from wger.core.models import DaysOfWeek+from wger.manager.api.consts import CONFIG_FIELDSfrom wger.manager.models import (Day,+ MaxRepsConfig,+ MaxRestConfig,+ MaxWeightConfig,RepsConfig,RestConfig,RiRConfig,@@ -82,16 +85,17 @@ class WeightConfigSerializer(serializers.ModelSerializer):class Meta:model = WeightConfig- fields = (- 'id',- 'slot_config',- 'iteration',- 'value',- 'operation',- 'step',- 'replace',- 'need_log_to_apply',- )+ fields = CONFIG_FIELDS+++class MaxWeightConfigSerializer(serializers.ModelSerializer):+ """+ Max Weight Config serializer+ """++ class Meta:+ model = MaxWeightConfig+ fields = CONFIG_FIELDSclass RepsConfigSerializer(serializers.ModelSerializer):@@ -101,16 +105,17 @@ class RepsConfigSerializer(serializers.ModelSerializer):class Meta:model = RepsConfig- fields = (- 'id',- 'slot_config',- 'iteration',- 'value',- 'operation',- 'step',- 'replace',- 'need_log_to_apply',- )+ fields = CONFIG_FIELDS+++class MaxRepsConfigSerializer(serializers.ModelSerializer):+ """+ Max Repetition Config serializer+ """++ class Meta:+ model = MaxRepsConfig+ fields = CONFIG_FIELDSclass SetNrConfigSerializer(serializers.ModelSerializer):@@ -120,15 +125,7 @@ class SetNrConfigSerializer(serializers.ModelSerializer):class Meta:model = SetsConfig- fields = (- 'id',- 'slot_config',- 'iteration',- 'value',- 'operation',- 'step',- 'replace',- )+ fields = CONFIG_FIELDSclass RiRConfigSerializer(serializers.ModelSerializer):@@ -138,15 +135,7 @@ class RiRConfigSerializer(serializers.ModelSerializer):class Meta:model = RiRConfig- fields = (- 'id',- 'slot_config',- 'iteration',- 'value',- 'operation',- 'step',- 'replace',- )+ fields = CONFIG_FIELDSclass RestConfigSerializer(serializers.ModelSerializer):@@ -156,15 +145,17 @@ class RestConfigSerializer(serializers.ModelSerializer):class Meta:model = RestConfig- fields = (- 'id',- 'slot_config',- 'iteration',- 'value',- 'operation',- 'step',- 'replace',- )+ fields = CONFIG_FIELDS+++class MaxRestConfigSerializer(serializers.ModelSerializer):+ """+ Rest Config serializer+ """++ class Meta:+ model = MaxRestConfig+ fields = CONFIG_FIELDSclass SlotConfigSerializer(serializers.ModelSerializer):@@ -173,10 +164,13 @@ class SlotConfigSerializer(serializers.ModelSerializer):"""weight_configs = WeightConfigSerializer(source='weightconfig_set', many=True)+ max_weight_configs = WeightConfigSerializer(source='maxweightconfig_set', many=True)reps_configs = RepsConfigSerializer(source='repsconfig_set', many=True)+ max_reps_configs = RepsConfigSerializer(source='maxrepsconfig_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)+ max_rest_configs = RestConfigSerializer(source='maxrestconfig_set', many=True)class Meta:model = SlotConfig@@ -184,19 +178,22 @@ class SlotConfigSerializer(serializers.ModelSerializer):'id','slot','exercise',- 'repetition_unit',- 'repetition_rounding',- 'weight_unit',- 'weight_rounding','order','comment','type','class_name',- 'weight_configs',+ 'repetition_unit',+ 'repetition_rounding','reps_configs',+ 'max_reps_configs',+ 'weight_unit',+ 'weight_rounding',+ 'weight_configs',+ 'max_weight_configs','set_nr_configs','rir_configs','rest_configs',+ 'max_rest_configs',)diff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex c7503ea8e..ebd9e334a 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -29,13 +29,22 @@ from rest_framework.response import Response# wgerfrom wger.exercises.models import ExerciseBase+from wger.manager.api.consts import CONFIG_FIELDSfrom wger.manager.api.serializers import (DaySerializer,LogDataSerializer,+ MaxRepsConfigSerializer,+ MaxRestConfigSerializer,+ MaxWeightConfigSerializer,+ RepsConfigSerializer,+ RestConfigSerializer,+ RiRConfigSerializer,RoutineSerializer,RoutineStructureSerializer,ScheduleSerializer,ScheduleStepSerializer,+ SetNrConfigSerializer,+ WeightConfigSerializer,WorkoutDayDataDisplayModeSerializer,WorkoutDayDataGymModeSerializer,WorkoutLogSerializer,@@ -44,9 +53,18 @@ from wger.manager.api.serializers import (WorkoutTemplateSerializer,)from wger.manager.models import (+ MaxRepsConfig,+ MaxRestConfig,+ MaxWeightConfig,+ RepsConfig,+ RestConfig,+ RiRConfig,Routine,Schedule,ScheduleStep,+ SetsConfig,+ SlotConfig,+ WeightConfig,Workout,WorkoutLog,WorkoutSession,@@ -416,3 +434,165 @@ class WorkoutLogViewSet(WgerOwnerObjectModelViewSet):Return objects to check for ownership permission"""return [(Workout, 'workout')]+++class AbstractConfigViewSet(WgerOwnerObjectModelViewSet):+ """+ API endpoint for weight config objects+ """++ is_private = True+ ordering_fields = '__all__'+ filterset_fields = CONFIG_FIELDS++ def get_owner_objects(self):+ """+ Return objects to check for ownership permission+ """+ return [(SlotConfig, 'slot_config')]+++class WeightConfigViewSet(AbstractConfigViewSet):+ """+ API endpoint for weight config objects+ """++ serializer_class = WeightConfigSerializer++ def get_queryset(self):+ """+ Only allow access to appropriate objects+ """+ # REST API generation+ if getattr(self, 'swagger_fake_view', False):+ return WeightConfig.objects.none()++ return WeightConfig.objects.filter(slot_config__slot__day__routine__user=self.request.user)+++class MaxWeightConfigViewSet(AbstractConfigViewSet):+ """+ API endpoint for max weight config objects+ """++ serializer_class = MaxWeightConfigSerializer++ def get_queryset(self):+ """+ Only allow access to appropriate objects+ """+ # REST API generation+ if getattr(self, 'swagger_fake_view', False):+ return MaxWeightConfig.objects.none()++ return MaxWeightConfig.objects.filter(+ slot_config__slot__day__routine__user=self.request.user+ )+++class RepsConfigViewSet(AbstractConfigViewSet):+ """+ API endpoint for reps config objects+ """++ serializer_class = RepsConfigSerializer++ def get_queryset(self):+ """+ Only allow access to appropriate objects+ """+ # REST API generation+ if getattr(self, 'swagger_fake_view', False):+ return RepsConfig.objects.none()++ return RepsConfig.objects.all()+++class MaxRepsConfigViewSet(AbstractConfigViewSet):+ """+ API endpoint for max reps config objects+ """++ serializer_class = MaxRepsConfigSerializer++ def get_queryset(self):+ """+ Only allow access to appropriate objects+ """+ # REST API generation+ if getattr(self, 'swagger_fake_view', False):+ return MaxRepsConfig.objects.none()++ return MaxRepsConfig.objects.all()+++class SetsConfigViewSet(AbstractConfigViewSet):+ """+ API endpoint for set config objects+ """++ serializer_class = SetNrConfigSerializer++ def get_queryset(self):+ """+ Only allow access to appropriate objects+ """+ # REST API generation+ if getattr(self, 'swagger_fake_view', False):+ return SetsConfig.objects.none()++ return SetsConfig.objects.filter(slot_config__slot__day__routine__user=self.request.user)+++class RestConfigViewSet(AbstractConfigViewSet):+ """+ API endpoint for set config objects+ """++ serializer_class = RestConfigSerializer++ def get_queryset(self):+ """+ Only allow access to appropriate objects+ """+ # REST API generation+ if getattr(self, 'swagger_fake_view', False):+ return RestConfig.objects.none()++ return RestConfig.objects.filter(slot_config__slot__day__routine__user=self.request.user)+++class MaxRestConfigViewSet(AbstractConfigViewSet):+ """+ API endpoint for max rest config objects+ """++ serializer_class = MaxRestConfigSerializer++ def get_queryset(self):+ """+ Only allow access to appropriate objects+ """+ # REST API generation+ if getattr(self, 'swagger_fake_view', False):+ return MaxRestConfig.objects.none()++ return MaxRestConfig.objects.filter(slot_config__slot__day__routine__user=self.request.user)+++class RiRConfigViewSet(AbstractConfigViewSet):+ """+ API endpoint for set config objects+ """++ serializer_class = RiRConfigSerializer++ def get_queryset(self):+ """+ Only allow access to appropriate objects+ """+ # REST API generation+ if getattr(self, 'swagger_fake_view', False):+ return RiRConfig.objects.none()++ return RiRConfig.objects.filter(slot_config__slot__day__routine__user=self.request.user)diff --git a/wger/manager/models/abstract_config.py b/wger/manager/models/abstract_config.pyindex 3924058dc..b2247421a 100644--- a/wger/manager/models/abstract_config.py+++ b/wger/manager/models/abstract_config.py@@ -95,3 +95,9 @@ class AbstractChangeConfig(models.Model):self.step = Noneself.operation = Nonesuper().save(**kwargs)++ def get_owner_object(self):+ """+ Config has no owner information+ """+ return self.slot_config.slot.day.routinediff --git a/wger/urls.py b/wger/urls.pyindex 484748e10..9f8845442 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -72,9 +72,31 @@ router.register(basename='public-templates',)router.register(- r'workoutsession', manager_api_views.WorkoutSessionViewSet, basename='workoutsession'+ r'workoutsession',+ manager_api_views.WorkoutSessionViewSet,+ basename='workoutsession',)router.register(r'workoutlog', manager_api_views.WorkoutLogViewSet, basename='workoutlog')+router.register(r'weight-config', manager_api_views.WeightConfigViewSet, basename='weight-config')+router.register(+ r'max-weight-config',+ manager_api_views.MaxWeightConfigViewSet,+ basename='max-weight-config',+)+router.register(r'reps-config', manager_api_views.RepsConfigViewSet, basename='reps-config')+router.register(+ r'max-reps-config',+ manager_api_views.MaxRepsConfigViewSet,+ basename='max-reps-config',+)+router.register(r'sets-config', manager_api_views.SetsConfigViewSet, basename='sets-config')+router.register(r'rest-config', manager_api_views.RestConfigViewSet, basename='rest-config')+router.register(+ r'max-rest-config',+ manager_api_views.MaxRestConfigViewSet,+ basename='max-rest-config',+)+router.register(r'rir-config', manager_api_views.RiRConfigViewSet, basename='rir-config')router.register(r'schedulestep', manager_api_views.ScheduleStepViewSet, basename='schedulestep')router.register(r'schedule', manager_api_views.ScheduleViewSet, basename='schedule')diff --git a/wger/utils/viewsets.py b/wger/utils/viewsets.pyindex 2325080e7..e09f7a34b 100644--- a/wger/utils/viewsets.py+++ b/wger/utils/viewsets.py@@ -49,6 +49,6 @@ class WgerOwnerObjectModelViewSet(viewsets.ModelViewSet):pk = request.data.get(entry[1])obj = entry[0].objects.get(pk=pk)if obj.get_owner_object().user != request.user:- raise exceptions.PermissionDenied('You are not allowed to do this')+ raise exceptions.PermissionDenied('You are not allowed to do this 111111')else:return super().update(request, *args, **kwargs)