Remove redundant filter

src/registrar/models/domain.py

@@ -909,11 +909,22 @@ class Domain(TimeStampedModel, DomainHelper):
         """Time to renew. Not implemented."""
         raise NotImplementedError()
 
-    def get_security_email(self):
-        logger.info("get_security_email-> getting the contact ")
-        secContact = self.security_contact
-        if secContact is not None:
-            return secContact.email
+    def get_security_email(self, skip_epp_call=False):
+        logger.info("get_security_email-> getting the contact")
+
+        # If specified, skip the epp call outright.
+        # Otherwise, proceed as normal.
+        if skip_epp_call:
+            logger.info("get_security_email-> skipping epp call")
+            security = PublicContact.ContactTypeChoices.SECURITY
+            security_contact = self.generic_contact_getter(security, skip_epp_call)
+        else:
+            security_contact = self.security_contact
+
+        # If we get a valid value for security_contact, pull its email
+        # Otherwise, just return nothing
+        if security_contact is not None and isinstance(security_contact, PublicContact):
+            return security_contact.email
         else:
             return None
 
@@ -1110,7 +1121,7 @@ class Domain(TimeStampedModel, DomainHelper):
             )
             raise error
 
-    def generic_contact_getter(self, contact_type_choice: PublicContact.ContactTypeChoices) -> PublicContact | None:
+    def generic_contact_getter(self, contact_type_choice: PublicContact.ContactTypeChoices, skip_epp_call=False) -> PublicContact | None:
         """Retrieves the desired PublicContact from the registry.
         This abstracts the caching and EPP retrieval for
         all contact items and thus may result in EPP calls being sent.
@@ -1121,7 +1132,6 @@ class Domain(TimeStampedModel, DomainHelper):
         If you wanted to setup getter logic for Security, you would call:
         cache_contact_helper(PublicContact.ContactTypeChoices.SECURITY),
         or cache_contact_helper("security").
-
         """
         # registrant_contact(s) are an edge case. They exist on
         # the "registrant" property as opposed to contacts.
@@ -1131,7 +1141,7 @@ class Domain(TimeStampedModel, DomainHelper):
 
         try:
             # Grab from cache
-            contacts = self._get_property(desired_property)
+            contacts = self._get_property(desired_property, skip_epp_call)
         except KeyError as error:
             # if contact type is security, attempt to retrieve registry id
             # for the security contact from domain.security_contact_registry_id
@@ -1866,9 +1876,9 @@ class Domain(TimeStampedModel, DomainHelper):
         """Remove cache data when updates are made."""
         self._cache = {}
 
-    def _get_property(self, property):
+    def _get_property(self, property, skip_epp_call=False):
         """Get some piece of info about a domain."""
-        if property not in self._cache:
+        if property not in self._cache and not skip_epp_call:
             self._fetch_cache(
                 fetch_hosts=(property == "hosts"),
                 fetch_contacts=(property == "contacts"),

src/registrar/utility/csv_export.py

@@ -24,9 +24,7 @@ def get_domain_infos(filter_condition, sort_fields):
     return domain_infos
 
 
-def write_row(writer, columns, domain_info):
-    security_contacts = domain_info.domain.contacts.filter(contact_type=PublicContact.ContactTypeChoices.SECURITY)
-
+def write_row(writer, columns, domain_info: DomainInformation):
     # For linter
     ao = " "
     if domain_info.authorizing_official:
@@ -34,9 +32,9 @@ def write_row(writer, columns, domain_info):
         last_name = domain_info.authorizing_official.last_name or ""
         ao = first_name + " " + last_name
 
+    security_email = domain_info.domain.get_security_email(skip_epp_call=True)
+    if security_email is None:
         security_email = " "
-    if security_contacts:
-        security_email = security_contacts[0].email
 
     invalid_emails = {"registrar@dotgov.gov", "dotgov@cisa.dhs.gov"}
     # These are default emails that should not be displayed in the csv report
@@ -78,9 +76,7 @@ def write_body(
     """
 
     # Get the domainInfos
-    domain_infos = get_domain_infos(filter_condition, sort_fields)
-
-    all_domain_infos = list(domain_infos)
+    all_domain_infos = get_domain_infos(filter_condition, sort_fields)
 
     # Write rows to CSV
     for domain_info in all_domain_infos: