feat: import 2024 MPs

commonknowledge · Jul 8, 2024 · b820371 · b820371
1 parent 7ac49e4
commit b820371
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/hub/graphql/types/model_types.py b/hub/graphql/types/model_types.py
@@ -709,7 +709,8 @@ def imported_data_count_by_area(
         data = self.imported_data_count_by_area(
             postcode_io_key=analytical_area_type.value
         )
-        return [GroupedDataCount(**datum) for datum in data]
+        area_key = postcodeIOKeyAreaTypeLookup[analytical_area_type]
+        return [GroupedDataCount(**datum, area_type=area_key) for datum in data]
 
     @strawberry_django.field
     def imported_data_count_for_area(
@@ -1181,8 +1182,12 @@ def public_map_report(info: Info, org_slug: str, report_slug: str) -> models.Map
 
 
 @strawberry_django.field()
-def area_by_gss(gss: str) -> models.Area:
-    return models.Area.objects.get(gss=gss)
+def area_by_gss(gss: str, analytical_area_type: AnalyticalAreaType) -> models.Area:
+    qs = models.Area.objects.all()
+    if analytical_area_type:
+        area_key = postcodeIOKeyAreaTypeLookup[analytical_area_type]
+        qs = qs.filter(area_type__code=area_key)
+    return qs.get(gss=gss)
 
 
 @strawberry_django.field()

diff --git a/hub/management/commands/import_mps.py b/hub/management/commands/import_mps.py
@@ -61,7 +61,7 @@
 class Command(BaseCommand):
     help = "Import UK Members of Parliament"
 
-    area_type = "WMC"
+    area_type = "WMC23"
 
     def add_arguments(self, parser):
         parser.add_argument(

diff --git a/nextjs/src/components/reportsConstituencyItem.tsx b/nextjs/src/components/reportsConstituencyItem.tsx
@@ -370,7 +370,7 @@ export const ConstituencyElectionCard = ({
 
 const CONSTITUENCY_DATA = gql`
   query GetConstituencyData($analyticalAreaType: AnalyticalAreaType!, $gss: String!, $reportID: ID!) {
-    constituency: area(gss: $gss) {
+    constituency: area(gss: $gss, analyticalAreaType: $analyticalAreaType) {
       id
       name
       mp: person(filters:{personType:"MP"}) {