only filter by data sets that are available for the area type

Otherwise you end up with no areas returned if you select a dataset that's not available for the area type Fixes #335
mysociety · Nov 21, 2023 · 775b53d · 775b53d
1 parent 0fd6a91
commit 775b53d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/hub/fixtures/area_data.json b/hub/fixtures/area_data.json
@@ -10,6 +10,7 @@
       "is_range": "True",
       "source": "https://parliament.uk",
       "table": "areadata",
+      "areas_available": [1],
       "category": "place"
     }
   },
@@ -23,6 +24,7 @@
       "last_update": "2022-10-10T13:20:30+00:00",
       "source": "https://parliament.uk",
       "table": "areadata",
+      "areas_available": [1],
       "category": "place"
     }
   },
@@ -36,6 +38,7 @@
       "last_update": "2022-10-10T13:20:30+00:00",
       "source": "http://example.org/polling",
       "table": "areadata",
+      "areas_available": [1],
       "category": "opinion"
     }
   },

diff --git a/hub/fixtures/areas.json b/hub/fixtures/areas.json
@@ -9,6 +9,16 @@
       "description": "Constituency"
     }
   },
+  {
+    "model": "hub.areatype",
+    "pk": 2,
+    "fields": {
+      "name": "Constituency 2023",
+      "code": "WMC23",
+      "area_type": "Constituency 2023",
+      "description": "Constituency 2023"
+    }
+  },
   {
     "model": "hub.area",
     "pk": 1,

diff --git a/hub/fixtures/elections.json b/hub/fixtures/elections.json
@@ -7,6 +7,7 @@
       "data_type": "integer",
       "last_update": "2022-10-10T13:20:30+00:00",
       "source": "https://wikipedia.org",
+      "areas_available": [1],
       "table": "person__persondata"
     }
   },
@@ -18,6 +19,7 @@
       "data_type": "date",
       "last_update": "2022-10-10T13:20:30+00:00",
       "source": "https://wikipedia.org",
+      "areas_available": [1],
       "table": "person__persondata"
     }
   },
@@ -29,6 +31,7 @@
       "data_type": "date",
       "last_update": "2022-10-10T13:20:30+00:00",
       "source": "https://wikipedia.org",
+      "areas_available": [1],
       "table": "person__persondata"
     }
   },

diff --git a/hub/fixtures/mp_memberships.json b/hub/fixtures/mp_memberships.json
@@ -7,6 +7,7 @@
       "name": "mp_appg_membership",
       "label": "APPG membership",
       "last_update": "2022-10-10T13:20:30+00:00",
+      "areas_available": [1],
       "source": "Parliament"
     }
   },

diff --git a/hub/mixins.py b/hub/mixins.py
@@ -23,6 +23,7 @@ class FilterMixin:
     @cache
     def filters(self):
         filters = []
+        area_type = self.area_type()
         for param, value in self.request.GET.items():
             if "__" in param and param not in ["shader", "columns"]:
                 name, comparator = param.split("__", 1)
@@ -33,7 +34,7 @@ def filters(self):
                 value = value.split(",")
 
             try:
-                dataset = DataSet.objects.get(name=name)
+                dataset = DataSet.objects.get(name=name, areas_available=area_type)
                 filters.append(
                     {
                         "dataset": dataset,
@@ -46,7 +47,7 @@ def filters(self):
                 )
             except DataSet.DoesNotExist:  # pragma: nocover
                 try:
-                    datatype = DataType.objects.get(name=name)
+                    datatype = DataType.objects.get(name=name, area_type=area_type)
                     filters.append(
                         {
                             "dataset": datatype.data_set,
@@ -102,6 +103,7 @@ def columns(self, mp_name=False):
 
         return columns
 
+    @cache
     def area_type(self):
         code = self.request.GET.get("area_type", "WMC")
         try: