Self hosted FLOSS fitness/workout, nutrition and weight tracker
Handle the need_log_to_apply flag
Roland Geider8b1e660c9237
diff --git a/wger/manager/models/abstract_config.py b/wger/manager/models/abstract_config.pyindex 26b212ed2..a5e3d1f85 100644--- a/wger/manager/models/abstract_config.py+++ b/wger/manager/models/abstract_config.py@@ -98,7 +98,8 @@ class AbstractChangeConfig(models.Model):default=False,)"""- Only apply the change if the user logged the last weight+ Only apply the change if the user logged the last weight, otherwise+ apply the rules anyway"""code = models.CharField(diff --git a/wger/manager/models/set_config.py b/wger/manager/models/set_config.pyindex 3d06f70e2..0381f1773 100644--- a/wger/manager/models/set_config.py+++ b/wger/manager/models/set_config.py@@ -110,23 +110,36 @@ class SetConfig(models.Model):max_iter_weight = 1max_iter_reps = 1+ weight = self.get_weight(max_iter_weight)+ reps = self.get_reps(max_iter_reps)+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++ # We can't directly do a .get(iteration=i) because there probably isn't one+ # so we simply take the last one, which will be responsible to calculate the+ # weight for the current iteration+ weight_config = self.weightconfig_set.filter(iteration__lte=i).last()+ reps_config = self.repsconfig_set.filter(iteration__lte=i).last()++ if not weight_config.need_log_to_apply and not reps_config.need_log_to_apply:+ max_iter_weight = i+ max_iter_reps = i++ elif weight_config.need_log_to_apply or reps_config.need_log_to_apply:+ 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:+ breakreturn SetConfigData(weight=self.get_weight(max_iter_weight),diff --git a/wger/manager/tests/test_set_config.py b/wger/manager/tests/test_set_config.pyindex 91a8f001b..b380a44b0 100644--- a/wger/manager/tests/test_set_config.py+++ b/wger/manager/tests/test_set_config.py@@ -11,6 +11,7 @@# GNU General Public License for more details.## You should have received a copy of the GNU Affero General Public License+# Standard Libraryfrom decimal import Decimal@@ -40,48 +41,26 @@ class SetConfigTestCase(WgerTestCase):def setUp(self):super().setUp()-- self.set_config = SetConfig(- set_id=1,- exercise_id=1,- order=1,- )+ self.set_config = SetConfig(set_id=1, exercise_id=1, order=1)self.set_config.save()- def test_weight_config_no_logs(self):+ def test_weight_config(self):"""Test that the weight is correctly calculated for each step / iteration- if there are no logs"""# Initial value- WeightConfig(- set_config=self.set_config,- iteration=1,- value=80,- ).save()+ WeightConfig(set_config=self.set_config, iteration=1, value=80).save()# Increase by 2.5- WeightConfig(- set_config=self.set_config,- iteration=3,- value=2.5,- ).save()+ WeightConfig(set_config=self.set_config, iteration=3, value=2.5).save()# Replace with 42- WeightConfig(- set_config=self.set_config,- iteration=6,- value=42,- replace=True,- ).save()+ WeightConfig(set_config=self.set_config, iteration=6, value=42, replace=True).save()# Reduce by 2WeightConfig(- set_config=self.set_config,- iteration=7,- value=2,- operation=OperationChoices.MINUS,+ set_config=self.set_config, iteration=7, value=2, operation=OperationChoices.MINUS).save()# Increase by 10%@@ -108,38 +87,13 @@ class SetConfigTestCase(WgerTestCase):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()+ WeightConfig(set_config=self.set_config, iteration=1, value=80).save()+ RepsConfig(set_config=self.set_config, iteration=1, value=5).save()+ RestConfig(set_config=self.set_config, iteration=1, value=120).save()+ RiRConfig(set_config=self.set_config, iteration=1, value=2).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+ # Increase weight by 2.5 at iteration 2WeightConfig(set_config=self.set_config,iteration=2,@@ -149,6 +103,18 @@ class SetConfigTestCase(WgerTestCase):step=StepChoices.ABSOLUTE,).save()+ # Replace weight with 42 at iteration 5, no logs needed+ WeightConfig(+ set_config=self.set_config,+ iteration=5,+ value=42,+ replace=True,+ need_log_to_apply=False,+ operation=OperationChoices.PLUS,+ step=StepChoices.ABSOLUTE,+ ).save()++ # Only did 4x82.5 at iteration 2WorkoutLog(exercise_base_id=1,user_id=1,@@ -158,6 +124,8 @@ class SetConfigTestCase(WgerTestCase):weight=82.5,reps=4,).save()++ # Did 5x82.5 at iteration 3WorkoutLog(exercise_base_id=1,user_id=1,@@ -170,37 +138,21 @@ class SetConfigTestCase(WgerTestCase):self.assertEqual(self.set_config.get_config(1),- SetConfigData(- weight=80,- reps=5,- rir=2,- rest=120,- ),+ 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,- ),+ 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,- ),+ 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,- ),+ SetConfigData(weight=Decimal(82.5), reps=5, rir=2, rest=120),+ )+ self.assertEqual(+ self.set_config.get_config(5),+ SetConfigData(weight=42, reps=5, rir=2, rest=120),)