diff --git a/src/registrar/models/utility/generic_helper.py b/src/registrar/models/utility/generic_helper.py index f9d4303c4..4f74b4163 100644 --- a/src/registrar/models/utility/generic_helper.py +++ b/src/registrar/models/utility/generic_helper.py @@ -170,18 +170,11 @@ class CreateOrUpdateOrganizationTypeHelper: # There is no avenue for this to occur in the UI, # as such - this can only occur if the object is initialized in this way. # Or if there are pre-existing data. - logger.debug( - "create_or_update_organization_type() -> is_election_board " - f"cannot exist for {generic_org_type}. Setting to None." - ) self.instance.is_election_board = None self.instance.organization_type = generic_org_type else: # This can only happen with manual data tinkering, which causes these to be out of sync. if self.instance.is_election_board is None: - logger.warning( - "create_or_update_organization_type() -> is_election_board is out of sync. Updating value." - ) self.instance.is_election_board = False if self.instance.is_election_board: @@ -218,10 +211,6 @@ class CreateOrUpdateOrganizationTypeHelper: # There is no avenue for this to occur in the UI, # as such - this can only occur if the object is initialized in this way. # Or if there are pre-existing data. - logger.warning( - "create_or_update_organization_type() -> is_election_board " - f"cannot exist for {current_org_type}. Setting to None." - ) self.instance.is_election_board = None else: # if self.instance.organization_type is set to None, then this means diff --git a/src/registrar/tests/test_reports.py b/src/registrar/tests/test_reports.py index 4c9733ae0..c82b928bb 100644 --- a/src/registrar/tests/test_reports.py +++ b/src/registrar/tests/test_reports.py @@ -1,7 +1,16 @@ import io from django.test import Client, RequestFactory, TestCase from io import StringIO -from registrar.models import DomainRequest, Domain, DomainInformation, UserDomainRole, User, PublicContact, DomainInvitation, FederalAgency +from registrar.models import ( + DomainRequest, + Domain, + DomainInformation, + UserDomainRole, + User, + PublicContact, + DomainInvitation, + FederalAgency, +) from registrar.utility.csv_export import ( DomainDataFull, DomainDataType, @@ -216,7 +225,7 @@ class ExportDataTestUserFacing(TestCase): DomainInvitation.objects.all().delete() FederalAgency.objects.all().delete() - #@less_console_noise_decorator + # @less_console_noise_decorator def test_domain_data_type_user(self): """Shows security contacts, domain managers, so for the current user""" @@ -276,7 +285,7 @@ class ExportDataTestUserFacing(TestCase): "State,SO,SO email,Security contact email,Domain managers,Invited domain managers\n" "interfere.gov,Ready,(blank),(blank),Federal - Executive,,," ", ,,(blank),staff@example.com,\n" - "somedomain123.gov,Dns needed,(blank),(blank),Interstate,,,,, ,," + "somedomain1234.gov,Dns needed,(blank),(blank),Interstate,,,,, ,," "(blank),staff@example.com,\n" ) @@ -293,7 +302,6 @@ class ExportDataTest(MockDb, MockEppLib): def setUp(self): super().setUp() - self.factory = RequestFactory() def tearDown(self): super().tearDown() diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py index ebdc09f60..f77f215d9 100644 --- a/src/registrar/utility/csv_export.py +++ b/src/registrar/utility/csv_export.py @@ -559,6 +559,11 @@ class DomainDataTypeUser(DomainDataType): The DomainDataType report, but sliced on the current request user """ + @classmethod + def export_data_to_csv(cls, csv_file, request=None): + logger.warning("in export_data_to_csv") + super().export_data_to_csv(csv_file, request=request) + @classmethod def get_filter_conditions(cls, request=None): """ @@ -566,12 +571,12 @@ class DomainDataTypeUser(DomainDataType): """ if request is None or not hasattr(request, "user") or not request.user: # Return nothing - logger.info(f"returning nothing: {request}") + logger.warning(f"returning nothing: {request}") return Q(id__in=[]) user_domain_roles = UserDomainRole.objects.filter(user=request.user) domain_ids = user_domain_roles.values_list("domain_id", flat=True) - logger.info(f"roles: {user_domain_roles} ids: {domain_ids}") + logger.warning(f"roles: {user_domain_roles} ids: {domain_ids}") return Q(id__in=domain_ids)