Self hosted FLOSS fitness/workout, nutrition and weight tracker
updated test cases and fixed linter/isort issues
nikithamurikinati1433ac5ca344
diff --git a/.vscode/settings.json b/.vscode/settings.jsonnew file mode 100644index 000000000..2cd8968be--- /dev/null+++ b/.vscode/settings.json@@ -0,0 +1 @@+123,125\ No newline at end of filediff --git a/wger/exercises/fixtures/test-exercises.json b/wger/exercises/fixtures/test-exercises.jsonindex c74c63550..8ca9a13d6 100644--- a/wger/exercises/fixtures/test-exercises.json+++ b/wger/exercises/fixtures/test-exercises.json@@ -77,36 +77,79 @@},{"pk": 1,- "model": "exercises.exercise",+ "model": "exercises.exercisebase","fields": {- "status": "2","category": 2,- "language": 1,"muscles": [1,2],"muscles_secondary": [3- ],- "description": "",- "name": "An exercise"+ ]}},{"pk": 2,- "model": "exercises.exercise",+ "model": "exercises.exercisebase","fields": {- "status": "2","category": 2,- "language": 2,"muscles": [2],"muscles_secondary": [1,3+ ]+ }+ },+ {+ "pk": 3,+ "model": "exercises.exercisebase",+ "fields": {+ "category": 3,+ "muscles": [+ 1+ ]+ }+ },+ {+ "pk": 4,+ "model": "exercises.exercisebase",+ "fields": {+ "category": 3,+ "muscles": [+ 1],+ "muscles_secondary":[]+ }+ },+ {+ "pk": 6,+ "model": "exercises.exercisebase",+ "fields": {+ "category": 1,+ "muscles": []+ }+ },+ {+ "pk": 1,+ "model": "exercises.exercise",+ "fields": {+ "status": "2",+ "language": 1,+ "exercise_base": 1,+ "description": "",+ "name": "An exercise"+ }+ },+ {+ "pk": 2,+ "model": "exercises.exercise",+ "fields": {+ "status": "2",+ "language": 2,+ "exercise_base": 2,"description": "","name": "Very cool exercise"}@@ -116,11 +159,8 @@"model": "exercises.exercise","fields": {"status": "2",- "category": 3,- "language": 1,- "muscles": [- 1- ],+ "language": 1,+ "exercise_base": 3,"description": "","name": "Boring exercise"}@@ -130,12 +170,9 @@"model": "exercises.exercise","fields": {"status": "1",- "category": 3,"language": 1,- "muscles": [- 1- ],"description": "",+ "exercise_base": 3,"license_author": "test","name": "Pending exercise"}@@ -145,12 +182,8 @@"model": "exercises.exercise","fields": {"status": "2",- "category": 3,"language": 1,- "muscles": [- 1- ],- "muscles_secondary":[],+ "exercise_base": 4,"description": "","name": "Needed for demo user"}@@ -160,12 +193,8 @@"model": "exercises.exercise","fields": {"status": "2",- "category": 3,"language": 1,- "muscles": [- 1- ],- "muscles_secondary":[],+ "exercise_base": 4,"description": "","name": "Needed for demo user"}@@ -175,12 +204,8 @@"model": "exercises.exercise","fields": {"status": "2",- "category": 3,"language": 2,- "muscles": [- 1- ],- "muscles_secondary":[],+ "exercise_base": 4,"description": "","name": "Needed for demo user"}@@ -190,12 +215,8 @@"model": "exercises.exercise","fields": {"status": "2",- "category": 3,"language": 2,- "muscles": [- 1- ],- "muscles_secondary":[],+ "exercise_base": 4,"description": "","name": "Needed for demo user"}@@ -205,12 +226,8 @@"model": "exercises.exercise","fields": {"status": "2",- "category": 3,"language": 2,- "muscles": [- 1- ],- "muscles_secondary":[],+ "exercise_base": 4,"description": "","name": "Needed for demo user"}@@ -220,12 +237,8 @@"model": "exercises.exercise","fields": {"status": "2",- "category": 3,"language": 2,- "muscles": [- 1- ],- "muscles_secondary":[],+ "exercise_base": 4,"description": "","name": "Needed for demo user"}diff --git a/wger/exercises/tests/test_corrected_exercise.py b/wger/exercises/tests/test_corrected_exercise.pyindex 7c8341462..332adfa07 100644--- a/wger/exercises/tests/test_corrected_exercise.py+++ b/wger/exercises/tests/test_corrected_exercise.py@@ -32,11 +32,11 @@ class ExercisesCorrectionTestCase(WgerTestCase):"""description = 'a nice, long and accurate description for the exercise'response = self.client.post(reverse('exercise:exercise:correct', kwargs={'pk': 1}),- {'category': 3,- 'name_original': 'my test exercise',+ {'name_original': 'my test exercise','license': 2,'description': description,- 'muscles': [3]})+ 'muscles': [3],+ 'category': 3})if fail:self.assertEqual(response.status_code, 403)@@ -50,10 +50,10 @@ class ExercisesCorrectionTestCase(WgerTestCase):exercise = Exercise.objects.get(pk=1)self.assertEqual(exercise.name, 'An exercise')self.assertEqual(exercise.description, '')- self.assertEqual(exercise.category_id, 2)+ self.assertEqual(exercise.exercise_base.category_id, 2)self.assertEqual(exercise.language_id, 1)- self.assertEqual([i.pk for i in exercise.muscles.all()], [1, 2])- self.assertEqual([i.pk for i in exercise.muscles_secondary.all()], [3])+ self.assertEqual([i.pk for i in exercise.exercise_base.muscles.all()], [1, 2])+ self.assertEqual([i.pk for i in exercise.exercise_base.muscles_secondary.all()], [3])# Check the notification emailif fail:diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.pyindex 745d51769..4d15c875f 100644--- a/wger/exercises/tests/test_equipment.py+++ b/wger/exercises/tests/test_equipment.py@@ -164,7 +164,7 @@ class EquipmentCacheTestCase(WgerTestCase):exercise = Exercise.objects.get(pk=2)exercise.name = 'Very cool exercise 2'exercise.description = 'New description'- exercise.equipment.add(Equipment.objects.get(pk=2))+ exercise.exercise_base.equipment.add(Equipment.objects.get(pk=2))exercise.save()self.assertFalse(cache.get(make_template_fragment_key('equipment-overview', [2])))diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.pyindex a97f37948..0b9543f35 100644--- a/wger/exercises/tests/test_exercise.py+++ b/wger/exercises/tests/test_exercise.py@@ -89,18 +89,20 @@ class ExerciseIndexTestCase(WgerTestCase):self.assertEqual(response.context['active_tab'], WORKOUT_TAB)# Correct categories are shown- category_1 = response.context['exercises'][0].category+ category_1 = response.context['exercises'][0].exercise_base.categoryself.assertEqual(category_1.id, 2)self.assertEqual(category_1.name, "Another category")- category_2 = response.context['exercises'][1].category+ category_2 = response.context['exercises'][1].exercise_base.categoryself.assertEqual(category_2.id, 3)self.assertEqual(category_2.name, "Yet another category")# Correct exercises in the categories- exercises_1 = category_1.exercise_set.all()+ exercise_bases_1 = category_1.exercisebase_set.all()+ exercises_1 = exercise_bases_1[0].exercises.all()+ exercises_2 = exercise_bases_1[1].exercises.all()exercise_1 = exercises_1[0]- exercise_2 = exercises_1[1]+ exercise_2 = exercises_2[0]self.assertEqual(exercise_1.id, 1)self.assertEqual(exercise_1.name, "An exercise")@@ -181,7 +183,7 @@ class ExerciseDetailTestCase(WgerTestCase):exercise_1 = response.context['exercise']self.assertEqual(exercise_1.id, 1)- muscles = exercise_1.muscles.all()+ muscles = exercise_1.exercise_base.muscles.all()muscle_1 = muscles[0]muscle_2 = muscles[1]@@ -241,10 +243,12 @@ class ExercisesTestCase(WgerTestCase):# Add an exercisecount_before = Exercise.objects.count()response = self.client.post(reverse('exercise:exercise:add'),- {'category': 2,- 'name_original': 'my test exercise',+ {'name_original': 'my test exercise','license': 1,- 'muscles': [1, 2]})+ 'exercise_base': {+ 'category': 2,+ 'muscles': [1, 2]+ }})count_after = Exercise.objects.count()self.assertIn(response.status_code, STATUS_CODES_FAIL)@@ -277,10 +281,10 @@ class ExercisesTestCase(WgerTestCase):count_before = Exercise.objects.count()description = 'a nice, long and accurate description for the exercise'response = self.client.post(reverse('exercise:exercise:add'),- {'category': 2,- 'name_original': 'my test exercise',+ {'name_original': 'my test exercise','license': 1,'description': description,+ 'category': 2,'muscles': [1, 2]})count_after = Exercise.objects.count()self.assertEqual(response.status_code, 302)@@ -310,18 +314,20 @@ class ExercisesTestCase(WgerTestCase):# Wrong category - addingresponse = self.client.post(reverse('exercise:exercise:add'),- {'category': 111,- 'name_original': 'my test exercise',+ {'name_original': 'my test exercise','license': 1,- 'muscles': [1, 2]})+ 'category': 111,+ 'muscles': [1, 2]+ })self.assertTrue(response.context['form'].errors['category'])# Wrong category - editingresponse = self.client.post(reverse('exercise:exercise:edit', kwargs={'pk': '1'}),- {'category': 111,- 'name_original': 'my test exercise',+ {'name_original': 'my test exercise','license': 1,- 'muscles': [1, 2]})+ 'category': 111,+ 'muscles': [1, 2]+ })if admin:self.assertTrue(response.context['form'].errors['category'])else:@@ -329,18 +335,20 @@ class ExercisesTestCase(WgerTestCase):# No muscles - addingresponse = self.client.post(reverse('exercise:exercise:add'),- {'category': 1,- 'name_original': 'my test exercise',+ {'name_original': 'my test exercise','license': 1,- 'muscles': []})+ 'category': 1,+ 'muscles': []+ })self.assertEqual(response.status_code, 302)# No muscles - editingresponse = self.client.post(reverse('exercise:exercise:edit', kwargs={'pk': '1'}),- {'category': 1,- 'name_original': 'my test exercise',+ {'name_original': 'my test exercise','license': 1,- 'muscles': []})+ 'category': 1,+ 'muscles': []+ })if admin:self.assertEqual(response.status_code, 302)else:@@ -449,7 +457,7 @@ class ExercisesCacheTestCase(WgerTestCase):exercise = Exercise.objects.get(pk=2)exercise.name = 'Very cool exercise 2'exercise.description = 'New description'- exercise.muscles_secondary.add(Muscle.objects.get(pk=2))+ exercise.exercise_base.muscles_secondary.add(Muscle.objects.get(pk=2))exercise.save()self.assertFalse(cache.get(make_template_fragment_key('muscle-overview', [2])))diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex 958f46faa..5eaf0b6c2 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -213,10 +213,12 @@ class ExercisesEditAddView(WgerFormMixin):def get_form(self, form_class=None):form = super(ExercisesEditAddView, self).get_form(form_class)exercise = self.get_form_kwargs()['instance']- form.fields['category'].initial = exercise.exercise_base.category- form.fields['equipment'].initial = exercise.exercise_base.equipment.all()- form.fields['muscles'].initial = exercise.exercise_base.muscles.all()- form.fields['muscles_secondary'].initial = exercise.exercise_base.muscles_secondary.all()+ if exercise is not None:+ form.fields['category'].initial = exercise.exercise_base.category+ form.fields['equipment'].initial = exercise.exercise_base.equipment.all()+ form.fields['muscles'].initial = exercise.exercise_base.muscles.all()+ form.fields['muscles_secondary'].initial = \+ exercise.exercise_base.muscles_secondary.all()form.helper.layout = Layout("name_original","description",@@ -236,7 +238,7 @@ class ExercisesEditAddView(WgerFormMixin):return formdef form_valid(self, form):- exercise_base = Exercise.objects.get(name=form.instance.name).exercise_base+ exercise_base = Exercise.objects.filter(name=form.instance.name)[0].exercise_baseexercise_base.equipment.set(form.cleaned_data['equipment'].all())exercise_base.muscles.set(form.cleaned_data['muscles'].all())exercise_base.muscles_secondary.set(form.cleaned_data['muscles_secondary'].all())@@ -272,13 +274,22 @@ class ExerciseAddView(ExercisesEditAddView, LoginRequiredMixin, CreateView):"""form.instance.language = load_language()form.instance.set_author(self.request)- exercise_base = ExerciseBase.objects.create(- category=ExerciseCategory.objects.get(name=form.cleaned_data['category'])- )-- exercise_base.equipment.set(form.cleaned_data['equipment'].all())- exercise_base.muscles.set(form.cleaned_data['muscles'].all())- exercise_base.muscles_secondary.set(form.cleaned_data['muscles_secondary'].all())+ existing = ExerciseBase.objects.filter(+ category=ExerciseCategory.objects.get(name=form.cleaned_data['category']))+ for elem in form.cleaned_data['equipment'].all():+ existing = existing.filter(equipment=elem)+ for elem in form.cleaned_data['muscles'].all():+ existing = existing.filter(muscles=elem)+ for elem in form.cleaned_data['muscles_secondary'].all():+ existing = existing.filter(equipment=elem)+ if not existing:+ exercise_base = ExerciseBase.objects.create(+ category=ExerciseCategory.objects.get(name=form.cleaned_data['category']))+ exercise_base.equipment.set(form.cleaned_data['equipment'].all())+ exercise_base.muscles.set(form.cleaned_data['muscles'].all())+ exercise_base.muscles_secondary.set(form.cleaned_data['muscles_secondary'].all())+ else:+ exercise_base = existing.first()form.instance.exercise_base = exercise_baseform.instance.save()@@ -314,8 +325,6 @@ class ExerciseCorrectView(ExercisesEditAddView, LoginRequiredMixin, UpdateView):def get_context_data(self, **kwargs):context = super(ExerciseCorrectView, self).get_context_data(**kwargs)context['title'] = _('Correct {0}').format(self.object.name)- # context['form']context['exercise']- print(context)return contextdef form_valid(self, form):diff --git a/wger/manager/signals.py b/wger/manager/signals.pyindex f3a6df408..ee18a4296 100644--- a/wger/manager/signals.py+++ b/wger/manager/signals.py@@ -55,7 +55,9 @@ post_save.connect(update_activity_cache, sender=WorkoutLog)def reset_muscle_cache(sender, instance, **kwargs):- exercises = Exercise.objects.filter(Q(muscles=instance) | Q(muscles_secondary=instance)).all()+ exercises = Exercise.objects.filter(+ Q(exercise_base__muscles=instance)+ | Q(exercise_base__muscles_secondary=instance)).all()languages = Language.objects.all()for exercise in exercises:diff --git a/wger/settings.tpl b/wger/settings.tplindex 3475daffd..e70362b2e 100644--- a/wger/settings.tpl+++ b/wger/settings.tpl@@ -67,4 +67,3 @@ WGER_SETTINGS['EMAIL_FROM'] = 'wger Workout Manager <[email protected]>'# Your twitter handle, if you have one for this instance.#WGER_SETTINGS['TWITTER'] = ''-