zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-12 04:29:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

add disclose

Browse source
This commit is contained in:
zandercymatics 2025-03-25 08:41:15 -06:00
parent d6465c5c3a
commit fefbf0e755
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/registrar/models/domain.py
View file

@ -1703,14 +1703,14 @@ class Domain(TimeStampedModel, DomainHelper):
# https://github.com/cisagov/epplib/blob/master/epplib/models/common.py#L32 # https://github.com/cisagov/epplib/blob/master/epplib/models/common.py#L32
DF = epp.DiscloseField DF = epp.DiscloseField
all_disclose_fields = {field for field in DF} 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} fields_to_remove = {DF.NOTIFY_EMAIL, DF.VAT, DF.IDENT}
if contact.contact_type == contact.ContactTypeChoices.SECURITY: if contact.contact_type == contact.ContactTypeChoices.SECURITY:
if contact.email not in DefaultEmail.get_all_emails(): if contact.email not in DefaultEmail.get_all_emails():
fields_to_remove.add(DF.EMAIL) fields_to_remove.add(DF.EMAIL)
elif contact.contact_type == contact.ContactTypeChoices.ADMINISTRATIVE: 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 disclose_args["fields"].difference_update(fields_to_remove) # type: ignore

14
src/registrar/tests/test_models_domain.py
View file

@ -1003,7 +1003,7 @@ class TestRegistrantContacts(MockEppLib):
expected_contact, disclose=False, disclose_fields=disclose_fields expected_contact, disclose=False, disclose_fields=disclose_fields
) )
elif expected_contact.contact_type == PublicContact.ContactTypeChoices.ADMINISTRATIVE: 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( expectedCreateCommand = self._convertPublicContactToEpp(
expected_contact, expected_contact,
disclose=False, disclose=False,
@ -1029,7 +1029,9 @@ class TestRegistrantContacts(MockEppLib):
DF = common.DiscloseField DF = common.DiscloseField
expected_disclose = { expected_disclose = {
"auth_info": common.ContactAuthInfo(pw="2fooBAR123fooBaz"), "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", "email": "help@get.gov",
"extensions": [], "extensions": [],
"fax": None, "fax": None,
@ -1054,7 +1056,9 @@ class TestRegistrantContacts(MockEppLib):
# Separated for linter # Separated for linter
expected_not_disclose = { expected_not_disclose = {
"auth_info": common.ContactAuthInfo(pw="2fooBAR123fooBaz"), "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", "email": "help@get.gov",
"extensions": [], "extensions": [],
"fax": None, "fax": None,
@ -1108,7 +1112,9 @@ class TestRegistrantContacts(MockEppLib):
DF = common.DiscloseField DF = common.DiscloseField
# Create contact with empty fields list # 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 # Verify disclosure settings
self.assertEqual(result.disclose.flag, True) self.assertEqual(result.disclose.flag, True)