Merge pull request #1759 from IFRCGo/feature/having-multiple-districts-in-one-query

Allowing multiple admin2, district, country queries

Author: szabozoltan69

api/drf_views.py

@@ -192,7 +192,11 @@ class CountryFilter(filters.FilterSet):
 
     class Meta:
         model = Country
-        fields = ('region', 'record_type',)
+        fields = {
+            'id': ('exact', 'in'),
+            'region': ('exact', 'in'),
+            'record_type': ('exact', 'in'),
+        }
 
 
 class CountryViewset(viewsets.ReadOnlyModelViewSet):
@@ -247,7 +251,11 @@ class CountryFilterRMD(filters.FilterSet):
 
     class Meta:
         model = Country
-        fields = ('region', 'record_type',)
+        fields = {
+            'id': ('exact', 'in'),
+            'region': ('exact', 'in'),
+            'record_type': ('exact', 'in'),
+        }
 
 class CountryRMDViewset(viewsets.ReadOnlyModelViewSet):
     queryset = Country.objects.filter(is_deprecated=False).filter(iso3__isnull=False).exclude(iso3="")
@@ -259,7 +267,13 @@ class CountryRMDViewset(viewsets.ReadOnlyModelViewSet):
 class DistrictRMDFilter(filters.FilterSet):
     class Meta:
         model = District
-        fields = ('country','country__name')
+        fields = {
+            'id': ('exact', 'in'),
+            'country': ('exact', 'in'),
+            'country__iso3': ('exact', 'in'),
+            'country__name': ('exact', 'in'),
+            'name': ('exact', 'in'),
+        }
 
 
 class DistrictRMDViewset(viewsets.ReadOnlyModelViewSet):
@@ -342,7 +356,13 @@ def get_serializer_class(self):
 class DistrictFilter(filters.FilterSet):
     class Meta:
         model = District
-        fields = ('country', 'country__iso3', 'name',)
+        fields = {
+            'id': ('exact', 'in'),
+            'country': ('exact', 'in'),
+            'country__iso3': ('exact', 'in'),
+            'country__name': ('exact', 'in'),
+            'name': ('exact', 'in'),
+        }
 
 
 class DistrictViewset(viewsets.ReadOnlyModelViewSet):
@@ -363,7 +383,13 @@ def get_serializer_class(self):
 class Admin2Filter(filters.FilterSet):
     class Meta:
         model = Admin2
-        fields = ('admin1', 'admin1__country', 'admin1__country__iso3')
+        fields = {
+            'id': ('exact', 'in'),
+            'admin1': ('exact', 'in'),
+            'admin1__country': ('exact', 'in'),
+            'admin1__country__iso3': ('exact', 'in'),
+            'name': ('exact', 'in'),
+        }
 
 
 class Admin2Viewset(viewsets.ReadOnlyModelViewSet):