Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix filtering for base configs (even if this wasn't being used)
Roland Geiderc55c2a06cfcc
diff --git a/wger/manager/api/filtersets.py b/wger/manager/api/filtersets.pyindex f4b4f5942..134061250 100644--- a/wger/manager/api/filtersets.py+++ b/wger/manager/api/filtersets.py@@ -14,22 +14,12 @@# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.# Third Party-from django_filters import (- UnknownFieldBehavior,- rest_framework as filters,-)+from django_filters import rest_framework as filters# wger-from wger.manager.api.consts import BASE_CONFIG_FILTER_FIELDSfrom wger.manager.models import WorkoutLog-class BaseConfigFilterSet(filters.FilterSet):- class Meta:- fields = BASE_CONFIG_FILTER_FIELDS- unknown_field_behavior = UnknownFieldBehavior.IGNORE--class WorkoutLogFilterSet(filters.FilterSet):class Meta:model = WorkoutLogdiff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex 99e4b7b11..fec2cb108 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -26,11 +26,8 @@ from rest_framework.decorators import actionfrom rest_framework.response import Response# wger-from wger.manager.api.consts import BASE_CONFIG_FIELDS-from wger.manager.api.filtersets import (- BaseConfigFilterSet,- WorkoutLogFilterSet,-)+from wger.manager.api.consts import BASE_CONFIG_FILTER_FIELDS+from wger.manager.api.filtersets import WorkoutLogFilterSetfrom wger.manager.api.permissions import RoutinePermissionfrom wger.manager.api.serializers import (DaySerializer,@@ -430,7 +427,7 @@ class AbstractConfigViewSet(WgerOwnerObjectModelViewSet):is_private = Trueordering_fields = '__all__'- filterset_fields = BASE_CONFIG_FIELDS+ filterset_fields = BASE_CONFIG_FILTER_FIELDSdef get_owner_objects(self):"""@@ -445,7 +442,6 @@ class WeightConfigViewSet(AbstractConfigViewSet):"""serializer_class = WeightConfigSerializer- filterset_class = BaseConfigFilterSetdef get_queryset(self):"""@@ -464,7 +460,6 @@ class MaxWeightConfigViewSet(AbstractConfigViewSet):"""serializer_class = MaxWeightConfigSerializer- filterset_class = BaseConfigFilterSetdef get_queryset(self):"""@@ -485,7 +480,6 @@ class RepetitionsConfigViewSet(AbstractConfigViewSet):"""serializer_class = RepetitionsConfigSerializer- filterset_class = BaseConfigFilterSetdef get_queryset(self):"""@@ -506,7 +500,6 @@ class MaxRepetitionsConfigViewSet(AbstractConfigViewSet):"""serializer_class = MaxRepetitionsConfigSerializer- filterset_class = BaseConfigFilterSetdef get_queryset(self):"""@@ -527,7 +520,6 @@ class SetsConfigViewSet(AbstractConfigViewSet):"""serializer_class = SetNrConfigSerializer- filterset_class = BaseConfigFilterSetdef get_queryset(self):"""@@ -546,7 +538,6 @@ class MaxSetsConfigViewSet(AbstractConfigViewSet):"""serializer_class = MaxSetNrConfigSerializer- filterset_class = BaseConfigFilterSetdef get_queryset(self):"""@@ -565,7 +556,6 @@ class RestConfigViewSet(AbstractConfigViewSet):"""serializer_class = RestConfigSerializer- filterset_class = BaseConfigFilterSetdef get_queryset(self):"""@@ -584,7 +574,6 @@ class MaxRestConfigViewSet(AbstractConfigViewSet):"""serializer_class = MaxRestConfigSerializer- filterset_class = BaseConfigFilterSetdef get_queryset(self):"""@@ -603,7 +592,6 @@ class RiRConfigViewSet(AbstractConfigViewSet):"""serializer_class = RiRConfigSerializer- filterset_class = BaseConfigFilterSetdef get_queryset(self):"""@@ -622,7 +610,6 @@ class MaxRiRConfigViewSet(AbstractConfigViewSet):"""serializer_class = MaxRiRConfigSerializer- filterset_class = BaseConfigFilterSetdef get_queryset(self):"""diff --git a/wger/manager/tests/test_api_config_filter.py b/wger/manager/tests/test_api_config_filter.pynew file mode 100644index 000000000..3b1161dcd--- /dev/null+++ b/wger/manager/tests/test_api_config_filter.py@@ -0,0 +1,36 @@+# This file is part of wger Workout Manager.+#+# wger Workout Manager is free software: you can redistribute it and/or modify+# it under the terms of the GNU Affero General Public License as published by+# the Free Software Foundation, either version 3 of the License, or+# (at your option) any later version.+#+# wger Workout Manager is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# You should have received a copy of the GNU Affero General Public License++# Django+from django.urls import reverse++# wger+from wger.core.tests.base_testcase import WgerTestCase+++class ConfigFilterTestCase(WgerTestCase):+ """+ The config endpoints must honour the ``slot_entry`` query filter+ """++ def test_filter_by_slot_entry(self):+ self.user_login()+ url = reverse('weight-config-list')++ response = self.client.get(url)+ self.assertEqual(response.data['count'], 4)++ response = self.client.get(url, {'slot_entry': 1})+ self.assertEqual(response.data['count'], 1)+ self.assertEqual(response.data['results'][0]['slot_entry'], 1)