Self hosted FLOSS fitness/workout, nutrition and weight tracker
Small cleanups
Roland Geider52e6a185e993
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.pyindex 9d4efd197..9a72c17a0 100644--- a/wger/exercises/api/serializers.py+++ b/wger/exercises/api/serializers.py@@ -508,15 +508,21 @@ class ExerciseTranslationSerializer(serializers.ModelSerializer):if description and language:validate_language_matches(description, language, 'description')- # Check for duplicates+ # Check for duplicates, but only when the name is actually being+ # changed since there are possibly near-duplicates in the existing dbname = value.get('name')- if name and language:+ name_changed = not self.instance or _normalise_name(name or '') != _normalise_name(+ self.instance.name+ )+ if name and language and name_changed:exclude_pk = self.instance.pk if self.instance else Noneduplicate_hit = _check_duplicates(name, language, exclude_pk=exclude_pk)if duplicate_hit:raise serializers.ValidationError({- 'name': f'The name "{name}" is too similar to the existing exercise "{duplicate_hit}". Please choose a more distinct name or submit a variation instead.'+ 'name': f'The name "{name}" is too similar to the existing exercise '+ f'"{duplicate_hit}". Please choose a more distinct name or submit '+ f'a variation instead.'})diff --git a/wger/exercises/tests/api/test_create_throttle.py b/wger/exercises/tests/api/test_create_throttle.pyindex b4edac8cb..c771d59e7 100644--- a/wger/exercises/tests/api/test_create_throttle.py+++ b/wger/exercises/tests/api/test_create_throttle.py@@ -41,14 +41,14 @@ class ExerciseCreateThrottleTestCase(BaseTestCase, ApiBaseTestCase):"""@staticmethod- def get_payload():+ def get_payload(name='Throttle Test Exercise'):return {'category': 3,'license': 5,'license_author': 'tester','translations': [{- 'name': 'Throttle Test Exercise',+ 'name': name,'description_source': ('A sufficiently long English description so the language ''detector recognises it and the minimum length passes.'@@ -97,7 +97,9 @@ class ExerciseCreateThrottleTestCase(BaseTestCase, ApiBaseTestCase):with mock.patch.dict(api_settings.DEFAULT_THROTTLE_RATES, {'exercise_create': '1/min'}):first = self.client.post(url, data=self.get_payload())- second = self.client.post(url, data=self.get_payload())+ # A distinct name, otherwise the duplicate-name check would reject+ # the second submission before the throttle exemption is exercised.+ second = self.client.post(url, data=self.get_payload('Completely Different Movement'))self.assertEqual(first.status_code, status.HTTP_201_CREATED)self.assertEqual(second.status_code, status.HTTP_201_CREATED)diff --git a/wger/exercises/tests/test_exercise_translation.py b/wger/exercises/tests/test_exercise_translation.pyindex 6f208c418..ec7d3779c 100644--- a/wger/exercises/tests/test_exercise_translation.py+++ b/wger/exercises/tests/test_exercise_translation.py@@ -21,6 +21,7 @@ from wger.core.tests.api_base_test import ExerciseCrudApiTestCasefrom wger.core.tests.base_testcase import WgerTestCasefrom wger.exercises.models import (Exercise,+ ExerciseCategory,Muscle,Translation,)@@ -404,10 +405,6 @@ class ExerciseTranslationCustomApiTestCase(ActstreamApiMixin, ExerciseCrudApiTesTest that submitting a name structurally identical (ignoring spaces/hyphens)to an existing exercise in the same language is rejected."""-- # wger- from wger.exercises.models import ExerciseCategory-category = ExerciseCategory.objects.first()exercise_a = Exercise.objects.create(@@ -444,12 +441,11 @@ class ExerciseTranslationCustomApiTestCase(ActstreamApiMixin, ExerciseCrudApiTesdef test_post_rejects_fuzzy_duplicate_name(self):"""- Test that submitting a name semantically similar (trigram)- to an existing exercise in the same language is rejected.+ Test that submitting a name that is only fuzzily similar to an existing+ one in the same language is rejected. The names differ even after+ normalisation (stripping spaces/hyphens leaves the trailing "s"), so+ this exercises the similarity fallback rather than exact matching."""- # wger- from wger.exercises.models import ExerciseCategory-category = ExerciseCategory.objects.first()exercise_a = Exercise.objects.create(@@ -460,8 +456,8 @@ class ExerciseTranslationCustomApiTestCase(ActstreamApiMixin, ExerciseCrudApiTesTranslation.objects.create(exercise=exercise_a,language_id=2,- name='Bench Press',- description_source='A base description for the bench press seed translation.',+ name='Deadlift',+ description_source='A base description for the deadlift seed translation.',)exercise_b = Exercise.objects.create(@@ -471,8 +467,8 @@ class ExerciseTranslationCustomApiTestCase(ActstreamApiMixin, ExerciseCrudApiTes)payload = {- 'name': 'Benchpress', # fuzzy duplicate- 'description_source': 'A new description for the benchpress duplicate test.',+ 'name': 'Deadlifts', # fuzzy duplicate (plural variant)+ 'description_source': 'A new description for the deadlifts duplicate test.','exercise': exercise_b.pk,'language': 2,}@@ -497,7 +493,13 @@ class ExerciseTranslationCustomApiTestCase(ActstreamApiMixin, ExerciseCrudApiTes# passing the same name backresponse = self.client.patch(self.url_detail,- data={'description_source': 'Updating the description only', 'name': original_name},+ data={+ 'description_source': (+ 'A sufficiently long English description so the language '+ 'detector can reliably recognise it as English.'+ ),+ 'name': original_name,+ },)self.assertEqual(response.status_code, status.HTTP_200_OK)@@ -507,10 +509,6 @@ class ExerciseTranslationCustomApiTestCase(ActstreamApiMixin, ExerciseCrudApiTesTest that editing an existing translation's name to collide witha DIFFERENT existing translation's name is rejected."""-- # wger- from wger.exercises.models import ExerciseCategory-other_exercise = Exercise.objects.create(category=ExerciseCategory.objects.first(),license_id=2,@@ -531,3 +529,38 @@ class ExerciseTranslationCustomApiTestCase(ActstreamApiMixin, ExerciseCrudApiTesself.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)self.assertIn('name', response.json())++ def test_patch_allows_edit_when_unchanged_name_collides_with_existing(self):+ """+ Test that editing a translation without changing its name succeeds even+ when another, pre-existing near-duplicate already lives in the database+ """+ translation = Translation.objects.get(pk=self.pk)++ # Seed a near-duplicate of the edited translation in the same language+ twin_exercise = Exercise.objects.create(+ category=ExerciseCategory.objects.first(),+ license_id=2,+ license_author='test',+ )+ Translation.objects.create(+ exercise=twin_exercise,+ language_id=translation.language_id,+ name=translation.name.replace(' ', '-'),+ description_source='Base description for the pre-existing near-duplicate.',+ )++ self.authenticate('trainer1')+ # Resubmit the unchanged name together with a new description+ response = self.client.patch(+ self.url_detail,+ data={+ 'name': translation.name,+ 'description_source': (+ 'A sufficiently long English description so the language '+ 'detector can reliably recognise it as English.'+ ),+ },+ )++ self.assertEqual(response.status_code, status.HTTP_200_OK)