zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-05-19 02:49:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update function naming and length check

Browse source
This commit is contained in:
Rebecca Hsieh 2024-02-15 10:52:14 -08:00
parent 22cefd6ed8
commit a66fb36432
No known key found for this signature in database
2 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/registrar/tests/test_reports.py
View file

@ -10,7 +10,7 @@ from django.contrib.auth import get_user_model
from registrar.models.user_domain_role import UserDomainRole from registrar.models.user_domain_role import UserDomainRole
from registrar.tests.common import MockEppLib from registrar.tests.common import MockEppLib
from registrar.utility.csv_export import ( from registrar.utility.csv_export import (
write_body, write_csv,
get_default_start_date, get_default_start_date,
get_default_end_date, get_default_end_date,
) )
@ -403,7 +403,7 @@ class ExportDataTest(MockEppLib):
} }
self.maxDiff = None self.maxDiff = None
# Call the export functions # Call the export functions
write_body( write_csv(
writer, columns, sort_fields, filter_condition, get_domain_managers=False, should_write_header=True writer, columns, sort_fields, filter_condition, get_domain_managers=False, should_write_header=True
) )
@ -427,7 +427,7 @@ class ExportDataTest(MockEppLib):
expected_content = expected_content.replace(",,", "").replace(",", "").replace(" ", "").strip() expected_content = expected_content.replace(",,", "").replace(",", "").replace(" ", "").strip()
self.assertEqual(csv_content, expected_content) self.assertEqual(csv_content, expected_content)
def test_write_body(self): def test_write_csv(self):
"""Test that write_body returns the """Test that write_body returns the
existing domain, test that sort by domain name works, existing domain, test that sort by domain name works,
test that filter works""" test that filter works"""
@ -462,7 +462,7 @@ class ExportDataTest(MockEppLib):
], ],
} }
# Call the export functions # Call the export functions
write_body( write_csv(
writer, columns, sort_fields, filter_condition, get_domain_managers=False, should_write_header=True writer, columns, sort_fields, filter_condition, get_domain_managers=False, should_write_header=True
) )
# Reset the CSV file's position to the beginning # Reset the CSV file's position to the beginning
@ -512,7 +512,7 @@ class ExportDataTest(MockEppLib):
], ],
} }
# Call the export functions # Call the export functions
write_body( write_csv(
writer, columns, sort_fields, filter_condition, get_domain_managers=False, should_write_header=True writer, columns, sort_fields, filter_condition, get_domain_managers=False, should_write_header=True
) )
# Reset the CSV file's position to the beginning # Reset the CSV file's position to the beginning
@ -591,7 +591,7 @@ class ExportDataTest(MockEppLib):
} }
# Call the export functions # Call the export functions
write_body( write_csv(
writer, writer,
columns, columns,
sort_fields, sort_fields,
@ -599,7 +599,7 @@ class ExportDataTest(MockEppLib):
get_domain_managers=False, get_domain_managers=False,
should_write_header=True, should_write_header=True,
) )
write_body( write_csv(
writer, writer,
columns, columns,
sort_fields_for_deleted_domains, sort_fields_for_deleted_domains,
@ -664,7 +664,7 @@ class ExportDataTest(MockEppLib):
} }
self.maxDiff = None self.maxDiff = None
# Call the export functions # Call the export functions
write_body( write_csv(
writer, columns, sort_fields, filter_condition, get_domain_managers=True, should_write_header=True writer, columns, sort_fields, filter_condition, get_domain_managers=True, should_write_header=True
) )

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

@ -136,7 +136,7 @@ def update_columns_with_domain_managers(columns, max_dm_count):
columns.append(f"Domain manager email {i}") columns.append(f"Domain manager email {i}")
def write_body( def write_csv(
writer, writer,
columns, columns,
sort_fields, sort_fields,
@ -161,7 +161,7 @@ def write_body(
# 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: if get_domain_managers and len(all_domain_infos) > 0:
# We want to get the max amont of domain managers an # We want to get the max amont of domain managers an
# account has to set the column header dynamically # 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) max_dm_count = max(len(domain_info.domain.permissions.all()) for domain_info in all_domain_infos)
@ -179,6 +179,7 @@ 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 should_write_header: if should_write_header:
write_header(writer, columns) write_header(writer, columns)
@ -219,7 +220,7 @@ def export_data_type_to_csv(csv_file):
Domain.State.ON_HOLD, Domain.State.ON_HOLD,
], ],
} }
write_body(writer, columns, sort_fields, filter_condition, get_domain_managers=True, should_write_header=True) write_csv(writer, columns, sort_fields, filter_condition, get_domain_managers=True, should_write_header=True)
def export_data_full_to_csv(csv_file): def export_data_full_to_csv(csv_file):
@ -250,7 +251,7 @@ def export_data_full_to_csv(csv_file):
Domain.State.ON_HOLD, Domain.State.ON_HOLD,
], ],
} }
write_body(writer, columns, sort_fields, filter_condition, get_domain_managers=False, should_write_header=True) write_csv(writer, columns, sort_fields, filter_condition, get_domain_managers=False, should_write_header=True)
def export_data_federal_to_csv(csv_file): def export_data_federal_to_csv(csv_file):
@ -282,7 +283,7 @@ def export_data_federal_to_csv(csv_file):
Domain.State.ON_HOLD, Domain.State.ON_HOLD,
], ],
} }
write_body(writer, columns, sort_fields, filter_condition, get_domain_managers=False, should_write_header=True) write_csv(writer, columns, sort_fields, filter_condition, get_domain_managers=False, should_write_header=True)
def get_default_start_date(): def get_default_start_date():
@ -349,8 +350,8 @@ def export_data_growth_to_csv(csv_file, start_date, end_date):
"domain__deleted__gte": start_date_formatted, "domain__deleted__gte": start_date_formatted,
} }
write_body(writer, columns, sort_fields, filter_condition, get_domain_managers=False, should_write_header=True) write_csv(writer, columns, sort_fields, filter_condition, get_domain_managers=False, should_write_header=True)
write_body( write_csv(
writer, writer,
columns, columns,
sort_fields_for_deleted_domains, sort_fields_for_deleted_domains,