diff --git a/src/registrar/tests/test_reports.py b/src/registrar/tests/test_reports.py index b7f1653d3..a496b5f46 100644 --- a/src/registrar/tests/test_reports.py +++ b/src/registrar/tests/test_reports.py @@ -682,6 +682,7 @@ def test_domain_unmanaged(self): def test_domain_request_growth(self): """Shows submitted requests within a date range, sorted""" # Remove "Submitted at" because we can't guess this immutable, dynamically generated test data + print("we are in here") columns = [ "Domain request", "Domain type", @@ -692,6 +693,7 @@ def test_domain_request_growth(self): # Create a CSV file in memory csv_file = StringIO() # Call the export functions + print("something") DomainRequestGrowth.export_data_to_csv( csv_file, start_date=self.start_date.strftime("%Y-%m-%d"), @@ -699,8 +701,11 @@ def test_domain_request_growth(self): ) # Reset the CSV file's position to the beginning csv_file.seek(0) + print("uuuuu") + print(csv_file) # Read the content into a variable csv_content = csv_file.read() + print(csv_content) expected_content = ( "Domain request,Domain type,Federal type\n" "city3.gov,Federal,Executive\n" diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py index 9141556af..a2adc6c86 100644 --- a/src/registrar/utility/csv_export.py +++ b/src/registrar/utility/csv_export.py @@ -1265,11 +1265,11 @@ def parse_row(cls, columns, model): """ # Handle the federal_type field. Defaults to the wrong format. - federal_type = model.converted_federal_type + federal_type = model.get("federal_type") human_readable_federal_type = BranchChoices.get_branch_label(federal_type) if federal_type else None # Handle the org_type field - org_type = model.converted_generic_org_type + org_type = model.get("generic_org_type") human_readable_org_type = DomainRequest.OrganizationChoices.get_org_label(org_type) if org_type else None # Handle the status field. Defaults to the wrong format. @@ -1277,7 +1277,7 @@ def parse_row(cls, columns, model): status_display = DomainRequest.DomainRequestStatus.get_status_label(status) if status else None # Handle the region field. - state_territory = model.converted_state_territory + state_territory = model.get("state_territory") region = get_region(state_territory) if state_territory else None # Handle the requested_domain field (add a default if None)