This commit is contained in:
Rachid Mrad 2024-03-28 19:33:19 -04:00
parent 5cd70dad34
commit 7aefce86db
No known key found for this signature in database

View file

@ -148,6 +148,41 @@ def _get_security_emails(sec_contact_ids):
return security_emails_dict return security_emails_dict
def update_columns_with_domain_managers(
domain_info, update_columns, columns, max_dm_active, max_dm_invited, max_dm_total
):
"""Helper function that works with 'global' variables set in write_domains_csv
Accepts:
domain_info -> Domains to parse
update_columns -> A control to make sure we only run the columns test and update when needed
columns -> The header cells in the csv that's under construction
max_dm_active -> Starts at 0 and gets updated and passed again through this method
max_dm_invited -> Starts at 0 and gets updated and passed again through this method
max_dm_total -> Starts at 0 and gets updated and passed again through this method
Returns:
Updated update_columns, columns, max_dm_active, max_dm_invited, max_dm_total"""
dm_active = domain_info.domain.permissions.count()
dm_invited = domain_info.domain.invitations.filter(status=DomainInvitation.DomainInvitationStatus.INVITED).count()
if dm_active > max_dm_active or dm_invited > max_dm_invited:
max_dm_active = max(dm_active, max_dm_active)
max_dm_invited = max(dm_invited, max_dm_invited)
max_dm_total = max_dm_active + max_dm_invited
update_columns = True
if update_columns:
for i in range(1, max_dm_total + 1):
column_name = f"Domain manager {i}"
column2_name = f"DM{i} status"
if column_name not in columns:
columns.append(column_name)
columns.append(column2_name)
update_columns = False
return update_columns, columns, max_dm_active, max_dm_invited, max_dm_total
def write_domains_csv( def write_domains_csv(
writer, writer,
columns, columns,
@ -165,10 +200,6 @@ def write_domains_csv(
all_domain_infos = get_domain_infos(filter_condition, sort_fields) all_domain_infos = get_domain_infos(filter_condition, sort_fields)
# td_agencies = all_domain_infos.filter(domain__invitation__status='invited').annotate(invitations_count=Count('invitations')).values_list('domain_name', 'invitations_count').distinct()
# Create a dictionary mapping of domain_name to federal_agency
# td_dict = dict(td_agencies)
# Store all security emails to avoid epp calls or excessive filters # Store all security emails to avoid epp calls or excessive filters
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)
@ -195,25 +226,11 @@ def write_domains_csv(
# Get max number of domain managers # Get max number of domain managers
if get_domain_managers: if get_domain_managers:
dm_active = domain_info.domain.permissions.count() update_columns, columns, max_dm_active, max_dm_invited, max_dm_total = (
dm_invited = domain_info.domain.invitations.filter( update_columns_with_domain_managers(
status=DomainInvitation.DomainInvitationStatus.INVITED domain_info, update_columns, columns, max_dm_active, max_dm_invited, max_dm_total
).count() )
)
if dm_active > max_dm_active or dm_invited > max_dm_invited:
max_dm_active = max(dm_active, max_dm_active)
max_dm_invited = max(dm_invited, max_dm_invited)
max_dm_total = max_dm_active + max_dm_invited
update_columns = True
if update_columns:
for i in range(1, max_dm_total + 1):
column_name = f"Domain manager {i}"
column2_name = f"DM{i} status"
if column_name not in columns:
columns.append(column_name)
columns.append(column2_name)
update_columns = False
try: try:
row = parse_domain_row(columns, domain_info, security_emails_dict, get_domain_managers) row = parse_domain_row(columns, domain_info, security_emails_dict, get_domain_managers)