Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add session object to every log, fix tests
Roland Geider23e026ccfe8b
diff --git a/wger/gym/tests/test_user_last_activity.py b/wger/gym/tests/test_user_last_activity.pyindex 3214df34c..0769808e3 100644--- a/wger/gym/tests/test_user_last_activity.py+++ b/wger/gym/tests/test_user_last_activity.py@@ -30,6 +30,8 @@ from wger.manager.models import (class UserLastActivityTestCase(WgerTestCase):"""Test the helper function for last user activity++ TODO: check if we want to get rid of usercache.last_activity"""def test_user_last_activity(self):@@ -41,10 +43,10 @@ class UserLastActivityTestCase(WgerTestCase):log = WorkoutLog.objects.get(pk=1)session = WorkoutSession.objects.get(pk=1)- self.assertEqual(user.usercache.last_activity, datetime.date(2013, 10, 30))+ self.assertEqual(user.usercache.last_activity, datetime.date(2025, 11, 1))self.assertEqual(get_user_last_activity(user),- datetime.datetime(2013, 10, 29, 23, 0, tzinfo=datetime.timezone.utc),+ datetime.datetime(2025, 10, 31, 23, 0, tzinfo=datetime.timezone.utc),)# Log more recent than session@@ -55,9 +57,12 @@ class UserLastActivityTestCase(WgerTestCase):user = User.objects.get(username='admin')self.assertEqual(get_user_last_activity(user),- datetime.datetime(2014, 10, 1, 22, 0, tzinfo=datetime.timezone.utc),+ datetime.datetime(2025, 10, 31, 23, 0, tzinfo=datetime.timezone.utc),+ )+ self.assertEqual(+ user.usercache.last_activity,+ datetime.date(2025, 11, 1),)- self.assertEqual(user.usercache.last_activity, datetime.date(2014, 10, 2))# Session more recent than loglog.date = datetime.date(2014, 9, 1)@@ -67,12 +72,18 @@ class UserLastActivityTestCase(WgerTestCase):user = User.objects.get(username='admin')self.assertEqual(get_user_last_activity(user),- datetime.datetime(2014, 8, 31, 22, 0, tzinfo=datetime.timezone.utc),+ datetime.datetime(2025, 10, 31, 23, 0, tzinfo=datetime.timezone.utc),+ )+ self.assertEqual(+ user.usercache.last_activity,+ datetime.date(2025, 11, 1),)- self.assertEqual(user.usercache.last_activity, datetime.date(2014, 9, 1))# No logs, but sessionWorkoutLog.objects.filter(user=user).delete()user = User.objects.get(username='admin')self.assertEqual(get_user_last_activity(user), None)- self.assertEqual(user.usercache.last_activity, datetime.date(2014, 9, 1))+ self.assertEqual(+ user.usercache.last_activity,+ datetime.date(2025, 11, 1),+ )diff --git a/wger/manager/fixtures/test-workout-log-data.json b/wger/manager/fixtures/test-workout-log-data.jsonindex 16a2b0e77..a0cca9263 100644--- a/wger/manager/fixtures/test-workout-log-data.json+++ b/wger/manager/fixtures/test-workout-log-data.json@@ -3,11 +3,12 @@"pk": 1,"model": "manager.workoutlog","fields": {- "weight": 30,"routine": 1,+ "session": 1,+ "weight": 30,"reps": 8,"user": 1,- "date": "2012-10-01T00:00:00+01:00",+ "date": "2025-10-01T00:00:00+01:00","exercise": 1}},@@ -15,11 +16,12 @@"pk": 2,"model": "manager.workoutlog","fields": {- "weight": 32,"routine": 1,+ "session": 2,+ "weight": 32,"reps": 8,"user": 1,- "date": "2012-10-10T00:00:00+01:00",+ "date": "2025-10-20T00:00:00+01:00","exercise": 1}},@@ -27,11 +29,12 @@"pk": 3,"model": "manager.workoutlog","fields": {- "weight": 38,"routine": 1,+ "session": 3,+ "weight": 38,"reps": 8,"user": 1,- "date": "2013-10-30T00:00:00+01:00",+ "date": "2025-10-30T00:00:00+01:00","exercise": 1}},@@ -39,11 +42,12 @@"pk": 4,"model": "manager.workoutlog","fields": {- "weight": 30,"routine": 1,+ "session": 4,+ "weight": 30,"reps": 8,"user": 1,- "date": "2012-11-01T00:00:00+01:00",+ "date": "2025-11-01T00:00:00+01:00","exercise": 1}},@@ -52,10 +56,11 @@"model": "manager.workoutlog","fields": {"weight": 30,- "routine": 3,+ "session": 5,+ "routine": 5,"reps": 8,"user": 2,- "date": "2012-11-01T00:00:00+01:00",+ "date": "2025-11-01T00:00:00+01:00","exercise": 2}}diff --git a/wger/manager/fixtures/test-workout-session.json b/wger/manager/fixtures/test-workout-session.jsonindex ee697e1a6..108bb4b02 100644--- a/wger/manager/fixtures/test-workout-session.json+++ b/wger/manager/fixtures/test-workout-session.json@@ -8,7 +8,7 @@"routine": 1,"time_end": "18:30:00","user": 1,- "date": "2012-10-01",+ "date": "2025-10-01","notes": "Notes come here"}},@@ -21,7 +21,7 @@"routine": 1,"time_end": "18:00:00","user": 1,- "date": "2014-01-20",+ "date": "2025-01-20","notes": "Even more notes and impressions"}},@@ -34,20 +34,33 @@"routine": 2,"time_end": "15:00:00","user": 1,- "date": "2014-01-30",+ "date": "2025-01-30","notes": "I spent the whole day in the gym"}},{"pk": 4,"model": "manager.workoutsession",+ "fields": {+ "impression": "3",+ "time_start": "10:00:00",+ "routine": 3,+ "time_end": "10:15:00",+ "user": 1,+ "date": "2025-11-01",+ "notes": "Something, something else"+ }+ },+ {+ "pk": 5,+ "model": "manager.workoutsession","fields": {"impression": "3","time_start": "10:00:00","routine": 3,"time_end": "10:15:00","user": 2,- "date": "2014-01-30",+ "date": "2025-11-01","notes": "Something, something else"}}diff --git a/wger/manager/tests/test_log_model.py b/wger/manager/tests/test_log_model.pyindex 1737d2036..8a9958435 100644--- a/wger/manager/tests/test_log_model.py+++ b/wger/manager/tests/test_log_model.py@@ -22,7 +22,6 @@ from wger.manager.models import (WorkoutSession,)-logger = logging.getLogger(__name__)@@ -55,28 +54,28 @@ class LogModelTestCase(WgerTestCase):Test that no session is created if the log already has one"""- self.assertEqual(WorkoutSession.objects.count(), 4)+ self.assertEqual(WorkoutSession.objects.count(), 5)log = WorkoutLog.objects.get(pk=1)log.session_id = 1- self.assertEqual(WorkoutSession.objects.count(), 4)+ self.assertEqual(WorkoutSession.objects.count(), 5)def test_session_ownership(self):"""Test that the session foreign key checks ownership"""session1 = WorkoutSession.objects.get(pk=1)- session4 = WorkoutSession.objects.get(pk=4)+ session5 = WorkoutSession.objects.get(pk=5)self.assertEqual(session1.user_id, 1)- self.assertEqual(session4.user_id, 2)+ self.assertEqual(session5.user_id, 2)log = WorkoutLog.objects.get(pk=1)- log.session = session4+ log.session = session5log.save()- self.assertNotEquals(log.session_id, 4)+ self.assertNotEqual(log.session_id, 4)def test_routine_ownership(self):"""diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.pyindex f81d8bb17..c8b06f793 100644--- a/wger/manager/tests/test_workout_session.py+++ b/wger/manager/tests/test_workout_session.py@@ -25,7 +25,7 @@ class WorkoutSessionApiTestCase(api_base_test.ApiBaseResourceTestCase):Tests the workout overview resource"""- pk = 4+ pk = 5resource = WorkoutSessionprivate_resource = Truedata = {