Self hosted FLOSS fitness/workout, nutrition and weight tracker
add serializers, querysets and use perform methods instead of pre_save
Laszlo Ratsko4d97d69ba44a
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 4bab95252..7a7e95d0a 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -17,7 +17,7 @@from rest_framework import serializers-from wger.manager.models import Workout+from wger.manager.models import Workout, ScheduleStepfrom wger.manager.models import Dayfrom wger.manager.models import Settingfrom wger.manager.models import Set@@ -54,6 +54,14 @@ class WorkoutLogSerializer(serializers.ModelSerializer):exclude = ('user',)+class ScheduleStepSerializer(serializers.ModelSerializer):+ '''+ ScheduleStep serializer+ '''+ class Meta:+ model = ScheduleStep++class ScheduleSerializer(serializers.ModelSerializer):'''Schedule serializer@@ -97,9 +105,9 @@ class WorkoutCanonicalFormExerciseListSerializer(serializers.Serializer):Serializer for settings in the canonical form of a workout'''setting_obj_list = SettingSerializer(many=True)- setting_list = serializers.Field()- setting_text = serializers.Field()- comment_list = serializers.Field()+ setting_list = serializers.ReadOnlyField()+ setting_text = serializers.ReadOnlyField()+ comment_list = serializers.ReadOnlyField()class WorkoutCanonicalFormExerciseSerializer(serializers.Serializer):@@ -110,7 +118,7 @@ class WorkoutCanonicalFormExerciseSerializer(serializers.Serializer):exercise_list = WorkoutCanonicalFormExerciseListSerializer()has_settings = serializers.BooleanField()is_superset = serializers.BooleanField()- muscles = serializers.Field()+ muscles = serializers.ReadOnlyField()class DayCanonicalFormSerializer(serializers.Serializer):@@ -119,8 +127,8 @@ class DayCanonicalFormSerializer(serializers.Serializer):'''obj = DaySerializer()set_list = WorkoutCanonicalFormExerciseSerializer(many=True)- days_of_week = serializers.Field()- muscles = serializers.Field()+ days_of_week = serializers.ReadOnlyField()+ muscles = serializers.ReadOnlyField()class WorkoutCanonicalFormSerializer(serializers.Serializer):@@ -128,5 +136,5 @@ class WorkoutCanonicalFormSerializer(serializers.Serializer):Serializer for the canonical form of a workout'''obj = WorkoutSerializer()- muscles = serializers.Field()+ muscles = serializers.ReadOnlyField()day_list = DayCanonicalFormSerializer(many=True)diff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex ed12e9c87..11aac8445 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -21,7 +21,7 @@ from rest_framework import viewsetsfrom rest_framework.response import Responsefrom rest_framework.decorators import detail_route-from wger.manager.api.serializers import WorkoutSerializer+from wger.manager.api.serializers import WorkoutSerializer, ScheduleStepSerializerfrom wger.manager.api.serializers import WorkoutCanonicalFormSerializerfrom wger.manager.api.serializers import DaySerializerfrom wger.manager.api.serializers import SettingSerializer@@ -58,11 +58,17 @@ class WorkoutViewSet(viewsets.ModelViewSet):'''return Workout.objects.filter(user=self.request.user)- def pre_save(self, obj):+ def perform_create(self, serializer):'''Set the owner'''- obj.user = self.request.user+ serializer.save(user=self.request.user)++ def perform_update(self, serializer):+ '''+ Set the owner+ '''+ serializer.save(user=self.request.user)@detail_route()def canonical_representation(self, request, pk):@@ -97,12 +103,19 @@ class WorkoutSessionViewSet(WgerOwnerObjectModelViewSet):'''return WorkoutSession.objects.filter(user=self.request.user)- def pre_save(self, obj):+ def perform_create(self, serializer):+ '''+ Set the owner+ '''+ today = datetime.date.today()+ serializer.save(date=today, user=self.request.user)++ def perform_update(self, serializer):'''Set the owner'''- obj.date = datetime.date.today() # TODO: actually, this should be editable- obj.user = self.request.user+ today = datetime.date.today()+ serializer.save(date=today, user=self.request.user)def get_owner_objects(self):'''@@ -117,6 +130,7 @@ class ScheduleStepViewSet(WgerOwnerObjectModelViewSet):'''model = ScheduleStep+ serializer_class = ScheduleStepSerializeris_private = Trueordering_fields = '__all__'filter_fields = ('schedule',@@ -157,11 +171,17 @@ class ScheduleViewSet(viewsets.ModelViewSet):'''return Schedule.objects.filter(user=self.request.user)- def pre_save(self, obj):+ def perform_create(self, serializer):'''- Set the order+ Set the owner+ '''+ serializer.save(user=self.request.user)++ def perform_update(self, serializer):'''- obj.user = self.request.user+ Set the owner+ '''+ serializer.save(user=self.request.user)class DayViewSet(WgerOwnerObjectModelViewSet):@@ -235,11 +255,17 @@ class SettingViewSet(WgerOwnerObjectModelViewSet):'''return Setting.objects.filter(set__exerciseday__training__user=self.request.user)- def pre_save(self, obj):+ def perform_create(self, serializer):+ '''+ Set the order+ '''+ serializer.save(order=1)++ def perform_update(self, serializer):'''Set the order'''- obj.order = 1+ serializer.save(order=1)def get_owner_objects(self):'''@@ -269,11 +295,17 @@ class WorkoutLogViewSet(WgerOwnerObjectModelViewSet):return WorkoutLog.objects.filter(user=self.request.user)- def pre_save(self, obj):+ def perform_create(self, serializer):'''- Set the order+ Set the owner+ '''+ serializer.save(user=self.request.user)++ def perform_update(self, serializer):+ '''+ Set the owner'''- obj.user = self.request.user+ serializer.save(user=self.request.user)def get_owner_objects(self):'''