Fix remaining tests (hopefully)

src/registrar/admin.py

@@ -307,7 +307,6 @@ class DomainRequestAdminForm(forms.ModelForm):
 
         return cleaned_data
 
-
     def _check_for_valid_rejection_reason(self, rejection_reason) -> bool:
         """
         Checks if the rejection_reason field is not none.
@@ -3197,6 +3196,7 @@ class SuborganizationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         extra_context = {"domain_requests": domain_requests, "domains": domains}
         return super().change_view(request, object_id, form_url, extra_context)
 
+
 class AllowedEmailAdmin(ListHeaderAdmin):
     class Meta:
         model = models.AllowedEmail
@@ -3206,6 +3206,7 @@ class AllowedEmailAdmin(ListHeaderAdmin):
     search_help_text = "Search by email."
     ordering = ["email"]
 
+
 admin.site.unregister(LogEntry)  # Unregister the default registration
 
 admin.site.register(LogEntry, CustomLogEntryAdmin)

src/registrar/fixtures_users.py

@@ -245,9 +245,7 @@ class UserFixture:
 
     # Additional emails to add to the AllowedEmail whitelist.
     # The format should be as follows: ["email@igorville.gov", "email2@igorville.gov"]
-    ADDITIONAL_ALLOWED_EMAILS = [
+    ADDITIONAL_ALLOWED_EMAILS = ["zander.adkinson@ecstech.com"]
-        "zander.adkinson@ecstech.com"
-    ]
 
     def load_users(cls, users, group_name, are_superusers=False):
         logger.info(f"Going to load {len(users)} users in group {group_name}")

src/registrar/models/allowed_email.py

@@ -35,21 +35,17 @@ class AllowedEmail(TimeStampedModel):
         # Check if there's a '+' in the local part
         if "+" in local:
             base_local = local.split("+")[0]
-            base_email_exists = cls.objects.filter(
+            base_email_exists = cls.objects.filter(Q(email__iexact=f"{base_local}@{domain}")).exists()
-                Q(email__iexact=f"{base_local}@{domain}")
-            ).exists()
 
             # Given an example email, such as "joe.smoe+1@igorville.com"
             # The full regex statement will be: "^joe.smoe\\+\\d+@igorville.com$"
-            pattern = f'^{re.escape(base_local)}\\+\\d+@{re.escape(domain)}$'
+            pattern = f"^{re.escape(base_local)}\\+\\d+@{re.escape(domain)}$"
             return base_email_exists and re.match(pattern, email)
         else:
             # Edge case, the +1 record exists but the base does not,
             # and the record we are checking is the base record.
-            pattern = f'^{re.escape(local)}\\+\\d+@{re.escape(domain)}$'
+            pattern = f"^{re.escape(local)}\\+\\d+@{re.escape(domain)}$"
-            plus_email_exists = cls.objects.filter(
+            plus_email_exists = cls.objects.filter(Q(email__iregex=pattern)).exists()
-                Q(email__iregex=pattern)
-            ).exists()
             return plus_email_exists
 
     def __str__(self):

src/registrar/models/domain_request.py

@@ -580,14 +580,8 @@ class DomainRequest(TimeStampedModel):
     @classmethod
     def get_statuses_that_send_emails(cls):
         """Returns a list of statuses that send an email to the user"""
-        excluded_statuses = [
+        excluded_statuses = [cls.DomainRequestStatus.INELIGIBLE, cls.DomainRequestStatus.IN_REVIEW]
-            cls.DomainRequestStatus.INELIGIBLE,
+        return [status for status in cls.DomainRequestStatus if status not in excluded_statuses]
-            cls.DomainRequestStatus.IN_REVIEW
-        ]
-        return [
-            status for status in cls.DomainRequestStatus
-            if status not in excluded_statuses
-        ]
 
     def sync_organization_type(self):
         """

src/registrar/tests/test_admin_request.py

@@ -56,6 +56,7 @@ class TestDomainRequestAdmin(MockEppLib):
     @classmethod
     def tearDownClass(cls):
         super().tearDownClass()
+        AllowedEmail.objects.all.delete()
 
     @classmethod
     def setUpClass(self):
@@ -74,6 +75,8 @@ class TestDomainRequestAdmin(MockEppLib):
             model=DomainRequest,
         )
         self.mock_client = MockSESClient()
+        allowed_emails = [AllowedEmail(email="mayor@igorville.gov"), AllowedEmail(email="help@get.gov")]
+        AllowedEmail.objects.bulk_create(allowed_emails)
 
     def tearDown(self):
         super().tearDown()
@@ -604,8 +607,8 @@ class TestDomainRequestAdmin(MockEppLib):
     ):
         """Helper method for the email test cases.
         email_index is the index of the email in mock_client."""
-        allowed_email, _ = AllowedEmail.objects.get_or_create(email=email_address)
+        AllowedEmail.objects.get_or_create(email=email_address)
-        allowed_bcc_email, _ = AllowedEmail.objects.get_or_create(email=bcc_email_address)
+        AllowedEmail.objects.get_or_create(email=bcc_email_address)
         with less_console_noise():
             # Access the arguments passed to send_email
             call_args = self.mock_client.EMAILS_SENT
@@ -633,9 +636,6 @@ class TestDomainRequestAdmin(MockEppLib):
             bcc_email = kwargs["Destination"]["BccAddresses"][0]
             self.assertEqual(bcc_email, bcc_email_address)
 
-        allowed_email.delete()
-        allowed_bcc_email.delete()
-
     @override_settings(IS_PRODUCTION=True)
     @less_console_noise_decorator
     def test_action_needed_sends_reason_email_prod_bcc(self):

src/registrar/utility/email.py

@@ -40,8 +40,6 @@ def send_templated_email(
     Raises EmailSendingError if SES client could not be accessed
     """
 
-
-    
     if not settings.IS_PRODUCTION:  # type: ignore
         if flag_is_active(None, "disable_email_sending"):  # type: ignore
             message = "Could not send email. Email sending is disabled due to flag 'disable_email_sending'."
@@ -49,7 +47,7 @@ def send_templated_email(
         else:
             # Raise an email sending error if these doesn't exist within our whitelist.
             # If these emails don't exist, this function can handle that elsewhere.
-            AllowedEmail = apps.get_model('registrar', 'AllowedEmail')
+            AllowedEmail = apps.get_model("registrar", "AllowedEmail")
             message = "Could not send email. The email '{}' does not exist within the whitelist."
             if to_address and not AllowedEmail.is_allowed_email(to_address):
                 raise EmailSendingError(message.format(to_address))