Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Better handling of None values

Roland Geider7fd00bc1e2cb
diff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.py
index 9c5ef11e8..86f387783 100644
--- a/wger/manager/models/routine.py
+++ b/wger/manager/models/routine.py
@@ -52,7 +52,6 @@ from wger.manager.models import (
)
from wger.utils.cache import CacheKeyMapper
-
logger = logging.getLogger(__name__)
@@ -379,13 +378,16 @@ class Routine(models.Model):
week_nr: int,
iter: int,
exercise: Exercise,
- value: Decimal | int,
+ value: Decimal | int | None,
):
"""
Updates grouped log data
This method just adds the value to the corresponding entries
"""
+ if value is None:
+ return
+
muscles = exercise.muscles.all()
entry.daily[date].exercises[exercise.id] += value
@@ -500,14 +502,13 @@ class Routine(models.Model):
# TODO: filter for lb
for log in session.logs.kg().reps():
+ iteration = log.iteration
exercise = log.exercise
weight = log.weight
reps = log.repetitions
- iteration = log.iteration
- exercise_volume = weight * reps
- calculate_intensity = reps is not None and weight is not None
- exercise_intensity = brzycki_intensity(weight, reps)
+ values_not_none = reps is not None and weight is not None
+ exercise_volume = weight * reps if values_not_none else 0
update_grouped_log_data(
entry=result.volume,
@@ -517,6 +518,8 @@ class Routine(models.Model):
exercise=exercise,
value=exercise_volume,
)
+
+ # Each log always corresponds to one set
update_grouped_log_data(
entry=result.sets,
iter=iteration,
@@ -526,7 +529,7 @@ class Routine(models.Model):
value=1,
)
- if calculate_intensity:
+ if values_not_none:
update_grouped_log_data(
entry=intensity_counter,
iter=iteration,
@@ -542,7 +545,7 @@ class Routine(models.Model):
week_nr=week_number,
date=session_date,
exercise=exercise,
- value=exercise_intensity,
+ value=brzycki_intensity(weight, reps),
)
calculate_average_intensity(result.intensity, intensity_counter)
diff --git a/wger/manager/tests/test_routine_statistics.py b/wger/manager/tests/test_routine_statistics.py
index 0717811ed..9afc57580 100644
--- a/wger/manager/tests/test_routine_statistics.py
+++ b/wger/manager/tests/test_routine_statistics.py
@@ -299,3 +299,35 @@ class RoutineStatisticsTestCase(WgerTestCase):
total=10,
),
)
+
+ def test_handle_null_weight(self):
+ WorkoutLog(
+ user_id=1,
+ routine=self.routine,
+ date=datetime.date(2024, 2, 12),
+ repetitions_unit_id=REP_UNIT_REPETITIONS,
+ repetitions=5,
+ weight_unit_id=WEIGHT_UNIT_KG,
+ weight=None,
+ exercise_id=1,
+ iteration=1,
+ ).save()
+
+ # No exception happens
+ self.routine.calculate_log_statistics()
+
+ def test_handle_null_repetitions(self):
+ WorkoutLog(
+ user_id=1,
+ routine=self.routine,
+ date=datetime.date(2024, 2, 12),
+ repetitions_unit_id=REP_UNIT_REPETITIONS,
+ repetitions=None,
+ weight_unit_id=WEIGHT_UNIT_KG,
+ weight=4,
+ exercise_id=1,
+ iteration=1,
+ ).save()
+
+ # No exception happens
+ self.routine.calculate_log_statistics()