diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index b054afb5b..39e5ae8f5 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -1703,14 +1703,14 @@ class Domain(TimeStampedModel, DomainHelper): # https://github.com/cisagov/epplib/blob/master/epplib/models/common.py#L32 DF = epp.DiscloseField all_disclose_fields = {field for field in DF} - disclose_args = {"fields": all_disclose_fields, "flag": False, "types": {DF.ADDR: "loc"}} + disclose_args = {"fields": all_disclose_fields, "flag": False, "types": {DF.ADDR: "loc", DF.NAME: "loc"}} fields_to_remove = {DF.NOTIFY_EMAIL, DF.VAT, DF.IDENT} if contact.contact_type == contact.ContactTypeChoices.SECURITY: if contact.email not in DefaultEmail.get_all_emails(): fields_to_remove.add(DF.EMAIL) elif contact.contact_type == contact.ContactTypeChoices.ADMINISTRATIVE: - fields_to_remove.update({DF.EMAIL, DF.VOICE, DF.ADDR}) + fields_to_remove.update({DF.NAME, DF.EMAIL, DF.VOICE, DF.ADDR}) disclose_args["fields"].difference_update(fields_to_remove) # type: ignore diff --git a/src/registrar/tests/test_models_domain.py b/src/registrar/tests/test_models_domain.py index 5ca32140c..1d84c2fe8 100644 --- a/src/registrar/tests/test_models_domain.py +++ b/src/registrar/tests/test_models_domain.py @@ -1003,7 +1003,7 @@ class TestRegistrantContacts(MockEppLib): expected_contact, disclose=False, disclose_fields=disclose_fields ) elif expected_contact.contact_type == PublicContact.ContactTypeChoices.ADMINISTRATIVE: - disclose_fields = self.all_disclose_fields - {"email", "voice", "addr"} + disclose_fields = self.all_disclose_fields - {"name", "email", "voice", "addr"} expectedCreateCommand = self._convertPublicContactToEpp( expected_contact, disclose=False, @@ -1029,7 +1029,9 @@ class TestRegistrantContacts(MockEppLib): DF = common.DiscloseField expected_disclose = { "auth_info": common.ContactAuthInfo(pw="2fooBAR123fooBaz"), - "disclose": common.Disclose(flag=False, fields=disclose_email_field, types={DF.ADDR: "loc"}), + "disclose": common.Disclose( + flag=False, fields=disclose_email_field, types={DF.ADDR: "loc", DF.NAME: "loc"} + ), "email": "help@get.gov", "extensions": [], "fax": None, @@ -1054,7 +1056,9 @@ class TestRegistrantContacts(MockEppLib): # Separated for linter expected_not_disclose = { "auth_info": common.ContactAuthInfo(pw="2fooBAR123fooBaz"), - "disclose": common.Disclose(flag=False, fields=disclose_email_field, types={DF.ADDR: "loc"}), + "disclose": common.Disclose( + flag=False, fields=disclose_email_field, types={DF.ADDR: "loc", DF.NAME: "loc"} + ), "email": "help@get.gov", "extensions": [], "fax": None, @@ -1108,7 +1112,9 @@ class TestRegistrantContacts(MockEppLib): DF = common.DiscloseField # Create contact with empty fields list - result = self._convertPublicContactToEpp(dummy_contact, disclose=True, disclose_fields={DF.EMAIL}) + result = self._convertPublicContactToEpp( + dummy_contact, disclose=True, disclose_fields={DF.ADDR: "loc", DF.NAME: "loc"} + ) # Verify disclosure settings self.assertEqual(result.disclose.flag, True)