Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix the remaining date lookups on WorkoutSession

Roland Geider007572084076
diff --git a/wger/trophies/checkers/date_based.py b/wger/trophies/checkers/date_based.py
index 07c4ece9e..12b86c7f0 100644
--- a/wger/trophies/checkers/date_based.py
+++ b/wger/trophies/checkers/date_based.py
@@ -70,8 +70,8 @@ class DateBasedChecker(BaseTrophyChecker):
return WorkoutSession.objects.filter(
user=self.user,
- date__month=month,
- date__day=day,
+ datetime_start__month=month,
+ datetime_start__day=day,
).exists()
def get_progress(self) -> float:
diff --git a/wger/trophies/tests/test_checkers.py b/wger/trophies/tests/test_checkers.py
index 231befc69..1a8d2de6a 100644
--- a/wger/trophies/tests/test_checkers.py
+++ b/wger/trophies/tests/test_checkers.py
@@ -18,12 +18,14 @@ from decimal import Decimal
# Django
from django.contrib.auth.models import User
+from django.utils import timezone
# wger
from wger.core.tests.base_testcase import WgerTestCase
from wger.exercises.models.base import Exercise
from wger.exercises.models.category import ExerciseCategory
from wger.manager.models.log import WorkoutLog
+from wger.manager.models.session import WorkoutSession
from wger.trophies.checkers.date_based import DateBasedChecker
from wger.trophies.checkers.inactivity_return import InactivityReturnChecker
from wger.trophies.checkers.personal_record import PersonalRecordChecker
@@ -433,6 +435,28 @@ class DateBasedCheckerTestCase(WgerTestCase):
checker = DateBasedChecker(self.user, self.trophy, {'month': 1, 'day': 1})
self.assertEqual(checker.get_progress(), 100.0)
+ def test_check_other_date_achieved(self):
+ """Dates other than Jan 1st are looked up in the sessions"""
+
+ WorkoutSession.objects.create(
+ user=self.user,
+ datetime_start=timezone.make_aware(datetime.datetime(2024, 12, 24, 12, 0)),
+ )
+
+ checker = DateBasedChecker(self.user, self.trophy, {'month': 12, 'day': 24})
+ self.assertTrue(checker.check())
+
+ def test_check_other_date_not_achieved(self):
+ """No session on that day means the trophy is not achieved"""
+
+ WorkoutSession.objects.create(
+ user=self.user,
+ datetime_start=timezone.make_aware(datetime.datetime(2024, 12, 23, 12, 0)),
+ )
+
+ checker = DateBasedChecker(self.user, self.trophy, {'month': 12, 'day': 24})
+ self.assertFalse(checker.check())
+
class InactivityReturnCheckerTestCase(WgerTestCase):
"""