Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add a DB constraint for the start and end order
Roland Geiderb56f0631a9b2
diff --git a/wger/manager/migrations/0029_alter_workoutsession_options_and_more.py b/wger/manager/migrations/0029_alter_workoutsession_options_and_more.pyindex 9c6d620b1..1d274a8d8 100644--- a/wger/manager/migrations/0029_alter_workoutsession_options_and_more.py+++ b/wger/manager/migrations/0029_alter_workoutsession_options_and_more.py@@ -121,4 +121,12 @@ class Migration(migrations.Migration):model_name='workoutsession',name='time_start',),+ migrations.AddConstraint(+ model_name='workoutsession',+ constraint=models.CheckConstraint(+ condition=models.Q(('datetime_end__isnull', True))+ | models.Q(('datetime_end__gte', F('datetime_start'))),+ name='session_end_after_start',+ ),+ ),]diff --git a/wger/manager/models/session.py b/wger/manager/models/session.pyindex 2fd7d4ae7..ccc94e9da 100644--- a/wger/manager/models/session.py+++ b/wger/manager/models/session.py@@ -151,6 +151,13 @@ class WorkoutSession(models.Model):'datetime_start',]indexes = [models.Index(fields=['routine', 'datetime_start'])]+ constraints = [+ models.CheckConstraint(+ condition=models.Q(datetime_end__isnull=True)+ | models.Q(datetime_end__gte=models.F('datetime_start')),+ name='session_end_after_start',+ ),+ ]@classmethoddef max_duration(cls) -> datetime.timedelta:diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.pyindex c807bed6b..6b01c59a0 100644--- a/wger/manager/tests/test_workout_session.py+++ b/wger/manager/tests/test_workout_session.py@@ -16,6 +16,10 @@import datetime# Django+from django.db import (+ IntegrityError,+ transaction,+)from django.test import override_settingsfrom django.urls import reversefrom django.utils import timezone@@ -124,6 +128,27 @@ class WorkoutSessionDurationTestCase(WgerTestCase):self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)+class WorkoutSessionIntervalConstraintTestCase(WgerTestCase):+ """+ Test the database constraint on the session interval+ """++ START = timezone.make_aware(datetime.datetime(2025, 3, 10, 18, 0))++ def test_an_end_before_the_start_is_rejected(self):+ with self.assertRaises(IntegrityError), transaction.atomic():+ WorkoutSession.objects.create(+ user_id=1,+ datetime_start=self.START,+ datetime_end=self.START - datetime.timedelta(hours=1),+ )++ def test_a_session_without_an_end_is_allowed(self):+ session = WorkoutSession.objects.create(user_id=1, datetime_start=self.START)++ self.assertIsNone(session.datetime_end)++class WorkoutSessionLegacyFieldsTestCase(WgerTestCase):"""Test that writes in the pre-2.7 shape still arrive