mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-05-16 17:47:02 +02:00
Address refactor feedback
This commit is contained in:
parent
6e062e841f
commit
a8857ef18e
1 changed files with 10 additions and 14 deletions
|
@ -133,7 +133,6 @@ def update_columns_with_domain_managers(columns, max_dm_count):
|
||||||
based on the maximum domain manager count.
|
based on the maximum domain manager count.
|
||||||
"""
|
"""
|
||||||
for i in range(1, max_dm_count + 1):
|
for i in range(1, max_dm_count + 1):
|
||||||
if f"Domain manager email {i}" not in columns:
|
|
||||||
columns.append(f"Domain manager email {i}")
|
columns.append(f"Domain manager email {i}")
|
||||||
|
|
||||||
|
|
||||||
|
@ -159,22 +158,19 @@ def write_body(
|
||||||
|
|
||||||
security_emails_dict = _get_security_emails(sec_contact_ids)
|
security_emails_dict = _get_security_emails(sec_contact_ids)
|
||||||
|
|
||||||
# The maximum amount of domain managers an account has
|
|
||||||
# We get the max so we can set the column header accurately
|
|
||||||
max_dm_count = 0
|
|
||||||
# Flag bc we don't want to set header every loop
|
|
||||||
paginator_ran = False
|
|
||||||
# Reduce the memory overhead when performing the write operation
|
# Reduce the memory overhead when performing the write operation
|
||||||
paginator = Paginator(all_domain_infos, 1000)
|
paginator = Paginator(all_domain_infos, 1000)
|
||||||
|
|
||||||
|
if get_domain_managers:
|
||||||
|
# We want to get the max amont of domain managers an
|
||||||
|
# account has to set the column header dynamically
|
||||||
|
max_dm_count = max(len(domain_info.domain.permissions.all()) for domain_info in all_domain_infos)
|
||||||
|
update_columns_with_domain_managers(columns, max_dm_count)
|
||||||
|
|
||||||
for page_num in paginator.page_range:
|
for page_num in paginator.page_range:
|
||||||
page = paginator.page(page_num)
|
page = paginator.page(page_num)
|
||||||
rows = []
|
rows = []
|
||||||
for domain_info in page.object_list:
|
for domain_info in page.object_list:
|
||||||
if get_domain_managers:
|
|
||||||
dm_count = len(domain_info.domain.permissions.all())
|
|
||||||
if dm_count > max_dm_count:
|
|
||||||
max_dm_count = dm_count
|
|
||||||
update_columns_with_domain_managers(columns, max_dm_count)
|
|
||||||
try:
|
try:
|
||||||
row = parse_row(columns, domain_info, security_emails_dict, get_domain_managers)
|
row = parse_row(columns, domain_info, security_emails_dict, get_domain_managers)
|
||||||
rows.append(row)
|
rows.append(row)
|
||||||
|
@ -183,11 +179,10 @@ def write_body(
|
||||||
# It indicates that DomainInformation.domain is None.
|
# It indicates that DomainInformation.domain is None.
|
||||||
logger.error("csv_export -> Error when parsing row, domain was None")
|
logger.error("csv_export -> Error when parsing row, domain was None")
|
||||||
continue
|
continue
|
||||||
if paginator_ran is False and should_write_header:
|
if should_write_header:
|
||||||
write_header(writer, columns)
|
write_header(writer, columns)
|
||||||
|
|
||||||
writer.writerows(rows)
|
writer.writerows(rows)
|
||||||
paginator_ran = True
|
|
||||||
|
|
||||||
|
|
||||||
def export_data_type_to_csv(csv_file):
|
def export_data_type_to_csv(csv_file):
|
||||||
|
@ -222,6 +217,7 @@ def export_data_type_to_csv(csv_file):
|
||||||
Domain.State.READY,
|
Domain.State.READY,
|
||||||
Domain.State.DNS_NEEDED,
|
Domain.State.DNS_NEEDED,
|
||||||
Domain.State.ON_HOLD,
|
Domain.State.ON_HOLD,
|
||||||
|
Domain.State.UNKNOWN, # REMOVE
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
write_body(writer, columns, sort_fields, filter_condition, True, True)
|
write_body(writer, columns, sort_fields, filter_condition, True, True)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue