From 57195e08daa15558528d8a33733da849fdee172a Mon Sep 17 00:00:00 2001 From: Zarino Zappia Date: Tue, 24 Sep 2024 17:17:04 +0100 Subject: [PATCH] Fix import scripts that failed when run with multiple AreaTypes These import scripts all used QuerySet.get() insted of QuerySet.filter() which was causing an exception when both WMC and WMC23 AreaTypes were present in the database. --- hub/management/commands/import_cen_nzsg_members.py | 2 +- hub/management/commands/import_mp_engagement.py | 4 ++-- hub/management/commands/import_mps_appg_data.py | 2 +- hub/management/commands/import_mps_relevant_votes.py | 4 ++-- .../commands/import_mps_select_committee_membership.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hub/management/commands/import_cen_nzsg_members.py b/hub/management/commands/import_cen_nzsg_members.py index 5beee79f0..f0ad1fe60 100644 --- a/hub/management/commands/import_cen_nzsg_members.py +++ b/hub/management/commands/import_cen_nzsg_members.py @@ -60,7 +60,7 @@ def create_data_types(self): }, ) - for at in AreaType.objects.get(code__in=["WMC", "WMC23"]): + for at in AreaType.objects.filter(code__in=["WMC", "WMC23"]): nzsg_ds.areas_available.add(at) cen_ds.areas_available.add(at) diff --git a/hub/management/commands/import_mp_engagement.py b/hub/management/commands/import_mp_engagement.py index 96fa8ca5e..578e370cc 100644 --- a/hub/management/commands/import_mp_engagement.py +++ b/hub/management/commands/import_mp_engagement.py @@ -54,7 +54,7 @@ def create_data_types(self): }, ) - for at in AreaType.objects.get(code__in=["WMC", "WMC23"]): + for at in AreaType.objects.filter(code__in=["WMC", "WMC23"]): ds.areas_available.add(at) data_type, created = DataType.objects.update_or_create( @@ -79,7 +79,7 @@ def create_data_types(self): }, ) - for at in AreaType.objects.get(code__in=["WMC", "WMC23"]): + for at in AreaType.objects.filter(code__in=["WMC", "WMC23"]): ds.areas_available.add(at) data_type, created = DataType.objects.update_or_create( diff --git a/hub/management/commands/import_mps_appg_data.py b/hub/management/commands/import_mps_appg_data.py index 401188acb..f333674be 100644 --- a/hub/management/commands/import_mps_appg_data.py +++ b/hub/management/commands/import_mps_appg_data.py @@ -103,7 +103,7 @@ def create_data_type(self): }, ) - for at in AreaType.objects.get(code__in=["WMC", "WMC23"]): + for at in AreaType.objects.filter(code__in=["WMC", "WMC23"]): appg_membership_ds.areas_available.add(at) appg_membership, created = DataType.objects.update_or_create( diff --git a/hub/management/commands/import_mps_relevant_votes.py b/hub/management/commands/import_mps_relevant_votes.py index 8ac4865cd..f650ef095 100644 --- a/hub/management/commands/import_mps_relevant_votes.py +++ b/hub/management/commands/import_mps_relevant_votes.py @@ -198,7 +198,7 @@ def create_data_types(self, votes, edms): }, ) - for at in AreaType.objects.get(code__in=["WMC", "WMC23"]): + for at in AreaType.objects.filter(code__in=["WMC", "WMC23"]): ds.areas_available.add(at) data_type, created = DataType.objects.update_or_create( @@ -226,7 +226,7 @@ def create_data_types(self, votes, edms): }, ) - for at in AreaType.objects.get(code__in=["WMC", "WMC23"]): + for at in AreaType.objects.filter(code__in=["WMC", "WMC23"]): ds.areas_available.add(at) data_type, created = DataType.objects.update_or_create( diff --git a/hub/management/commands/import_mps_select_committee_membership.py b/hub/management/commands/import_mps_select_committee_membership.py index 5385cae0e..1e7e81b41 100644 --- a/hub/management/commands/import_mps_select_committee_membership.py +++ b/hub/management/commands/import_mps_select_committee_membership.py @@ -71,7 +71,7 @@ def create_data_types(self): }, ) - for at in AreaType.objects.get(code__in=["WMC", "WMC23"]): + for at in AreaType.objects.filter(code__in=["WMC", "WMC23"]): select_committee_membership_ds.areas_available.add(at) select_committee_membership, created = DataType.objects.update_or_create(