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

Additional improvements

Browse source
This commit is contained in:
zandercymatics 2024-01-22 13:21:31 -07:00
parent 421c2bd2ea
commit eb5ae025f8
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,6 @@ import logging
from datetime import datetime from datetime import datetime
from registrar.models.domain import Domain from registrar.models.domain import Domain
from registrar.models.domain_information import DomainInformation from registrar.models.domain_information import DomainInformation
from registrar.models.public_contact import PublicContact
from django.db.models import Value from django.db.models import Value
from django.db.models.functions import Coalesce from django.db.models.functions import Coalesce
from django.utils import timezone from django.utils import timezone
@ -24,29 +23,32 @@ def get_domain_infos(filter_condition, sort_fields):
return domain_infos return domain_infos
def write_row(writer, columns, domain_info: DomainInformation): def write_row(writer, columns, domain_info: DomainInformation, skip_epp_call=True):
# For linter # For linter
ao = " " ao = " "
if domain_info.authorizing_official: if domain_info.authorizing_official:
first_name = domain_info.authorizing_official.first_name or "" first_name = domain_info.authorizing_official.first_name or ""
last_name = domain_info.authorizing_official.last_name or "" last_name = domain_info.authorizing_official.last_name or ""
ao = first_name + " " + last_name ao = f"{first_name} {last_name}"
security_email = domain_info.domain.get_security_email(skip_epp_call=True) security_email = domain_info.domain.get_security_email(skip_epp_call)
if security_email is None: if security_email is None:
security_email = " " security_email = " "
invalid_emails = {"registrar@dotgov.gov", "dotgov@cisa.dhs.gov"} invalid_emails = {"registrar@dotgov.gov", "dotgov@cisa.dhs.gov"}
# These are default emails that should not be displayed in the csv report # These are default emails that should not be displayed in the csv report
if security_email is not None and security_email.lower() in invalid_emails: if security_email.lower() in invalid_emails:
security_email = "(blank)" security_email = "(blank)"
if domain_info.federal_type:
domain_type = f"{domain_info.get_organization_type_display()} - {domain_info.get_federal_type_display()}"
else:
domain_type = domain_info.get_organization_type_display()
# create a dictionary of fields which can be included in output # create a dictionary of fields which can be included in output
FIELDS = { FIELDS = {
"Domain name": domain_info.domain.name, "Domain name": domain_info.domain.name,
"Domain type": domain_info.get_organization_type_display() + " - " + domain_info.get_federal_type_display() "Domain type": domain_type,
if domain_info.federal_type
else domain_info.get_organization_type_display(),
"Agency": domain_info.federal_agency, "Agency": domain_info.federal_agency,
"Organization name": domain_info.organization_name, "Organization name": domain_info.organization_name,
"City": domain_info.city, "City": domain_info.city,
@ -61,7 +63,8 @@ def write_row(writer, columns, domain_info: DomainInformation):
"Deleted": domain_info.domain.deleted, "Deleted": domain_info.domain.deleted,
} }
writer.writerow([FIELDS.get(column, "") for column in columns]) row = [FIELDS.get(column, "") for column in columns]
writer.writerow(row)
def write_body( def write_body(