From e6e6cfa24f8f8ebf83cfe7f157ee7e37b60c5168 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Sun, 29 Oct 2023 06:04:35 -0400 Subject: [PATCH] update to filter_conditions; formatting for lines too long --- src/registrar/tests/test_reports.py | 6 ++++-- src/registrar/utility/csv_export.py | 24 +++++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/registrar/tests/test_reports.py b/src/registrar/tests/test_reports.py index 2f9155423..7474194a3 100644 --- a/src/registrar/tests/test_reports.py +++ b/src/registrar/tests/test_reports.py @@ -114,7 +114,8 @@ class ExportDataTest(TestCase): # print(csv_content) # self.maxDiff = None - # Normalize line endings and remove commas, spaces and leading/trailing whitespace + # Normalize line endings and remove commas, + # spaces and leading/trailing whitespace csv_content = ( csv_content.replace(",,", "") .replace(",", "") @@ -169,7 +170,8 @@ class ExportDataTest(TestCase): "ddomain3.gov,federal,Armed Forces Retirement Home\n" ) - # Normalize line endings and remove commas, spaces and leading/trailing whitespace + # Normalize line endings and remove commas, + # spaces and leading/trailing whitespace csv_content = ( csv_content.replace(",,", "") .replace(",", "") diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py index 846404995..281fc6078 100644 --- a/src/registrar/utility/csv_export.py +++ b/src/registrar/utility/csv_export.py @@ -58,9 +58,11 @@ def export_data_type_to_csv(csv_file): ] sort_fields = ["domain__name"] filter_condition = { - "domain__state": Domain.State.READY, - "domain__state": Domain.State.DNS_NEEDED, - "domain__state": Domain.State.ON_HOLD, + "domain__state__in": [ + Domain.State.READY, + Domain.State.DNS_NEEDED, + Domain.State.ON_HOLD, + ], } export_domains_to_writer(writer, columns, sort_fields, filter_condition) @@ -79,9 +81,11 @@ def export_data_full_to_csv(csv_file): ] sort_fields = ["domain__name", "federal_agency", "organization_type"] filter_condition = { - "domain__state": Domain.State.READY, - "domain__state": Domain.State.DNS_NEEDED, - "domain__state": Domain.State.ON_HOLD, + "domain__state__in": [ + Domain.State.READY, + Domain.State.DNS_NEEDED, + Domain.State.ON_HOLD, + ], } export_domains_to_writer(writer, columns, sort_fields, filter_condition) @@ -101,8 +105,10 @@ def export_data_federal_to_csv(csv_file): sort_fields = ["domain__name", "federal_agency", "organization_type"] filter_condition = { "organization_type__icontains": "federal", - "domain__state": Domain.State.READY, - "domain__state": Domain.State.DNS_NEEDED, - "domain__state": Domain.State.ON_HOLD, + "domain__state__in": [ + Domain.State.READY, + Domain.State.DNS_NEEDED, + Domain.State.ON_HOLD, + ], } export_domains_to_writer(writer, columns, sort_fields, filter_condition)