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

security contact email working

Browse source
This commit is contained in:
David Kennedy 2024-06-26 18:31:21 -04:00
parent 4b40b95bac
commit c0d513c28f
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -186,6 +186,7 @@ class DomainExport:
"domain__expiration_date", "domain__expiration_date",
"domain__created_at", "domain__created_at",
"domain__deleted", "domain__deleted",
"domain__security_contact_registry_id",
"authorizing_official__email", "authorizing_official__email",
"federal_agency__agency", "federal_agency__agency",
] ]
@ -225,6 +226,9 @@ class DomainExport:
], ],
} }
# Fetch all relevant PublicContact entries
public_contacts = cls.get_all_security_emails()
domain_infos = ( domain_infos = (
DomainInformation.objects.select_related("domain") DomainInformation.objects.select_related("domain")
.filter(**filter_condition) .filter(**filter_condition)
@ -235,11 +239,12 @@ class DomainExport:
annotations = {} annotations = {}
additional_values = [ additional_values = [
"domain__name", "domain__name",
"domain__security_contact_registry_id",
"federal_agency__agency", "federal_agency__agency",
] ]
# Convert the domain request queryset to a dictionary (including annotated fields) # Convert the domain request queryset to a dictionary (including annotated fields)
annotated_domains = cls.annotate_and_retrieve_fields(domain_infos, annotations, {}, {}, {}, additional_values) annotated_domains = cls.annotate_and_retrieve_fields(domain_infos, annotations, public_contacts, {}, {}, additional_values)
requests_dict = convert_queryset_to_dict(annotated_domains, is_model=False) requests_dict = convert_queryset_to_dict(annotated_domains, is_model=False)
# Write the csv file # Write the csv file
@ -274,6 +279,9 @@ class DomainExport:
], ],
} }
# Fetch all relevant PublicContact entries
public_contacts = cls.get_all_security_emails()
domain_infos = ( domain_infos = (
DomainInformation.objects.select_related("domain") DomainInformation.objects.select_related("domain")
.filter(**filter_condition) .filter(**filter_condition)
@ -284,11 +292,12 @@ class DomainExport:
annotations = {} annotations = {}
additional_values = [ additional_values = [
"domain__name", "domain__name",
"domain__security_contact_registry_id",
"federal_agency__agency", "federal_agency__agency",
] ]
# Convert the domain request queryset to a dictionary (including annotated fields) # Convert the domain request queryset to a dictionary (including annotated fields)
annotated_domains = cls.annotate_and_retrieve_fields(domain_infos, annotations, {}, {}, {}, additional_values) annotated_domains = cls.annotate_and_retrieve_fields(domain_infos, annotations, public_contacts, {}, {}, additional_values)
requests_dict = convert_queryset_to_dict(annotated_domains, is_model=False) requests_dict = convert_queryset_to_dict(annotated_domains, is_model=False)
# Write the csv file # Write the csv file
@ -629,7 +638,7 @@ class DomainExport:
# Annotate with security_contact from public_contacts # Annotate with security_contact from public_contacts
for domain in queryset: for domain in queryset:
domain['security_contact_email'] = public_contacts.get(domain.get('domain__registry_id')) domain['security_contact_email'] = public_contacts.get(domain.get('domain__security_contact_registry_id'))
domain['invited_users'] = ', '.join(invited_users_dict.get(domain.get('domain__name'), [])) domain['invited_users'] = ', '.join(invited_users_dict.get(domain.get('domain__name'), []))
domain['managers'] = ', '.join(managers_dict.get(domain.get('domain__name'), [])) domain['managers'] = ', '.join(managers_dict.get(domain.get('domain__name'), []))
annotated_domains.append(domain) annotated_domains.append(domain)