Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Rename muscle_group to muscle

Roland Geider677974e6eb6e
diff --git a/wger/core/tests/test_preferences.py b/wger/core/tests/test_preferences.py
index 38e2fd5b5..ac5caf223 100644
--- a/wger/core/tests/test_preferences.py
+++ b/wger/core/tests/test_preferences.py
@@ -26,6 +26,7 @@ from wger.core.tests.base_testcase import WgerTestCase
from wger.utils.constants import TWOPLACES
from wger.weight.models import WeightEntry
+
logger = logging.getLogger(__name__)
@@ -307,6 +308,7 @@ class PreferencesCalculationsTestCase(WgerTestCase):
user.userprofile.calculate_activities(), decimal.Decimal(1.52).quantize(TWOPLACES)
)
+
# TODO: the user can't delete or create new profiles
# class UserProfileApiTestCase(api_base_test.ApiBaseResourceTestCase):
# """
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index 7119ccc8a..db4cdddcb 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -437,9 +437,9 @@ class LogDataSerializer(serializers.Serializer):
"""
exercises = serializers.DictField()
- muscle_group = serializers.DictField()
- upper_body = serializers.DecimalField(max_digits=10, decimal_places=2)
+ muscle = serializers.DictField()
upper_body = serializers.DecimalField(max_digits=10, decimal_places=2)
+ lower_body = serializers.DecimalField(max_digits=10, decimal_places=2)
total = serializers.DecimalField(max_digits=10, decimal_places=2)
diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.py
index 7549ab254..36be65f5a 100644
--- a/wger/manager/dataclasses.py
+++ b/wger/manager/dataclasses.py
@@ -194,7 +194,7 @@ class WorkoutDayData:
@dataclass
class LogData:
exercises: defaultdict[int, Decimal] = field(default_factory=lambda: defaultdict(Decimal))
- muscle_group: defaultdict[int, Decimal] = field(default_factory=lambda: defaultdict(Decimal))
+ muscle: defaultdict[int, Decimal] = field(default_factory=lambda: defaultdict(Decimal))
upper_body: Decimal = 0
lower_body: Decimal = 0
total: Decimal = 0
@@ -212,5 +212,4 @@ class GroupedLogData:
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/models/routine.py b/wger/manager/models/routine.py
index 9d69131c4..8a0fd2bcd 100644
--- a/wger/manager/models/routine.py
+++ b/wger/manager/models/routine.py
@@ -17,6 +17,7 @@
# Standard Library
import datetime
from collections import Counter
+from decimal import Decimal
from typing import List
# Django
@@ -29,7 +30,9 @@ from django.urls import reverse
from django.utils.translation import gettext_lazy as _
# wger
+from wger.exercises.models import Muscle
from wger.manager.dataclasses import (
+ GroupedLogData,
RoutineLogData,
WorkoutDayData,
)
@@ -283,6 +286,36 @@ class Routine(models.Model):
"""
result = RoutineLogData()
+ def update_grouped_log_data(
+ entry: GroupedLogData,
+ date: datetime.date,
+ week_nr: int,
+ iteration: int,
+ muscles: List[Muscle],
+ value: Decimal | int,
+ ):
+ """
+ Updates grouped log data
+
+ This method always just adds the value to the corresponding entries
+ """
+
+ entry.daily[date].exercises[exercise.id] += value
+ entry.weekly[week_nr].exercises[exercise.id] += value
+ entry.iteration[iteration].exercises[exercise.id] += value
+ entry.mesocycle.exercises[exercise.id] += value
+
+ entry.daily[date].total += value
+ entry.weekly[week_nr].total += value
+ entry.iteration[iteration].total += value
+ entry.mesocycle.total += value
+
+ for muscle in muscles:
+ entry.daily[date].muscle[muscle.id] += value
+ entry.weekly[week_number].muscle[muscle.id] += value
+ entry.iteration[iteration].muscle[muscle.id] += value
+ entry.mesocycle.muscle[muscle.id] += value
+
# Iterate over each workout session associated with the routine
for session in self.sessions.all():
session_date = session.date
@@ -296,58 +329,21 @@ class Routine(models.Model):
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
+ update_grouped_log_data(
+ entry=result.volume,
+ iteration=iteration,
+ week_nr=week_number,
+ date=session_date,
+ muscles=exercise.muscles.all(),
+ value=exercise_volume,
+ )
+ update_grouped_log_data(
+ entry=result.sets,
+ iteration=iteration,
+ week_nr=week_number,
+ date=session_date,
+ muscles=exercise.muscles.all(),
+ value=1,
+ )
return result
diff --git a/wger/manager/tests/test_routine_statistics.py b/wger/manager/tests/test_routine_statistics.py
index b2699ecbe..cfa7385c5 100644
--- a/wger/manager/tests/test_routine_statistics.py
+++ b/wger/manager/tests/test_routine_statistics.py
@@ -106,7 +106,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.sets.mesocycle,
LogData(
exercises={1: 2, 3: 1},
- muscle_group={1: 3, 2: 2},
+ muscle={1: 3, 2: 2},
upper_body=0,
lower_body=0,
total=3,
@@ -118,7 +118,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.sets.iteration[1],
LogData(
exercises={1: 1},
- muscle_group={1: 1, 2: 1},
+ muscle={1: 1, 2: 1},
upper_body=0,
lower_body=0,
total=1,
@@ -128,7 +128,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.sets.iteration[2],
LogData(
exercises={1: 1},
- muscle_group={1: 1, 2: 1},
+ muscle={1: 1, 2: 1},
upper_body=0,
lower_body=0,
total=1,
@@ -138,7 +138,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.sets.iteration[3],
LogData(
exercises={3: 1},
- muscle_group={1: 1},
+ muscle={1: 1},
upper_body=0,
lower_body=0,
total=1,
@@ -150,7 +150,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.sets.weekly[5],
LogData(
exercises={1: 2},
- muscle_group={1: 2, 2: 2},
+ muscle={1: 2, 2: 2},
upper_body=0,
lower_body=0,
total=2,
@@ -160,7 +160,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.sets.weekly[6],
LogData(
exercises={3: 1},
- muscle_group={1: 1},
+ muscle={1: 1},
upper_body=0,
lower_body=0,
total=1,
@@ -172,7 +172,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.sets.daily[datetime.date(2024, 2, 1)],
LogData(
exercises={1: 1},
- muscle_group={1: 1, 2: 1},
+ muscle={1: 1, 2: 1},
upper_body=0,
lower_body=0,
total=1,
@@ -182,7 +182,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.sets.daily[datetime.date(2024, 2, 2)],
LogData(
exercises={1: 1},
- muscle_group={1: 1, 2: 1},
+ muscle={1: 1, 2: 1},
upper_body=0,
lower_body=0,
total=1,
@@ -192,7 +192,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.sets.daily[datetime.date(2024, 2, 10)],
LogData(
exercises={3: 1},
- muscle_group={1: 1},
+ muscle={1: 1},
upper_body=0,
lower_body=0,
total=1,
@@ -207,7 +207,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.volume.mesocycle,
LogData(
exercises={1: 60, 3: 10},
- muscle_group={1: 70, 2: 60},
+ muscle={1: 70, 2: 60},
upper_body=0,
lower_body=0,
total=70,
@@ -219,7 +219,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.volume.iteration[1],
LogData(
exercises={1: 50},
- muscle_group={1: 50, 2: 50},
+ muscle={1: 50, 2: 50},
upper_body=0,
lower_body=0,
total=50,
@@ -229,7 +229,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.volume.iteration[2],
LogData(
exercises={1: 10},
- muscle_group={1: 10, 2: 10},
+ muscle={1: 10, 2: 10},
upper_body=0,
lower_body=0,
total=10,
@@ -239,7 +239,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.volume.iteration[3],
LogData(
exercises={3: 10},
- muscle_group={1: 10},
+ muscle={1: 10},
upper_body=0,
lower_body=0,
total=10,
@@ -251,7 +251,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.volume.weekly[5],
LogData(
exercises={1: 60},
- muscle_group={1: 60, 2: 60},
+ muscle={1: 60, 2: 60},
upper_body=0,
lower_body=0,
total=60,
@@ -261,7 +261,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.volume.weekly[6],
LogData(
exercises={3: 10},
- muscle_group={1: 10},
+ muscle={1: 10},
upper_body=0,
lower_body=0,
total=10,
@@ -273,7 +273,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.volume.daily[datetime.date(2024, 2, 1)],
LogData(
exercises={1: 50},
- muscle_group={1: 50, 2: 50},
+ muscle={1: 50, 2: 50},
upper_body=0,
lower_body=0,
total=50,
@@ -283,7 +283,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.volume.daily[datetime.date(2024, 2, 2)],
LogData(
exercises={1: 10},
- muscle_group={1: 10, 2: 10},
+ muscle={1: 10, 2: 10},
upper_body=0,
lower_body=0,
total=10,
@@ -293,7 +293,7 @@ class RoutineStatisticsTestCase(WgerTestCase):
stats.volume.daily[datetime.date(2024, 2, 10)],
LogData(
exercises={3: 10},
- muscle_group={1: 10},
+ muscle={1: 10},
upper_body=0,
lower_body=0,
total=10,
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index e5acbced3..d0881a6bc 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -35,6 +35,7 @@ from wger.manager.views import (
workout_session,
)
+
# sub patterns for workout logs
patterns_log = [
path(
diff --git a/wger/utils/cache.py b/wger/utils/cache.py
index 398ba7cad..6e8f8d94b 100644
--- a/wger/utils/cache.py
+++ b/wger/utils/cache.py
@@ -19,6 +19,7 @@ import logging
from django.core.cache import cache
from django.core.cache.utils import make_template_fragment_key
+
logger = logging.getLogger(__name__)