zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-05-16 09:37:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

update to filter_conditions; formatting for lines too long

Browse source
This commit is contained in:
David Kennedy 2023-10-29 06:04:35 -04:00
parent 82772c633b
commit e6e6cfa24f
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
2 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/registrar/tests/test_reports.py
View file

@ -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(",", "")

24
src/registrar/utility/csv_export.py
View file

@ -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)