Self hosted FLOSS fitness/workout, nutrition and weight tracker
Calculate statistics for the routine
Roland Geider4d8255a6133a
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex f7d61fa48..7119ccc8a 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -422,15 +422,49 @@ class WorkoutLogSerializer(serializers.ModelSerializer):]-class LogDataSerializer(serializers.Serializer):+class LogDisplaySerializer(serializers.Serializer):"""- Log Data serializer+ Log Display Data serializer"""session = WorkoutSessionSerializer()logs = WorkoutLogSerializer(many=True)+class LogDataSerializer(serializers.Serializer):+ """+ Log Stats Data serializer+ """++ exercises = serializers.DictField()+ muscle_group = serializers.DictField()+ upper_body = serializers.DecimalField(max_digits=10, decimal_places=2)+ upper_body = serializers.DecimalField(max_digits=10, decimal_places=2)+ total = serializers.DecimalField(max_digits=10, decimal_places=2)+++class GroupedLogDataSerializer(serializers.Serializer):+ """+ Log Stats Data serializer+ """++ iteration = serializers.DictField(child=LogDataSerializer())+ weekly = serializers.DictField(child=LogDataSerializer())+ daily = serializers.DictField(child=LogDataSerializer())+ mesocycle = LogDataSerializer()+++class LogStatsDataSerializer(serializers.Serializer):+ """+ Log Stats Data serializer+ """++ intensity = GroupedLogDataSerializer()+ # tonnage = GroupedLogDataSerializer()+ sets = GroupedLogDataSerializer()+ volume = GroupedLogDataSerializer()++class ScheduleStepSerializer(serializers.ModelSerializer):"""ScheduleStep serializerdiff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex 0530a0679..5b9845f5f 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -34,7 +34,8 @@ from wger.exercises.models import Exercisefrom wger.manager.api.consts import CONFIG_FIELDSfrom wger.manager.api.serializers import (DaySerializer,- LogDataSerializer,+ LogDisplaySerializer,+ LogStatsDataSerializer,MaxRepsConfigSerializer,MaxRestConfigSerializer,MaxWeightConfigSerializer,@@ -56,6 +57,7 @@ from wger.manager.api.serializers import (WorkoutSessionSerializer,WorkoutTemplateSerializer,)+from wger.manager.dataclasses import RoutineLogDatafrom wger.manager.models import (Day,MaxRepsConfig,@@ -211,7 +213,22 @@ class RoutineViewSet(viewsets.ModelViewSet):except ValueError:pass- return Response(LogDataSerializer(self.get_object().logs_display(date), many=True).data)+ return Response(LogDisplaySerializer(self.get_object().logs_display(date), many=True).data)++ @action(detail=True, url_path='stats')+ def stats(self, request, pk):+ """+ Returns the logs for the routine+ """+ cache_key = CacheKeyMapper.get_routine_api_stats(pk)+ cached_data = cache.get(cache_key)+ if cached_data is not None:+ return Response(cached_data)++ out = LogStatsDataSerializer(self.get_object().calculate_log_statistics()).data+ cache.set(cache_key, out, settings.WGER_SETTINGS['ROUTINE_CACHE_TTL'])++ return Response(out)class WorkoutViewSet(viewsets.ModelViewSet):diff --git a/wger/manager/consts.py b/wger/manager/consts.pyindex 048dd8b9c..e7d5c7f31 100644--- a/wger/manager/consts.py+++ b/wger/manager/consts.py@@ -26,3 +26,7 @@ RIR_OPTIONS = [('3.5', 3.5),('4', 4),]++ID_UNIT_REPS = 1+ID_UNIT_KG = 1+ID_UNIT_LB = 2diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.pyindex 1ebca665a..5e61b3b0e 100644--- a/wger/manager/dataclasses.py+++ b/wger/manager/dataclasses.py@@ -17,6 +17,7 @@# Standard Libraryimport datetime+from collections import defaultdictfrom dataclasses import (dataclass,field,@@ -181,3 +182,28 @@ class WorkoutDayData:return []return self.day.get_slots_display_mode(self.iteration)+++@dataclass+class LogData:+ exercises: defaultdict[int, Decimal] = field(default_factory=lambda: defaultdict(Decimal))+ muscle_group: defaultdict[int, Decimal] = field(default_factory=lambda: defaultdict(Decimal))+ upper_body: Decimal = 0+ lower_body: Decimal = 0+ total: Decimal = 0+++@dataclass+class GroupedLogData:+ mesocycle: LogData = field(default_factory=LogData)+ iteration: defaultdict[int, LogData] = field(default_factory=lambda: defaultdict(LogData))+ weekly: defaultdict[int, LogData] = field(default_factory=lambda: defaultdict(LogData))+ daily: defaultdict[datetime.date, LogData] = field(default_factory=lambda: defaultdict(LogData))+++@dataclass+class RoutineLogData:+ volume: GroupedLogData = field(default_factory=GroupedLogData)+ intensity: GroupedLogData = field(default_factory=GroupedLogData)+ # tonnage: GroupedLogData = field(default_factory=GroupedLogData)+ sets: GroupedLogData = field(default_factory=GroupedLogData)diff --git a/wger/manager/helpers.py b/wger/manager/helpers.pyindex 8cf9d4df4..bb3e0fe94 100644--- a/wger/manager/helpers.py+++ b/wger/manager/helpers.py@@ -280,3 +280,4 @@ def reset_routine_cache(instance: Routine):cache.delete(CacheKeyMapper.get_routine_api_date_sequence_key(instance.id))cache.delete(CacheKeyMapper.get_routine_api_current_iteration_display_key(instance.id))cache.delete(CacheKeyMapper.get_routine_api_structure_key(instance.id))+ cache.delete(CacheKeyMapper.get_routine_api_stats(instance.id))diff --git a/wger/manager/management/commands/dummy-generator-workout-diary.py b/wger/manager/management/commands/dummy-generator-workout-diary.pyindex 15b5c473b..225dd7b7e 100644--- a/wger/manager/management/commands/dummy-generator-workout-diary.py+++ b/wger/manager/management/commands/dummy-generator-workout-diary.py@@ -79,7 +79,7 @@ class Command(BaseCommand):exercise=entry.exercise,routine=routine,reps=reps,- weight=50 - reps + random.randint(1, 10),+ weight=50 - reps + random.randint(1, 30),date=date,)weight_log.append(log)diff --git a/wger/manager/managers.py b/wger/manager/managers.pyindex 438a05db7..04f93051a 100644--- a/wger/manager/managers.py+++ b/wger/manager/managers.py@@ -18,6 +18,13 @@from django.core.exceptions import ObjectDoesNotExistfrom django.db import models+# wger+from wger.manager.consts import (+ ID_UNIT_KG,+ ID_UNIT_LB,+ ID_UNIT_REPS,+)+class ScheduleManager(models.Manager):"""@@ -64,6 +71,39 @@ class ScheduleManager(models.Manager):return active_workout, schedule+class WorkoutLogQuerySet(models.QuerySet):+ def kg(self):+ """Return all entries with kg as weight"""+ return self.filter(weight_unit_id=ID_UNIT_KG)++ def lb(self):+ """Return all entries with lb as weight"""+ return self.filter(weight_unit_id=ID_UNIT_LB)++ def reps(self):+ """Return all entries with reps as unit"""+ return self.filter(repetition_unit_id=ID_UNIT_REPS)+++class WorkoutLogManager(models.Manager):+ """Custom manager for log entries"""++ def get_queryset(self):+ return WorkoutLogQuerySet(self.model, using=self._db)++ def kg(self):+ """Return all entries with kg as weight"""+ return self.get_queryset().kg()++ def lb(self):+ """Return all entries with lb as weight"""+ return self.get_queryset().lb()++ def reps(self):+ """Return all entries with reps as unit"""+ return self.get_queryset().reps()++class WorkoutManager(models.Manager):def get_queryset(self):return super().get_queryset().filter(is_template=False)diff --git a/wger/manager/models/log.py b/wger/manager/models/log.pyindex 5a1f0f108..5f9e5b97c 100644--- a/wger/manager/models/log.py+++ b/wger/manager/models/log.py@@ -30,6 +30,7 @@ from wger.core.models import ()from wger.exercises.models import Exercisefrom wger.manager.consts import RIR_OPTIONS+from wger.manager.managers import WorkoutLogManagerfrom wger.manager.models.session import WorkoutSessionfrom wger.utils.cache import reset_workout_log@@ -39,6 +40,8 @@ class WorkoutLog(models.Model):A log entry for an exercise"""+ objects = WorkoutLogManager()+date = models.DateTimeField(verbose_name=_('Date'),default=datetime.datetime.now,diff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.pyindex 07c767231..9d69131c4 100644--- a/wger/manager/models/routine.py+++ b/wger/manager/models/routine.py@@ -29,7 +29,10 @@ from django.urls import reversefrom django.utils.translation import gettext_lazy as _# wger-from wger.manager.dataclasses import WorkoutDayData+from wger.manager.dataclasses import (+ RoutineLogData,+ WorkoutDayData,+)from wger.utils.cache import CacheKeyMapper@@ -262,7 +265,7 @@ class Routine(models.Model):"""out = []- qs = self.workoutsession_set.all()+ qs = self.sessions.all()if date:qs = qs.filter(date=date)@@ -270,3 +273,81 @@ class Routine(models.Model):out.append({'session': session, 'logs': session.logs.all()})return out++ def calculate_log_statistics(self) -> RoutineLogData:+ """+ Calculates various statistics for the routine based on the logged workouts.++ Returns:+ RoutineLogData: An object containing the calculated statistics.+ """+ result = RoutineLogData()++ # Iterate over each workout session associated with the routine+ for session in self.sessions.all():+ session_date = session.date+ week_number = session_date.isocalendar().week++ # TODO: filter for lb+ for log in session.logs.kg().reps():+ exercise = log.exercise+ weight = log.weight+ reps = log.reps+ iteration = log.iteration+ exercise_volume = weight * reps++ # Initialize LogData+ daily_volume = result.volume.daily[session_date]+ weekly_volume = result.volume.weekly[week_number]+ iteration_volume = result.volume.iteration[iteration]+ mesocycle_volume = result.volume.mesocycle++ daily_sets = result.sets.daily[session_date]+ weekly_sets = result.sets.weekly[week_number]+ iteration_sets = result.sets.iteration[iteration]+ mesocycle_sets = result.sets.mesocycle++ #+ # Volume calculations+ #+ daily_volume.exercises[exercise.id] += exercise_volume+ weekly_volume.exercises[exercise.id] += exercise_volume+ iteration_volume.exercises[exercise.id] += exercise_volume+ mesocycle_volume.exercises[exercise.id] += exercise_volume++ #+ # Sets calculations+ #+ daily_sets.exercises[exercise.id] += 1+ weekly_sets.exercises[exercise.id] += 1+ iteration_sets.exercises[exercise.id] += 1+ mesocycle_sets.exercises[exercise.id] += 1++ #+ # Muscles calculations+ #+ for muscle in exercise.muscles.all():+ # Volume+ daily_volume.muscle_group[muscle.id] += exercise_volume+ weekly_volume.muscle_group[muscle.id] += exercise_volume+ iteration_volume.muscle_group[muscle.id] += exercise_volume+ mesocycle_volume.muscle_group[muscle.id] += exercise_volume++ # Sets+ daily_sets.muscle_group[muscle.id] += 1+ weekly_sets.muscle_group[muscle.id] += 1+ iteration_sets.muscle_group[muscle.id] += 1+ mesocycle_sets.muscle_group[muscle.id] += 1++ # Update totals for daily, weekly, and mesocycle+ daily_volume.total += exercise_volume+ weekly_volume.total += exercise_volume+ iteration_volume.total += exercise_volume+ mesocycle_volume.total += exercise_volume++ daily_sets.total += 1+ weekly_sets.total += 1+ iteration_sets.total += 1+ mesocycle_sets.total += 1++ return resultdiff --git a/wger/manager/models/session.py b/wger/manager/models/session.pyindex b12f783ed..4987bb471 100644--- a/wger/manager/models/session.py+++ b/wger/manager/models/session.py@@ -57,6 +57,7 @@ class WorkoutSession(models.Model):routine = models.ForeignKey('Routine',on_delete=models.CASCADE,+ related_name='sessions',null=True,)diff --git a/wger/manager/signals.py b/wger/manager/signals.pyindex 7d183edfd..a84878923 100644--- a/wger/manager/signals.py+++ b/wger/manager/signals.py@@ -100,6 +100,10 @@ def update_cache_rir_config(sender, instance: RiRConfig, **kwargs):reset_routine_cache(instance.slot_entry.slot.day.routine)+def update_cache_log(sender, instance: WorkoutLog, **kwargs):+ reset_routine_cache(instance.routine)++post_save.connect(update_activity_cache, sender=WorkoutSession)post_save.connect(update_activity_cache, sender=WorkoutLog)@@ -115,6 +119,7 @@ pre_save.connect(update_cache_sets_config, sender=SetsConfig)pre_save.connect(update_cache_rest_config, sender=RestConfig)pre_save.connect(update_cache_max_rest_config, sender=MaxRestConfig)pre_save.connect(update_cache_rir_config, sender=RiRConfig)+pre_save.connect(update_cache_log, sender=WorkoutLog)pre_delete.connect(update_cache_routine, sender=Routine)pre_delete.connect(update_cache_day, sender=Day)diff --git a/wger/manager/tests/test_routine_statistics.py b/wger/manager/tests/test_routine_statistics.pynew file mode 100644index 000000000..b2699ecbe--- /dev/null+++ b/wger/manager/tests/test_routine_statistics.py@@ -0,0 +1,301 @@+# This file is part of wger Workout Manager.+#+# wger Workout Manager is free software: you can redistribute it and/or modify+# it under the terms of the GNU Affero General Public License as published by+# the Free Software Foundation, either version 3 of the License, or+# (at your option) any later version.+#+# wger Workout Manager is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# You should have received a copy of the GNU Affero General Public License++# Standard Library+import datetime++# wger+from wger.core.tests.base_testcase import WgerTestCase+from wger.manager.consts import (+ ID_UNIT_KG,+ ID_UNIT_LB,+ ID_UNIT_REPS,+)+from wger.manager.dataclasses import LogData+from wger.manager.models import WorkoutLog+from wger.manager.models.routine import Routine+++class RoutineStatisticsTestCase(WgerTestCase):+ """+ Test the statistics calculations+ """++ routine: Routine++ def setUp(self):+ super().setUp()++ self.routine = Routine(+ user_id=1,+ name='A routine',+ description='A routine',+ start=datetime.date(2024, 1, 1),+ end=datetime.date(2024, 1, 10),+ )+ self.routine.save()++ # Exercise 1, 5 x 10kg, volume 50+ WorkoutLog(+ user_id=1,+ routine=self.routine,+ date=datetime.date(2024, 2, 1),+ repetition_unit_id=ID_UNIT_REPS,+ weight_unit_id=ID_UNIT_KG,+ reps=5,+ weight=10,+ exercise_id=1,+ iteration=1,+ ).save()++ # Exercise 1, 1 x 10kg, different day but same week, volume 10+ WorkoutLog(+ user_id=1,+ routine=self.routine,+ date=datetime.date(2024, 2, 2),+ repetition_unit_id=ID_UNIT_REPS,+ weight_unit_id=ID_UNIT_KG,+ reps=1,+ weight=10,+ exercise_id=1,+ iteration=2,+ ).save()++ # Exercise 3, 5 x 5kg, different week, volume 10+ WorkoutLog(+ user_id=1,+ routine=self.routine,+ date=datetime.date(2024, 2, 10),+ repetition_unit_id=ID_UNIT_REPS,+ weight_unit_id=ID_UNIT_KG,+ reps=1,+ weight=10,+ exercise_id=3,+ iteration=3,+ ).save()++ # Exercise 3, 5 x 5kg, different week, weight in lb+ WorkoutLog(+ user_id=1,+ routine=self.routine,+ date=datetime.date(2024, 2, 10),+ repetition_unit_id=ID_UNIT_REPS,+ weight_unit_id=ID_UNIT_LB,+ reps=1,+ weight=10,+ exercise_id=3,+ iteration=3,+ ).save()++ def test_sets_calculations(self):+ stats = self.routine.calculate_log_statistics()++ # Mesocycle+ self.assertEqual(+ stats.sets.mesocycle,+ LogData(+ exercises={1: 2, 3: 1},+ muscle_group={1: 3, 2: 2},+ upper_body=0,+ lower_body=0,+ total=3,+ ),+ )++ # Iteration+ self.assertEqual(+ stats.sets.iteration[1],+ LogData(+ exercises={1: 1},+ muscle_group={1: 1, 2: 1},+ upper_body=0,+ lower_body=0,+ total=1,+ ),+ )+ self.assertEqual(+ stats.sets.iteration[2],+ LogData(+ exercises={1: 1},+ muscle_group={1: 1, 2: 1},+ upper_body=0,+ lower_body=0,+ total=1,+ ),+ )+ self.assertEqual(+ stats.sets.iteration[3],+ LogData(+ exercises={3: 1},+ muscle_group={1: 1},+ upper_body=0,+ lower_body=0,+ total=1,+ ),+ )++ # Weekly+ self.assertEqual(+ stats.sets.weekly[5],+ LogData(+ exercises={1: 2},+ muscle_group={1: 2, 2: 2},+ upper_body=0,+ lower_body=0,+ total=2,+ ),+ )+ self.assertEqual(+ stats.sets.weekly[6],+ LogData(+ exercises={3: 1},+ muscle_group={1: 1},+ upper_body=0,+ lower_body=0,+ total=1,+ ),+ )++ # Daily+ self.assertEqual(+ stats.sets.daily[datetime.date(2024, 2, 1)],+ LogData(+ exercises={1: 1},+ muscle_group={1: 1, 2: 1},+ upper_body=0,+ lower_body=0,+ total=1,+ ),+ )+ self.assertEqual(+ stats.sets.daily[datetime.date(2024, 2, 2)],+ LogData(+ exercises={1: 1},+ muscle_group={1: 1, 2: 1},+ upper_body=0,+ lower_body=0,+ total=1,+ ),+ )+ self.assertEqual(+ stats.sets.daily[datetime.date(2024, 2, 10)],+ LogData(+ exercises={3: 1},+ muscle_group={1: 1},+ upper_body=0,+ lower_body=0,+ total=1,+ ),+ )++ def test_volume_calculations(self):+ stats = self.routine.calculate_log_statistics()++ # Mesocycle+ self.assertEqual(+ stats.volume.mesocycle,+ LogData(+ exercises={1: 60, 3: 10},+ muscle_group={1: 70, 2: 60},+ upper_body=0,+ lower_body=0,+ total=70,+ ),+ )++ # Iteration+ self.assertEqual(+ stats.volume.iteration[1],+ LogData(+ exercises={1: 50},+ muscle_group={1: 50, 2: 50},+ upper_body=0,+ lower_body=0,+ total=50,+ ),+ )+ self.assertEqual(+ stats.volume.iteration[2],+ LogData(+ exercises={1: 10},+ muscle_group={1: 10, 2: 10},+ upper_body=0,+ lower_body=0,+ total=10,+ ),+ )+ self.assertEqual(+ stats.volume.iteration[3],+ LogData(+ exercises={3: 10},+ muscle_group={1: 10},+ upper_body=0,+ lower_body=0,+ total=10,+ ),+ )++ # Weekly+ self.assertEqual(+ stats.volume.weekly[5],+ LogData(+ exercises={1: 60},+ muscle_group={1: 60, 2: 60},+ upper_body=0,+ lower_body=0,+ total=60,+ ),+ )+ self.assertEqual(+ stats.volume.weekly[6],+ LogData(+ exercises={3: 10},+ muscle_group={1: 10},+ upper_body=0,+ lower_body=0,+ total=10,+ ),+ )++ # Daily+ self.assertEqual(+ stats.volume.daily[datetime.date(2024, 2, 1)],+ LogData(+ exercises={1: 50},+ muscle_group={1: 50, 2: 50},+ upper_body=0,+ lower_body=0,+ total=50,+ ),+ )+ self.assertEqual(+ stats.volume.daily[datetime.date(2024, 2, 2)],+ LogData(+ exercises={1: 10},+ muscle_group={1: 10, 2: 10},+ upper_body=0,+ lower_body=0,+ total=10,+ ),+ )+ self.assertEqual(+ stats.volume.daily[datetime.date(2024, 2, 10)],+ LogData(+ exercises={3: 10},+ muscle_group={1: 10},+ upper_body=0,+ lower_body=0,+ total=10,+ ),+ )diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex b8aafc86d..89217e879 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -228,54 +228,6 @@ patterns_session = [),]-# sub patterns for workout days-patterns_day = [- path(- '<int:pk>/edit',- login_required(day.DayEditView.as_view()),- name='edit',- ),- path(- '<int:workout_pk>/add',- login_required(day.DayCreateView.as_view()),- name='add',- ),- path(- '<int:pk>/delete',- day.delete,- name='delete',- ),- path(- '<int:pk>/log/add',- log.add,- name='log',- ),-]--# sub patterns for workout sets-patterns_set = [- path(- '<int:day_pk>/add',- set.create,- name='add',- ),- path(- 'get-formset/<int:base_pk>/<int:reps>',- set.get_formset,- name='get-formset',- ), # Used by JS- path(- '<int:pk>/delete',- set.delete,- name='delete',- ),- path(- '<int:pk>/edit',- set.edit,- name='edit',- ),-]-# sub patterns for schedulespatterns_schedule = [path(diff --git a/wger/utils/cache.py b/wger/utils/cache.pyindex dfb05f7af..398ba7cad 100644--- a/wger/utils/cache.py+++ b/wger/utils/cache.py@@ -19,7 +19,6 @@ import loggingfrom django.core.cache import cachefrom django.core.cache.utils import make_template_fragment_key-logger = logging.getLogger(__name__)@@ -58,8 +57,9 @@ class CacheKeyMapper:NUTRITION_CACHE_KEY = 'nutrition-cache-log-{0}'EXERCISE_API_KEY = 'base-uuid-{0}'ROUTINE_DATE_SEQUENCE_KEY = 'routine-date-sequence-{0}'- ROUTINE_API_DATE_SEQUENCE_DISPLAY_KEY = 'routine-api-date-sequence-display{0}'- ROUTINE_API_CURRENT_ITERATION_DISPLAY_KEY = 'routine-api-current-iteration-sequence-display{0}'+ ROUTINE_API_DATE_SEQUENCE_DISPLAY_KEY = 'routine-api-date-sequence-display-{0}'+ ROUTINE_API_CURRENT_ITERATION_DISPLAY_KEY = 'routine-api-current-iteration-sequence-display-{0}'+ ROUTINE_API_STATS_KEY = 'routine-api-stats-{0}'ROUTINE_API_STRUCTURE_KEY = 'routine-api-structure-{0}'def get_pk(self, param):@@ -111,6 +111,10 @@ class CacheKeyMapper:def get_routine_api_current_iteration_display_key(cls, id: int):return cls.ROUTINE_API_CURRENT_ITERATION_DISPLAY_KEY.format(id)+ @classmethod+ def get_routine_api_stats(cls, id: int):+ return cls.ROUTINE_API_STATS_KEY.format(id)+@classmethoddef get_routine_api_structure_key(cls, id: int):return cls.ROUTINE_API_STRUCTURE_KEY.format(id)