Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add endpoint for exercise bases
Roland Geider503bb9c0f6c5
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.pyindex 37c1f3f46..f98023915 100644--- a/wger/core/api/serializers.py+++ b/wger/core/api/serializers.py@@ -120,7 +120,7 @@ class LanguageSerializer(serializers.ModelSerializer):class Meta:model = Language- fields = ['short_name', 'full_name']+ fields = ['id', 'short_name', 'full_name']class DaysOfWeekSerializer(serializers.ModelSerializer):diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.pyindex 401068e06..25db2184d 100644--- a/wger/exercises/api/serializers.py+++ b/wger/exercises/api/serializers.py@@ -33,7 +33,7 @@ from wger.exercises.models import (class ExerciseBaseSerializer(serializers.ModelSerializer):"""- Exercise serializer+ Exercise base serializer"""class Meta:@@ -41,11 +41,12 @@ class ExerciseBaseSerializer(serializers.ModelSerializer):fields = ['id','uuid',+ 'creation_date',+ 'update_date','category','muscles','muscles_secondary','equipment',- 'creation_date',]diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex 45f7af815..a16e448af 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -60,25 +60,20 @@ from wger.exercises.models import (Muscle,Variation,)-from wger.utils.language import (- load_item_languages,- load_language,-)-from wger.utils.models import AbstractSubmissionModel-from wger.utils.permissions import CreateOnlyPermission+from wger.utils.language import load_item_languageslogger = logging.getLogger(__name__)-class ExerciseBaseViewSet(viewsets.ReadOnlyModelViewSet):+class ExerciseBaseViewSet(CreateUpdateModelViewSet):"""API endpoint for exercise base objects. For a read-only endpoint with allthe information of an exercise, see /api/v2/exerciseinfo/"""- queryset = Exercise.objects.accepted()+ queryset = ExerciseBase.objects.accepted()serializer_class = ExerciseBaseSerializer- permission_classes = (IsAuthenticatedOrReadOnly, CreateOnlyPermission)+ permission_classes = (IsAuthenticatedOrReadOnly, ) #CanEditExercisesordering_fields = '__all__'filterset_fields = ('category',@@ -87,15 +82,13 @@ class ExerciseBaseViewSet(viewsets.ReadOnlyModelViewSet):'equipment',)--class ExerciseViewSet(CreateUpdateModelViewSet):+class ExerciseViewSet(viewsets.ReadOnlyModelViewSet): #viewsets.ReadOnlyModelViewSet"""- API endpoint for exercise objects. For a read-only endpoint with all+ API endpoint for exercise objects. For a single read-only endpoint with allthe information of an exercise, see /api/v2/exerciseinfo/"""queryset = Exercise.objects.accepted()serializer_class = ExerciseSerializer- permission_classes = (CanEditExercises, )ordering_fields = '__all__'filterset_fields = ('uuid',@@ -107,60 +100,6 @@ class ExerciseViewSet(CreateUpdateModelViewSet):'name',)- def perform_create(self, serializer):- """- New exercise- """-- # Exercise Base- base = ExerciseBase(category=serializer.validated_data['category'], variations=None)- base.save()- base.muscles.set(serializer.validated_data['muscles'])- base.muscles_secondary.set(serializer.validated_data['muscles_secondary'])- base.equipment.set(serializer.validated_data['equipment'])- base.save()-- # Exercise- exercise = Exercise(- name_original=serializer.validated_data['name'],- description=serializer.validated_data['description'],- exercise_base=base,- language=serializer.validated_data['language'],- status=AbstractSubmissionModel.STATUS_ACCEPTED- )- exercise.save()- serializer.validated_data['id'] = exercise.id- serializer.validated_data['uuid'] = exercise.uuid- serializer.validated_data['exercise_base'] = exercise.exercise_base-- def perform_update(self, serializer):- """- Update exercise- """- exercise = serializer.instance- base = exercise.exercise_base- for attr, value in serializer.validated_data.items():- if (attr == 'name'):- exercise.name_original = value-- if (attr == 'description'):- exercise.description = value-- if (attr == 'category'):- base.category = value-- if (attr == 'muscles'):- base.muscles.set(value)-- if (attr == 'muscles_secondary'):- base.muscles_secondary.set(value)-- if (attr == 'equipment'):- base.equipment.set(value)-- base.save()- exercise.save()-def get_queryset(self):"""Add additional filters for fields from exercise base"""diff --git a/wger/exercises/migrations/0016_auto_20210912_1231.py b/wger/exercises/migrations/0016_auto_20210912_1231.pynew file mode 100644index 000000000..2dd6d6603--- /dev/null+++ b/wger/exercises/migrations/0016_auto_20210912_1231.py@@ -0,0 +1,48 @@+# Generated by Django 3.2.3 on 2021-09-12 10:31++from django.db import migrations, models+import django.db.models.deletion+import django.utils.timezone+++class Migration(migrations.Migration):++ dependencies = [+ ('exercises', '0015_auto_20210613_2349'),+ ]++ operations = [+ migrations.AddField(+ model_name='exercisebase',+ name='creation_date',+ field=models.DateField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='Date'),+ preserve_default=False,+ ),+ migrations.AddField(+ model_name='exercisebase',+ name='update_date',+ field=models.DateTimeField(auto_now=True, verbose_name='Date'),+ ),+ migrations.AddField(+ model_name='historicalexercisebase',+ name='creation_date',+ field=models.DateField(blank=True, default=django.utils.timezone.now, editable=False, verbose_name='Date'),+ preserve_default=False,+ ),+ migrations.AddField(+ model_name='historicalexercisebase',+ name='update_date',+ field=models.DateTimeField(blank=True, default=django.utils.timezone.now, editable=False, verbose_name='Date'),+ preserve_default=False,+ ),+ migrations.AlterField(+ model_name='exercisecomment',+ name='exercise',+ field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='exercises.exercise', verbose_name='Exercise'),+ ),+ migrations.AlterField(+ model_name='historicalexercisecomment',+ name='exercise',+ field=models.ForeignKey(blank=True, db_constraint=False, editable=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='exercises.exercise', verbose_name='Exercise'),+ ),+ ]diff --git a/wger/exercises/models/base.py b/wger/exercises/models/base.pyindex bab166726..e2c08eafb 100644--- a/wger/exercises/models/base.py+++ b/wger/exercises/models/base.py@@ -86,6 +86,18 @@ class ExerciseBase(AbstractSubmissionModel, AbstractLicenseModel, models.Model):)"""Variations of this exercise"""+ creation_date = models.DateField(+ _('Date'),+ auto_now_add=True,+ )+ """The submission date"""++ update_date = models.DateTimeField(+ _('Date'),+ auto_now=True+ )+ """Datetime of last modification"""+history = HistoricalRecords()"""Edit history"""diff --git a/wger/urls.py b/wger/urls.pyindex b6facce39..8d9e47a49 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -98,6 +98,11 @@ router.register(exercises_api_views.ExerciseViewSet,basename='exercise',)+router.register(+ r'exercise-base',+ exercises_api_views.ExerciseBaseViewSet,+ basename='exercise-base',+)router.register(r'equipment',exercises_api_views.EquipmentViewSet,