Self hosted FLOSS fitness/workout, nutrition and weight tracker
Count workout sessions as user activity again
Roland Geider7fc5729f963d
diff --git a/wger/gym/helpers.py b/wger/gym/helpers.pyindex c263e5a50..254f0cb56 100644--- a/wger/gym/helpers.py+++ b/wger/gym/helpers.py@@ -14,6 +14,9 @@## You should have received a copy of the GNU Affero General Public License+# Django+from django.utils import timezone+def get_user_last_activity(user):"""@@ -29,27 +32,20 @@ def get_user_last_activity(user):WorkoutSession,)- last_activity = None+ dates = []- # Check workout logs+ # Check workout logs. They use datetimes, the sessions and the user cache+ # only dateslast_log = WorkoutLog.objects.filter(user=user).order_by('date').last()if last_log:- last_activity = last_log.date+ dates.append(timezone.localdate(last_log.date))# Check workout sessionslast_session = WorkoutSession.objects.filter(user=user).order_by('date').last()if last_session:- last_session = last_session.date-- # Return the last one- # if last_session:- # if not last_activity:- # last_activity = last_session- #- # if last_activity < last_session:- # last_activity = last_session+ dates.append(last_session.date)- return last_activity+ return max(dates) if dates else None_CSV_FORMULA_PREFIXES = ('=', '+', '-', '@', '\t', '\r')diff --git a/wger/gym/tests/test_user_last_activity.py b/wger/gym/tests/test_user_last_activity.pyindex 721a6a475..861bee3cb 100644--- a/wger/gym/tests/test_user_last_activity.py+++ b/wger/gym/tests/test_user_last_activity.py@@ -17,6 +17,7 @@ import datetime# Djangofrom django.contrib.auth.models import User+from django.utils import timezone# wgerfrom wger.core.tests.base_testcase import WgerTestCase@@ -34,56 +35,53 @@ class UserLastActivityTestCase(WgerTestCase):TODO: check if we want to get rid of usercache.last_activity"""- def test_user_last_activity(self):+ def setUp(self):+ super().setUp()++ self.user = User.objects.get(username='admin')++ # Start from a clean slate, the fixtures have both logs and sessions+ WorkoutLog.objects.filter(user=self.user).delete()+ WorkoutSession.objects.filter(user=self.user).delete()++ def add_log(self, date: datetime.date):+ WorkoutLog(+ user=self.user,+ exercise_id=1,+ routine_id=1,+ weight=80,+ repetitions=5,+ date=timezone.make_aware(datetime.datetime.combine(date, datetime.time(12, 0))),+ ).save()++ def add_session(self, date: datetime.date):+ WorkoutSession(user=self.user, routine_id=1, date=date).save()++ def test_no_activity(self):+ self.assertIsNone(get_user_last_activity(self.user))++ def test_only_logs(self):+ self.add_log(datetime.date(2024, 3, 1))+ self.add_log(datetime.date(2024, 3, 5))++ self.assertEqual(get_user_last_activity(self.user), datetime.date(2024, 3, 5))++ def test_only_sessions(self):"""- Test the helper function for last user activity+ Users that only track sessions are active too"""- self.user_login('admin')- user = User.objects.get(username='admin')- log = WorkoutLog.objects.get(pk='aaaaaaaa-aaaa-aaaa-aaaa-000000000001')- session = WorkoutSession.objects.get(pk='bbbbbbbb-bbbb-bbbb-bbbb-000000000001')-- self.assertEqual(user.usercache.last_activity, datetime.date(2025, 11, 1))- self.assertEqual(- get_user_last_activity(user),- datetime.datetime(2025, 10, 31, 23, 0, tzinfo=datetime.timezone.utc),- )-- # Log more recent than session- log.date = datetime.date(2014, 10, 2)- log.save()- session.date = datetime.date(2014, 10, 1)- session.save()- user = User.objects.get(username='admin')- self.assertEqual(- get_user_last_activity(user),- datetime.datetime(2025, 10, 31, 23, 0, tzinfo=datetime.timezone.utc),- )- self.assertEqual(- user.usercache.last_activity,- datetime.date(2025, 11, 1),- )-- # Session more recent than log- log.date = datetime.date(2014, 9, 1)- log.save()- session.date = datetime.date(2014, 10, 5)- session.save()- user = User.objects.get(username='admin')- self.assertEqual(- get_user_last_activity(user),- datetime.datetime(2025, 10, 31, 23, 0, tzinfo=datetime.timezone.utc),- )- self.assertEqual(- user.usercache.last_activity,- datetime.date(2025, 11, 1),- )-- # No logs, but session- WorkoutLog.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(2025, 11, 1),- )+ self.add_session(datetime.date(2024, 3, 7))++ self.assertEqual(get_user_last_activity(self.user), datetime.date(2024, 3, 7))++ def test_log_more_recent_than_session(self):+ self.add_log(datetime.date(2024, 3, 10))+ self.add_session(datetime.date(2024, 3, 2))++ self.assertEqual(get_user_last_activity(self.user), datetime.date(2024, 3, 10))++ def test_session_more_recent_than_log(self):+ self.add_log(datetime.date(2024, 3, 2))+ self.add_session(datetime.date(2024, 3, 10))++ self.assertEqual(get_user_last_activity(self.user), datetime.date(2024, 3, 10))