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

var name correction

Browse source
This commit is contained in:
Rachid Mrad 2024-04-03 11:31:46 -04:00
parent 9d8d90e45a
commit 602f07f219
No known key found for this signature in database
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,7 +56,7 @@ def get_domain_infos(filter_condition, sort_fields):
def parse_row_for_domain( def parse_row_for_domain(
columns, columns,
domain_info: DomainInformation, domain_info: DomainInformation,
dict_security_emails_dict=None, dict_security_emails=None,
should_get_domain_managers=False, should_get_domain_managers=False,
dict_domain_invitations_with_invited_status=None, dict_domain_invitations_with_invited_status=None,
dict_user_domain_roles=None, dict_user_domain_roles=None,
@ -72,8 +72,8 @@ def parse_row_for_domain(
# Grab the security email from a preset dictionary. # Grab the security email from a preset dictionary.
# If nothing exists in the dictionary, grab from .contacts. # If nothing exists in the dictionary, grab from .contacts.
if dict_security_emails_dict is not None and domain.name in dict_security_emails_dict: if dict_security_emails is not None and domain.name in dict_security_emails:
_email = dict_security_emails_dict.get(domain.name) _email = dict_security_emails.get(domain.name)
security_email = _email if _email is not None else " " security_email = _email if _email is not None else " "
else: else:
# If the dictionary doesn't contain that data, lets filter for it manually. # If the dictionary doesn't contain that data, lets filter for it manually.
@ -135,7 +135,7 @@ def _get_security_emails(sec_contact_ids):
""" """
Retrieve security contact emails for the given security contact IDs. Retrieve security contact emails for the given security contact IDs.
""" """
dict_security_emails_dict = {} dict_security_emails = {}
public_contacts = ( public_contacts = (
PublicContact.objects.only("email", "domain__name") PublicContact.objects.only("email", "domain__name")
.select_related("domain") .select_related("domain")
@ -145,12 +145,12 @@ def _get_security_emails(sec_contact_ids):
# Populate a dictionary of domain names and their security contacts # Populate a dictionary of domain names and their security contacts
for contact in public_contacts: for contact in public_contacts:
domain: Domain = contact.domain domain: Domain = contact.domain
if domain is not None and domain.name not in dict_security_emails_dict: if domain is not None and domain.name not in dict_security_emails:
dict_security_emails_dict[domain.name] = contact.email dict_security_emails[domain.name] = contact.email
else: else:
logger.warning("csv_export -> Domain was none for PublicContact") logger.warning("csv_export -> Domain was none for PublicContact")
return dict_security_emails_dict return dict_security_emails
def count_domain_managers(domain_name, dict_domain_invitations_with_invited_status, dict_user_domain_roles): def count_domain_managers(domain_name, dict_domain_invitations_with_invited_status, dict_user_domain_roles):
@ -248,7 +248,7 @@ def write_csv_for_domains(
# Retrieve domain information and all sec emails # Retrieve domain information and all sec emails
all_domain_infos = get_domain_infos(filter_condition, sort_fields) all_domain_infos = get_domain_infos(filter_condition, sort_fields)
sec_contact_ids = all_domain_infos.values_list("domain__security_contact_registry_id", flat=True) sec_contact_ids = all_domain_infos.values_list("domain__security_contact_registry_id", flat=True)
dict_security_emails_dict = _get_security_emails(sec_contact_ids) dict_security_emails = _get_security_emails(sec_contact_ids)
paginator = Paginator(all_domain_infos, 1000) paginator = Paginator(all_domain_infos, 1000)
# Initialize variables # Initialize variables
@ -283,7 +283,7 @@ def write_csv_for_domains(
row = parse_row_for_domain( row = parse_row_for_domain(
columns, columns,
domain_info, domain_info,
dict_security_emails_dict, dict_security_emails,
should_get_domain_managers, should_get_domain_managers,
dict_domain_invitations_with_invited_status, dict_domain_invitations_with_invited_status,
dict_user_domain_roles, dict_user_domain_roles,