From 6a7a8cd0f6679f1f9f0473ce030e352e341913de Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 24 Nov 2023 13:31:59 -0500
Subject: [PATCH 01/39] added checks for conditions that produce info message;
 added info message; changed submit button if conditions exist; changed
 behavior of submit button

---
 src/registrar/templates/application_form.html |  7 +++
 src/registrar/views/application.py            | 58 +++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/src/registrar/templates/application_form.html b/src/registrar/templates/application_form.html
index 6830033b5..a1b91ec40 100644
--- a/src/registrar/templates/application_form.html
+++ b/src/registrar/templates/application_form.html
@@ -66,6 +66,13 @@
               value="next"
               class="usa-button"
             >Save and continue</button>
+            {% elif pending_requests_exist %}
+            <button
+              type="submit"
+              name="submit_button"
+              value="save_and_return"
+              class="usa-button usa-button--outline"
+            >Save and return to manage your domains</button>
             {% else %}
             <button
               type="submit"
diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index e907be8e5..464018e8e 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -1,11 +1,14 @@
 import logging
 
 from django.http import Http404, HttpResponse, HttpResponseRedirect
+from django.db.models import Q
 from django.shortcuts import redirect, render
 from django.urls import resolve, reverse
+from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 from django.contrib import messages
+from typing import List
 
 from registrar.forms import application_wizard as forms
 from registrar.models import DomainApplication
@@ -218,6 +221,23 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
         self.steps.current = current_url
         context = self.get_context_data()
         context["forms"] = self.get_forms()
+
+        # if pending requests exist and user does not have approved domains,
+        #     present message that domain application cannot be submitted
+        pending_requests = self.pending_requests()
+        if len(pending_requests) > 0:
+            # TODO may want to move this whole thing to utility/errors.py
+            message_header = "You cannot submit this request yet"
+            message_content = (
+                f"<h4 class='usa-alert__heading'>{message_header}</h4>"
+                "<p>New domain requests cannot be submitted until we have finished reviewing your pending request: "
+                f"<strong>{pending_requests[0].requested_domain}</strong>. You can continue to fill out this request and "
+                "save it as a draft to be submitted later. "
+                f"<a class='usa-link' href='{reverse('home')}'>View your pending requests.</a></p>"
+            )
+            messages.info(request, mark_safe(message_content))
+        context["pending_requests_exist"] = len(pending_requests) > 0
+
         return render(request, self.template_name, context)
 
     def get_all_forms(self, **kwargs) -> list:
@@ -266,6 +286,39 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
 
         return instantiated
 
+    def pending_requests(self) -> List[DomainApplication]:
+        """return an array of pending requests if user has pending requests
+        and no approved requests"""
+        if self.approved_applications_exist() or self.approved_domains_exist():
+            return []
+        else:
+            return self.pending_applications()
+    
+    def approved_applications_exist(self) -> bool:
+        """Checks if user is creator of applications with APPROVED status"""
+        approved_application_count = DomainApplication.objects.filter(
+            creator=self.request.user,
+            status=DomainApplication.APPROVED
+        ).count()
+        return approved_application_count > 0
+
+    def approved_domains_exist(self) -> bool:
+        """Checks if user has permissions on approved domains
+        
+        This additional check is necessary to account for domains which were migrated
+        and do not have an application"""
+        return self.request.user.permissions.count() > 0
+    
+    def pending_applications(self) -> List[DomainApplication]:
+        """Returns a List of user's applications with one of the following states:
+        SUBMITTED, IN_REVIEW, ACTION_NEEDED"""
+        # if the current application has ACTION_NEEDED status, this check should not be performed
+        if self.application.status == DomainApplication.ACTION_NEEDED:
+            return []
+        check_statuses = [DomainApplication.APPROVED, DomainApplication.IN_REVIEW, DomainApplication.ACTION_NEEDED]
+        filter_conditions = Q(creator=self.request.user) & Q(status__in=check_statuses)
+        return DomainApplication.objects.filter(filter_conditions)
+
     def get_context_data(self):
         """Define context for access on all wizard pages."""
         return {
@@ -328,6 +381,11 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
         if button == "save":
             messages.success(request, "Your progress has been saved!")
             return self.goto(self.steps.current)
+        # if user opted to save progress and return,
+        # return them to the home page
+        if button == "save_and_return":
+            messages.success(request, "Your progress has been saved!")
+            return HttpResponseRedirect(reverse("home"))
         # otherwise, proceed as normal
         return self.goto_next_step()
 

From 55541ca9671140472915775fe8ad697a9731cfd5 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 24 Nov 2023 14:02:35 -0500
Subject: [PATCH 02/39] formatted for linting

---
 src/registrar/views/application.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index 464018e8e..fef9073c4 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -8,7 +8,6 @@ from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 from django.contrib import messages
-from typing import List
 
 from registrar.forms import application_wizard as forms
 from registrar.models import DomainApplication
@@ -231,11 +230,11 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
             message_content = (
                 f"<h4 class='usa-alert__heading'>{message_header}</h4>"
                 "<p>New domain requests cannot be submitted until we have finished reviewing your pending request: "
-                f"<strong>{pending_requests[0].requested_domain}</strong>. You can continue to fill out this request and "
-                "save it as a draft to be submitted later. "
+                f"<strong>{pending_requests[0].requested_domain}</strong>. You can continue to fill out this request "
+                "and save it as a draft to be submitted later. "
                 f"<a class='usa-link' href='{reverse('home')}'>View your pending requests.</a></p>"
             )
-            messages.info(request, mark_safe(message_content))
+            messages.info(request, mark_safe(message_content))  # nosec
         context["pending_requests_exist"] = len(pending_requests) > 0
 
         return render(request, self.template_name, context)
@@ -286,30 +285,29 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
 
         return instantiated
 
-    def pending_requests(self) -> List[DomainApplication]:
+    def pending_requests(self):
         """return an array of pending requests if user has pending requests
         and no approved requests"""
         if self.approved_applications_exist() or self.approved_domains_exist():
             return []
         else:
             return self.pending_applications()
-    
-    def approved_applications_exist(self) -> bool:
+
+    def approved_applications_exist(self):
         """Checks if user is creator of applications with APPROVED status"""
         approved_application_count = DomainApplication.objects.filter(
-            creator=self.request.user,
-            status=DomainApplication.APPROVED
+            creator=self.request.user, status=DomainApplication.APPROVED
         ).count()
         return approved_application_count > 0
 
-    def approved_domains_exist(self) -> bool:
+    def approved_domains_exist(self):
         """Checks if user has permissions on approved domains
-        
+
         This additional check is necessary to account for domains which were migrated
         and do not have an application"""
         return self.request.user.permissions.count() > 0
-    
-    def pending_applications(self) -> List[DomainApplication]:
+
+    def pending_applications(self):
         """Returns a List of user's applications with one of the following states:
         SUBMITTED, IN_REVIEW, ACTION_NEEDED"""
         # if the current application has ACTION_NEEDED status, this check should not be performed

From 7047736c9532b476d0806b082cf9538e90cc1746 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 24 Nov 2023 14:22:14 -0500
Subject: [PATCH 03/39] removed extraneous message

---
 src/registrar/views/application.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index fef9073c4..344270505 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -382,7 +382,6 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
         # if user opted to save progress and return,
         # return them to the home page
         if button == "save_and_return":
-            messages.success(request, "Your progress has been saved!")
             return HttpResponseRedirect(reverse("home"))
         # otherwise, proceed as normal
         return self.goto_next_step()

From 2db1f9e96f2942eb3ebd7506a03ee72f4250ce21 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 24 Nov 2023 15:16:36 -0500
Subject: [PATCH 04/39] wrote test for application view when multiple
 applications exist

---
 src/registrar/tests/test_views.py | 41 +++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 936c344f7..1066f0cf9 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -36,7 +36,9 @@ from registrar.models import (
 from registrar.views.application import ApplicationWizard, Step
 
 from .common import less_console_noise
+import logging
 
+logger = logging.getLogger(__name__)
 
 class TestViews(TestCase):
     def setUp(self):
@@ -144,6 +146,45 @@ class DomainApplicationTests(TestWithUser, WebTest):
         result = page.form.submit()
         self.assertIn("What kind of U.S.-based government organization do you represent?", result)
 
+    def test_application_multiple_applications_exist(self):
+        """Test that an info message appears when user has multiple applications already"""
+        # create and submit an application, and set ti in_review status
+        contact = Contact.objects.create()
+        com_website, _ = Website.objects.get_or_create(website="igorville.com")
+        gov_website, _ = Website.objects.get_or_create(website="igorville.gov")
+        domain, _ = DraftDomain.objects.get_or_create(name="igorville.gov")
+        application = DomainApplication.objects.create(
+            creator=self.user,
+            investigator=self.user,
+            organization_type=DomainApplication.OrganizationChoices.FEDERAL,
+            federal_type=DomainApplication.BranchChoices.EXECUTIVE,
+            is_election_board=False,
+            organization_name="Test",
+            address_line1="100 Main St.",
+            address_line2="APT 1A",
+            state_territory="CA",
+            zipcode="12345-6789",
+            authorizing_official=contact,
+            requested_domain=domain,
+            submitter=contact,
+            purpose="Igorville rules!",
+            anything_else="All of Igorville loves the dotgov program.",
+            is_policy_acknowledged=True,
+        )
+        application.current_websites.add(com_website)
+        application.alternative_domains.add(gov_website)
+        application.other_contacts.add(contact)
+        application.submit()
+        application.in_review()
+        application.save()
+        print(application.creator)
+        print(application.status)
+
+        # now, attempt to create another one
+        with less_console_noise():
+            page = self.app.get("/register/").follow()
+            self.assertContains(page, "You cannot submit this request yet")
+
     @boto3_mocking.patching
     def test_application_form_submission(self):
         """

From ff45177077d08e61a734b654d0be0ea1ec43c0b7 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 24 Nov 2023 15:18:40 -0500
Subject: [PATCH 05/39] touched up test_views

---
 src/registrar/tests/test_views.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 1066f0cf9..e00dfc3de 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -36,9 +36,7 @@ from registrar.models import (
 from registrar.views.application import ApplicationWizard, Step
 
 from .common import less_console_noise
-import logging
 
-logger = logging.getLogger(__name__)
 
 class TestViews(TestCase):
     def setUp(self):

From 03cc06046f54185ddbbb0b3e13021b4d6f1e7106 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 24 Nov 2023 15:59:53 -0500
Subject: [PATCH 06/39] fixed checked statuses

---
 src/registrar/tests/test_views.py  | 5 +----
 src/registrar/views/application.py | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index e00dfc3de..433c10aac 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -146,7 +146,7 @@ class DomainApplicationTests(TestWithUser, WebTest):
 
     def test_application_multiple_applications_exist(self):
         """Test that an info message appears when user has multiple applications already"""
-        # create and submit an application, and set ti in_review status
+        # create and submit an application
         contact = Contact.objects.create()
         com_website, _ = Website.objects.get_or_create(website="igorville.com")
         gov_website, _ = Website.objects.get_or_create(website="igorville.gov")
@@ -173,10 +173,7 @@ class DomainApplicationTests(TestWithUser, WebTest):
         application.alternative_domains.add(gov_website)
         application.other_contacts.add(contact)
         application.submit()
-        application.in_review()
         application.save()
-        print(application.creator)
-        print(application.status)
 
         # now, attempt to create another one
         with less_console_noise():
diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index 344270505..c9420a19c 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -313,7 +313,7 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
         # if the current application has ACTION_NEEDED status, this check should not be performed
         if self.application.status == DomainApplication.ACTION_NEEDED:
             return []
-        check_statuses = [DomainApplication.APPROVED, DomainApplication.IN_REVIEW, DomainApplication.ACTION_NEEDED]
+        check_statuses = [DomainApplication.SUBMITTED, DomainApplication.IN_REVIEW, DomainApplication.ACTION_NEEDED]
         filter_conditions = Q(creator=self.request.user) & Q(status__in=check_statuses)
         return DomainApplication.objects.filter(filter_conditions)
 

From 50fc6ea502cb162052c7b1a4eccbfce4f22f6101 Mon Sep 17 00:00:00 2001
From: dave-kennedy-ecs <111779554+dave-kennedy-ecs@users.noreply.github.com>
Date: Sat, 25 Nov 2023 06:12:35 -0500
Subject: [PATCH 07/39] Update src/registrar/views/application.py

Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
---
 src/registrar/views/application.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index c9420a19c..aef5ea806 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -314,8 +314,10 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
         if self.application.status == DomainApplication.ACTION_NEEDED:
             return []
         check_statuses = [DomainApplication.SUBMITTED, DomainApplication.IN_REVIEW, DomainApplication.ACTION_NEEDED]
-        filter_conditions = Q(creator=self.request.user) & Q(status__in=check_statuses)
-        return DomainApplication.objects.filter(filter_conditions)
+    return DomainApplication.objects.filter(
+        creator=self.request.user,
+        status__in=check_statuses
+    )
 
     def get_context_data(self):
         """Define context for access on all wizard pages."""

From 2e8b46e05e3ff66fa824b80b4a80f7484ce5d0b4 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 25 Nov 2023 06:17:26 -0500
Subject: [PATCH 08/39] simplified filter for legibility

---
 src/registrar/views/application.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index aef5ea806..a42371f43 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -1,7 +1,6 @@
 import logging
 
 from django.http import Http404, HttpResponse, HttpResponseRedirect
-from django.db.models import Q
 from django.shortcuts import redirect, render
 from django.urls import resolve, reverse
 from django.utils.safestring import mark_safe
@@ -314,10 +313,7 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
         if self.application.status == DomainApplication.ACTION_NEEDED:
             return []
         check_statuses = [DomainApplication.SUBMITTED, DomainApplication.IN_REVIEW, DomainApplication.ACTION_NEEDED]
-    return DomainApplication.objects.filter(
-        creator=self.request.user,
-        status__in=check_statuses
-    )
+        return DomainApplication.objects.filter(creator=self.request.user, status__in=check_statuses)
 
     def get_context_data(self):
         """Define context for access on all wizard pages."""

From d4b1b12baf490297d0d6b458c19b2b91793130b2 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 25 Nov 2023 06:23:33 -0500
Subject: [PATCH 09/39] removed TODO, too complicated

---
 src/registrar/views/application.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index a42371f43..2323c0309 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -224,7 +224,6 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
         #     present message that domain application cannot be submitted
         pending_requests = self.pending_requests()
         if len(pending_requests) > 0:
-            # TODO may want to move this whole thing to utility/errors.py
             message_header = "You cannot submit this request yet"
             message_content = (
                 f"<h4 class='usa-alert__heading'>{message_header}</h4>"

From 1eedc3f1f2bae19346b6bd7558bba8b64f2e2b95 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Mon, 27 Nov 2023 21:08:11 -0500
Subject: [PATCH 10/39] removed redundancy in test cases

---
 src/registrar/tests/test_views.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 2ce4b1ccd..0da07fa4c 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -1255,6 +1255,8 @@ class TestDomainOverview(TestWithDomainPermissions, WebTest):
         self.app.set_user(self.user.username)
         self.client.force_login(self.user)
 
+
+class TestDomainDetail(TestDomainOverview):
     def test_domain_detail_link_works(self):
         home_page = self.app.get("/")
         self.assertContains(home_page, "igorville.gov")
@@ -1263,7 +1265,7 @@ class TestDomainOverview(TestWithDomainPermissions, WebTest):
         self.assertContains(detail_page, "igorville.gov")
         self.assertContains(detail_page, "Status")
 
-    def test_domain_overview_blocked_for_ineligible_user(self):
+    def test_domain_detail_blocked_for_ineligible_user(self):
         """We could easily duplicate this test for all domain management
         views, but a single url test should be solid enough since all domain
         management pages share the same permissions class"""
@@ -1275,7 +1277,7 @@ class TestDomainOverview(TestWithDomainPermissions, WebTest):
             response = self.client.get(reverse("domain", kwargs={"pk": self.domain.id}))
             self.assertEqual(response.status_code, 403)
 
-    def test_domain_overview_allowed_for_on_hold(self):
+    def test_domain_detail_allowed_for_on_hold(self):
         """Test that the domain overview page displays for on hold domain"""
         home_page = self.app.get("/")
         self.assertContains(home_page, "on-hold.gov")
@@ -1284,7 +1286,7 @@ class TestDomainOverview(TestWithDomainPermissions, WebTest):
         detail_page = self.client.get(reverse("domain", kwargs={"pk": self.domain_on_hold.id}))
         self.assertNotContains(detail_page, "Edit")
 
-    def test_domain_see_just_nameserver(self):
+    def test_domain_detail_see_just_nameserver(self):
         home_page = self.app.get("/")
         self.assertContains(home_page, "justnameserver.com")
 
@@ -1295,7 +1297,7 @@ class TestDomainOverview(TestWithDomainPermissions, WebTest):
         self.assertContains(detail_page, "ns1.justnameserver.com")
         self.assertContains(detail_page, "ns2.justnameserver.com")
 
-    def test_domain_see_nameserver_and_ip(self):
+    def test_domain_detail_see_nameserver_and_ip(self):
         home_page = self.app.get("/")
         self.assertContains(home_page, "nameserverwithip.gov")
 
@@ -1311,7 +1313,7 @@ class TestDomainOverview(TestWithDomainPermissions, WebTest):
         self.assertContains(detail_page, "(1.2.3.4,")
         self.assertContains(detail_page, "2.3.4.5)")
 
-    def test_domain_with_no_information_or_application(self):
+    def test_domain_detail_with_no_information_or_application(self):
         """Test that domain management page returns 200 and displays error
         when no domain information or domain application exist"""
         # have to use staff user for this test

From b42adbdb26c9a79edf063d0502701de86c49d587 Mon Sep 17 00:00:00 2001
From: dave-kennedy-ecs <111779554+dave-kennedy-ecs@users.noreply.github.com>
Date: Tue, 28 Nov 2023 18:40:38 -0500
Subject: [PATCH 11/39] Update src/registrar/views/application.py

Co-authored-by: rachidatecs <107004823+rachidatecs@users.noreply.github.com>
---
 src/registrar/views/application.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index 2323c0309..1dbc0faf6 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -227,7 +227,7 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
             message_header = "You cannot submit this request yet"
             message_content = (
                 f"<h4 class='usa-alert__heading'>{message_header}</h4>"
-                "<p>New domain requests cannot be submitted until we have finished reviewing your pending request: "
+                "<p class="margin-bottom-0">New domain requests cannot be submitted until we have finished reviewing your pending request: "
                 f"<strong>{pending_requests[0].requested_domain}</strong>. You can continue to fill out this request "
                 "and save it as a draft to be submitted later. "
                 f"<a class='usa-link' href='{reverse('home')}'>View your pending requests.</a></p>"

From edd91258211c2170ecd164adb7f38bb0724d01ca Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Tue, 28 Nov 2023 18:46:38 -0500
Subject: [PATCH 12/39] fixed typo in message context

---
 src/registrar/views/application.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index 1dbc0faf6..b03198b0f 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -227,9 +227,9 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
             message_header = "You cannot submit this request yet"
             message_content = (
                 f"<h4 class='usa-alert__heading'>{message_header}</h4>"
-                "<p class="margin-bottom-0">New domain requests cannot be submitted until we have finished reviewing your pending request: "
-                f"<strong>{pending_requests[0].requested_domain}</strong>. You can continue to fill out this request "
-                "and save it as a draft to be submitted later. "
+                "<p class='margin-bottom-0'>New domain requests cannot be submitted until we have finished "
+                f"reviewing your pending request: <strong>{pending_requests[0].requested_domain}</strong>. "
+                "You can continue to fill out this request and save it as a draft to be submitted later. "
                 f"<a class='usa-link' href='{reverse('home')}'>View your pending requests.</a></p>"
             )
             messages.info(request, mark_safe(message_content))  # nosec

From 442b61ce5faf4696011214f6b446f8ff6d3311d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Nov 2023 00:29:40 +0000
Subject: [PATCH 13/39] Bump cryptography from 41.0.5 to 41.0.6 in /src

Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.5 to 41.0.6.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/41.0.5...41.0.6)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/requirements.txt b/src/requirements.txt
index dd19bf978..4d155cb61 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -8,7 +8,7 @@ certifi==2023.7.22; python_version >= '3.6'
 cfenv==0.5.3
 cffi==1.16.0; python_version >= '3.8'
 charset-normalizer==3.3.2; python_full_version >= '3.7.0'
-cryptography==41.0.5; python_version >= '3.7'
+cryptography==41.0.6; python_version >= '3.7'
 defusedxml==0.7.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 dj-database-url==2.1.0
 dj-email-url==1.0.6

From 49f56a72058d6e4f93e5d813b8415c7e8b53dc9f Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Wed, 29 Nov 2023 06:23:45 -0500
Subject: [PATCH 14/39] simplified test case

---
 src/registrar/tests/test_views.py | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 037ff1b8b..fa645597f 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -147,31 +147,7 @@ class DomainApplicationTests(TestWithUser, WebTest):
     def test_application_multiple_applications_exist(self):
         """Test that an info message appears when user has multiple applications already"""
         # create and submit an application
-        contact = Contact.objects.create()
-        com_website, _ = Website.objects.get_or_create(website="igorville.com")
-        gov_website, _ = Website.objects.get_or_create(website="igorville.gov")
-        domain, _ = DraftDomain.objects.get_or_create(name="igorville.gov")
-        application = DomainApplication.objects.create(
-            creator=self.user,
-            investigator=self.user,
-            organization_type=DomainApplication.OrganizationChoices.FEDERAL,
-            federal_type=DomainApplication.BranchChoices.EXECUTIVE,
-            is_election_board=False,
-            organization_name="Test",
-            address_line1="100 Main St.",
-            address_line2="APT 1A",
-            state_territory="CA",
-            zipcode="12345-6789",
-            authorizing_official=contact,
-            requested_domain=domain,
-            submitter=contact,
-            purpose="Igorville rules!",
-            anything_else="All of Igorville loves the dotgov program.",
-            is_policy_acknowledged=True,
-        )
-        application.current_websites.add(com_website)
-        application.alternative_domains.add(gov_website)
-        application.other_contacts.add(contact)
+        application = completed_application(user=self.user)
         application.submit()
         application.save()
 

From 4f3deae19852d917f97a0d8e3919949a800557fa Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:37:30 -0800
Subject: [PATCH 15/39] Add error message when epp domain check fails

---
 src/api/views.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/api/views.py b/src/api/views.py
index 2cb23a9b2..8cc2eda0c 100644
--- a/src/api/views.py
+++ b/src/api/views.py
@@ -22,7 +22,8 @@ DOMAIN_API_MESSAGES = {
     " Contact us if you need help coming up with a domain.",
     "invalid": "Enter a domain using only letters, numbers, or hyphens (though we don't recommend using hyphens).",
     "success": "That domain is available!",
-    "error": "Error finding domain availability.",
+    "error": "Error finding domain availability. Please wait a few minutes and try again. If you continue \
+    to receive this error after a few tries, contact help@get.gov",
 }
 
 
@@ -64,8 +65,8 @@ def check_domain_available(domain):
         else:
             # domain search string doesn't end with .gov, add it on here
             return Domain.available(domain + ".gov")
-    except Exception:
-        return False
+    except Exception as err:
+        return err
 
 
 @require_http_methods(["GET"])

From a956bef03795ad4ed79935d498a5c86ac470c18c Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:48:23 -0800
Subject: [PATCH 16/39] Update error handling test

---
 src/api/tests/test_available.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/tests/test_available.py b/src/api/tests/test_available.py
index 524fd689a..a80290985 100644
--- a/src/api/tests/test_available.py
+++ b/src/api/tests/test_available.py
@@ -109,7 +109,7 @@ class AvailableViewTest(MockEppLib):
         self.assertFalse(json.loads(response.content)["available"])
         # domain set to raise error returns false for availability
         error_domain_available = available(request, "errordomain.gov")
-        self.assertFalse(json.loads(error_domain_available.content)["available"])
+        self.assertRaises(json.loads(error_domain_available.content)["available"])
 
 
 class AvailableAPITest(MockEppLib):

From 18ae412d0e87e0916448a694ffacee7cb18fd882 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Wed, 29 Nov 2023 16:39:03 -0800
Subject: [PATCH 17/39] Update availability tests

---
 src/api/tests/test_available.py | 10 ++++++----
 src/api/views.py                |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/api/tests/test_available.py b/src/api/tests/test_available.py
index a80290985..dc0f5ee54 100644
--- a/src/api/tests/test_available.py
+++ b/src/api/tests/test_available.py
@@ -101,15 +101,17 @@ class AvailableViewTest(MockEppLib):
         self.assertTrue(json.loads(response.content)["available"])
 
     def test_error_handling(self):
-        """Calling with bad strings raises an error."""
+        """Calling with bad strings returns error (error verifying) or unavailable (invalid domain)."""
         bad_string = "blah!;"
         request = self.factory.get(API_BASE_PATH + bad_string)
         request.user = self.user
         response = available(request, domain=bad_string)
         self.assertFalse(json.loads(response.content)["available"])
-        # domain set to raise error returns false for availability
-        error_domain_available = available(request, "errordomain.gov")
-        self.assertRaises(json.loads(error_domain_available.content)["available"])
+        # domain set to raise error returns false for availability and error message
+        error_domain_response = available(request, domain="errordomain.gov")
+        self.assertFalse(json.loads(error_domain_response.content)["available"])
+        self.assertIn("Error finding domain availability", 
+        json.loads(error_domain_response.content)["message"])
 
 
 class AvailableAPITest(MockEppLib):
diff --git a/src/api/views.py b/src/api/views.py
index 56a2b786a..d01acaa3f 100644
--- a/src/api/views.py
+++ b/src/api/views.py
@@ -30,8 +30,8 @@ DOMAIN_API_MESSAGES = {
     ),
     "invalid": "Enter a domain using only letters, numbers, or hyphens (though we don't recommend using hyphens).",
     "success": "That domain is available!",
-    "error": "Error finding domain availability. Please wait a few minutes and try again. If you continue \
-    to receive this error after a few tries, contact help@get.gov",
+    "error": "Error finding domain availability. Please wait a few minutes and try again.\
+    If you continue to receive this error after a few tries, contact help@get.gov",
 }
 
 
@@ -74,7 +74,7 @@ def check_domain_available(domain):
             # domain search string doesn't end with .gov, add it on here
             return Domain.available(domain + ".gov")
     except Exception as err:
-        return err
+        raise err
 
 
 @require_http_methods(["GET"])

From b3145b96c72999d7e18a90cc493628e5a3897351 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Wed, 29 Nov 2023 16:58:00 -0800
Subject: [PATCH 18/39] Fix lint errors

---
 src/api/tests/test_available.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/api/tests/test_available.py b/src/api/tests/test_available.py
index dc0f5ee54..412dae64b 100644
--- a/src/api/tests/test_available.py
+++ b/src/api/tests/test_available.py
@@ -110,8 +110,7 @@ class AvailableViewTest(MockEppLib):
         # domain set to raise error returns false for availability and error message
         error_domain_response = available(request, domain="errordomain.gov")
         self.assertFalse(json.loads(error_domain_response.content)["available"])
-        self.assertIn("Error finding domain availability", 
-        json.loads(error_domain_response.content)["message"])
+        self.assertIn("Error finding domain availability", json.loads(error_domain_response.content)["message"])
 
 
 class AvailableAPITest(MockEppLib):

From 348104c59e714db9bd4419f9b63e88b87055d4aa Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 30 Nov 2023 12:53:23 -0500
Subject: [PATCH 19/39] Alerts refator to use slim on small and most triggered
 alerts, full on most persistent and large alerts

---
 src/registrar/templates/application_form.html   | 8 ++++++++
 src/registrar/templates/domain_dnssec.html      | 4 ++--
 src/registrar/templates/domain_nameservers.html | 2 +-
 src/registrar/views/application.py              | 7 ++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/registrar/templates/application_form.html b/src/registrar/templates/application_form.html
index a1b91ec40..9279e708a 100644
--- a/src/registrar/templates/application_form.html
+++ b/src/registrar/templates/application_form.html
@@ -22,6 +22,14 @@
           {% include "includes/form_messages.html" %}
 {% endblock %}
 
+{% if pending_requests_message %}
+<div class="usa-alert usa-alert--info margin-bottom-2">
+  <div class="usa-alert__body">
+    {{ pending_requests_message }}
+  </div>
+</div>
+{% endif %}
+
 {% block form_errors %}
         {% comment %}
            to make sense of this loop, consider that 
diff --git a/src/registrar/templates/domain_dnssec.html b/src/registrar/templates/domain_dnssec.html
index c92ca2b78..93eef8b90 100644
--- a/src/registrar/templates/domain_dnssec.html
+++ b/src/registrar/templates/domain_dnssec.html
@@ -40,9 +40,9 @@
     >
     {% else %}
     <div id="enable-dnssec">
-      <div class="usa-alert usa-alert--info usa-alert--slim">
+      <div class="usa-alert usa-alert--info">
         <div class="usa-alert__body">
-          It is strongly recommended that you only enable DNSSEC if you know how to set it up properly at your hosting service. If you make a mistake, it could cause your domain name to stop working.
+          <p>It is strongly recommended that you only enable DNSSEC if you know how to set it up properly at your hosting service. If you make a mistake, it could cause your domain name to stop working.</p>
         </div>
       </div>
       <a href="{% url 'domain-dns-dnssec-dsdata' pk=domain.id %}" class="usa-button">Enable DNSSEC</a>
diff --git a/src/registrar/templates/domain_nameservers.html b/src/registrar/templates/domain_nameservers.html
index ad718ad75..15b810193 100644
--- a/src/registrar/templates/domain_nameservers.html
+++ b/src/registrar/templates/domain_nameservers.html
@@ -15,7 +15,7 @@
 
   <p>Add a name server record by entering the address (e.g., ns1.nameserver.com) in the name server fields below. You must add at least two name servers (13 max).</p>
 
-  <div class="usa-alert usa-alert--slim usa-alert--info">
+  <div class="usa-alert usa-alert--info">
     <div class="usa-alert__body">
       <p class="margin-top-0">Add an IP address only when your name server's address includes your domain name (e.g., if your domain name is “example.gov” and your name server is “ns1.example.gov,” then an IP address is required). Multiple IP addresses must be separated with commas.</p>
       <p class="margin-bottom-0">This step is uncommon unless you self-host your DNS or use custom addresses for your nameserver.</p>
diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index b03198b0f..f11c26b69 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -221,18 +221,19 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
         context["forms"] = self.get_forms()
 
         # if pending requests exist and user does not have approved domains,
-        #     present message that domain application cannot be submitted
+        # present message that domain application cannot be submitted
         pending_requests = self.pending_requests()
         if len(pending_requests) > 0:
             message_header = "You cannot submit this request yet"
             message_content = (
-                f"<h4 class='usa-alert__heading'>{message_header}</h4>"
+                f"<h4 class='usa-alert__heading'>{message_header}</h4> "
                 "<p class='margin-bottom-0'>New domain requests cannot be submitted until we have finished "
                 f"reviewing your pending request: <strong>{pending_requests[0].requested_domain}</strong>. "
                 "You can continue to fill out this request and save it as a draft to be submitted later. "
                 f"<a class='usa-link' href='{reverse('home')}'>View your pending requests.</a></p>"
             )
-            messages.info(request, mark_safe(message_content))  # nosec
+            context["pending_requests_message"] = mark_safe(message_content)  # nosec
+
         context["pending_requests_exist"] = len(pending_requests) > 0
 
         return render(request, self.template_name, context)

From a5e2e030c253f3fdd2c29c7f7d7f1ebb2daa4718 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Thu, 30 Nov 2023 11:10:50 -0800
Subject: [PATCH 20/39] Separated availability error tests into two

---
 src/api/tests/test_available.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/api/tests/test_available.py b/src/api/tests/test_available.py
index 412dae64b..2bd6c70a6 100644
--- a/src/api/tests/test_available.py
+++ b/src/api/tests/test_available.py
@@ -100,19 +100,23 @@ class AvailableViewTest(MockEppLib):
         response = available(request, domain="igorville")
         self.assertTrue(json.loads(response.content)["available"])
 
-    def test_error_handling(self):
-        """Calling with bad strings returns error (error verifying) or unavailable (invalid domain)."""
+    def test_bad_string_handling(self):
+        """Calling with bad strings returns unavailable."""
         bad_string = "blah!;"
         request = self.factory.get(API_BASE_PATH + bad_string)
         request.user = self.user
         response = available(request, domain=bad_string)
         self.assertFalse(json.loads(response.content)["available"])
+
+    def test_error_handling(self):
+        """Error thrown while calling availabilityAPI returns error."""
+        request = self.factory.get(API_BASE_PATH + "errordomain.gov")
+        request.user = self.user
         # domain set to raise error returns false for availability and error message
         error_domain_response = available(request, domain="errordomain.gov")
         self.assertFalse(json.loads(error_domain_response.content)["available"])
         self.assertIn("Error finding domain availability", json.loads(error_domain_response.content)["message"])
 
-
 class AvailableAPITest(MockEppLib):
 
     """Test that the API can be called as expected."""

From 91077e7da0e54f4d51b51d6faae54e9d4491d922 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Thu, 30 Nov 2023 11:12:08 -0800
Subject: [PATCH 21/39] remove try catch block in availabile check

---
 src/api/views.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/api/views.py b/src/api/views.py
index d01acaa3f..d16e7af7f 100644
--- a/src/api/views.py
+++ b/src/api/views.py
@@ -67,14 +67,12 @@ def check_domain_available(domain):
     a match.
     """
     Domain = apps.get_model("registrar.Domain")
-    try:
-        if domain.endswith(".gov"):
-            return Domain.available(domain)
-        else:
-            # domain search string doesn't end with .gov, add it on here
-            return Domain.available(domain + ".gov")
-    except Exception as err:
-        raise err
+    if domain.endswith(".gov"):
+        return Domain.available(domain)
+    else:
+        # domain search string doesn't end with .gov, add it on here
+        return Domain.available(domain + ".gov")
+
 
 
 @require_http_methods(["GET"])

From ba87db7c56ed41493f7d637a86b4bd4a5c0e3b9f Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Thu, 30 Nov 2023 11:23:37 -0800
Subject: [PATCH 22/39] update error to cannot_contact_registry

---
 src/api/tests/test_available.py | 4 +++-
 src/api/views.py                | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/api/tests/test_available.py b/src/api/tests/test_available.py
index 2bd6c70a6..eb8385c0a 100644
--- a/src/api/tests/test_available.py
+++ b/src/api/tests/test_available.py
@@ -8,6 +8,7 @@ from django.test import RequestFactory
 from ..views import available, check_domain_available
 from .common import less_console_noise
 from registrar.tests.common import MockEppLib
+from registrar.utility.errors import GenericError, GenericErrorCodes
 from unittest.mock import call
 
 from epplibwrapper import (
@@ -115,7 +116,8 @@ class AvailableViewTest(MockEppLib):
         # domain set to raise error returns false for availability and error message
         error_domain_response = available(request, domain="errordomain.gov")
         self.assertFalse(json.loads(error_domain_response.content)["available"])
-        self.assertIn("Error finding domain availability", json.loads(error_domain_response.content)["message"])
+        self.assertEqual(GenericError._error_mapping[GenericErrorCodes.CANNOT_CONTACT_REGISTRY], 
+        json.loads(error_domain_response.content)["message"])
 
 class AvailableAPITest(MockEppLib):
 
diff --git a/src/api/views.py b/src/api/views.py
index d16e7af7f..0e51f4392 100644
--- a/src/api/views.py
+++ b/src/api/views.py
@@ -5,6 +5,7 @@ from django.http import JsonResponse
 from django.utils.safestring import mark_safe
 
 from registrar.templatetags.url_helpers import public_site_url
+from registrar.utility.errors import GenericError, GenericErrorCodes
 
 import requests
 
@@ -30,8 +31,7 @@ DOMAIN_API_MESSAGES = {
     ),
     "invalid": "Enter a domain using only letters, numbers, or hyphens (though we don't recommend using hyphens).",
     "success": "That domain is available!",
-    "error": "Error finding domain availability. Please wait a few minutes and try again.\
-    If you continue to receive this error after a few tries, contact help@get.gov",
+    "error": GenericError._error_mapping[GenericErrorCodes.CANNOT_CONTACT_REGISTRY],
 }
 
 

From 77964522830723a36edb9bdb4f361e85d1c5ac06 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Thu, 30 Nov 2023 11:24:20 -0800
Subject: [PATCH 23/39] Fix lint errors

---
 src/api/tests/test_available.py | 7 +++++--
 src/api/views.py                | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/api/tests/test_available.py b/src/api/tests/test_available.py
index eb8385c0a..956d5e858 100644
--- a/src/api/tests/test_available.py
+++ b/src/api/tests/test_available.py
@@ -116,8 +116,11 @@ class AvailableViewTest(MockEppLib):
         # domain set to raise error returns false for availability and error message
         error_domain_response = available(request, domain="errordomain.gov")
         self.assertFalse(json.loads(error_domain_response.content)["available"])
-        self.assertEqual(GenericError._error_mapping[GenericErrorCodes.CANNOT_CONTACT_REGISTRY], 
-        json.loads(error_domain_response.content)["message"])
+        self.assertEqual(
+            GenericError._error_mapping[GenericErrorCodes.CANNOT_CONTACT_REGISTRY],
+            json.loads(error_domain_response.content)["message"],
+        )
+
 
 class AvailableAPITest(MockEppLib):
 
diff --git a/src/api/views.py b/src/api/views.py
index 0e51f4392..f84f4439f 100644
--- a/src/api/views.py
+++ b/src/api/views.py
@@ -74,7 +74,6 @@ def check_domain_available(domain):
         return Domain.available(domain + ".gov")
 
 
-
 @require_http_methods(["GET"])
 @login_not_required
 def available(request, domain=""):

From 4f25e513711ef4e37d71dfe444a68caad389a618 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 30 Nov 2023 15:52:57 -0500
Subject: [PATCH 24/39] fixed space on info heading

---
 src/registrar/templates/application_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/application_form.html b/src/registrar/templates/application_form.html
index 9279e708a..c4c3b2188 100644
--- a/src/registrar/templates/application_form.html
+++ b/src/registrar/templates/application_form.html
@@ -23,7 +23,7 @@
 {% endblock %}
 
 {% if pending_requests_message %}
-<div class="usa-alert usa-alert--info margin-bottom-2">
+<div class="usa-alert usa-alert--info margin-bottom-3">
   <div class="usa-alert__body">
     {{ pending_requests_message }}
   </div>

From 7223eef13a10a838d2e6a2195bb06dea0e4da0d5 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 30 Nov 2023 16:01:26 -0500
Subject: [PATCH 25/39] format info message in dnssec

---
 src/registrar/templates/domain_dnssec.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/domain_dnssec.html b/src/registrar/templates/domain_dnssec.html
index 93eef8b90..7742a329b 100644
--- a/src/registrar/templates/domain_dnssec.html
+++ b/src/registrar/templates/domain_dnssec.html
@@ -42,7 +42,7 @@
     <div id="enable-dnssec">
       <div class="usa-alert usa-alert--info">
         <div class="usa-alert__body">
-          <p>It is strongly recommended that you only enable DNSSEC if you know how to set it up properly at your hosting service. If you make a mistake, it could cause your domain name to stop working.</p>
+          <p class="margin-y-0">It is strongly recommended that you only enable DNSSEC if you know how to set it up properly at your hosting service. If you make a mistake, it could cause your domain name to stop working.</p>
         </div>
       </div>
       <a href="{% url 'domain-dns-dnssec-dsdata' pk=domain.id %}" class="usa-button">Enable DNSSEC</a>

From 4588a02d44dbb719e09596965ac70256c584d92f Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Thu, 30 Nov 2023 13:25:55 -0800
Subject: [PATCH 26/39] Add period to registry error message

---
 src/registrar/utility/errors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/utility/errors.py b/src/registrar/utility/errors.py
index 52b1ea1d3..486f00597 100644
--- a/src/registrar/utility/errors.py
+++ b/src/registrar/utility/errors.py
@@ -42,7 +42,7 @@ class GenericError(Exception):
         GenericErrorCodes.CANNOT_CONTACT_REGISTRY: """
 We’re experiencing a system connection error. Please wait a few minutes
 and try again. If you continue to receive this error after a few tries,
-contact help@get.gov
+contact help@get.gov.
         """,
         GenericErrorCodes.GENERIC_ERROR: ("Value entered was wrong."),
     }

From 5f68677d7fb079de059093fea1562fcc66bc3454 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Thu, 30 Nov 2023 16:23:20 -0800
Subject: [PATCH 27/39] Raise system error message on EPP fail

---
 src/registrar/forms/application_wizard.py     | 5 +++++
 src/registrar/models/utility/domain_helper.py | 8 ++++++--
 src/registrar/utility/errors.py               | 4 ++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index a70c23e52..428215fc0 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -392,6 +392,7 @@ CurrentSitesFormSet = forms.formset_factory(
 class AlternativeDomainForm(RegistrarForm):
     def clean_alternative_domain(self):
         """Validation code for domain names."""
+
         try:
             requested = self.cleaned_data.get("alternative_domain", None)
             validated = DraftDomain.validate(requested, blank_ok=True)
@@ -399,6 +400,8 @@ class AlternativeDomainForm(RegistrarForm):
             raise forms.ValidationError(DOMAIN_API_MESSAGES["extra_dots"], code="extra_dots")
         except errors.DomainUnavailableError:
             raise forms.ValidationError(DOMAIN_API_MESSAGES["unavailable"], code="unavailable")
+        except errors.RegistrySystemError:
+            raise forms.ValidationError(DOMAIN_API_MESSAGES["error"], code="error")
         except ValueError:
             raise forms.ValidationError(DOMAIN_API_MESSAGES["invalid"], code="invalid")
         return validated
@@ -484,6 +487,8 @@ class DotGovDomainForm(RegistrarForm):
             raise forms.ValidationError(DOMAIN_API_MESSAGES["extra_dots"], code="extra_dots")
         except errors.DomainUnavailableError:
             raise forms.ValidationError(DOMAIN_API_MESSAGES["unavailable"], code="unavailable")
+        except errors.RegistrySystemError:
+            raise forms.ValidationError(DOMAIN_API_MESSAGES["error"], code="error")
         except ValueError:
             raise forms.ValidationError(DOMAIN_API_MESSAGES["invalid"], code="invalid")
         return validated
diff --git a/src/registrar/models/utility/domain_helper.py b/src/registrar/models/utility/domain_helper.py
index 49badd5d7..5e4360fad 100644
--- a/src/registrar/models/utility/domain_helper.py
+++ b/src/registrar/models/utility/domain_helper.py
@@ -2,6 +2,7 @@ import re
 
 from api.views import check_domain_available
 from registrar.utility import errors
+from registrar.utility.errors import GenericError, GenericErrorCodes
 
 
 class DomainHelper:
@@ -40,8 +41,11 @@ class DomainHelper:
             raise errors.ExtraDotsError()
         if not DomainHelper.string_could_be_domain(domain + ".gov"):
             raise ValueError()
-        if not check_domain_available(domain):
-            raise errors.DomainUnavailableError()
+        try:
+            if not check_domain_available(domain):
+                raise errors.DomainUnavailableError()
+        except Exception:
+            raise errors.RegistrySystemError()
         return domain
 
     @classmethod
diff --git a/src/registrar/utility/errors.py b/src/registrar/utility/errors.py
index 486f00597..93b8855f3 100644
--- a/src/registrar/utility/errors.py
+++ b/src/registrar/utility/errors.py
@@ -13,6 +13,10 @@ class DomainUnavailableError(ValueError):
     pass
 
 
+class RegistrySystemError(ValueError):
+    pass
+
+
 class ActionNotAllowed(Exception):
     """User accessed an action that is not
     allowed by the current state"""

From 0c12676d2763e44b6e0cb7b349e895e6e668fd92 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Thu, 30 Nov 2023 16:25:41 -0800
Subject: [PATCH 28/39] Remove unused import

---
 src/registrar/models/utility/domain_helper.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/registrar/models/utility/domain_helper.py b/src/registrar/models/utility/domain_helper.py
index 5e4360fad..a3c71dc0d 100644
--- a/src/registrar/models/utility/domain_helper.py
+++ b/src/registrar/models/utility/domain_helper.py
@@ -2,7 +2,6 @@ import re
 
 from api.views import check_domain_available
 from registrar.utility import errors
-from registrar.utility.errors import GenericError, GenericErrorCodes
 
 
 class DomainHelper:

From e62cf84def72beb3e033f50fcb1723ba15f41519 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Thu, 30 Nov 2023 16:26:22 -0800
Subject: [PATCH 29/39] Remove unused whitespace

---
 src/registrar/forms/application_wizard.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index 428215fc0..03207087f 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -392,7 +392,6 @@ CurrentSitesFormSet = forms.formset_factory(
 class AlternativeDomainForm(RegistrarForm):
     def clean_alternative_domain(self):
         """Validation code for domain names."""
-
         try:
             requested = self.cleaned_data.get("alternative_domain", None)
             validated = DraftDomain.validate(requested, blank_ok=True)

From db14ddc45d1df7704437ed7b69b6dde6cebca4e0 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Thu, 30 Nov 2023 17:05:23 -0800
Subject: [PATCH 30/39] Fix lint errors

---
 src/registrar/models/utility/domain_helper.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/registrar/models/utility/domain_helper.py b/src/registrar/models/utility/domain_helper.py
index a3c71dc0d..14cae53bc 100644
--- a/src/registrar/models/utility/domain_helper.py
+++ b/src/registrar/models/utility/domain_helper.py
@@ -29,11 +29,8 @@ class DomainHelper:
         if not isinstance(domain, str):
             raise ValueError("Domain name must be a string")
         domain = domain.lower().strip()
-        if domain == "":
-            if blank_ok:
-                return domain
-            else:
-                raise errors.BlankValueError()
+        if domain == "" and not blank_ok:
+            raise errors.BlankValueError()
         if domain.endswith(".gov"):
             domain = domain[:-4]
         if "." in domain:

From 01b1e3e520430f7d19ad511ab518e3e4955f8f01 Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Fri, 1 Dec 2023 10:45:20 -0600
Subject: [PATCH 31/39] New transition method to force unknown state

---
 src/registrar/models/domain.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index 94430fb36..c3cf8c41f 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -1338,6 +1338,19 @@ class Domain(TimeStampedModel, DomainHelper):
         logger.info("Changing to DNS_NEEDED state")
         logger.info("able to transition to DNS_NEEDED state")
 
+    @transition(
+        field="state",
+        source="*",
+        target=State.UNKNOWN,
+    )
+    def force_unknown(self):
+        """Force a domain to go into our unknown state.
+
+        This can be useful on a limited basis when we need a domain
+        to be created in the registry for some reason.
+        """
+        pass
+
     def _disclose_fields(self, contact: PublicContact):
         """creates a disclose object that can be added to a contact Create using
         .disclose= <this function> on the command before sending.

From 45f8e260181063a2301f5d01b8a84aff815c3095 Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Fri, 1 Dec 2023 11:24:45 -0600
Subject: [PATCH 32/39] Allow unknown state in data migration

---
 .../management/commands/load_transition_domain.py   |  1 +
 src/registrar/models/domain.py                      | 13 -------------
 src/registrar/models/transition_domain.py           |  1 +
 src/registrar/tests/data/test_domain_statuses.txt   |  2 +-
 .../tests/test_transition_domain_migrations.py      | 11 +++++++++++
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/registrar/management/commands/load_transition_domain.py b/src/registrar/management/commands/load_transition_domain.py
index 6566a2f16..e1165bf9f 100644
--- a/src/registrar/management/commands/load_transition_domain.py
+++ b/src/registrar/management/commands/load_transition_domain.py
@@ -176,6 +176,7 @@ class Command(BaseCommand):
             "clienthold": TransitionDomain.StatusChoices.ON_HOLD,
             "created": TransitionDomain.StatusChoices.READY,
             "ok": TransitionDomain.StatusChoices.READY,
+            "unknown": TransitionDomain.StatusChoices.UNKNOWN,
         }
         mapped_status = status_maps.get(status_to_map)
         return mapped_status
diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index c3cf8c41f..94430fb36 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -1338,19 +1338,6 @@ class Domain(TimeStampedModel, DomainHelper):
         logger.info("Changing to DNS_NEEDED state")
         logger.info("able to transition to DNS_NEEDED state")
 
-    @transition(
-        field="state",
-        source="*",
-        target=State.UNKNOWN,
-    )
-    def force_unknown(self):
-        """Force a domain to go into our unknown state.
-
-        This can be useful on a limited basis when we need a domain
-        to be created in the registry for some reason.
-        """
-        pass
-
     def _disclose_fields(self, contact: PublicContact):
         """creates a disclose object that can be added to a contact Create using
         .disclose= <this function> on the command before sending.
diff --git a/src/registrar/models/transition_domain.py b/src/registrar/models/transition_domain.py
index c5b9b125c..9e6d40cf1 100644
--- a/src/registrar/models/transition_domain.py
+++ b/src/registrar/models/transition_domain.py
@@ -5,6 +5,7 @@ from .utility.time_stamped_model import TimeStampedModel
 class StatusChoices(models.TextChoices):
     READY = "ready", "Ready"
     ON_HOLD = "on hold", "On Hold"
+    UNKNOWN = "unknown", "Unknown"
 
 
 class TransitionDomain(TimeStampedModel):
diff --git a/src/registrar/tests/data/test_domain_statuses.txt b/src/registrar/tests/data/test_domain_statuses.txt
index a5377f5fd..53342906d 100644
--- a/src/registrar/tests/data/test_domain_statuses.txt
+++ b/src/registrar/tests/data/test_domain_statuses.txt
@@ -2,4 +2,4 @@ Anomaly.gov|muahaha|
 TestDomain.gov|ok|
 FakeWebsite1.gov|serverHold|
 FakeWebsite2.gov|Hold|
-FakeWebsite3.gov|ok|
\ No newline at end of file
+FakeWebsite3.gov|unknown|
diff --git a/src/registrar/tests/test_transition_domain_migrations.py b/src/registrar/tests/test_transition_domain_migrations.py
index 91625207d..4e549bdd6 100644
--- a/src/registrar/tests/test_transition_domain_migrations.py
+++ b/src/registrar/tests/test_transition_domain_migrations.py
@@ -193,6 +193,17 @@ class TestOrganizationMigration(TestCase):
 
         self.assertEqual(transition, expected_transition_domain)
 
+    def test_transition_domain_status_unknown(self):
+        """
+        Test that a domain in unknown status can be loaded
+        """  # noqa - E501 (harder to read)
+        # == First, parse all existing data == #
+        self.run_load_domains()
+        self.run_transfer_domains()
+
+        domain_object = Domain.objects.get(name="fakewebsite3.gov")
+        self.assertEqual(domain_object.state, Domain.State.UNKNOWN)
+
     def test_load_organization_data_domain_information(self):
         """
         This test verifies the functionality of the load_organization_data method.

From adb120714e1759f6dacdd861940b54f73cd06055 Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Fri, 1 Dec 2023 11:46:16 -0600
Subject: [PATCH 33/39] Migrations file for new transition domain status

---
 .../0048_alter_transitiondomain_status.py     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 src/registrar/migrations/0048_alter_transitiondomain_status.py

diff --git a/src/registrar/migrations/0048_alter_transitiondomain_status.py b/src/registrar/migrations/0048_alter_transitiondomain_status.py
new file mode 100644
index 000000000..d67c91e4b
--- /dev/null
+++ b/src/registrar/migrations/0048_alter_transitiondomain_status.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.2.7 on 2023-12-01 17:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registrar", "0047_transitiondomain_address_line_transitiondomain_city_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="transitiondomain",
+            name="status",
+            field=models.CharField(
+                blank=True,
+                choices=[("ready", "Ready"), ("on hold", "On Hold"), ("unknown", "Unknown")],
+                default="ready",
+                help_text="domain status during the transfer",
+                max_length=255,
+                verbose_name="Status",
+            ),
+        ),
+    ]

From 578f5bac1a3c888e39b63ebc194db0e383759449 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Fri, 1 Dec 2023 10:10:25 -0800
Subject: [PATCH 34/39] Make class function for GenericError mapping

---
 src/api/views.py                | 2 +-
 src/registrar/utility/errors.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/api/views.py b/src/api/views.py
index f84f4439f..10507fd7f 100644
--- a/src/api/views.py
+++ b/src/api/views.py
@@ -31,7 +31,7 @@ DOMAIN_API_MESSAGES = {
     ),
     "invalid": "Enter a domain using only letters, numbers, or hyphens (though we don't recommend using hyphens).",
     "success": "That domain is available!",
-    "error": GenericError._error_mapping[GenericErrorCodes.CANNOT_CONTACT_REGISTRY],
+    "error": GenericError.get_error_mapping(GenericErrorCodes.CANNOT_CONTACT_REGISTRY),
 }
 
 
diff --git a/src/registrar/utility/errors.py b/src/registrar/utility/errors.py
index 93b8855f3..7edf11deb 100644
--- a/src/registrar/utility/errors.py
+++ b/src/registrar/utility/errors.py
@@ -60,6 +60,10 @@ contact help@get.gov.
     def __str__(self):
         return f"{self.message}"
 
+    @classmethod
+    def get_error_mapping(self, code=None):
+        return self._error_mapping.get(code)
+
 
 class NameserverErrorCodes(IntEnum):
     """Used in the NameserverError class for

From 63b2c1c699f7069aa86fb8ac106b1303008eb819 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Fri, 1 Dec 2023 10:11:37 -0800
Subject: [PATCH 35/39] Rename error mapping method

---
 src/registrar/utility/errors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/utility/errors.py b/src/registrar/utility/errors.py
index 7edf11deb..9463c1387 100644
--- a/src/registrar/utility/errors.py
+++ b/src/registrar/utility/errors.py
@@ -61,7 +61,7 @@ contact help@get.gov.
         return f"{self.message}"
 
     @classmethod
-    def get_error_mapping(self, code=None):
+    def get_error_message(self, code=None):
         return self._error_mapping.get(code)
 
 

From 5e8e50dcbc4e7035faa275e8aa6f1d3f1a98d215 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Fri, 1 Dec 2023 10:33:04 -0800
Subject: [PATCH 36/39] Update API views

---
 src/api/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/views.py b/src/api/views.py
index 10507fd7f..93d27a382 100644
--- a/src/api/views.py
+++ b/src/api/views.py
@@ -31,7 +31,7 @@ DOMAIN_API_MESSAGES = {
     ),
     "invalid": "Enter a domain using only letters, numbers, or hyphens (though we don't recommend using hyphens).",
     "success": "That domain is available!",
-    "error": GenericError.get_error_mapping(GenericErrorCodes.CANNOT_CONTACT_REGISTRY),
+    "error": GenericError.get_error_message(GenericErrorCodes.CANNOT_CONTACT_REGISTRY),
 }
 
 

From 4d3c7b94f514e40ec3d5248b0cb39093ccdcc8ab Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Fri, 1 Dec 2023 10:34:34 -0800
Subject: [PATCH 37/39] Update availability test

---
 src/api/tests/test_available.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/tests/test_available.py b/src/api/tests/test_available.py
index 956d5e858..9de152b06 100644
--- a/src/api/tests/test_available.py
+++ b/src/api/tests/test_available.py
@@ -117,7 +117,7 @@ class AvailableViewTest(MockEppLib):
         error_domain_response = available(request, domain="errordomain.gov")
         self.assertFalse(json.loads(error_domain_response.content)["available"])
         self.assertEqual(
-            GenericError._error_mapping[GenericErrorCodes.CANNOT_CONTACT_REGISTRY],
+            GenericError.get_error_message(GenericErrorCodes.CANNOT_CONTACT_REGISTRY),
             json.loads(error_domain_response.content)["message"],
         )
 

From fa5ac29606697de42a9f2630bb93aba82d7e8bcb Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Fri, 1 Dec 2023 15:18:57 -0800
Subject: [PATCH 38/39] Specified error messages and function comments

---
 src/api/views.py                              | 2 +-
 src/registrar/models/utility/domain_helper.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/views.py b/src/api/views.py
index 93d27a382..85ae021c9 100644
--- a/src/api/views.py
+++ b/src/api/views.py
@@ -64,7 +64,7 @@ def check_domain_available(domain):
 
     The given domain is lowercased to match against the domains list. If the
     given domain doesn't end with .gov, ".gov" is added when looking for
-    a match.
+    a match. If check fails, throws a RegistryError.
     """
     Domain = apps.get_model("registrar.Domain")
     if domain.endswith(".gov"):
diff --git a/src/registrar/models/utility/domain_helper.py b/src/registrar/models/utility/domain_helper.py
index 14cae53bc..c8419ca54 100644
--- a/src/registrar/models/utility/domain_helper.py
+++ b/src/registrar/models/utility/domain_helper.py
@@ -40,8 +40,8 @@ class DomainHelper:
         try:
             if not check_domain_available(domain):
                 raise errors.DomainUnavailableError()
-        except Exception:
-            raise errors.RegistrySystemError()
+        except RegistryError as err:
+            raise errors.RegistrySystemError() from err
         return domain
 
     @classmethod

From b4c8ce26d47c2352cbd1c00c11b1ffd001780342 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Fri, 1 Dec 2023 15:34:11 -0800
Subject: [PATCH 39/39] Add import for EPP RegistryError

---
 src/registrar/models/utility/domain_helper.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/registrar/models/utility/domain_helper.py b/src/registrar/models/utility/domain_helper.py
index c8419ca54..e43661b1d 100644
--- a/src/registrar/models/utility/domain_helper.py
+++ b/src/registrar/models/utility/domain_helper.py
@@ -2,6 +2,7 @@ import re
 
 from api.views import check_domain_available
 from registrar.utility import errors
+from epplibwrapper.errors import RegistryError
 
 
 class DomainHelper: