diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index b1ed5dd48..8a7f9c6e6 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -1406,7 +1406,7 @@ class Domain(TimeStampedModel, DomainHelper): DF = epp.DiscloseField fields = {DF.EMAIL} - hidden_security_emails = [DefaultEmail.PUBLIC_CONTACT_DEFAULT, DefaultEmail.LEGACY_DEFAULT] + hidden_security_emails = [DefaultEmail.PUBLIC_CONTACT_DEFAULT.value, DefaultEmail.LEGACY_DEFAULT.value] disclose = is_security and contact.email not in hidden_security_emails # Delete after testing on other devices logger.info("Updated domain contact %s to disclose: %s", contact.email, disclose) diff --git a/src/registrar/models/public_contact.py b/src/registrar/models/public_contact.py index a7f3703a9..08891fa97 100644 --- a/src/registrar/models/public_contact.py +++ b/src/registrar/models/public_contact.py @@ -89,7 +89,7 @@ class PublicContact(TimeStampedModel): sp="VA", pc="20598-0645", cc="US", - email=DefaultEmail.PUBLIC_CONTACT_DEFAULT, + email=DefaultEmail.PUBLIC_CONTACT_DEFAULT.value, voice="+1.8882820870", pw="thisisnotapassword", ) @@ -106,7 +106,7 @@ class PublicContact(TimeStampedModel): sp="VA", pc="22201", cc="US", - email=DefaultEmail.PUBLIC_CONTACT_DEFAULT, + email=DefaultEmail.PUBLIC_CONTACT_DEFAULT.value, voice="+1.8882820870", pw="thisisnotapassword", ) @@ -123,7 +123,7 @@ class PublicContact(TimeStampedModel): sp="VA", pc="22201", cc="US", - email=DefaultEmail.PUBLIC_CONTACT_DEFAULT, + email=DefaultEmail.PUBLIC_CONTACT_DEFAULT.value, voice="+1.8882820870", pw="thisisnotapassword", ) @@ -140,7 +140,7 @@ class PublicContact(TimeStampedModel): sp="VA", pc="22201", cc="US", - email=DefaultEmail.PUBLIC_CONTACT_DEFAULT, + email=DefaultEmail.PUBLIC_CONTACT_DEFAULT.value, voice="+1.8882820870", pw="thisisnotapassword", ) diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py index 3d025309a..e2e5f9c54 100644 --- a/src/registrar/utility/csv_export.py +++ b/src/registrar/utility/csv_export.py @@ -65,7 +65,7 @@ def parse_row(columns, domain_info: DomainInformation, security_emails_dict=None security_email = _email if _email is not None else " " # These are default emails that should not be displayed in the csv report - invalid_emails = {DefaultEmail.LEGACY_DEFAULT, DefaultEmail.PUBLIC_CONTACT_DEFAULT} + invalid_emails = {DefaultEmail.LEGACY_DEFAULT.value, DefaultEmail.PUBLIC_CONTACT_DEFAULT.value} if security_email.lower() in invalid_emails: security_email = "(blank)" diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 08d8a923f..a5a4783a9 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -142,7 +142,7 @@ class DomainView(DomainBaseView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - default_emails = [DefaultEmail.PUBLIC_CONTACT_DEFAULT, DefaultEmail.LEGACY_DEFAULT] + default_emails = [DefaultEmail.PUBLIC_CONTACT_DEFAULT.value, DefaultEmail.LEGACY_DEFAULT.value] context["hidden_security_emails"] = default_emails @@ -571,7 +571,7 @@ class DomainSecurityEmailView(DomainFormBaseView): initial = super().get_initial() security_contact = self.object.security_contact - invalid_emails = [DefaultEmail.PUBLIC_CONTACT_DEFAULT, DefaultEmail.LEGACY_DEFAULT] + invalid_emails = [DefaultEmail.PUBLIC_CONTACT_DEFAULT.value, DefaultEmail.LEGACY_DEFAULT.value] if security_contact is None or security_contact.email in invalid_emails: initial["security_email"] = None return initial