[Scorecards] only suggest similar councils of same type on council page

Sometimes the list of similar councils was including other types of
councils and when you clicked on those you got an error. This adds
something to get_related_councils which filters by council group to
remove these.

Author: struan

caps/models.py

@@ -377,7 +377,9 @@ def get_emissions_cluster(self):
             assignments__council=self, type__slug="emissions"
         )
 
-    def get_related_councils(self, cut_off: int = 10) -> List[dict]:
+    def get_related_councils(
+        self, cut_off: int = 10, scoring_group: str = None
+    ) -> List[dict]:
         """
         get all related councils
         """
@@ -397,6 +399,13 @@ def get_related_councils(self, cut_off: int = 10) -> List[dict]:
             declared_emergency=Min("emergencydeclaration__date_declared"),
         )
 
+        if scoring_group is not None:
+            group = self.SCORING_GROUPS[scoring_group]
+            councils = councils.filter(
+                authority_type__in=group["types"],
+                country__in=group["countries"],
+            )
+
         council_lookup = {council.id: council for council in councils}
         council_ids = list(council_lookup.keys()) + [self.id]
 
@@ -413,7 +422,14 @@ def get_related_councils(self, cut_off: int = 10) -> List[dict]:
             labels[comparison.label.type_id][comparison.council_id] = comparison
 
         processed_councils = []
-        for d in self.distances.all().order_by("type_id", "-match_score"):
+        distances = self.distances.all().order_by("type_id", "-match_score")
+        if scoring_group is not None:
+            group = self.SCORING_GROUPS[scoring_group]
+            distances = distances.filter(
+                council_b__authority_type__in=group["types"],
+                council_b__country__in=group["countries"],
+            )
+        for d in distances:
             # deepcopy to make sure the same council in multiple comparison types
             # are seperate objects with seperate links to Distance objects
             nc = deepcopy(council_lookup[d.council_b_id])

scoring/views.py

@@ -407,7 +407,7 @@ def get_context_data(self, **kwargs):
         )
         context["comparisons"] = comparisons
 
-        for group in council.get_related_councils(5):
+        for group in council.get_related_councils(5, group["slug"]):
             if group["type"].slug == "composite":
                 if comparisons:
                     # Filter out any related councils that are already being compared