Self hosted FLOSS fitness/workout, nutrition and weight tracker
Correctly check if there are no requirements for a field
Roland Geiderd44b72de5c34
diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.pyindex 31b3be81e..77e0abd7a 100644--- a/wger/manager/dataclasses.py+++ b/wger/manager/dataclasses.py@@ -275,3 +275,6 @@ class ConfigRequirements:def __init__(self, data: Dict[str, Any]):self.rules = data.get('rules', [])++ def __bool__(self):+ return bool(self.rules)diff --git a/wger/manager/fixtures/test-routine-data.json b/wger/manager/fixtures/test-routine-data.jsonindex 5501929d0..3242680bd 100644--- a/wger/manager/fixtures/test-routine-data.json+++ b/wger/manager/fixtures/test-routine-data.json@@ -201,7 +201,10 @@"value": 5,"operation": "r","step": "abs",- "repeat": false+ "repeat": false,+ "requirements": {+ "rules": []+ }}},{@@ -213,7 +216,10 @@"value": 2,"operation": "r","step": "abs",- "repeat": false+ "repeat": false,+ "requirements": {+ "rules": []+ }}},{@@ -225,7 +231,8 @@"value": 5,"operation": "r","step": "abs",- "repeat": false+ "repeat": false,+ "requirements": null}},{@@ -237,7 +244,8 @@"value": 3,"operation": "r","step": "abs",- "repeat": false+ "repeat": false,+ "requirements": null}},{@@ -249,7 +257,8 @@"value": 80,"operation": "r","step": "abs",- "repeat": false+ "repeat": false,+ "requirements": null}},{@@ -261,7 +270,8 @@"value": 20,"operation": "r","step": "abs",- "repeat": false+ "repeat": false,+ "requirements": null}},{@@ -273,7 +283,8 @@"value": 80,"operation": "r","step": "abs",- "repeat": false+ "repeat": false,+ "requirements": null}},{@@ -285,7 +296,8 @@"value": 50,"operation": "r","step": "abs",- "repeat": false+ "repeat": false,+ "requirements": null}},{@@ -297,7 +309,8 @@"value": 4,"operation": "r","step": "abs",- "repeat": false+ "repeat": false,+ "requirements": null}},{@@ -309,7 +322,8 @@"value": 5,"operation": "r","step": "abs",- "repeat": false+ "repeat": false,+ "requirements": null}},{@@ -321,7 +335,8 @@"value": 6,"operation": "r","step": "abs",- "repeat": false+ "repeat": false,+ "requirements": null}},{@@ -333,7 +348,8 @@"value": 4,"operation": "r","step": "abs",- "repeat": false+ "repeat": false,+ "requirements": null}}]diff --git a/wger/manager/models/slot_entry.py b/wger/manager/models/slot_entry.pyindex 7939c9ac5..566dcc831 100644--- a/wger/manager/models/slot_entry.py+++ b/wger/manager/models/slot_entry.py@@ -382,13 +382,15 @@ class SlotEntry(models.Model):if not config:continue- if not config.requirements:+ requirements = config.requirements_object++ if not requirements:max_iterations[field] = i# logger.debug(f'No requirements for {field} in iteration {i}')continue- requirements = config.requirements_object-+ # Field has requirements, check if they are met+ # logger.debug(f'Requirements for {field} in iteration {i}: {requirements.rules}')for log in log_data:all_fields_met = all(getattr(log, req_field) is not None@@ -449,6 +451,7 @@ class SlotEntry(models.Model):result,settings.WGER_SETTINGS['ROUTINE_CACHE_TTL'],)+return result#diff --git a/wger/manager/signals.py b/wger/manager/signals.pyindex 9f13d7e40..a98b89efe 100644--- a/wger/manager/signals.py+++ b/wger/manager/signals.py@@ -76,15 +76,15 @@ def handle_config_change(sender, instance: AbstractChangeConfig, **kwargs):def handle_workout_log_change(sender, instance: WorkoutLog, **kwargs):update_activity_cache(sender, instance, **kwargs)- cache.delete(CacheKeyMapper.routine_api_logs(instance.routine.id))if instance.routine:+ cache.delete(CacheKeyMapper.routine_api_logs(instance.routine.id))reset_routine_cache(instance.routine, structure=False)def handle_workout_session_change(sender, instance: WorkoutSession, **kwargs):update_activity_cache(sender, instance, **kwargs)- cache.delete(CacheKeyMapper.routine_api_logs(instance.routine.id))if instance.routine:+ cache.delete(CacheKeyMapper.routine_api_logs(instance.routine.id))reset_routine_cache(instance.routine, structure=False)diff --git a/wger/manager/tests/test_change_config_model.py b/wger/manager/tests/test_change_config_model.pyindex cdc54972d..3f28cd683 100644--- a/wger/manager/tests/test_change_config_model.py+++ b/wger/manager/tests/test_change_config_model.py@@ -41,3 +41,23 @@ class ChangeConfigTestCase(WgerTestCase):config.requirements_object,ConfigRequirements(data={'rules': ['weight', 'repetitions']}),)++ def test_bool_false(self):+ """+ Test the __bool__ method in ConfigRequirements+ """++ config = SetsConfig.objects.get(pk=1)++ self.assertEqual(config.requirements, {'rules': []})+ self.assertFalse(config.requirements_object)++ def test_bool_true(self):+ """+ Test the __bool__ method in ConfigRequirements+ """++ config = SetsConfig.objects.get(pk=1)+ config.requirements = {'rules': ['weight', 'repetitions']}++ self.assertTrue(config.requirements_object)diff --git a/wger/urls.py b/wger/urls.pyindex 9600af1df..fc63fbc72 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -51,6 +51,7 @@ from wger.nutrition.api import views as nutrition_api_viewsfrom wger.utils.generic_views import TextTemplateViewfrom wger.weight.api import views as weight_api_views+## REST API#@@ -344,7 +345,7 @@ urlpatterns += [#if settings.DEBUG:urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)- urlpatterns.append(path("__debug__/", include("debug_toolbar.urls")))+ # urlpatterns.append(path('__debug__/', include('debug_toolbar.urls')))if settings.EXPOSE_PROMETHEUS_METRICS:urlpatterns += [