Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Keep the session backfill ordered across a DST spring-forward

Roland Geider506aa50666a8
diff --git a/wger/manager/migrations/0029_alter_workoutsession_options_and_more.py b/wger/manager/migrations/0029_alter_workoutsession_options_and_more.py
index 1d274a8d8..60b5d5da4 100644
--- a/wger/manager/migrations/0029_alter_workoutsession_options_and_more.py
+++ b/wger/manager/migrations/0029_alter_workoutsession_options_and_more.py
@@ -28,6 +28,10 @@ def build_interval(session):
# An end before the start means the session ran over midnight
if session.time_end < session.time_start:
end += datetime.timedelta(days=1)
+ # A DST gap can invert the instants, and the check constraint
+ # compares instants (aware datetimes in one zone compare wall clock)
+ if end.timestamp() < start.timestamp():
+ end = start
return start, end
# An end without a start was never valid, but nothing enforced it
diff --git a/wger/manager/tests/test_migration_session_datetime.py b/wger/manager/tests/test_migration_session_datetime.py
index 33635b6a3..f9997c8e1 100644
--- a/wger/manager/tests/test_migration_session_datetime.py
+++ b/wger/manager/tests/test_migration_session_datetime.py
@@ -31,9 +31,9 @@ def local(*args):
return timezone.make_aware(datetime.datetime(*args))
-def session(time_start=None, time_end=None, first_log=None, last_log=None):
+def session(time_start=None, time_end=None, first_log=None, last_log=None, date=DAY):
return SimpleNamespace(
- date=DAY,
+ date=date,
time_start=time_start,
time_end=time_end,
first_log=first_log,
@@ -58,6 +58,18 @@ class BuildIntervalTestCase(SimpleTestCase):
self.assertEqual(start, local(2025, 3, 10, 23, 0))
self.assertEqual(end, local(2025, 3, 11, 1, 30))
+ def test_a_dst_gap_cannot_invert_the_interval(self):
+ with timezone.override('Europe/Berlin'):
+ start, end = migration.build_interval(
+ session(
+ datetime.time(2, 30),
+ datetime.time(3, 0),
+ date=datetime.date(2025, 3, 30),
+ )
+ )
+
+ self.assertGreaterEqual(end.timestamp(), start.timestamp())
+
def test_only_a_start_stays_open(self):
start, end = migration.build_interval(session(time_start=datetime.time(10, 0)))