Self hosted FLOSS fitness/workout, nutrition and weight tracker
Reformat code using ruff
Justin889c575a58ab
diff --git a/wger/core/migrations/0020_add_trophies_enabled_to_userprofile.py b/wger/core/migrations/0020_add_trophies_enabled_to_userprofile.pyindex a70f23647..4d76371bd 100644--- a/wger/core/migrations/0020_add_trophies_enabled_to_userprofile.py+++ b/wger/core/migrations/0020_add_trophies_enabled_to_userprofile.py@@ -4,7 +4,6 @@ from django.db import migrations, modelsclass Migration(migrations.Migration):-dependencies = [('core', '0019_delete_daysofweek'),]@@ -13,6 +12,10 @@ class Migration(migrations.Migration):migrations.AddField(model_name='userprofile',name='trophies_enabled',- field=models.BooleanField(default=True, help_text='Enable or disable the trophy system for this user', verbose_name='Enable trophies'),+ field=models.BooleanField(+ default=True,+ help_text='Enable or disable the trophy system for this user',+ verbose_name='Enable trophies',+ ),),]diff --git a/wger/trophies/checkers/personal_record.py b/wger/trophies/checkers/personal_record.pyindex caf5f84ac..6b772b67a 100644--- a/wger/trophies/checkers/personal_record.py+++ b/wger/trophies/checkers/personal_record.py@@ -27,7 +27,7 @@ class PersonalRecordChecker(BaseTrophyChecker):Used to detect when PRs are beaten and award trophies accordingly.- params:+ params:log (WorkoutLog): workout log used to check if a PR was beaten."""@@ -38,20 +38,21 @@ class PersonalRecordChecker(BaseTrophyChecker):"""log = self.params.get('log', None)- if not log: raise ValueError("Log should not be None")+ if not log:+ raise ValueError('Log should not be None')weight = getattr(log, 'weight', None)repetitions = getattr(log, 'repetitions', None)if weight is None:- raise ValueError("Weight should not be None")+ raise ValueError('Weight should not be None')if repetitions is None:- raise ValueError("Repetitions should not be None")+ raise ValueError('Repetitions should not be None')try:reps = int(repetitions)except (TypeError, ValueError):- raise ValueError("Repetitions must be an integer")+ raise ValueError('Repetitions must be an integer')if reps == 37:raise ValueError("In Brzycki's formula, repetitions cannot be equal to 37.")@@ -59,29 +60,32 @@ class PersonalRecordChecker(BaseTrophyChecker):try:w = float(weight)except (TypeError, ValueError):- raise ValueError("Weight must be a number")+ raise ValueError('Weight must be a number')return round(w * (36.0 / float(37 - reps)), 2)-def check(self) -> bool:"""Check if user has beaten Personal Record."""log = self.params.get('log', None)if not log:return False-+exercise = getattr(log, 'exercise', None)- pr_trophy = Trophy.objects.get(name="Personal Record")+ pr_trophy = Trophy.objects.get(name='Personal Record')if not pr_trophy:raise Exception("Trophy 'Personal Record' not found.")- last_pr = UserTrophy.objects.filter(- user=log.user,- trophy=pr_trophy,- context_data__exercise_id=exercise.id,- ).order_by('-earned_at').first()+ last_pr = (+ UserTrophy.objects.filter(+ user=log.user,+ trophy=pr_trophy,+ context_data__exercise_id=exercise.id,+ )+ .order_by('-earned_at')+ .first()+ )if last_pr and last_pr.context_data:prev = last_pr.context_data.get('one_rep_max_estimate')@@ -94,7 +98,6 @@ class PersonalRecordChecker(BaseTrophyChecker):return Falsereturn True-def get_progress(self) -> float:"""Get progress as percentage."""@@ -116,7 +119,7 @@ class PersonalRecordChecker(BaseTrophyChecker):try:one_rm_estimate = self._estimate_one_rep_max()except Exception as e:- print(f"PR estimation failed : {e}")+ print(f'PR estimation failed : {e}')one_rm_estimate = Nonereturn {@@ -124,12 +127,14 @@ class PersonalRecordChecker(BaseTrophyChecker):'date': getattr(log, 'date', None).isoformat(),'session_id': getattr(session, 'id', None) if session else None,'exercise_id': getattr(exercise, 'id', None) if exercise else None,- 'repetitions_unit_id': getattr(repetitions_unit, 'id', None) if repetitions_unit else None,+ 'repetitions_unit_id': getattr(repetitions_unit, 'id', None)+ if repetitions_unit+ else None,'repetitions': float(repetitions) if repetitions else None,'weight_unit_id': getattr(weight_unit, 'id', None) if weight_unit else None,'weight': float(weight) if weight else None,'iteration': getattr(log, 'iteration', None),- 'one_rep_max_estimate': one_rm_estimate+ 'one_rep_max_estimate': one_rm_estimate,}def get_target_value(self) -> int:@@ -140,4 +145,3 @@ class PersonalRecordChecker(BaseTrophyChecker):def get_progress_display(self) -> str:return 'N/A'-diff --git a/wger/trophies/migrations/0001_initial.py b/wger/trophies/migrations/0001_initial.pyindex e4c99b050..8670de75a 100644--- a/wger/trophies/migrations/0001_initial.py+++ b/wger/trophies/migrations/0001_initial.py@@ -293,7 +293,7 @@ class Migration(migrations.Migration):options={'verbose_name': 'User trophy','verbose_name_plural': 'User trophies',- 'ordering': ['-earned_at']+ 'ordering': ['-earned_at'],},),]diff --git a/wger/trophies/migrations/0004_trophy_is_repeatable_usertrophy_context_data.py b/wger/trophies/migrations/0004_trophy_is_repeatable_usertrophy_context_data.pyindex d1af1e7ab..5710500ce 100644--- a/wger/trophies/migrations/0004_trophy_is_repeatable_usertrophy_context_data.py+++ b/wger/trophies/migrations/0004_trophy_is_repeatable_usertrophy_context_data.py@@ -4,7 +4,6 @@ from django.db import migrations, modelsclass Migration(migrations.Migration):-dependencies = [('trophies', '0003_load_initial_trophies'),]@@ -25,8 +24,7 @@ class Migration(migrations.Migration):order=10,)- print(f'Trophy migration: Created trophy \'Personal Record\'')-+ print(f"Trophy migration: Created trophy 'Personal Record'")def remove_personal_record_trophy(apps, schema_editor):Trophy = apps.get_model('trophies', 'Trophy')@@ -36,12 +34,22 @@ class Migration(migrations.Migration):migrations.AddField(model_name='trophy',name='is_repeatable',- field=models.BooleanField(default=False, help_text='If true, this trophy can be earned multiple times', verbose_name='Repeatable'),+ field=models.BooleanField(+ default=False,+ help_text='If true, this trophy can be earned multiple times',+ verbose_name='Repeatable',+ ),),migrations.AddField(model_name='usertrophy',name='context_data',- field=models.JSONField(blank=True, default=None, help_text='Additional information concerning this trophy', null=True, verbose_name='Context data'),+ field=models.JSONField(+ blank=True,+ default=None,+ help_text='Additional information concerning this trophy',+ null=True,+ verbose_name='Context data',+ ),),migrations.RunPython(create_personal_record_trophy, remove_personal_record_trophy),]diff --git a/wger/trophies/models/user_trophy.py b/wger/trophies/models/user_trophy.pyindex 53001b53e..02df3b548 100644--- a/wger/trophies/models/user_trophy.py+++ b/wger/trophies/models/user_trophy.py@@ -95,8 +95,11 @@ class UserTrophy(models.Model):def save(self, *args, **kwargs):# Prevent duplicate non-repeatable trophies (allow more than one if trophy.is_repeatable)- if not self.trophy.is_repeatable and UserTrophy.objects.filter(- user=self.user, trophy=self.trophy- ).exclude(pk=self.pk).exists():+ if (+ not self.trophy.is_repeatable+ and UserTrophy.objects.filter(user=self.user, trophy=self.trophy)+ .exclude(pk=self.pk)+ .exists()+ ):raise IntegrityError('User already has this non-repeatable trophy')- super().save(*args, **kwargs)\ No newline at end of file+ super().save(*args, **kwargs)diff --git a/wger/trophies/services/trophy.py b/wger/trophies/services/trophy.pyindex 3f52d91a8..32790bc68 100644--- a/wger/trophies/services/trophy.py+++ b/wger/trophies/services/trophy.py@@ -72,7 +72,7 @@ class TrophyService:if cls.should_skip_user(user):return []- # Evaluate all active trophies. evaluate_trophy() will skip non-repeatable trophies+ # Evaluate all active trophies. evaluate_trophy() will skip non-repeatable trophies# the user already has, while repeatable trophies are always checked.trophies = Trophy.objects.filter(is_active=True).order_by('order', 'name')@@ -103,7 +103,10 @@ class TrophyService:return None# Check if already earned- if not trophy.is_repeatable and UserTrophy.objects.filter(user=user, trophy=trophy).exists():+ if (+ not trophy.is_repeatable+ and UserTrophy.objects.filter(user=user, trophy=trophy).exists()+ ):return None# Get the checker for this trophy@@ -124,7 +127,13 @@ class TrophyService:return None@classmethod- def award_trophy(cls, user: User, trophy: Trophy, progress: float = 100.0, context_data: Optional[dict]=None) -> UserTrophy:+ def award_trophy(+ cls,+ user: User,+ trophy: Trophy,+ progress: float = 100.0,+ context_data: Optional[dict] = None,+ ) -> UserTrophy:"""Award a trophy to a user.@@ -142,10 +151,7 @@ class TrophyService:if trophy.is_repeatable:created = Trueuser_trophy = UserTrophy.objects.create(- user=user,- trophy=trophy,- progress=progress,- context_data=context_data+ user=user, trophy=trophy, progress=progress, context_data=context_data)else:user_trophy, created = UserTrophy.objects.get_or_create(diff --git a/wger/trophies/signals.py b/wger/trophies/signals.pyindex 068d4a510..a9e2dc891 100644--- a/wger/trophies/signals.py+++ b/wger/trophies/signals.py@@ -96,10 +96,14 @@ def workout_log_saved(sender, instance, created, **kwargs):trophy = Trophy.objects.get(name='Personal Record', is_active=True)checker = CheckerRegistry.create_checker(instance.user, trophy)checker.params = {'log': instance}- existing = UserTrophy.objects.filter(user=instance.user, trophy=trophy, context_data__log_id=instance.id).exists()+ existing = UserTrophy.objects.filter(+ user=instance.user, trophy=trophy, context_data__log_id=instance.id+ ).exists()if not existing and checker and checker.check():context = checker.get_context_data()- TrophyService.award_trophy(instance.user, trophy, progress=100.0, context_data=context)+ TrophyService.award_trophy(+ instance.user, trophy, progress=100.0, context_data=context+ )else:# Edited log - full recalculation for accuracy@@ -110,6 +114,7 @@ def workout_log_saved(sender, instance, created, **kwargs):except Exception as e:logger.error(f'Error updating statistics for user {instance.user_id}: {e}', exc_info=True)+@receiver(post_delete, sender=WorkoutLog)def workout_log_deleted(sender, instance, **kwargs):"""diff --git a/wger/trophies/tests/test_checkers.py b/wger/trophies/tests/test_checkers.pyindex 81ddbb952..52ff8c8ea 100644--- a/wger/trophies/tests/test_checkers.py+++ b/wger/trophies/tests/test_checkers.py@@ -489,6 +489,7 @@ class InactivityReturnCheckerTestCase(WgerTestCase):checker = InactivityReturnChecker(self.user, self.trophy, {'inactive_days': 30})self.assertEqual(checker.get_progress(), 100.0)+class PersonalRecordCheckerTestCase(WgerTestCase):def setUp(self):super().setUp()@@ -504,7 +505,7 @@ class PersonalRecordCheckerTestCase(WgerTestCase):'checker_params': {},'is_active': True,'is_repeatable': True,- }+ },)def test_check_returns_false_with_no_logs(self):@@ -519,7 +520,7 @@ class PersonalRecordCheckerTestCase(WgerTestCase):log = WorkoutLog(user=self.user, exercise=self.exercise, repetitions=10, weight=100)checker = PersonalRecordChecker(self.user, self.trophy, {'log': log})-+self.assertTrue(checker.check())context = checker.get_context_data()self.assertIsNotNone(context)@@ -530,7 +531,7 @@ class PersonalRecordCheckerTestCase(WgerTestCase):log1 = WorkoutLog(user=self.user, exercise=self.exercise, repetitions=10, weight=100)checker1 = PersonalRecordChecker(self.user, self.trophy, {'log': log1})self.assertTrue(checker1.check())-+log2 = WorkoutLog(user=self.user, exercise=self.exercise, repetitions=10, weight=110)checker2 = PersonalRecordChecker(self.user, self.trophy, {'log': log2})self.assertTrue(checker2.check())@@ -544,7 +545,7 @@ class PersonalRecordCheckerTestCase(WgerTestCase):log1 = WorkoutLog(user=self.user, exercise=self.exercise, repetitions=10, weight=100)checker1 = PersonalRecordChecker(self.user, self.trophy, {'log': log1})self.assertTrue(checker1.check())-+# lower weightlog2 = WorkoutLog(user=self.user, exercise=self.exercise, repetitions=10, weight=90)checker2 = PersonalRecordChecker(self.user, self.trophy, {'log': log2})@@ -562,14 +563,14 @@ class PersonalRecordCheckerTestCase(WgerTestCase):def test_estimate_1rm(self):from wger.trophies.checkers.personal_record import PersonalRecordChecker-+log = WorkoutLog(user=self.user, exercise=self.exercise, repetitions=10, weight=100)one_rm = round(100 * (36.0 / (37 - 10)), 2)checker = PersonalRecordChecker(self.user, self.trophy, {'log': log})estimate = checker._estimate_one_rep_max()self.assertEquals(estimate, one_rm)- self.assertEquals(checker.get_context_data().get("one_rep_max_estimate"), one_rm)+ self.assertEquals(checker.get_context_data().get('one_rep_max_estimate'), one_rm)def test_estimate_1rm_raises_on_missing_values(self):from wger.trophies.checkers.personal_record import PersonalRecordChecker@@ -592,7 +593,7 @@ class PersonalRecordCheckerTestCase(WgerTestCase):checker._estimate_one_rep_max()context = checker.get_context_data()- self.assertIsNone(context.get("one_rep_max_estimate"))+ self.assertIsNone(context.get('one_rep_max_estimate'))def test_estimate_1rm_raises_on_repetitions_37(self):from wger.trophies.checkers.personal_record import PersonalRecordChecker@@ -601,5 +602,3 @@ class PersonalRecordCheckerTestCase(WgerTestCase):checker = PersonalRecordChecker(self.user, self.trophy, {'log': log})with self.assertRaises(ValueError):checker._estimate_one_rep_max()--\ No newline at end of filediff --git a/wger/trophies/tests/test_integration.py b/wger/trophies/tests/test_integration.pyindex c5a3833c4..dc5a4b258 100644--- a/wger/trophies/tests/test_integration.py+++ b/wger/trophies/tests/test_integration.py@@ -120,7 +120,7 @@ class TrophyIntegrationTestCase(WgerTestCase):"""Only awards the Personal Record trophy if the log is a PR"""UserTrophy.objects.filter(user=self.user).delete()exercise = Exercise.objects.create(category=ExerciseCategory.objects.create(name='pr_cat'))-+# first log = PRWorkoutLog.objects.create(user=self.user, exercise=exercise, repetitions=10, weight=100)pr_trophies = UserTrophy.objects.filter(user=self.user, trophy=self.personal_record_trophy)diff --git a/wger/trophies/tests/test_models.py b/wger/trophies/tests/test_models.pyindex 5a99aa845..4708983da 100644--- a/wger/trophies/tests/test_models.py+++ b/wger/trophies/tests/test_models.py@@ -209,28 +209,23 @@ class UserTrophyModelTestCase(WgerTestCase):def test_repeatable_trophy_earned_twice(self):"""Test a user can earn the same repeatable trophy twice"""repeatable_trophy = Trophy.objects.create(- name='Repeatable Test',- trophy_type=Trophy.TYPE_OTHER,+ name='Repeatable Test',+ trophy_type=Trophy.TYPE_OTHER,checker_class='personal_record',- is_repeatable=True+ is_repeatable=True,)-+user_trophy_1 = UserTrophy.objects.create(- user=self.user,- trophy=repeatable_trophy,- context_data={"weight":100, "unit":"kg"}+ user=self.user, trophy=repeatable_trophy, context_data={'weight': 100, 'unit': 'kg'})user_trophy_2 = UserTrophy.objects.create(- user=self.user,- trophy=repeatable_trophy,- context_data={"weight":110, "unit":"kg"}+ user=self.user, trophy=repeatable_trophy, context_data={'weight': 110, 'unit': 'kg'})self.assertNotEquals(user_trophy_1, user_trophy_2)self.assertEqual(UserTrophy.objects.filter(trophy=repeatable_trophy).count(), 2)-def test_context_data_default_should_be_none(self):"""Test context_data default is None"""user_trophy = UserTrophy.objects.create(diff --git a/wger/trophies/tests/test_services.py b/wger/trophies/tests/test_services.pyindex b8b87007d..9ce59e307 100644--- a/wger/trophies/tests/test_services.py+++ b/wger/trophies/tests/test_services.py@@ -305,12 +305,16 @@ class TrophyServiceTestCase(WgerTestCase):def test_award_pr_trophy_multiple_times(self):"""PR trophies can be awarded multiple times via TrophyService"""pr_trophy, _ = Trophy.objects.get_or_create(- name="Personal Record",+ name='Personal Record',defaults={'is_repeatable': True, 'is_active': True},)- ut1 = TrophyService.award_trophy(self.user, pr_trophy, progress=100.0, context_data={'log_id': 1})- ut2 = TrophyService.award_trophy(self.user, pr_trophy, progress=100.0, context_data={'log_id': 2})+ ut1 = TrophyService.award_trophy(+ self.user, pr_trophy, progress=100.0, context_data={'log_id': 1}+ )+ ut2 = TrophyService.award_trophy(+ self.user, pr_trophy, progress=100.0, context_data={'log_id': 2}+ )self.assertEqual(UserTrophy.objects.filter(user=self.user, trophy=pr_trophy).count(), 2)self.assertNotEquals(ut1, ut2)