Self hosted FLOSS fitness/workout, nutrition and weight tracker
Correctly skip calculations if the user didn't log the needed weights
Roland Geider50c3498760ac
diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.pyindex 0adb93767..d442d466b 100644--- a/wger/manager/dataclasses.py+++ b/wger/manager/dataclasses.py@@ -1,5 +1,6 @@# Standard Libraryfrom dataclasses import dataclass+from decimal import Decimal# wgerfrom wger.manager.models import DayNg@@ -9,3 +10,11 @@ from wger.manager.models import DayNgclass WorkoutDay:day: DayNgiteration: int+++@dataclass+class SetConfigData:+ weight: Decimal | int+ reps: Decimal | int+ rir: Decimal | int+ rest: Decimal | intdiff --git a/wger/manager/migrations/0020_workoutlog_iteration_alter_setconfig_comment_and_more.py b/wger/manager/migrations/0020_workoutlog_iteration_alter_setconfig_comment_and_more.pynew file mode 100644index 000000000..d030d4df7--- /dev/null+++ b/wger/manager/migrations/0020_workoutlog_iteration_alter_setconfig_comment_and_more.py@@ -0,0 +1,27 @@+# Generated by Django 4.2.6 on 2024-03-09 14:03++from django.db import migrations, models+++class Migration(migrations.Migration):+ dependencies = [+ ('manager', '0019_alter_repsconfig_options_alter_restconfig_options_and_more'),+ ]++ operations = [+ migrations.AddField(+ model_name='workoutlog',+ name='iteration',+ field=models.PositiveIntegerField(null=True),+ ),+ migrations.AlterField(+ model_name='setconfig',+ name='comment',+ field=models.CharField(blank=True, max_length=100),+ ),+ migrations.AlterField(+ model_name='setconfig',+ name='order',+ field=models.PositiveIntegerField(blank=True),+ ),+ ]diff --git a/wger/manager/models/log.py b/wger/manager/models/log.pyindex fe1d7c057..9a3b4cd35 100644--- a/wger/manager/models/log.py+++ b/wger/manager/models/log.py@@ -75,6 +75,10 @@ class WorkoutLog(models.Model):null=True,)+ iteration = models.PositiveIntegerField(+ null=True,+ )+repetition_unit = models.ForeignKey(RepetitionUnit,verbose_name=_('Unit'),diff --git a/wger/manager/models/set_config.py b/wger/manager/models/set_config.pyindex 7d18a7681..3d06f70e2 100644--- a/wger/manager/models/set_config.py+++ b/wger/manager/models/set_config.py@@ -24,6 +24,7 @@ from wger.core.models import (WeightUnit,)from wger.exercises.models import ExerciseBase+from wger.manager.dataclasses import SetConfigDatafrom wger.manager.models.abstract_config import (AbstractChangeConfig,OperationChoices,@@ -68,13 +69,11 @@ class SetConfig(models.Model):order = models.PositiveIntegerField(blank=True,- verbose_name=_('Order'),)comment = models.CharField(max_length=100,blank=True,- verbose_name=_('Comment'),)# Metaclass to set some other properties@@ -107,6 +106,35 @@ class SetConfig(models.Model):return out+ def get_config(self, iteration: int):+ max_iter_weight = 1+ max_iter_reps = 1++ for i in range(1, iteration + 1):+ weight = self.get_weight(max_iter_weight)+ reps = self.get_reps(max_iter_reps)++ log_data = self.workoutlog_set.filter(iteration=i - 1)++ # If any of the entries in last log is greater than the last config data,+ # proceed. Otherwise, the weight won't change+ if log_data.exists():+ for log in log_data:+ if log.weight >= weight and log.reps >= reps:+ max_iter_weight = i+ max_iter_reps = i++ # As soon as we find a log that we didn't make, stop+ else:+ break++ return SetConfigData(+ weight=self.get_weight(max_iter_weight),+ reps=self.get_reps(max_iter_reps),+ rir=self.get_rir(iteration),+ rest=self.get_rest(iteration),+ )+def get_weight(self, iteration: int):return self.calculate_config_value(self.weightconfig_set.filter(iteration__lte=iteration))diff --git a/wger/manager/tests/test_set_config.py b/wger/manager/tests/test_set_config.pyindex d2bc63ddb..91a8f001b 100644--- a/wger/manager/tests/test_set_config.py+++ b/wger/manager/tests/test_set_config.py@@ -11,10 +11,19 @@# GNU General Public License for more details.## You should have received a copy of the GNU Affero General Public License+# Standard Library+from decimal import Decimal# wgerfrom wger.core.tests.base_testcase import WgerTestCase-from wger.manager.models import WeightConfig+from wger.manager.dataclasses import SetConfigData+from wger.manager.models import (+ RepsConfig,+ RestConfig,+ RiRConfig,+ WeightConfig,+ WorkoutLog,+)from wger.manager.models.abstract_config import (OperationChoices,StepChoices,@@ -39,9 +48,10 @@ class SetConfigTestCase(WgerTestCase):)self.set_config.save()- def test_weight_config(self):+ def test_weight_config_no_logs(self):"""Test that the weight is correctly calculated for each step / iteration+ if there are no logs"""# Initial value@@ -91,3 +101,106 @@ class SetConfigTestCase(WgerTestCase):self.assertEqual(self.set_config.get_weight(6), 42)self.assertEqual(self.set_config.get_weight(7), 40)self.assertEqual(self.set_config.get_weight(8), 44)++ def test_weight_config_with_logs(self):+ """+ Test that the weight is correctly calculated for each step / iteration+ if there are logs+ """++ self.maxDiff = None++ # Initial value+ WeightConfig(+ set_config=self.set_config,+ iteration=1,+ value=80,+ need_log_to_apply=False,+ ).save()++ RepsConfig(+ set_config=self.set_config,+ iteration=1,+ value=5,+ need_log_to_apply=False,+ ).save()++ RestConfig(+ set_config=self.set_config,+ iteration=1,+ value=120,+ need_log_to_apply=False,+ ).save()++ RiRConfig(+ set_config=self.set_config,+ iteration=1,+ value=2,+ need_log_to_apply=False,+ ).save()++ # Increase by 2.5+ WeightConfig(+ set_config=self.set_config,+ iteration=2,+ value=2.5,+ need_log_to_apply=True,+ operation=OperationChoices.PLUS,+ step=StepChoices.ABSOLUTE,+ ).save()++ WorkoutLog(+ exercise_base_id=1,+ user_id=1,+ workout_id=1,+ set_config=self.set_config,+ iteration=2,+ weight=82.5,+ reps=4,+ ).save()+ WorkoutLog(+ exercise_base_id=1,+ user_id=1,+ workout_id=1,+ set_config=self.set_config,+ iteration=3,+ weight=82.5,+ reps=5,+ ).save()++ self.assertEqual(+ self.set_config.get_config(1),+ SetConfigData(+ weight=80,+ reps=5,+ rir=2,+ rest=120,+ ),+ )+ self.assertEqual(+ self.set_config.get_config(2),+ SetConfigData(+ weight=80,+ reps=5,+ rir=2,+ rest=120,+ ),+ )+ self.assertEqual(+ self.set_config.get_config(3),+ SetConfigData(+ weight=80,+ reps=5,+ rir=2,+ rest=120,+ ),+ )+ self.assertEqual(+ self.set_config.get_config(4),+ SetConfigData(+ weight=Decimal(82.5),+ reps=5,+ rir=2,+ rest=120,+ ),+ )