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

accounting for federal types of None in sorting

Browse source
This commit is contained in:
David Kennedy 2023-11-06 14:55:59 -05:00
parent 0614e344f8
commit 5cce2dcf77
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
1 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,8 @@ import csv
from registrar.models.domain import Domain
from registrar.models.domain_information import DomainInformation
from registrar.models.public_contact import PublicContact
from django.db.models import Value
from django.db.models.functions import Coalesce
def export_domains_to_writer(writer, columns, sort_fields, filter_condition):
@ -61,7 +63,13 @@ def export_data_type_to_csv(csv_file):
"Status",
"Expiration Date",
]
sort_fields = ["organization_type", "federal_type", "federal_agency", "domain__name"]
# Coalesce is used to replace federal_type of None with ZZZZZ
sort_fields = [
"organization_type",
Coalesce("federal_type", Value("ZZZZZ")),
"federal_agency",
"domain__name",
]
filter_condition = {
"domain__state__in": [
Domain.State.READY,
@ -84,7 +92,13 @@ def export_data_full_to_csv(csv_file):
"State",
"Security Contact Email",
]
sort_fields = ["organization_type", "federal_type", "federal_agency", "domain__name"]
# Coalesce is used to replace federal_type of None with ZZZZZ
sort_fields = [
"organization_type",
Coalesce("federal_type", Value("ZZZZZ")),
"federal_agency",
"domain__name",
]
filter_condition = {
"domain__state__in": [
Domain.State.READY,
@ -107,7 +121,13 @@ def export_data_federal_to_csv(csv_file):
"State",
"Security Contact Email",
]
sort_fields = ["organization_type", "federal_type", "federal_agency", "domain__name"]
# Coalesce is used to replace federal_type of None with ZZZZZ
sort_fields = [
"organization_type",
Coalesce("federal_type", Value("ZZZZZ")),
"federal_agency",
"domain__name",
]
filter_condition = {
"organization_type__icontains": "federal",
"domain__state__in": [