Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add option to generate and set new variation connections

Roland Geider0271b36412bb
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index d2ff15886..e650a4d3c 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -581,21 +581,43 @@ class ExerciseSubmissionSerializer(serializers.ModelSerializer):
id = serializers.IntegerField(required=False, read_only=True)
category = serializers.PrimaryKeyRelatedField(queryset=ExerciseCategory.objects.all())
- muscles = serializers.PrimaryKeyRelatedField(queryset=Muscle.objects.all(), many=True)
- muscles_secondary = serializers.PrimaryKeyRelatedField(queryset=Muscle.objects.all(), many=True)
- equipment = serializers.PrimaryKeyRelatedField(queryset=Equipment.objects.all(), many=True)
- variations = serializers.PrimaryKeyRelatedField(
- queryset=Variation.objects.all(),
+ muscles = serializers.PrimaryKeyRelatedField(
+ queryset=Muscle.objects.all(),
+ many=True,
required=False,
- allow_null=True,
+ default=list,
+ )
+ muscles_secondary = serializers.PrimaryKeyRelatedField(
+ queryset=Muscle.objects.all(),
+ many=True,
+ required=False,
+ default=list,
+ )
+ equipment = serializers.PrimaryKeyRelatedField(
+ queryset=Equipment.objects.all(),
+ many=True,
+ required=False,
+ default=list,
)
+ translations = ExerciseTranslationSubmissionSerializer(many=True)
license = serializers.PrimaryKeyRelatedField(
queryset=License.objects.all(),
required=False,
# Note, using a function here because of problems during tests
default=get_default_license,
)
- translations = ExerciseTranslationSubmissionSerializer(many=True)
+ variations = serializers.PrimaryKeyRelatedField(
+ queryset=Variation.objects.all(),
+ required=False,
+ allow_null=True,
+ )
+ variations_connect_to = serializers.PrimaryKeyRelatedField(
+ queryset=Exercise.objects.all(),
+ required=False,
+ allow_null=True,
+ write_only=True,
+ help_text='If provided, the created exercise will be added to the selected variation set.',
+ )
class Meta:
fields = [
@@ -605,6 +627,7 @@ class ExerciseSubmissionSerializer(serializers.ModelSerializer):
'muscles_secondary',
'equipment',
'variations',
+ 'variations_connect_to',
'license',
'license_author',
'translations',
@@ -625,6 +648,14 @@ class ExerciseSubmissionSerializer(serializers.ModelSerializer):
{'translations': 'You must provide at least one translation in English.'}
)
+ # Either the variations or variations_connect_to field may be set, not both
+ if data.get('variations') and data.get('variations_connect_to'):
+ raise serializers.ValidationError(
+ {
+ 'variations': 'Either set the variations or the variations_connect_to field, not both.'
+ }
+ )
+
return data
@transaction.atomic
@@ -645,4 +676,15 @@ class ExerciseSubmissionSerializer(serializers.ModelSerializer):
serializer: ExerciseTranslationSubmissionSerializer = self.fields['translations'].child
serializer.create(validated_data=translation, exercise=exercise)
+ # If requested, add the exercise to an existing variation set
+ connect_to: Exercise | None = validated_data.get('variations_connect_to')
+ if connect_to:
+ new_variation = Variation.objects.create()
+
+ connect_to.variations = new_variation
+ connect_to.save()
+
+ exercise.variations = new_variation
+ exercise.save()
+
return exercise
diff --git a/wger/exercises/tests/api/test_exercise_submission_api.py b/wger/exercises/tests/api/test_exercise_submission_api.py
index 6c9cef7c7..a811ca5ae 100644
--- a/wger/exercises/tests/api/test_exercise_submission_api.py
+++ b/wger/exercises/tests/api/test_exercise_submission_api.py
@@ -27,6 +27,7 @@ from wger.exercises.models import (
Exercise,
ExerciseComment,
Translation,
+ Variation,
)
@@ -70,13 +71,14 @@ class SearchSubmissionApiTestCase(BaseTestCase, ApiBaseTestCase):
@staticmethod
def get_counts():
- Counts = namedtuple('Counts', ['exercise', 'translation', 'alias', 'comment'])
+ Counts = namedtuple('Counts', ['exercise', 'translation', 'alias', 'comment', 'variations'])
return Counts(
Exercise.objects.count(),
Translation.objects.count(),
Alias.objects.count(),
ExerciseComment.objects.count(),
+ Variation.objects.count(),
)
def test_successful_submission_full(self):
@@ -174,3 +176,26 @@ class SearchSubmissionApiTestCase(BaseTestCase, ApiBaseTestCase):
response_data.get('translations'),
['You must provide at least one translation in English.'],
)
+
+ def test_successfully_creates_new_variation(self):
+ """
+ Correctly connects the new exercise to another exercise via a new variation.
+ """
+ self.authenticate('admin')
+
+ payload = self.get_payload()
+ payload['variations_connect_to'] = 5
+ del payload['variations']
+
+ connected_exercise = Exercise.objects.get(pk=5)
+ self.assertIsNone(connected_exercise.variations_id)
+
+ counts_before = self.get_counts()
+ response = self.client.post(self.url, data=payload)
+ exercise = Exercise.objects.get(pk=response.json().get('id'))
+ connected_exercise.refresh_from_db()
+ counts_after = self.get_counts()
+
+ self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+ self.assertEqual(counts_before.variations + 1, counts_after.variations)
+ self.assertEqual(exercise.variations_id, connected_exercise.variations_id)