Self hosted FLOSS fitness/workout, nutrition and weight tracker
Stop inventing a midnight start for end-only sessions
Roland Geider6cfdf30ff4fa
diff --git a/wger/manager/migrations/0029_alter_workoutsession_options_and_more.py b/wger/manager/migrations/0029_alter_workoutsession_options_and_more.pyindex 60b5d5da4..e8dd4a1ca 100644--- a/wger/manager/migrations/0029_alter_workoutsession_options_and_more.py+++ b/wger/manager/migrations/0029_alter_workoutsession_options_and_more.py@@ -34,9 +34,13 @@ def build_interval(session):end = startreturn start, end- # An end without a start was never valid, but nothing enforced it+ # An end without a start was never valid, but nothing enforced it: take the+ # start from the logs, or keep the session open with the end as its startif session.time_end:- return combine(session.date, datetime.time(0, 0)), combine(session.date, session.time_end)+ end = combine(session.date, session.time_end)+ if session.first_log and session.first_log < end:+ return session.first_log, end+ return end, None# No times recorded: the logs know when it actually happenedif session.first_log:diff --git a/wger/manager/tests/test_migration_session_datetime.py b/wger/manager/tests/test_migration_session_datetime.pyindex f9997c8e1..090b8885c 100644--- a/wger/manager/tests/test_migration_session_datetime.py+++ b/wger/manager/tests/test_migration_session_datetime.py@@ -76,12 +76,28 @@ class BuildIntervalTestCase(SimpleTestCase):self.assertEqual(start, local(2025, 3, 10, 10, 0))self.assertIsNone(end)- def test_only_an_end_starts_at_midnight(self):- start, end = migration.build_interval(session(time_end=datetime.time(11, 30)))+ def test_only_an_end_takes_the_start_from_the_logs(self):+ start, end = migration.build_interval(+ session(time_end=datetime.time(11, 30), first_log=local(2025, 3, 10, 10, 15))+ )- self.assertEqual(start, local(2025, 3, 10, 0, 0))+ self.assertEqual(start, local(2025, 3, 10, 10, 15))self.assertEqual(end, local(2025, 3, 10, 11, 30))+ def test_only_an_end_without_logs_becomes_an_open_start(self):+ start, end = migration.build_interval(session(time_end=datetime.time(11, 30)))++ self.assertEqual(start, local(2025, 3, 10, 11, 30))+ self.assertIsNone(end)++ def test_a_log_after_the_end_leaves_the_session_open(self):+ start, end = migration.build_interval(+ session(time_end=datetime.time(11, 30), first_log=local(2025, 3, 10, 12, 0))+ )++ self.assertEqual(start, local(2025, 3, 10, 11, 30))+ self.assertIsNone(end)+def test_no_times_uses_the_logs(self):start, end = migration.build_interval(session(first_log=local(2025, 3, 10, 18, 15), last_log=local(2025, 3, 10, 19, 40))