Merge pull request #1605 from IFRCGo/feature/dref-filter

Fix filter in dref

Author: szabozoltan69

dref/filter_set.py

@@ -14,7 +14,7 @@ class DrefFilter(filters.FilterSet):
         widget=filters.widgets.CSVWidget,
     )
     country = filters.ModelMultipleChoiceFilter(
-        field_name='drefcountrydistrict__country',
+        field_name='country',
         queryset=Country.objects.all()
     )
 

dref/test_views.py

@@ -426,6 +426,35 @@ def test_filter_dref_status(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data['results']), 2)
 
+    def test_dref_country_filter(self):
+        country1 = Country.objects.create(name='country1')
+        country2 = Country.objects.create(name='country2')
+        DrefFactory.create(
+            title='test',
+            status=Dref.Status.COMPLETED,
+            created_by=self.user,
+            country=country1
+        )
+        DrefFactory.create(
+            status=Dref.Status.COMPLETED, created_by=self.user
+        )
+        DrefFactory.create(
+            status=Dref.Status.COMPLETED,
+            created_by=self.user,
+            country=country2
+        )
+        DrefFactory.create(
+            status=Dref.Status.IN_PROGRESS,
+            created_by=self.user,
+            country=country1
+        )
+        DrefFactory.create(status=Dref.Status.IN_PROGRESS, created_by=self.user)
+        url = f'/api/v2/dref/?country={country1.id}'
+        self.client.force_authenticate(self.user)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.data['results']), 2)
+
     def test_dref_options(self):
         """
         Test for various dref attributes

dref/views.py

@@ -32,7 +32,6 @@
     DrefFilter,
     DrefOperationalUpdateFilter
 )
-from dref.permissions import DrefOperationalUpdateCreatePermission
 
 
 class DrefViewSet(RevisionMixin, viewsets.ModelViewSet):
@@ -71,7 +70,7 @@ def get_published(self, request, pk=None, version=None):
 
 class DrefOperationalUpdateViewSet(RevisionMixin, viewsets.ModelViewSet):
     serializer_class = DrefOperationalUpdateSerializer
-    permission_classes = [permissions.IsAuthenticated, DrefOperationalUpdateCreatePermission]
+    permission_classes = [permissions.IsAuthenticated]
     filterset_class = DrefOperationalUpdateFilter
 
     def get_queryset(self):