Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Reset the routine caches when the owner's timezone changes

Roland Geider109661d718a4
diff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.py
index 3b6659a48..1c8c02272 100644
--- a/wger/manager/models/routine.py
+++ b/wger/manager/models/routine.py
@@ -270,7 +270,7 @@ class Routine(models.Model):
can_proceed = (
not current_day.need_logs_to_advance
or (current_day.need_logs_to_advance and has_session)
- or current_date > timezone.localdate()
+ or current_date > timezone.localdate(timezone=tz)
)
wrapped = False
@@ -321,7 +321,7 @@ class Routine(models.Model):
# mutation
ttl = settings.WGER_SETTINGS['ROUTINE_CACHE_TTL']
if any(day.need_logs_to_advance for day in days_list):
- now = timezone.localtime()
+ now = timezone.localtime(timezone=tz)
next_midnight = (now + datetime.timedelta(days=1)).replace(
hour=0, minute=0, second=0, microsecond=0
)
@@ -336,7 +336,8 @@ class Routine(models.Model):
the results for "today"
"""
if date is None:
- date = timezone.localdate()
+ # The owner's "today", like the days of the sequence itself
+ date = timezone.localdate(timezone=self.user.userprofile.zone_info)
for data in self.date_sequence:
if data.date == date:
diff --git a/wger/manager/signals.py b/wger/manager/signals.py
index 51ee82428..ae0167073 100644
--- a/wger/manager/signals.py
+++ b/wger/manager/signals.py
@@ -21,9 +21,11 @@ from django.core.exceptions import ObjectDoesNotExist
from django.db.models.signals import (
post_save,
pre_delete,
+ pre_save,
)
# wger
+from wger.core.models import UserProfile
from wger.gym.helpers import get_user_last_activity
from wger.manager.helpers import reset_routine_cache
from wger.manager.models import (
@@ -118,9 +120,31 @@ def handle_workout_session_change(sender, instance: WorkoutSession, **kwargs):
reset_routine_cache(instance.routine, structure=False)
+def remember_time_zone(sender, instance: UserProfile, raw=False, **kwargs):
+ if raw or instance.pk is None:
+ return
+ instance._old_time_zone = (
+ UserProfile.objects.filter(pk=instance.pk).values_list('time_zone', flat=True).first()
+ )
+
+
+def handle_time_zone_change(sender, instance: UserProfile, created=False, raw=False, **kwargs):
+ if raw or created:
+ return
+ if getattr(instance, '_old_time_zone', instance.time_zone) == instance.time_zone:
+ return
+ # The date sequences cut their calendar days in the owner's zone; the
+ # structure caches do not depend on it
+ for routine in Routine.objects.filter(user_id=instance.user_id):
+ reset_routine_cache(routine, structure=False)
+
+
post_save.connect(handle_workout_session_change, sender=WorkoutSession)
post_save.connect(handle_workout_log_change, sender=WorkoutLog)
+pre_save.connect(remember_time_zone, sender=UserProfile)
+post_save.connect(handle_time_zone_change, sender=UserProfile)
+
post_save.connect(update_cache_routine, sender=Routine)
post_save.connect(update_cache_day, sender=Day)
post_save.connect(update_cache_slot, sender=Slot)
diff --git a/wger/manager/tests/test_routine.py b/wger/manager/tests/test_routine.py
index b32276bae..11ebff052 100644
--- a/wger/manager/tests/test_routine.py
+++ b/wger/manager/tests/test_routine.py
@@ -14,6 +14,7 @@
# Standard Library
import datetime
+import zoneinfo
from unittest import mock
# Django
@@ -535,6 +536,38 @@ class RoutineTestCase(WgerTestCase):
WorkoutDayData(day=self.day1, iteration=3, date=datetime.date(2024, 1, 7)),
)
+ def test_data_for_day_defaults_to_the_owners_today(self):
+ """
+ The default date resolves in the owner's zone, not the active one
+ """
+ # 26 hours apart, so their calendar days differ at every time of day
+ west = timezone.localdate(timezone=zoneinfo.ZoneInfo('Etc/GMT+12'))
+ east = timezone.localdate(timezone=zoneinfo.ZoneInfo('Pacific/Kiritimati'))
+ self.assertNotEqual(west, east)
+
+ sequence = [
+ WorkoutDayData(day=None, iteration=1, date=west),
+ WorkoutDayData(day=None, iteration=1, date=east),
+ ]
+ profile = self.routine.user.userprofile
+
+ # Both directions: the active zone can agree with at most one of them
+ for zone_name, expected in (
+ ('Etc/GMT+12', sequence[0]),
+ ('Pacific/Kiritimati', sequence[1]),
+ ):
+ profile.time_zone = zone_name
+ profile.save()
+
+ routine = Routine.objects.get(pk=self.routine.pk)
+ with mock.patch.object(
+ Routine,
+ 'date_sequence',
+ new_callable=mock.PropertyMock,
+ return_value=sequence,
+ ):
+ self.assertEqual(routine.data_for_day(), expected)
+
def _date_sequence_cache_ttl(self):
"""Capture the timeout date_sequence passes to cache.set, forcing a cache miss."""
with (
diff --git a/wger/manager/tests/test_routine_cache.py b/wger/manager/tests/test_routine_cache.py
index 89b15a80c..33ec5520e 100644
--- a/wger/manager/tests/test_routine_cache.py
+++ b/wger/manager/tests/test_routine_cache.py
@@ -22,6 +22,7 @@ from django.urls import reverse
from django.utils import timezone
# wger
+from wger.core.models import UserProfile
from wger.core.tests.api_base_test import ApiBaseTestCase
from wger.core.tests.base_testcase import BaseTestCase
from wger.manager.models import (
@@ -107,6 +108,26 @@ class RoutineCacheInvalidationTestCase(BaseTestCase, ApiBaseTestCase):
self.assert_volatile_caches_cleared()
+ def test_changing_the_timezone_resets_the_cache(self):
+ # The date sequences cut their calendar days in the owner's zone
+ self.prime_caches()
+
+ profile = UserProfile.objects.get(user_id=self.USER_ID)
+ profile.time_zone = 'Pacific/Auckland'
+ profile.save()
+
+ self.assert_volatile_caches_cleared()
+
+ def test_saving_the_profile_without_a_zone_change_keeps_the_cache(self):
+ self.prime_caches()
+
+ profile = UserProfile.objects.get(user_id=self.USER_ID)
+ profile.height = 180
+ profile.save()
+
+ for key in self.volatile_keys:
+ self.assertIsNotNone(cache.get(key))
+
def test_log_without_routine_keeps_the_cache(self):
self.prime_caches()