From f1c8f52456f43c951a26271793997ef322484e7e Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Mon, 26 Aug 2024 11:23:02 -0700
Subject: [PATCH 001/118] Remove refs to submitter in domain request

---
 src/registrar/models/domain_request.py | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index 966c880d7..acd41053b 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -339,13 +339,12 @@ class DomainRequest(TimeStampedModel):
         help_text="The suborganization that this domain request is included under",
     )
 
-    # This is the domain request user who created this domain request. The contact
-    # information that they gave is in the `submitter` field
+    # This is the domain request user who created this domain request.
     creator = models.ForeignKey(
         "registrar.User",
         on_delete=models.PROTECT,
         related_name="domain_requests_created",
-        help_text="Person who submitted the domain request; will not receive email updates",
+        help_text="Person who submitted the domain request. Will receive email updates.",
     )
 
     investigator = models.ForeignKey(
@@ -483,17 +482,6 @@ class DomainRequest(TimeStampedModel):
         help_text="Other domain names the creator provided for consideration",
     )
 
-    # This is the contact information provided by the domain requestor. The
-    # user who created the domain request is in the `creator` field.
-    submitter = models.ForeignKey(
-        "registrar.Contact",
-        null=True,
-        blank=True,
-        related_name="submitted_domain_requests",
-        on_delete=models.PROTECT,
-        help_text='Person listed under "your contact information" in the request form; will receive email updates',
-    )
-
     purpose = models.TextField(
         null=True,
         blank=True,
@@ -715,9 +703,6 @@ class DomainRequest(TimeStampedModel):
         contact information. If there is not creator information, then do
         nothing.
 
-        If the waffle flag "profile_feature" is active, then this email will be sent to the
-        domain request creator rather than the submitter
-
         Optional args:
         bcc_address: str -> the address to bcc to
 
@@ -732,7 +717,7 @@ class DomainRequest(TimeStampedModel):
         custom_email_content: str -> Renders an email with the content of this string as its body text.
         """
 
-        recipient = self.creator if flag_is_active(None, "profile_feature") else self.submitter
+        recipient = self.creator
         if recipient is None or recipient.email is None:
             logger.warning(
                 f"Cannot send {new_status} email, no creator email address for domain request with pk: {self.pk}."
@@ -1170,9 +1155,6 @@ class DomainRequest(TimeStampedModel):
     def _is_purpose_complete(self):
         return self.purpose is not None
 
-    def _is_submitter_complete(self):
-        return self.submitter is not None
-
     def _has_other_contacts_and_filled(self):
         # Other Contacts Radio button is Yes and if all required fields are filled
         return (
@@ -1227,8 +1209,6 @@ class DomainRequest(TimeStampedModel):
             and self._is_senior_official_complete()
             and self._is_requested_domain_complete()
             and self._is_purpose_complete()
-            # NOTE: This flag leaves submitter as empty (request wont submit) hence set to True
-            and (self._is_submitter_complete() if not has_profile_feature_flag else True)
             and self._is_other_contacts_complete()
             and self._is_additional_details_complete()
             and self._is_policy_acknowledgement_complete()

From 2f2b2fe10ffc238d91148cc25281c4355c53eb32 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Mon, 26 Aug 2024 11:46:15 -0700
Subject: [PATCH 002/118] Remove submitter from models

---
 src/registrar/admin.py                        | 29 ++++------------
 src/registrar/fixtures_domain_requests.py     |  7 ----
 src/registrar/forms/domain_request_wizard.py  |  8 ++---
 ...ve_domaininformation_submitter_and_more.py | 33 +++++++++++++++++++
 src/registrar/models/domain_information.py    | 14 +-------
 .../admin/includes/detail_table_fieldset.html |  8 ++---
 .../templates/domain_request_review.html      |  4 +--
 .../templates/domain_request_status.html      |  4 +--
 src/registrar/views/domain_request.py         | 12 +++----
 9 files changed, 59 insertions(+), 60 deletions(-)
 create mode 100644 src/registrar/migrations/0119_remove_domaininformation_submitter_and_more.py

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 3ad5e3ea0..636a9fa5c 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -505,7 +505,6 @@ class AdminSortFields:
     sort_mapping = {
         # == Contact == #
         "other_contacts": (Contact, _name_sort),
-        "submitter": (Contact, _name_sort),
         # == Senior Official == #
         "senior_official": (SeniorOfficial, _name_sort),
         # == User == #
@@ -1390,13 +1389,9 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         "domain",
         "generic_org_type",
         "created_at",
-        "submitter",
     ]
 
-    orderable_fk_fields = [
-        ("domain", "name"),
-        ("submitter", ["first_name", "last_name"]),
-    ]
+    orderable_fk_fields = [("domain", "name")]
 
     # Filters
     list_filter = ["generic_org_type"]
@@ -1408,7 +1403,7 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
     search_help_text = "Search by domain."
 
     fieldsets = [
-        (None, {"fields": ["portfolio", "sub_organization", "creator", "submitter", "domain_request", "notes"]}),
+        (None, {"fields": ["portfolio", "sub_organization", "creator", "domain_request", "notes"]}),
         (".gov domain", {"fields": ["domain"]}),
         ("Contacts", {"fields": ["senior_official", "other_contacts", "no_other_contacts_rationale"]}),
         ("Background info", {"fields": ["anything_else"]}),
@@ -1472,7 +1467,6 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         "more_organization_information",
         "domain",
         "domain_request",
-        "submitter",
         "no_other_contacts_rationale",
         "anything_else",
         "is_policy_acknowledged",
@@ -1487,7 +1481,6 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         "domain_request",
         "senior_official",
         "domain",
-        "submitter",
         "portfolio",
         "sub_organization",
     ]
@@ -1658,13 +1651,11 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         "custom_election_board",
         "city",
         "state_territory",
-        "submitter",
         "investigator",
     ]
 
     orderable_fk_fields = [
         ("requested_domain", "name"),
-        ("submitter", ["first_name", "last_name"]),
         ("investigator", ["first_name", "last_name"]),
     ]
 
@@ -1694,11 +1685,11 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
     # Search
     search_fields = [
         "requested_domain__name",
-        "submitter__email",
-        "submitter__first_name",
-        "submitter__last_name",
+        "creator__email",
+        "creator__first_name",
+        "creator__last_name",
     ]
-    search_help_text = "Search by domain or submitter."
+    search_help_text = "Search by domain or creator."
 
     fieldsets = [
         (
@@ -1714,7 +1705,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
                     "action_needed_reason_email",
                     "investigator",
                     "creator",
-                    "submitter",
                     "approved_domain",
                     "notes",
                 ]
@@ -1802,7 +1792,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         "approved_domain",
         "alternative_domains",
         "purpose",
-        "submitter",
         "no_other_contacts_rationale",
         "anything_else",
         "is_policy_acknowledged",
@@ -1813,7 +1802,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
     autocomplete_fields = [
         "approved_domain",
         "requested_domain",
-        "submitter",
         "creator",
         "senior_official",
         "investigator",
@@ -2150,10 +2138,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         if not action_needed_reason or action_needed_reason == DomainRequest.ActionNeededReasons.OTHER:
             return None
 
-        if flag_is_active(None, "profile_feature"):  # type: ignore
-            recipient = domain_request.creator
-        else:
-            recipient = domain_request.submitter
+        recipient = domain_request.creator
 
         # Return the context of the rendered views
         context = {"domain_request": domain_request, "recipient": recipient}
diff --git a/src/registrar/fixtures_domain_requests.py b/src/registrar/fixtures_domain_requests.py
index 50f611474..fad8f3f8a 100644
--- a/src/registrar/fixtures_domain_requests.py
+++ b/src/registrar/fixtures_domain_requests.py
@@ -37,7 +37,6 @@ class DomainRequestFixture:
     #     "anything_else": None,
     #     "is_policy_acknowledged": None,
     #     "senior_official": None,
-    #     "submitter": None,
     #     "other_contacts": [],
     #     "current_websites": [],
     #     "alternative_domains": [],
@@ -123,12 +122,6 @@ class DomainRequestFixture:
             else:
                 da.senior_official = Contact.objects.create(**cls.fake_contact())
 
-        if not da.submitter:
-            if "submitter" in app and app["submitter"] is not None:
-                da.submitter, _ = Contact.objects.get_or_create(**app["submitter"])
-            else:
-                da.submitter = Contact.objects.create(**cls.fake_contact())
-
         if not da.requested_domain:
             if "requested_domain" in app and app["requested_domain"] is not None:
                 da.requested_domain, _ = DraftDomain.objects.get_or_create(name=app["requested_domain"])
diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index d97dd0de7..764436bb2 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -387,12 +387,12 @@ class PurposeForm(RegistrarForm):
 
 
 class YourContactForm(RegistrarForm):
-    JOIN = "submitter"
+    JOIN = "creator"
 
     def to_database(self, obj):
         if not self.is_valid():
             return
-        contact = getattr(obj, "submitter", None)
+        contact = getattr(obj, "creator", None)
         if contact is not None and not contact.has_more_than_one_join("submitted_domain_requests"):
             # if contact exists in the database and is not joined to other entities
             super().to_database(contact)
@@ -401,12 +401,12 @@ class YourContactForm(RegistrarForm):
             # in either case, create a new contact and update it
             contact = Contact()
             super().to_database(contact)
-            obj.submitter = contact
+            obj.creator = contact
             obj.save()
 
     @classmethod
     def from_database(cls, obj):
-        contact = getattr(obj, "submitter", None)
+        contact = getattr(obj, "creator", None)
         return super().from_database(contact)
 
     first_name = forms.CharField(
diff --git a/src/registrar/migrations/0119_remove_domaininformation_submitter_and_more.py b/src/registrar/migrations/0119_remove_domaininformation_submitter_and_more.py
new file mode 100644
index 000000000..d438d6744
--- /dev/null
+++ b/src/registrar/migrations/0119_remove_domaininformation_submitter_and_more.py
@@ -0,0 +1,33 @@
+# Generated by Django 4.2.10 on 2024-08-26 18:45
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0118_alter_portfolio_options_alter_portfolio_creator_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="domaininformation",
+            name="submitter",
+        ),
+        migrations.RemoveField(
+            model_name="domainrequest",
+            name="submitter",
+        ),
+        migrations.AlterField(
+            model_name="domainrequest",
+            name="creator",
+            field=models.ForeignKey(
+                help_text="Person who submitted the domain request. Will receive email updates.",
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="domain_requests_created",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]
diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py
index 774dba897..03b8cc047 100644
--- a/src/registrar/models/domain_information.py
+++ b/src/registrar/models/domain_information.py
@@ -48,8 +48,7 @@ class DomainInformation(TimeStampedModel):
         null=True,
     )
 
-    # This is the domain request user who created this domain request. The contact
-    # information that they gave is in the `submitter` field
+    # This is the domain request user who created this domain request.
     creator = models.ForeignKey(
         "registrar.User",
         on_delete=models.PROTECT,
@@ -197,17 +196,6 @@ class DomainInformation(TimeStampedModel):
         related_name="domain_info",
     )
 
-    # This is the contact information provided by the domain requestor. The
-    # user who created the domain request is in the `creator` field.
-    submitter = models.ForeignKey(
-        "registrar.Contact",
-        null=True,
-        blank=True,
-        related_name="submitted_domain_requests_information",
-        on_delete=models.PROTECT,
-        help_text='Person listed under "your contact information" in the request form',
-    )
-
     purpose = models.TextField(
         null=True,
         blank=True,
diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
index 683f33117..1c81e30d6 100644
--- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
+++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
@@ -70,7 +70,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
     <div class="readonly textarea-wrapper">
         <div id="action_needed_reason_email_readonly" class="dja-readonly-textarea-container padding-1 margin-top-0 padding-top-0 margin-bottom-1 thin-border collapse--dgsimple collapsed">
             <label class="max-full" for="action_needed_reason_email_view_more">
-                <strong>Sent to {% if has_profile_feature_flag %}creator{%else%}submitter{%endif%}</strong>
+                <strong>Sent to {% if has_profile_feature_flag %}creator{%else%}creator{%endif%}</strong>
             </label>
             <textarea id="action_needed_reason_email_view_more" cols="40" rows="20" class="{% if not original_object.action_needed_reason %}display-none{% endif %}" readonly>
                 {{ original_object.action_needed_reason_email }}
@@ -187,10 +187,10 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
         {% if not skip_additional_contact_info %}
             {% include "django/admin/includes/user_detail_list.html" with user=original_object.creator no_title_top_padding=field.is_readonly %}
         {% endif%}
-    {% elif field.field.name == "submitter" %}
+    {% elif field.field.name == "creator" %}
         <div class="flex-container tablet:margin-top-2">
-        <label aria-label="Submitter contact details"></label>
-        {% include "django/admin/includes/contact_detail_list.html" with user=original_object.submitter no_title_top_padding=field.is_readonly %}
+        <label aria-label="Creator contact details"></label>
+        {% include "django/admin/includes/contact_detail_list.html" with user=original_object.creator no_title_top_padding=field.is_readonly %}
         </div>
     {% elif field.field.name == "senior_official" %}
         <div class="flex-container">
diff --git a/src/registrar/templates/domain_request_review.html b/src/registrar/templates/domain_request_review.html
index 6776dd2c0..ced20b6b7 100644
--- a/src/registrar/templates/domain_request_review.html
+++ b/src/registrar/templates/domain_request_review.html
@@ -130,8 +130,8 @@
 
         {% if step == Step.YOUR_CONTACT %}
           {% namespaced_url 'domain-request' step as domain_request_url %}
-          {% if domain_request.submitter is not None %}
-            {% with title=form_titles|get_item:step value=domain_request.submitter %}
+          {% if domain_request.creator is not None %}
+            {% with title=form_titles|get_item:step value=domain_request.creator %}
               {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=domain_request_url contact='true' %}
             {% endwith %}
           {% else %}
diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html
index 183a8be81..c870f5ab1 100644
--- a/src/registrar/templates/domain_request_status.html
+++ b/src/registrar/templates/domain_request_status.html
@@ -109,8 +109,8 @@
       {% include "includes/summary_item.html" with title='Purpose of your domain' value=DomainRequest.purpose heading_level=heading_level %}
     {% endif %}
 
-    {% if DomainRequest.submitter and not has_profile_feature_flag %}
-      {% include "includes/summary_item.html" with title='Your contact information' value=DomainRequest.submitter contact='true' heading_level=heading_level %}
+    {% if DomainRequest.creator and not has_profile_feature_flag %}
+      {% include "includes/summary_item.html" with title='Your contact information' value=DomainRequest.creator contact='true' heading_level=heading_level %}
     {% endif %}
 
     {% if DomainRequest.other_contacts.all %}
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index b691549cd..45c0c3ddb 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -375,7 +375,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
             ),
             "dotgov_domain": self.domain_request.requested_domain is not None,
             "purpose": self.domain_request.purpose is not None,
-            "your_contact": self.domain_request.submitter is not None,
+            "your_contact": self.domain_request.creator is not None,
             "other_contacts": (
                 self.domain_request.other_contacts.exists()
                 or self.domain_request.no_other_contacts_rationale is not None
@@ -813,7 +813,7 @@ class DomainRequestDeleteView(DomainRequestPermissionDeleteView):
 
         # After a delete occurs, do a second sweep on any returned duplicates.
         # This determines if any of these three fields share a contact, which is used for
-        # the edge case where the same user may be an SO, and a submitter, for example.
+        # the edge case where the same user may be an SO, and a creator, for example.
         if len(duplicates) > 0:
             duplicates_to_delete, _ = self._get_orphaned_contacts(domain_request, check_db=True)
             Contact.objects.filter(id__in=duplicates_to_delete).delete()
@@ -826,7 +826,7 @@ class DomainRequestDeleteView(DomainRequestPermissionDeleteView):
         Collects all orphaned contacts associated with a given DomainRequest object.
 
         An orphaned contact is defined as a contact that is associated with the domain request,
-        but not with any other domain_request. This includes the senior official, the submitter,
+        but not with any other domain_request. This includes the senior official, the creator,
         and any other contacts linked to the domain_request.
 
         Parameters:
@@ -842,18 +842,18 @@ class DomainRequestDeleteView(DomainRequestPermissionDeleteView):
 
         # Get each contact object on the DomainRequest object
         so = domain_request.senior_official
-        submitter = domain_request.submitter
+        creator = domain_request.creator
         other_contacts = list(domain_request.other_contacts.all())
         other_contact_ids = domain_request.other_contacts.all().values_list("id", flat=True)
 
         # Check if the desired item still exists in the DB
         if check_db:
             so = self._get_contacts_by_id([so.id]).first() if so is not None else None
-            submitter = self._get_contacts_by_id([submitter.id]).first() if submitter is not None else None
+            creator = self._get_contacts_by_id([creator.id]).first() if creator is not None else None
             other_contacts = self._get_contacts_by_id(other_contact_ids)
 
         # Pair each contact with its db related name for use in checking if it has joins
-        checked_contacts = [(so, "senior_official"), (submitter, "submitted_domain_requests")]
+        checked_contacts = [(so, "senior_official"), (creator, "submitted_domain_requests")]
         checked_contacts.extend((contact, "contact_domain_requests") for contact in other_contacts)
 
         for contact, related_name in checked_contacts:

From 2713e597956fdd729b0551a1b5a03caa57eb00b9 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Mon, 26 Aug 2024 15:59:48 -0700
Subject: [PATCH 003/118] Remove submitter from model tests

---
 src/registrar/models/domain_request.py    |  7 +++-
 src/registrar/tests/common.py             | 20 +++++------
 src/registrar/tests/test_admin.py         | 44 ++++++++---------------
 src/registrar/tests/test_admin_domain.py  |  7 ----
 src/registrar/tests/test_admin_request.py | 30 ++++------------
 src/registrar/tests/test_models.py        | 29 ++++++---------
 src/registrar/tests/test_views.py         |  6 ----
 src/registrar/tests/test_views_request.py | 20 +++--------
 src/registrar/views/utility/mixins.py     | 12 +++----
 9 files changed, 57 insertions(+), 118 deletions(-)

diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index acd41053b..1c4cbb355 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -1137,6 +1137,10 @@ class DomainRequest(TimeStampedModel):
         # Special District -> "Election office" and "About your organization" page can't be empty
         return self.is_election_board is not None and self.about_your_organization is not None
 
+    # Do we still want to test this after creator is autogenerated? Currently it went back to being selectable
+    def _is_creator_complete(self):
+        return self.creator is not None
+
     def _is_organization_name_and_address_complete(self):
         return not (
             self.organization_name is None
@@ -1205,7 +1209,8 @@ class DomainRequest(TimeStampedModel):
     def _is_general_form_complete(self, request):
         has_profile_feature_flag = flag_is_active(request, "profile_feature")
         return (
-            self._is_organization_name_and_address_complete()
+            self._is_creator_complete()
+            and self._is_organization_name_and_address_complete()
             and self._is_senior_official_complete()
             and self._is_requested_domain_complete()
             and self._is_purpose_complete()
diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py
index ceb3b6e92..40d5108f4 100644
--- a/src/registrar/tests/common.py
+++ b/src/registrar/tests/common.py
@@ -392,7 +392,6 @@ class AuditedAdminMockData:
                 about_your_organization: str = "e-Government",
                 anything_else: str = "There is more",
                 senior_official: Contact = self.dummy_contact(item_name, "senior_official"),
-                submitter: Contact = self.dummy_contact(item_name, "submitter"),
                 creator: User = self.dummy_user(item_name, "creator"),
             }
         """  # noqa
@@ -410,7 +409,6 @@ class AuditedAdminMockData:
             about_your_organization="e-Government",
             anything_else="There is more",
             senior_official=self.dummy_contact(item_name, "senior_official"),
-            submitter=self.dummy_contact(item_name, "submitter"),
             creator=creator,
         )
         return common_args
@@ -897,7 +895,6 @@ def completed_domain_request(  # noqa
     has_cisa_representative=True,
     status=DomainRequest.DomainRequestStatus.STARTED,
     user=False,
-    submitter=False,
     name="city.gov",
     investigator=None,
     generic_org_type="federal",
@@ -921,14 +918,14 @@ def completed_domain_request(  # noqa
     domain, _ = DraftDomain.objects.get_or_create(name=name)
     alt, _ = Website.objects.get_or_create(website="city1.gov")
     current, _ = Website.objects.get_or_create(website="city.com")
-    if not submitter:
-        submitter, _ = Contact.objects.get_or_create(
-            first_name="Testy2",
-            last_name="Tester2",
-            title="Admin Tester",
-            email="mayor@igorville.gov",
-            phone="(555) 555 5556",
-        )
+    # if not creator:
+    #     creator, _ = Contact.objects.get_or_create(
+    #         first_name="Testy2",
+    #         last_name="Tester2",
+    #         title="Admin Tester",
+    #         email="mayor@igorville.gov",
+    #         phone="(555) 555 5556",
+    #     )
     other, _ = Contact.objects.get_or_create(
         first_name="Testy",
         last_name="Tester",
@@ -957,7 +954,6 @@ def completed_domain_request(  # noqa
         zipcode="10002",
         senior_official=so,
         requested_domain=domain,
-        submitter=submitter,
         creator=user,
         status=status,
         investigator=investigator,
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 827742ef1..b6c8e7c21 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -380,7 +380,7 @@ class TestDomainInformationAdmin(TestCase):
 
         contact, _ = Contact.objects.get_or_create(first_name="Henry", last_name="McFakerson")
         domain_request = completed_domain_request(
-            submitter=contact, name="city1244.gov", status=DomainRequest.DomainRequestStatus.IN_REVIEW
+            name="city1244.gov", status=DomainRequest.DomainRequestStatus.IN_REVIEW
         )
         domain_request.approve()
 
@@ -505,7 +505,6 @@ class TestDomainInformationAdmin(TestCase):
         # These should exist in the response
         expected_values = [
             ("creator", "Person who submitted the domain request"),
-            ("submitter", 'Person listed under "your contact information" in the request form'),
             ("domain_request", "Request associated with this domain"),
             ("no_other_contacts_rationale", "Required if creator does not list other employees"),
             ("urbanization", "Required for Puerto Rico only"),
@@ -629,16 +628,6 @@ class TestDomainInformationAdmin(TestCase):
         # Check for the field itself
         self.assertContains(response, "Meoward Jones")
 
-        # == Check for the submitter == #
-        self.assertContains(response, "mayor@igorville.gov", count=2)
-        expected_submitter_fields = [
-            # Field, expected value
-            ("title", "Admin Tester"),
-            ("phone", "(555) 555 5556"),
-        ]
-        self.test_helper.assert_response_contains_distinct_values(response, expected_submitter_fields)
-        self.assertContains(response, "Testy2 Tester2")
-
         # == Check for the senior_official == #
         self.assertContains(response, "testy@town.com", count=2)
         expected_so_fields = [
@@ -684,7 +673,6 @@ class TestDomainInformationAdmin(TestCase):
                 "more_organization_information",
                 "domain",
                 "domain_request",
-                "submitter",
                 "no_other_contacts_rationale",
                 "anything_else",
                 "is_policy_acknowledged",
@@ -703,19 +691,19 @@ class TestDomainInformationAdmin(TestCase):
             # Assert that sorting in reverse works correctly
             self.test_helper.assert_table_sorted("-1", ("-domain__name",))
 
-    def test_submitter_sortable(self):
-        """Tests if DomainInformation sorts by submitter correctly"""
+    def test_creator_sortable(self):
+        """Tests if DomainInformation sorts by creator correctly"""
         with less_console_noise():
             self.client.force_login(self.superuser)
 
             # Assert that our sort works correctly
             self.test_helper.assert_table_sorted(
                 "4",
-                ("submitter__first_name", "submitter__last_name"),
+                ("creator__first_name", "creator__last_name"),
             )
 
             # Assert that sorting in reverse works correctly
-            self.test_helper.assert_table_sorted("-4", ("-submitter__first_name", "-submitter__last_name"))
+            self.test_helper.assert_table_sorted("-4", ("-creator__first_name", "-creator__last_name"))
 
 
 class TestUserDomainRoleAdmin(TestCase):
@@ -1298,7 +1286,6 @@ class AuditedAdminTest(TestCase):
                 # Senior offical is commented out for now - this is alphabetized
                 # and this test does not accurately reflect that.
                 # DomainRequest.senior_official.field,
-                DomainRequest.submitter.field,
                 # DomainRequest.investigator.field,
                 DomainRequest.creator.field,
                 DomainRequest.requested_domain.field,
@@ -1358,7 +1345,6 @@ class AuditedAdminTest(TestCase):
                 # Senior offical is commented out for now - this is alphabetized
                 # and this test does not accurately reflect that.
                 # DomainInformation.senior_official.field,
-                DomainInformation.submitter.field,
                 # DomainInformation.creator.field,
                 (DomainInformation.domain.field, ["name"]),
                 (DomainInformation.domain_request.field, ["requested_domain__name"]),
@@ -1680,10 +1666,10 @@ class TestContactAdmin(TestCase):
             )
 
             # join it to 4 domain requests.
-            domain_request1 = completed_domain_request(submitter=contact, name="city1.gov")
-            domain_request2 = completed_domain_request(submitter=contact, name="city2.gov")
-            domain_request3 = completed_domain_request(submitter=contact, name="city3.gov")
-            domain_request4 = completed_domain_request(submitter=contact, name="city4.gov")
+            domain_request1 = completed_domain_request(name="city1.gov")
+            domain_request2 = completed_domain_request(name="city2.gov")
+            domain_request3 = completed_domain_request(name="city3.gov")
+            domain_request4 = completed_domain_request(name="city4.gov")
 
             with patch("django.contrib.messages.warning") as mock_warning:
                 # Use the test client to simulate the request
@@ -1720,12 +1706,12 @@ class TestContactAdmin(TestCase):
                 first_name="Henry",
                 last_name="McFakerson",
             )
-            domain_request1 = completed_domain_request(submitter=contact, name="city1.gov")
-            domain_request2 = completed_domain_request(submitter=contact, name="city2.gov")
-            domain_request3 = completed_domain_request(submitter=contact, name="city3.gov")
-            domain_request4 = completed_domain_request(submitter=contact, name="city4.gov")
-            domain_request5 = completed_domain_request(submitter=contact, name="city5.gov")
-            completed_domain_request(submitter=contact, name="city6.gov")
+            domain_request1 = completed_domain_request(name="city1.gov")
+            domain_request2 = completed_domain_request(name="city2.gov")
+            domain_request3 = completed_domain_request(name="city3.gov")
+            domain_request4 = completed_domain_request(name="city4.gov")
+            domain_request5 = completed_domain_request(name="city5.gov")
+            completed_domain_request(name="city6.gov")
             with patch("django.contrib.messages.warning") as mock_warning:
                 # Use the test client to simulate the request
                 response = self.client.get(reverse("admin:registrar_contact_change", args=[contact.pk]))
diff --git a/src/registrar/tests/test_admin_domain.py b/src/registrar/tests/test_admin_domain.py
index e156dd377..43602d395 100644
--- a/src/registrar/tests/test_admin_domain.py
+++ b/src/registrar/tests/test_admin_domain.py
@@ -423,13 +423,6 @@ class TestDomainAdminWithClient(TestCase):
         # Check for the field itself
         self.assertContains(response, "Meoward Jones")
 
-        # == Check for the submitter == #
-        self.assertContains(response, "mayor@igorville.gov")
-
-        self.assertContains(response, "Admin Tester")
-        self.assertContains(response, "(555) 555 5556")
-        self.assertContains(response, "Testy2 Tester2")
-
         # == Check for the senior_official == #
         self.assertContains(response, "testy@town.com")
         self.assertContains(response, "Chief Tester")
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index c4fc8bcee..2bce7de7a 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -94,7 +94,7 @@ class TestDomainRequestAdmin(MockEppLib):
         SeniorOfficial.objects.get_or_create(first_name="Zoup", last_name="Soup", title="title")
 
         contact, _ = Contact.objects.get_or_create(first_name="Henry", last_name="McFakerson")
-        domain_request = completed_domain_request(submitter=contact, name="city1.gov")
+        domain_request = completed_domain_request(name="city1.gov")
         request = self.factory.post("/admin/registrar/domainrequest/{}/change/".format(domain_request.pk))
         model_admin = AuditedAdmin(DomainRequest, self.site)
 
@@ -150,10 +150,6 @@ class TestDomainRequestAdmin(MockEppLib):
         # These should exist in the response
         expected_values = [
             ("creator", "Person who submitted the domain request; will not receive email updates"),
-            (
-                "submitter",
-                'Person listed under "your contact information" in the request form; will receive email updates',
-            ),
             ("approved_domain", "Domain associated with this request; will be blank until request is approved"),
             ("no_other_contacts_rationale", "Required if creator does not list other employees"),
             ("alternative_domains", "Other domain names the creator provided for consideration"),
@@ -409,8 +405,8 @@ class TestDomainRequestAdmin(MockEppLib):
         self.test_helper.assert_table_sorted("-1", ("-requested_domain__name",))
 
     @less_console_noise_decorator
-    def test_submitter_sortable(self):
-        """Tests if the DomainRequest sorts by submitter correctly"""
+    def test_creator_sortable(self):
+        """Tests if the DomainRequest sorts by creator correctly"""
         self.client.force_login(self.superuser)
 
         multiple_unalphabetical_domain_objects("domain_request")
@@ -424,8 +420,8 @@ class TestDomainRequestAdmin(MockEppLib):
         self.test_helper.assert_table_sorted(
             "11",
             (
-                "submitter__first_name",
-                "submitter__last_name",
+                "creator__first_name",
+                "creator__last_name",
             ),
         )
 
@@ -433,8 +429,8 @@ class TestDomainRequestAdmin(MockEppLib):
         self.test_helper.assert_table_sorted(
             "-11",
             (
-                "-submitter__first_name",
-                "-submitter__last_name",
+                "-creator__first_name",
+                "-creator__last_name",
             ),
         )
 
@@ -1381,16 +1377,6 @@ class TestDomainRequestAdmin(MockEppLib):
         # Check for the field itself
         self.assertContains(response, "Meoward Jones")
 
-        # == Check for the submitter == #
-        self.assertContains(response, "mayor@igorville.gov", count=2)
-        expected_submitter_fields = [
-            # Field, expected value
-            ("title", "Admin Tester"),
-            ("phone", "(555) 555 5556"),
-        ]
-        self.test_helper.assert_response_contains_distinct_values(response, expected_submitter_fields)
-        self.assertContains(response, "Testy2 Tester2")
-
         # == Check for the senior_official == #
         self.assertContains(response, "testy@town.com", count=2)
         expected_so_fields = [
@@ -1546,7 +1532,6 @@ class TestDomainRequestAdmin(MockEppLib):
             "senior_official",
             "approved_domain",
             "requested_domain",
-            "submitter",
             "purpose",
             "no_other_contacts_rationale",
             "anything_else",
@@ -1583,7 +1568,6 @@ class TestDomainRequestAdmin(MockEppLib):
                 "approved_domain",
                 "alternative_domains",
                 "purpose",
-                "submitter",
                 "no_other_contacts_rationale",
                 "anything_else",
                 "is_policy_acknowledged",
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index f4e998fff..5e8dbc80b 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -168,7 +168,6 @@ class TestDomainRequest(TestCase):
             zipcode="12345-6789",
             senior_official=contact,
             requested_domain=domain,
-            submitter=contact,
             purpose="Igorville rules!",
             anything_else="All of Igorville loves the dotgov program.",
             is_policy_acknowledged=True,
@@ -195,7 +194,6 @@ class TestDomainRequest(TestCase):
             state_territory="CA",
             zipcode="12345-6789",
             senior_official=contact,
-            submitter=contact,
             purpose="Igorville rules!",
             anything_else="All of Igorville loves the dotgov program.",
             is_policy_acknowledged=True,
@@ -258,7 +256,7 @@ class TestDomainRequest(TestCase):
     @less_console_noise_decorator
     def test_submit_from_started_sends_email(self):
         msg = "Create a domain request and submit it and see if email was sent."
-        domain_request = completed_domain_request(submitter=self.dummy_user, user=self.dummy_user_2)
+        domain_request = completed_domain_request(user=self.dummy_user_2)
         self.check_email_sent(domain_request, msg, "submit", 1, expected_content="Hello")
 
     @override_flag("profile_feature", active=True)
@@ -266,7 +264,7 @@ class TestDomainRequest(TestCase):
     def test_submit_from_started_sends_email_to_creator(self):
         """Tests if, when the profile feature flag is on, we send an email to the creator"""
         msg = "Create a domain request and submit it and see if email was sent when the feature flag is on."
-        domain_request = completed_domain_request(submitter=self.dummy_user, user=self.dummy_user_2)
+        domain_request = completed_domain_request(user=self.dummy_user_2)
         self.check_email_sent(
             domain_request, msg, "submit", 1, expected_content="Lava", expected_email="intern@igorville.com"
         )
@@ -275,7 +273,7 @@ class TestDomainRequest(TestCase):
     def test_submit_from_withdrawn_sends_email(self):
         msg = "Create a withdrawn domain request and submit it and see if email was sent."
         domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.WITHDRAWN, submitter=self.dummy_user
+            status=DomainRequest.DomainRequestStatus.WITHDRAWN
         )
         self.check_email_sent(domain_request, msg, "submit", 1, expected_content="Hello")
 
@@ -294,25 +292,19 @@ class TestDomainRequest(TestCase):
     @less_console_noise_decorator
     def test_approve_sends_email(self):
         msg = "Create a domain request and approve it and see if email was sent."
-        domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.IN_REVIEW, submitter=self.dummy_user
-        )
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
         self.check_email_sent(domain_request, msg, "approve", 1, expected_content="Hello")
 
     @less_console_noise_decorator
     def test_withdraw_sends_email(self):
         msg = "Create a domain request and withdraw it and see if email was sent."
-        domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.IN_REVIEW, submitter=self.dummy_user
-        )
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
         self.check_email_sent(domain_request, msg, "withdraw", 1, expected_content="Hello")
 
     @less_console_noise_decorator
     def test_reject_sends_email(self):
         msg = "Create a domain request and reject it and see if email was sent."
-        domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.APPROVED, submitter=self.dummy_user
-        )
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED)
         self.check_email_sent(domain_request, msg, "reject", 1, expected_content="Hello")
 
     @less_console_noise_decorator
@@ -1877,7 +1869,6 @@ class TestDomainRequestIncomplete(TestCase):
             senior_official=so,
             requested_domain=draft_domain,
             purpose="Some purpose",
-            submitter=you,
             no_other_contacts_rationale=None,
             has_cisa_representative=True,
             cisa_representative_email="somerep@cisa.com",
@@ -2007,11 +1998,11 @@ class TestDomainRequestIncomplete(TestCase):
         self.assertFalse(self.domain_request._is_purpose_complete())
 
     @less_console_noise_decorator
-    def test_is_submitter_complete(self):
-        self.assertTrue(self.domain_request._is_submitter_complete())
-        self.domain_request.submitter = None
+    def test_is_creator_complete(self):
+        self.assertTrue(self.domain_request._is_creator_complete())
+        self.domain_request.creator = None
         self.domain_request.save()
-        self.assertFalse(self.domain_request._is_submitter_complete())
+        self.assertFalse(self.domain_request._is_creator_complete())
 
     @less_console_noise_decorator
     def test_is_other_contacts_complete_missing_one_field(self):
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 6c2ad6b5e..890e6ebdd 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -381,7 +381,6 @@ class HomeTests(TestWithUser):
             requested_domain=site,
             status=DomainRequest.DomainRequestStatus.WITHDRAWN,
             senior_official=contact,
-            submitter=contact_user,
         )
         domain_request.other_contacts.set([contact_2])
 
@@ -392,7 +391,6 @@ class HomeTests(TestWithUser):
             requested_domain=site_2,
             status=DomainRequest.DomainRequestStatus.STARTED,
             senior_official=contact_2,
-            submitter=contact_shared,
         )
         domain_request_2.other_contacts.set([contact_shared])
 
@@ -455,7 +453,6 @@ class HomeTests(TestWithUser):
             requested_domain=site,
             status=DomainRequest.DomainRequestStatus.WITHDRAWN,
             senior_official=contact,
-            submitter=contact_user,
         )
         domain_request.other_contacts.set([contact_2])
 
@@ -466,7 +463,6 @@ class HomeTests(TestWithUser):
             requested_domain=site_2,
             status=DomainRequest.DomainRequestStatus.STARTED,
             senior_official=contact_2,
-            submitter=contact_shared,
         )
         domain_request_2.other_contacts.set([contact_shared])
 
@@ -1038,7 +1034,6 @@ class UserProfileTests(TestWithUser, WebTest):
             requested_domain=site,
             status=DomainRequest.DomainRequestStatus.SUBMITTED,
             senior_official=contact_user,
-            submitter=contact_user,
         )
         with override_flag("profile_feature", active=True):
             response = self.client.get(f"/domain-request/{domain_request.id}", follow=True)
@@ -1060,7 +1055,6 @@ class UserProfileTests(TestWithUser, WebTest):
             requested_domain=site,
             status=DomainRequest.DomainRequestStatus.SUBMITTED,
             senior_official=contact_user,
-            submitter=contact_user,
         )
         with override_flag("profile_feature", active=False):
             response = self.client.get(f"/domain-request/{domain_request.id}", follow=True)
diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 6642b6471..1f6b50ded 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -368,11 +368,11 @@ class DomainRequestTests(TestWithUser, WebTest):
         your_contact_result = your_contact_form.submit()
         # validate that data from this step are being saved
         domain_request = DomainRequest.objects.get()  # there's only one
-        self.assertEqual(domain_request.submitter.first_name, "Testy you")
-        self.assertEqual(domain_request.submitter.last_name, "Tester you")
-        self.assertEqual(domain_request.submitter.title, "Admin Tester")
-        self.assertEqual(domain_request.submitter.email, "testy-admin@town.com")
-        self.assertEqual(domain_request.submitter.phone, "(201) 555 5556")
+        self.assertEqual(domain_request.creator.first_name, self.user.first_name)
+        self.assertEqual(domain_request.creator.last_name, self.user.last_name)
+        self.assertEqual(domain_request.creator.title, self.user.title)
+        self.assertEqual(domain_request.creator.email, self.user.email)
+        self.assertEqual(domain_request.creator.phone, self.user.phone)
         # the post request should return a redirect to the next form in
         # the domain request page
         self.assertEqual(your_contact_result.status_code, 302)
@@ -1643,7 +1643,6 @@ class DomainRequestTests(TestWithUser, WebTest):
             state_territory="NY",
             zipcode="10002",
             senior_official=so,
-            submitter=you,
             creator=self.user,
             status="started",
         )
@@ -1780,7 +1779,6 @@ class DomainRequestTests(TestWithUser, WebTest):
             state_territory="NY",
             zipcode="10002",
             senior_official=so,
-            submitter=you,
             creator=self.user,
             status="started",
         )
@@ -1855,7 +1853,6 @@ class DomainRequestTests(TestWithUser, WebTest):
             state_territory="NY",
             zipcode="10002",
             senior_official=so,
-            submitter=you,
             creator=self.user,
             status="started",
         )
@@ -1933,7 +1930,6 @@ class DomainRequestTests(TestWithUser, WebTest):
             state_territory="NY",
             zipcode="10002",
             senior_official=so,
-            submitter=you,
             creator=self.user,
             status="started",
         )
@@ -2010,7 +2006,6 @@ class DomainRequestTests(TestWithUser, WebTest):
             state_territory="NY",
             zipcode="10002",
             senior_official=so,
-            submitter=you,
             creator=self.user,
             status="started",
         )
@@ -2086,7 +2081,6 @@ class DomainRequestTests(TestWithUser, WebTest):
             state_territory="NY",
             zipcode="10002",
             senior_official=so,
-            submitter=you,
             creator=self.user,
             status="started",
         )
@@ -2297,7 +2291,6 @@ class DomainRequestTests(TestWithUser, WebTest):
             address_line1="address 1",
             state_territory="NY",
             zipcode="10002",
-            submitter=you,
             creator=self.user,
             status="started",
         )
@@ -2363,7 +2356,6 @@ class DomainRequestTests(TestWithUser, WebTest):
             address_line1="address 1",
             state_territory="NY",
             zipcode="10002",
-            submitter=submitter,
             creator=self.user,
             status="started",
         )
@@ -2729,7 +2721,6 @@ class DomainRequestTests(TestWithUser, WebTest):
             zipcode="10002",
             senior_official=so,
             requested_domain=domain,
-            submitter=you,
             creator=self.user,
         )
         domain_request.other_contacts.add(other)
@@ -3072,7 +3063,6 @@ class TestWizardUnlockingSteps(TestWithUser, WebTest):
             requested_domain=site,
             status=DomainRequest.DomainRequestStatus.WITHDRAWN,
             senior_official=contact,
-            submitter=contact_user,
         )
         domain_request.other_contacts.set([contact_2])
 
diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py
index 16a896100..04d86593f 100644
--- a/src/registrar/views/utility/mixins.py
+++ b/src/registrar/views/utility/mixins.py
@@ -81,12 +81,12 @@ class OrderableFieldsMixin:
         Or for fields with multiple order_fields:
 
         ```
-        def get_sortable_submitter(self, obj):
-            return obj.submitter
+        def get_sortable_creator(self, obj):
+            return obj.creator
         # Allows column order sorting
-        get_sortable_submitter.admin_order_field = ["submitter__first_name", "submitter__last_name"]
+        get_sortable_creator.admin_order_field = ["creator__first_name", "creaotr__last_name"]
         # Sets column's header
-        get_sortable_submitter.short_description = "submitter"
+        get_sortable_creator.short_description = "creator"
         ```
 
         Parameters:
@@ -114,8 +114,8 @@ class OrderableFieldsMixin:
 
             Returns (example):
             ```
-            def get_submitter(self, obj):
-                return obj.submitter
+            def get_creator(self, obj):
+                return obj.creator
             ```
             """
             attr = getattr(obj, field)

From ff9e73def6f34708fd177eef2b5acae09e52ea63 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Tue, 27 Aug 2024 15:52:23 -0700
Subject: [PATCH 004/118] Continued test cleanup

---
 src/registrar/config/urls.py              |   6 -
 src/registrar/tests/test_admin.py         |   2 +-
 src/registrar/tests/test_admin_request.py |   4 +-
 src/registrar/tests/test_views.py         |  14 --
 src/registrar/tests/test_views_domain.py  |   6 -
 src/registrar/tests/test_views_request.py | 180 +++-------------------
 src/registrar/views/__init__.py           |   1 -
 src/registrar/views/domain.py             |  32 ----
 src/registrar/views/domain_request.py     |  15 --
 9 files changed, 22 insertions(+), 238 deletions(-)

diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py
index 413449896..7e483dc92 100644
--- a/src/registrar/config/urls.py
+++ b/src/registrar/config/urls.py
@@ -49,7 +49,6 @@ for step, view in [
     (Step.CURRENT_SITES, views.CurrentSites),
     (Step.DOTGOV_DOMAIN, views.DotgovDomain),
     (Step.PURPOSE, views.Purpose),
-    (Step.YOUR_CONTACT, views.YourContact),
     (Step.OTHER_CONTACTS, views.OtherContacts),
     (Step.ADDITIONAL_DETAILS, views.AdditionalDetails),
     (Step.REQUIREMENTS, views.Requirements),
@@ -198,11 +197,6 @@ urlpatterns = [
         views.DomainDsDataView.as_view(),
         name="domain-dns-dnssec-dsdata",
     ),
-    path(
-        "domain/<int:pk>/your-contact-information",
-        views.DomainYourContactInformationView.as_view(),
-        name="domain-your-contact-information",
-    ),
     path(
         "domain/<int:pk>/org-name-address",
         views.DomainOrgNameAddressView.as_view(),
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index b6c8e7c21..f69c37947 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -649,7 +649,7 @@ class TestDomainInformationAdmin(TestCase):
         self.test_helper.assert_response_contains_distinct_values(response, expected_other_employees_fields)
 
         # Test for the copy link
-        self.assertContains(response, "button--clipboard", count=4)
+        self.assertContains(response, "button--clipboard", count=3)
 
         # cleanup this test
         domain_info.delete()
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 2bce7de7a..5a1236d49 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -149,7 +149,7 @@ class TestDomainRequestAdmin(MockEppLib):
 
         # These should exist in the response
         expected_values = [
-            ("creator", "Person who submitted the domain request; will not receive email updates"),
+            ("creator", "Person who submitted the domain request; will receive email updates"),
             ("approved_domain", "Domain associated with this request; will be blank until request is approved"),
             ("no_other_contacts_rationale", "Required if creator does not list other employees"),
             ("alternative_domains", "Other domain names the creator provided for consideration"),
@@ -1397,7 +1397,7 @@ class TestDomainRequestAdmin(MockEppLib):
         self.test_helper.assert_response_contains_distinct_values(response, expected_other_employees_fields)
 
         # Test for the copy link
-        self.assertContains(response, "button--clipboard", count=5)
+        self.assertContains(response, "button--clipboard", count=4)
 
         # Test that Creator counts display properly
         self.assertNotContains(response, "Approved domains")
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 890e6ebdd..f142fb966 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -1006,20 +1006,6 @@ class UserProfileTests(TestWithUser, WebTest):
         self.assertContains(response, "Your profile")
         self.assertNotContains(response, "Your contact information")
 
-    @less_console_noise_decorator
-    def test_domain_your_contact_information_when_profile_feature_off(self):
-        """test that Your contact information is accessible when profile_feature is off"""
-        with override_flag("profile_feature", active=False):
-            response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
-        self.assertContains(response, "Your contact information")
-
-    @less_console_noise_decorator
-    def test_domain_your_contact_information_when_profile_feature_on(self):
-        """test that Your contact information is not accessible when profile feature is on"""
-        with override_flag("profile_feature", active=True):
-            response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
-        self.assertEqual(response.status_code, 404)
-
     @less_console_noise_decorator
     def test_request_when_profile_feature_on(self):
         """test that Your profile is in request page when profile feature is on"""
diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index 3a90543a2..980a1bf12 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -1602,12 +1602,6 @@ class TestDomainSuborganization(TestDomainOverview):
 
 
 class TestDomainContactInformation(TestDomainOverview):
-    @less_console_noise_decorator
-    def test_domain_your_contact_information(self):
-        """Can load domain's your contact information page."""
-        page = self.client.get(reverse("domain-your-contact-information", kwargs={"pk": self.domain.id}))
-        self.assertContains(page, "Your contact information")
-
     @less_console_noise_decorator
     def test_domain_your_contact_information_content(self):
         """Logged-in user's contact information appears on the page."""
diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 1f6b50ded..fab64180f 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -7,6 +7,7 @@ from api.tests.common import less_console_noise_decorator
 from .common import MockSESClient, completed_domain_request  # type: ignore
 from django_webtest import WebTest  # type: ignore
 import boto3_mocking  # type: ignore
+from waffle.testutils import override_flag
 
 from registrar.models import (
     DomainRequest,
@@ -348,41 +349,13 @@ class DomainRequestTests(TestWithUser, WebTest):
         # the post request should return a redirect to the next form in
         # the domain request page
         self.assertEqual(purpose_result.status_code, 302)
-        self.assertEqual(purpose_result["Location"], "/request/your_contact/")
-        num_pages_tested += 1
-
-        # ---- YOUR CONTACT INFO PAGE  ----
-        # Follow the redirect to the next form page
-        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
-        your_contact_page = purpose_result.follow()
-        your_contact_form = your_contact_page.forms[0]
-
-        your_contact_form["your_contact-first_name"] = "Testy you"
-        your_contact_form["your_contact-last_name"] = "Tester you"
-        your_contact_form["your_contact-title"] = "Admin Tester"
-        your_contact_form["your_contact-email"] = "testy-admin@town.com"
-        your_contact_form["your_contact-phone"] = "(201) 555 5556"
-
-        # test next button
-        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
-        your_contact_result = your_contact_form.submit()
-        # validate that data from this step are being saved
-        domain_request = DomainRequest.objects.get()  # there's only one
-        self.assertEqual(domain_request.creator.first_name, self.user.first_name)
-        self.assertEqual(domain_request.creator.last_name, self.user.last_name)
-        self.assertEqual(domain_request.creator.title, self.user.title)
-        self.assertEqual(domain_request.creator.email, self.user.email)
-        self.assertEqual(domain_request.creator.phone, self.user.phone)
-        # the post request should return a redirect to the next form in
-        # the domain request page
-        self.assertEqual(your_contact_result.status_code, 302)
-        self.assertEqual(your_contact_result["Location"], "/request/other_contacts/")
+        self.assertEqual(purpose_result["Location"], "/request/other_contacts/")
         num_pages_tested += 1
 
         # ---- OTHER CONTACTS PAGE  ----
         # Follow the redirect to the next form page
         self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
-        other_contacts_page = your_contact_result.follow()
+        other_contacts_page = purpose_result.follow()
 
         # This page has 3 forms in 1.
         # Let's set the yes/no radios to enable the other contacts fieldsets
@@ -492,11 +465,6 @@ class DomainRequestTests(TestWithUser, WebTest):
         self.assertContains(review_page, "city.gov")
         self.assertContains(review_page, "city1.gov")
         self.assertContains(review_page, "For all kinds of things.")
-        self.assertContains(review_page, "Testy you")
-        self.assertContains(review_page, "Tester you")
-        self.assertContains(review_page, "Admin Tester")
-        self.assertContains(review_page, "testy-admin@town.com")
-        self.assertContains(review_page, "(201) 555-5556")
         self.assertContains(review_page, "Testy2")
         self.assertContains(review_page, "Tester2")
         self.assertContains(review_page, "Another Tester")
@@ -704,41 +672,13 @@ class DomainRequestTests(TestWithUser, WebTest):
         # the post request should return a redirect to the next form in
         # the domain request page
         self.assertEqual(purpose_result.status_code, 302)
-        self.assertEqual(purpose_result["Location"], "/request/your_contact/")
-        num_pages_tested += 1
-
-        # ---- YOUR CONTACT INFO PAGE  ----
-        # Follow the redirect to the next form page
-        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
-        your_contact_page = purpose_result.follow()
-        your_contact_form = your_contact_page.forms[0]
-
-        your_contact_form["your_contact-first_name"] = "Testy you"
-        your_contact_form["your_contact-last_name"] = "Tester you"
-        your_contact_form["your_contact-title"] = "Admin Tester"
-        your_contact_form["your_contact-email"] = "testy-admin@town.com"
-        your_contact_form["your_contact-phone"] = "(201) 555 5556"
-
-        # test next button
-        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
-        your_contact_result = your_contact_form.submit()
-        # validate that data from this step are being saved
-        domain_request = DomainRequest.objects.get()  # there's only one
-        self.assertEqual(domain_request.submitter.first_name, "Testy you")
-        self.assertEqual(domain_request.submitter.last_name, "Tester you")
-        self.assertEqual(domain_request.submitter.title, "Admin Tester")
-        self.assertEqual(domain_request.submitter.email, "testy-admin@town.com")
-        self.assertEqual(domain_request.submitter.phone, "(201) 555 5556")
-        # the post request should return a redirect to the next form in
-        # the domain request page
-        self.assertEqual(your_contact_result.status_code, 302)
-        self.assertEqual(your_contact_result["Location"], "/request/other_contacts/")
+        self.assertEqual(purpose_result["Location"], "/request/other_contacts/")
         num_pages_tested += 1
 
         # ---- OTHER CONTACTS PAGE  ----
         # Follow the redirect to the next form page
         self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
-        other_contacts_page = your_contact_result.follow()
+        other_contacts_page = purpose_result.follow()
 
         # This page has 3 forms in 1.
         # Let's set the yes/no radios to enable the other contacts fieldsets
@@ -2264,6 +2204,7 @@ class DomainRequestTests(TestWithUser, WebTest):
         senior_official = domain_request.senior_official
         self.assertEquals("Testy2", senior_official.first_name)
 
+    @override_flag("profile_feature", active=True)
     @less_console_noise_decorator
     def test_edit_submitter_in_place(self):
         """When you:
@@ -2274,13 +2215,6 @@ class DomainRequestTests(TestWithUser, WebTest):
         # Populate the database with a domain request that
         # has a submitter
         # We'll do it from scratch
-        you, _ = Contact.objects.get_or_create(
-            first_name="Testy",
-            last_name="Tester",
-            title="Chief Tester",
-            email="testy@town.com",
-            phone="(201) 555 5555",
-        )
         domain_request, _ = DomainRequest.objects.get_or_create(
             generic_org_type="federal",
             federal_type="executive",
@@ -2297,7 +2231,7 @@ class DomainRequestTests(TestWithUser, WebTest):
 
         # submitter_pk is the initial pk of the submitter. set it before update
         # to be able to verify after update that the same contact object is in place
-        submitter_pk = you.id
+        creator_pk = self.user.id
 
         # prime the form by visiting /edit
         self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}))
@@ -2308,97 +2242,25 @@ class DomainRequestTests(TestWithUser, WebTest):
         session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
         self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
 
-        your_contact_page = self.app.get(reverse("domain-request:your_contact"))
+        profile_page = self.app.get(f"/user-profile")
         self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
 
-        your_contact_form = your_contact_page.forms[0]
+        profile_form = profile_page.forms[0]
 
         # Minimal check to ensure the form is loaded
-        self.assertEqual(your_contact_form["your_contact-first_name"].value, "Testy")
+        self.assertEqual(profile_form["first_name"].value, self.user.first_name)
 
         # update the first name of the contact
-        your_contact_form["your_contact-first_name"] = "Testy2"
+        profile_form["first_name"] = "Testy2"
 
         # Submit the updated form
-        your_contact_form.submit()
+        profile_form.submit()
 
         domain_request.refresh_from_db()
 
-        updated_submitter = domain_request.submitter
-        self.assertEquals(submitter_pk, updated_submitter.id)
-        self.assertEquals("Testy2", updated_submitter.first_name)
-
-    @less_console_noise_decorator
-    def test_edit_submitter_creates_new(self):
-        """When you:
-            1. edit an existing your contact which IS joined to another model,
-            2. then submit,
-        the domain request is linked to a new Contact, and the new Contact is updated."""
-
-        # Populate the database with a domain request that
-        # has submitter assigned to it, the submitter is also
-        # an other contact initially
-        # We'll do it from scratch
-        submitter, _ = Contact.objects.get_or_create(
-            first_name="Testy",
-            last_name="Tester",
-            title="Chief Tester",
-            email="testy@town.com",
-            phone="(201) 555 5555",
-        )
-        domain_request, _ = DomainRequest.objects.get_or_create(
-            generic_org_type="federal",
-            federal_type="executive",
-            purpose="Purpose of the site",
-            anything_else="No",
-            is_policy_acknowledged=True,
-            organization_name="Testorg",
-            address_line1="address 1",
-            state_territory="NY",
-            zipcode="10002",
-            creator=self.user,
-            status="started",
-        )
-        domain_request.other_contacts.add(submitter)
-
-        # submitter_pk is the initial pk of the your contact. set it before update
-        # to be able to verify after update that the other contact is still in place
-        # and not updated, and that the new submitter has a new id
-        submitter_pk = submitter.id
-
-        # prime the form by visiting /edit
-        self.app.get(reverse("edit-domain-request", kwargs={"id": domain_request.pk}))
-        # django-webtest does not handle cookie-based sessions well because it keeps
-        # resetting the session key on each new request, thus destroying the concept
-        # of a "session". We are going to do it manually, saving the session ID here
-        # and then setting the cookie on each request.
-        session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
-        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
-
-        your_contact_page = self.app.get(reverse("domain-request:your_contact"))
-        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
-
-        your_contact_form = your_contact_page.forms[0]
-
-        # Minimal check to ensure the form is loaded
-        self.assertEqual(your_contact_form["your_contact-first_name"].value, "Testy")
-
-        # update the first name of the contact
-        your_contact_form["your_contact-first_name"] = "Testy2"
-
-        # Submit the updated form
-        your_contact_form.submit()
-
-        domain_request.refresh_from_db()
-
-        # assert that the other contact is not updated
-        other_contacts = domain_request.other_contacts.all()
-        other_contact = other_contacts[0]
-        self.assertEquals(submitter_pk, other_contact.id)
-        self.assertEquals("Testy", other_contact.first_name)
-        # assert that the submitter is updated
-        submitter = domain_request.submitter
-        self.assertEquals("Testy2", submitter.first_name)
+        updated_creator = domain_request.creator
+        self.assertEquals(creator_pk, updated_creator.id)
+        self.assertEquals("Testy2", updated_creator.first_name)
 
     @less_console_noise_decorator
     def test_domain_request_about_your_organiztion_interstate(self):
@@ -2865,7 +2727,6 @@ class DomainRequestTestDifferentStatuses(TestWithUser, WebTest):
         self.assertContains(detail_page, "city1.gov")
         self.assertContains(detail_page, "Chief Tester")
         self.assertContains(detail_page, "testy@town.com")
-        self.assertContains(detail_page, "Admin Tester")
         self.assertContains(detail_page, "Status:")
 
     @less_console_noise_decorator
@@ -2882,7 +2743,6 @@ class DomainRequestTestDifferentStatuses(TestWithUser, WebTest):
         self.assertContains(detail_page, "city.gov")
         self.assertContains(detail_page, "Chief Tester")
         self.assertContains(detail_page, "testy@town.com")
-        self.assertContains(detail_page, "Admin Tester")
         self.assertContains(detail_page, "Status:")
 
     @less_console_noise_decorator
@@ -2896,7 +2756,6 @@ class DomainRequestTestDifferentStatuses(TestWithUser, WebTest):
         self.assertContains(detail_page, "city1.gov")
         self.assertContains(detail_page, "Chief Tester")
         self.assertContains(detail_page, "testy@town.com")
-        self.assertContains(detail_page, "Admin Tester")
         self.assertContains(detail_page, "Status:")
         # click the "Withdraw request" button
         mock_client = MockSESClient()
@@ -2929,7 +2788,6 @@ class DomainRequestTestDifferentStatuses(TestWithUser, WebTest):
         self.assertContains(detail_page, "city1.gov")
         self.assertContains(detail_page, "Chief Tester")
         self.assertContains(detail_page, "testy@town.com")
-        self.assertContains(detail_page, "Admin Tester")
         self.assertContains(detail_page, "Status:")
         # Restricted user trying to withdraw results in 403 error
         with less_console_noise():
@@ -3028,10 +2886,10 @@ class TestWizardUnlockingSteps(TestWithUser, WebTest):
             self.assertEqual(detail_page.status_code, 200)
 
             # 10 unlocked steps, one active step, the review step will have link_usa but not check_circle
-            self.assertContains(detail_page, "#check_circle", count=10)
+            self.assertContains(detail_page, "#check_circle", count=9)
             # Type of organization
             self.assertContains(detail_page, "usa-current", count=1)
-            self.assertContains(detail_page, "link_usa-checked", count=11)
+            self.assertContains(detail_page, "link_usa-checked", count=10)
 
         else:
             self.fail(f"Expected a redirect, but got a different response: {response}")
@@ -3090,10 +2948,10 @@ class TestWizardUnlockingSteps(TestWithUser, WebTest):
 
             # 5 unlocked steps (so, domain, submitter, other contacts, and current sites
             # which unlocks if domain exists), one active step, the review step is locked
-            self.assertContains(detail_page, "#check_circle", count=5)
+            self.assertContains(detail_page, "#check_circle", count=4)
             # Type of organization
             self.assertContains(detail_page, "usa-current", count=1)
-            self.assertContains(detail_page, "link_usa-checked", count=5)
+            self.assertContains(detail_page, "link_usa-checked", count=4)
 
         else:
             self.fail(f"Expected a redirect, but got a different response: {response}")
diff --git a/src/registrar/views/__init__.py b/src/registrar/views/__init__.py
index f6e87dd07..2c42263d3 100644
--- a/src/registrar/views/__init__.py
+++ b/src/registrar/views/__init__.py
@@ -8,7 +8,6 @@ from .domain import (
     DomainNameserversView,
     DomainDNSSECView,
     DomainDsDataView,
-    DomainYourContactInformationView,
     DomainSecurityEmailView,
     DomainUsersView,
     DomainAddUserView,
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 72f2fd27e..4de2ad31e 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -637,38 +637,6 @@ class DomainDsDataView(DomainFormBaseView):
             return super().form_valid(formset)
 
 
-class DomainYourContactInformationView(DomainFormBaseView):
-    """Domain your contact information editing view."""
-
-    template_name = "domain_your_contact_information.html"
-    form_class = UserForm
-
-    @waffle_flag("!profile_feature")  # type: ignore
-    def dispatch(self, request, *args, **kwargs):  # type: ignore
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_form_kwargs(self, *args, **kwargs):
-        """Add domain_info.submitter instance to make a bound form."""
-        form_kwargs = super().get_form_kwargs(*args, **kwargs)
-        form_kwargs["instance"] = self.request.user
-        return form_kwargs
-
-    def get_success_url(self):
-        """Redirect to the your contact information for the domain."""
-        return reverse("domain-your-contact-information", kwargs={"pk": self.object.pk})
-
-    def form_valid(self, form):
-        """The form is valid, call setter in model."""
-
-        # Post to DB using values from the form
-        form.save()
-
-        messages.success(self.request, "Your contact information for all your domains has been updated.")
-
-        # superclass has the redirect
-        return super().form_valid(form)
-
-
 class DomainSecurityEmailView(DomainFormBaseView):
     """Domain security email editing view."""
 
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 45c0c3ddb..220cfcae1 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -45,7 +45,6 @@ class Step(StrEnum):
     CURRENT_SITES = "current_sites"
     DOTGOV_DOMAIN = "dotgov_domain"
     PURPOSE = "purpose"
-    YOUR_CONTACT = "your_contact"
     OTHER_CONTACTS = "other_contacts"
     ADDITIONAL_DETAILS = "additional_details"
     REQUIREMENTS = "requirements"
@@ -91,7 +90,6 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         Step.CURRENT_SITES: _("Current websites"),
         Step.DOTGOV_DOMAIN: _(".gov domain"),
         Step.PURPOSE: _("Purpose of your domain"),
-        Step.YOUR_CONTACT: _("Your contact information"),
         Step.OTHER_CONTACTS: _("Other employees from your organization"),
         Step.ADDITIONAL_DETAILS: _("Additional details"),
         Step.REQUIREMENTS: _("Requirements for operating a .gov domain"),
@@ -375,7 +373,6 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
             ),
             "dotgov_domain": self.domain_request.requested_domain is not None,
             "purpose": self.domain_request.purpose is not None,
-            "your_contact": self.domain_request.creator is not None,
             "other_contacts": (
                 self.domain_request.other_contacts.exists()
                 or self.domain_request.no_other_contacts_rationale is not None
@@ -439,9 +436,6 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
             if condition:
                 step_list.append(step)
 
-        if flag_is_active(self.request, "profile_feature"):
-            step_list.remove(Step.YOUR_CONTACT)
-
         return step_list
 
     def goto(self, step):
@@ -582,15 +576,6 @@ class Purpose(DomainRequestWizard):
     forms = [forms.PurposeForm]
 
 
-class YourContact(DomainRequestWizard):
-    template_name = "domain_request_your_contact.html"
-    forms = [forms.YourContactForm]
-
-    @waffle_flag("!profile_feature")  # type: ignore
-    def dispatch(self, request, *args, **kwargs):  # type: ignore
-        return super().dispatch(request, *args, **kwargs)
-
-
 class OtherContacts(DomainRequestWizard):
     template_name = "domain_request_other_contacts.html"
     forms = [forms.OtherContactsYesNoForm, forms.OtherContactsFormSet, forms.NoOtherContactsForm]

From 11e44a326ab3ada8d58b0a51e822fa7a822ff3be Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Tue, 27 Aug 2024 16:04:15 -0700
Subject: [PATCH 005/118] Remove test_is_creator_complete test

---
 src/registrar/tests/test_models.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 5e8dbc80b..f4dd14ae0 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -1997,13 +1997,6 @@ class TestDomainRequestIncomplete(TestCase):
         self.domain_request.save()
         self.assertFalse(self.domain_request._is_purpose_complete())
 
-    @less_console_noise_decorator
-    def test_is_creator_complete(self):
-        self.assertTrue(self.domain_request._is_creator_complete())
-        self.domain_request.creator = None
-        self.domain_request.save()
-        self.assertFalse(self.domain_request._is_creator_complete())
-
     @less_console_noise_decorator
     def test_is_other_contacts_complete_missing_one_field(self):
         self.assertTrue(self.domain_request._is_other_contacts_complete())

From 9a83287c6ecde9869cd5b38bf9e5114a82baba02 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Tue, 27 Aug 2024 16:07:58 -0700
Subject: [PATCH 006/118] Remove test
 test_home_deletes_domain_request_and_orphans

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

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index f142fb966..cb340d444 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -349,77 +349,6 @@ class HomeTests(TestWithUser):
                         # clean up
                         domain_request.delete()
 
-    @less_console_noise_decorator
-    def test_home_deletes_domain_request_and_orphans(self):
-        """Tests if delete for DomainRequest deletes orphaned Contact objects"""
-
-        # Create the site and contacts to delete (orphaned)
-        contact = Contact.objects.create(
-            first_name="Henry",
-            last_name="Mcfakerson",
-        )
-        contact_shared = Contact.objects.create(
-            first_name="Relative",
-            last_name="Aether",
-        )
-
-        # Create two non-orphaned contacts
-        contact_2 = Contact.objects.create(
-            first_name="Saturn",
-            last_name="Mars",
-        )
-
-        # Attach a user object to a contact (should not be deleted)
-        contact_user, _ = Contact.objects.get_or_create(
-            first_name="Hank",
-            last_name="McFakey",
-        )
-
-        site = DraftDomain.objects.create(name="igorville.gov")
-        domain_request = DomainRequest.objects.create(
-            creator=self.user,
-            requested_domain=site,
-            status=DomainRequest.DomainRequestStatus.WITHDRAWN,
-            senior_official=contact,
-        )
-        domain_request.other_contacts.set([contact_2])
-
-        # Create a second domain request to attach contacts to
-        site_2 = DraftDomain.objects.create(name="teaville.gov")
-        domain_request_2 = DomainRequest.objects.create(
-            creator=self.user,
-            requested_domain=site_2,
-            status=DomainRequest.DomainRequestStatus.STARTED,
-            senior_official=contact_2,
-        )
-        domain_request_2.other_contacts.set([contact_shared])
-
-        igorville = DomainRequest.objects.filter(requested_domain__name="igorville.gov")
-        self.assertTrue(igorville.exists())
-
-        # Trigger the delete logic
-        self.client.post(reverse("domain-request-delete", kwargs={"pk": domain_request.pk}))
-
-        # igorville is now deleted
-        igorville = DomainRequest.objects.filter(requested_domain__name="igorville.gov")
-        self.assertFalse(igorville.exists())
-
-        # Check if the orphaned contacts were deleted
-        orphan = Contact.objects.filter(id=contact.id)
-        self.assertFalse(orphan.exists())
-        orphan = Contact.objects.filter(id=contact_user.id)
-        self.assertFalse(orphan.exists())
-
-        try:
-            edge_case = Contact.objects.filter(id=contact_2.id).get()
-        except Contact.DoesNotExist:
-            self.fail("contact_2 (a non-orphaned contact) was deleted")
-
-        self.assertEqual(edge_case, contact_2)
-
-        DomainRequest.objects.all().delete()
-        Contact.objects.all().delete()
-
     @less_console_noise_decorator
     def test_home_deletes_domain_request_and_shared_orphans(self):
         """Test the edge case for an object that will become orphaned after a delete

From d0b3dd7c4681a93b02aa22105d4d136e52ac3b42 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Tue, 27 Aug 2024 16:09:57 -0700
Subject: [PATCH 007/118] Delete test_home_deletes_domain_request_and_orphans

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

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index cb340d444..4e5553976 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -349,68 +349,6 @@ class HomeTests(TestWithUser):
                         # clean up
                         domain_request.delete()
 
-    @less_console_noise_decorator
-    def test_home_deletes_domain_request_and_shared_orphans(self):
-        """Test the edge case for an object that will become orphaned after a delete
-        (but is not an orphan at the time of deletion)"""
-
-        # Create the site and contacts to delete (orphaned)
-        contact = Contact.objects.create(
-            first_name="Henry",
-            last_name="Mcfakerson",
-        )
-        contact_shared = Contact.objects.create(
-            first_name="Relative",
-            last_name="Aether",
-        )
-
-        # Create two non-orphaned contacts
-        contact_2 = Contact.objects.create(
-            first_name="Saturn",
-            last_name="Mars",
-        )
-
-        # Attach a user object to a contact (should not be deleted)
-        contact_user, _ = Contact.objects.get_or_create(
-            first_name="Hank",
-            last_name="McFakey",
-        )
-
-        site = DraftDomain.objects.create(name="igorville.gov")
-        domain_request = DomainRequest.objects.create(
-            creator=self.user,
-            requested_domain=site,
-            status=DomainRequest.DomainRequestStatus.WITHDRAWN,
-            senior_official=contact,
-        )
-        domain_request.other_contacts.set([contact_2])
-
-        # Create a second domain request to attach contacts to
-        site_2 = DraftDomain.objects.create(name="teaville.gov")
-        domain_request_2 = DomainRequest.objects.create(
-            creator=self.user,
-            requested_domain=site_2,
-            status=DomainRequest.DomainRequestStatus.STARTED,
-            senior_official=contact_2,
-        )
-        domain_request_2.other_contacts.set([contact_shared])
-
-        teaville = DomainRequest.objects.filter(requested_domain__name="teaville.gov")
-        self.assertTrue(teaville.exists())
-
-        # Trigger the delete logic
-        self.client.post(reverse("domain-request-delete", kwargs={"pk": domain_request_2.pk}))
-
-        teaville = DomainRequest.objects.filter(requested_domain__name="teaville.gov")
-        self.assertFalse(teaville.exists())
-
-        # Check if the orphaned contact was deleted
-        orphan = Contact.objects.filter(id=contact_shared.id)
-        self.assertFalse(orphan.exists())
-
-        DomainRequest.objects.all().delete()
-        Contact.objects.all().delete()
-
     @less_console_noise_decorator
     def test_domain_request_form_view(self):
         response = self.client.get("/request/", follow=True)

From 2c43533441075088446cbe8b0108055d20e6462d Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Tue, 27 Aug 2024 16:46:30 -0700
Subject: [PATCH 008/118] Remove submitter from deleting orphaned contacts

---
 src/registrar/tests/test_views.py        | 133 +++++++++++++++++++++++
 src/registrar/tests/test_views_domain.py |  13 ---
 src/registrar/views/domain_request.py    |   4 +-
 3 files changed, 134 insertions(+), 16 deletions(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 4e5553976..f142fb966 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -349,6 +349,139 @@ class HomeTests(TestWithUser):
                         # clean up
                         domain_request.delete()
 
+    @less_console_noise_decorator
+    def test_home_deletes_domain_request_and_orphans(self):
+        """Tests if delete for DomainRequest deletes orphaned Contact objects"""
+
+        # Create the site and contacts to delete (orphaned)
+        contact = Contact.objects.create(
+            first_name="Henry",
+            last_name="Mcfakerson",
+        )
+        contact_shared = Contact.objects.create(
+            first_name="Relative",
+            last_name="Aether",
+        )
+
+        # Create two non-orphaned contacts
+        contact_2 = Contact.objects.create(
+            first_name="Saturn",
+            last_name="Mars",
+        )
+
+        # Attach a user object to a contact (should not be deleted)
+        contact_user, _ = Contact.objects.get_or_create(
+            first_name="Hank",
+            last_name="McFakey",
+        )
+
+        site = DraftDomain.objects.create(name="igorville.gov")
+        domain_request = DomainRequest.objects.create(
+            creator=self.user,
+            requested_domain=site,
+            status=DomainRequest.DomainRequestStatus.WITHDRAWN,
+            senior_official=contact,
+        )
+        domain_request.other_contacts.set([contact_2])
+
+        # Create a second domain request to attach contacts to
+        site_2 = DraftDomain.objects.create(name="teaville.gov")
+        domain_request_2 = DomainRequest.objects.create(
+            creator=self.user,
+            requested_domain=site_2,
+            status=DomainRequest.DomainRequestStatus.STARTED,
+            senior_official=contact_2,
+        )
+        domain_request_2.other_contacts.set([contact_shared])
+
+        igorville = DomainRequest.objects.filter(requested_domain__name="igorville.gov")
+        self.assertTrue(igorville.exists())
+
+        # Trigger the delete logic
+        self.client.post(reverse("domain-request-delete", kwargs={"pk": domain_request.pk}))
+
+        # igorville is now deleted
+        igorville = DomainRequest.objects.filter(requested_domain__name="igorville.gov")
+        self.assertFalse(igorville.exists())
+
+        # Check if the orphaned contacts were deleted
+        orphan = Contact.objects.filter(id=contact.id)
+        self.assertFalse(orphan.exists())
+        orphan = Contact.objects.filter(id=contact_user.id)
+        self.assertFalse(orphan.exists())
+
+        try:
+            edge_case = Contact.objects.filter(id=contact_2.id).get()
+        except Contact.DoesNotExist:
+            self.fail("contact_2 (a non-orphaned contact) was deleted")
+
+        self.assertEqual(edge_case, contact_2)
+
+        DomainRequest.objects.all().delete()
+        Contact.objects.all().delete()
+
+    @less_console_noise_decorator
+    def test_home_deletes_domain_request_and_shared_orphans(self):
+        """Test the edge case for an object that will become orphaned after a delete
+        (but is not an orphan at the time of deletion)"""
+
+        # Create the site and contacts to delete (orphaned)
+        contact = Contact.objects.create(
+            first_name="Henry",
+            last_name="Mcfakerson",
+        )
+        contact_shared = Contact.objects.create(
+            first_name="Relative",
+            last_name="Aether",
+        )
+
+        # Create two non-orphaned contacts
+        contact_2 = Contact.objects.create(
+            first_name="Saturn",
+            last_name="Mars",
+        )
+
+        # Attach a user object to a contact (should not be deleted)
+        contact_user, _ = Contact.objects.get_or_create(
+            first_name="Hank",
+            last_name="McFakey",
+        )
+
+        site = DraftDomain.objects.create(name="igorville.gov")
+        domain_request = DomainRequest.objects.create(
+            creator=self.user,
+            requested_domain=site,
+            status=DomainRequest.DomainRequestStatus.WITHDRAWN,
+            senior_official=contact,
+        )
+        domain_request.other_contacts.set([contact_2])
+
+        # Create a second domain request to attach contacts to
+        site_2 = DraftDomain.objects.create(name="teaville.gov")
+        domain_request_2 = DomainRequest.objects.create(
+            creator=self.user,
+            requested_domain=site_2,
+            status=DomainRequest.DomainRequestStatus.STARTED,
+            senior_official=contact_2,
+        )
+        domain_request_2.other_contacts.set([contact_shared])
+
+        teaville = DomainRequest.objects.filter(requested_domain__name="teaville.gov")
+        self.assertTrue(teaville.exists())
+
+        # Trigger the delete logic
+        self.client.post(reverse("domain-request-delete", kwargs={"pk": domain_request_2.pk}))
+
+        teaville = DomainRequest.objects.filter(requested_domain__name="teaville.gov")
+        self.assertFalse(teaville.exists())
+
+        # Check if the orphaned contact was deleted
+        orphan = Contact.objects.filter(id=contact_shared.id)
+        self.assertFalse(orphan.exists())
+
+        DomainRequest.objects.all().delete()
+        Contact.objects.all().delete()
+
     @less_console_noise_decorator
     def test_domain_request_form_view(self):
         response = self.client.get("/request/", follow=True)
diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index 980a1bf12..1da73087e 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -159,7 +159,6 @@ class TestDomainPermissions(TestWithDomainPermissions):
             "domain-dns-nameservers",
             "domain-org-name-address",
             "domain-senior-official",
-            "domain-your-contact-information",
             "domain-security-email",
         ]:
             with self.subTest(view_name=view_name):
@@ -179,7 +178,6 @@ class TestDomainPermissions(TestWithDomainPermissions):
             "domain-dns-nameservers",
             "domain-org-name-address",
             "domain-senior-official",
-            "domain-your-contact-information",
             "domain-security-email",
         ]:
             with self.subTest(view_name=view_name):
@@ -200,7 +198,6 @@ class TestDomainPermissions(TestWithDomainPermissions):
             "domain-dns-dnssec-dsdata",
             "domain-org-name-address",
             "domain-senior-official",
-            "domain-your-contact-information",
             "domain-security-email",
         ]:
             for domain in [
@@ -1601,16 +1598,6 @@ class TestDomainSuborganization(TestDomainOverview):
         portfolio.delete()
 
 
-class TestDomainContactInformation(TestDomainOverview):
-    @less_console_noise_decorator
-    def test_domain_your_contact_information_content(self):
-        """Logged-in user's contact information appears on the page."""
-        self.user.first_name = "Testy"
-        self.user.save()
-        page = self.app.get(reverse("domain-your-contact-information", kwargs={"pk": self.domain.id}))
-        self.assertContains(page, "Testy")
-
-
 class TestDomainSecurityEmail(TestDomainOverview):
     def test_domain_security_email_existing_security_contact(self):
         """Can load domain's security email page."""
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 220cfcae1..05f4e38ff 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -827,18 +827,16 @@ class DomainRequestDeleteView(DomainRequestPermissionDeleteView):
 
         # Get each contact object on the DomainRequest object
         so = domain_request.senior_official
-        creator = domain_request.creator
         other_contacts = list(domain_request.other_contacts.all())
         other_contact_ids = domain_request.other_contacts.all().values_list("id", flat=True)
 
         # Check if the desired item still exists in the DB
         if check_db:
             so = self._get_contacts_by_id([so.id]).first() if so is not None else None
-            creator = self._get_contacts_by_id([creator.id]).first() if creator is not None else None
             other_contacts = self._get_contacts_by_id(other_contact_ids)
 
         # Pair each contact with its db related name for use in checking if it has joins
-        checked_contacts = [(so, "senior_official"), (creator, "submitted_domain_requests")]
+        checked_contacts = [(so, "senior_official")]
         checked_contacts.extend((contact, "contact_domain_requests") for contact in other_contacts)
 
         for contact, related_name in checked_contacts:

From 06ef54f0319d8f6f85f04cf0d43331e24b92dbef Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Tue, 27 Aug 2024 17:16:52 -0700
Subject: [PATCH 009/118] Delete outdated contact join tests

---
 src/registrar/tests/common.py     |  9 +---
 src/registrar/tests/test_admin.py | 85 -------------------------------
 2 files changed, 1 insertion(+), 93 deletions(-)

diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py
index 40d5108f4..ea2462dfb 100644
--- a/src/registrar/tests/common.py
+++ b/src/registrar/tests/common.py
@@ -918,14 +918,7 @@ def completed_domain_request(  # noqa
     domain, _ = DraftDomain.objects.get_or_create(name=name)
     alt, _ = Website.objects.get_or_create(website="city1.gov")
     current, _ = Website.objects.get_or_create(website="city.com")
-    # if not creator:
-    #     creator, _ = Contact.objects.get_or_create(
-    #         first_name="Testy2",
-    #         last_name="Tester2",
-    #         title="Admin Tester",
-    #         email="mayor@igorville.gov",
-    #         phone="(555) 555 5556",
-    #     )
+    creator = user
     other, _ = Contact.objects.get_or_create(
         first_name="Testy",
         last_name="Tester",
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index f69c37947..4cce3ed14 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -1653,91 +1653,6 @@ class TestContactAdmin(TestCase):
 
             self.assertEqual(readonly_fields, expected_fields)
 
-    def test_change_view_for_joined_contact_five_or_less(self):
-        """Create a contact, join it to 4 domain requests.
-        Assert that the warning on the contact form lists 4 joins."""
-        with less_console_noise():
-            self.client.force_login(self.superuser)
-
-            # Create an instance of the model
-            contact, _ = Contact.objects.get_or_create(
-                first_name="Henry",
-                last_name="McFakerson",
-            )
-
-            # join it to 4 domain requests.
-            domain_request1 = completed_domain_request(name="city1.gov")
-            domain_request2 = completed_domain_request(name="city2.gov")
-            domain_request3 = completed_domain_request(name="city3.gov")
-            domain_request4 = completed_domain_request(name="city4.gov")
-
-            with patch("django.contrib.messages.warning") as mock_warning:
-                # Use the test client to simulate the request
-                response = self.client.get(reverse("admin:registrar_contact_change", args=[contact.pk]))
-
-                # Assert that the error message was called with the correct argument
-                # Note: The 5th join will be a user.
-                mock_warning.assert_called_once_with(
-                    response.wsgi_request,
-                    "<ul class='messagelist_content-list--unstyled'>"
-                    "<li>Joined to DomainRequest: <a href='/admin/registrar/"
-                    f"domainrequest/{domain_request1.pk}/change/'>city1.gov</a></li>"
-                    "<li>Joined to DomainRequest: <a href='/admin/registrar/"
-                    f"domainrequest/{domain_request2.pk}/change/'>city2.gov</a></li>"
-                    "<li>Joined to DomainRequest: <a href='/admin/registrar/"
-                    f"domainrequest/{domain_request3.pk}/change/'>city3.gov</a></li>"
-                    "<li>Joined to DomainRequest: <a href='/admin/registrar/"
-                    f"domainrequest/{domain_request4.pk}/change/'>city4.gov</a></li>"
-                    "</ul>",
-                )
-
-            # cleanup this test
-            DomainRequest.objects.all().delete()
-            contact.delete()
-
-    def test_change_view_for_joined_contact_five_or_more(self):
-        """Create a contact, join it to 6 domain requests.
-        Assert that the warning on the contact form lists 5 joins and a '1 more' ellispsis."""
-        with less_console_noise():
-            self.client.force_login(self.superuser)
-            # Create an instance of the model
-            # join it to 6 domain requests.
-            contact, _ = Contact.objects.get_or_create(
-                first_name="Henry",
-                last_name="McFakerson",
-            )
-            domain_request1 = completed_domain_request(name="city1.gov")
-            domain_request2 = completed_domain_request(name="city2.gov")
-            domain_request3 = completed_domain_request(name="city3.gov")
-            domain_request4 = completed_domain_request(name="city4.gov")
-            domain_request5 = completed_domain_request(name="city5.gov")
-            completed_domain_request(name="city6.gov")
-            with patch("django.contrib.messages.warning") as mock_warning:
-                # Use the test client to simulate the request
-                response = self.client.get(reverse("admin:registrar_contact_change", args=[contact.pk]))
-                logger.debug(mock_warning)
-                # Assert that the error message was called with the correct argument
-                # Note: The 6th join will be a user.
-                mock_warning.assert_called_once_with(
-                    response.wsgi_request,
-                    "<ul class='messagelist_content-list--unstyled'>"
-                    "<li>Joined to DomainRequest: <a href='/admin/registrar/"
-                    f"domainrequest/{domain_request1.pk}/change/'>city1.gov</a></li>"
-                    "<li>Joined to DomainRequest: <a href='/admin/registrar/"
-                    f"domainrequest/{domain_request2.pk}/change/'>city2.gov</a></li>"
-                    "<li>Joined to DomainRequest: <a href='/admin/registrar/"
-                    f"domainrequest/{domain_request3.pk}/change/'>city3.gov</a></li>"
-                    "<li>Joined to DomainRequest: <a href='/admin/registrar/"
-                    f"domainrequest/{domain_request4.pk}/change/'>city4.gov</a></li>"
-                    "<li>Joined to DomainRequest: <a href='/admin/registrar/"
-                    f"domainrequest/{domain_request5.pk}/change/'>city5.gov</a></li>"
-                    "</ul>"
-                    "<p class='font-sans-3xs'>And 1 more...</p>",
-                )
-            # cleanup this test
-            DomainRequest.objects.all().delete()
-            contact.delete()
-
 
 class TestVerifiedByStaffAdmin(TestCase):
 

From 804d19f30eb6c1be39f99e34dfe993b572d6dfef Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Tue, 27 Aug 2024 17:43:08 -0700
Subject: [PATCH 010/118] remove submitter from orphan tests

---
 src/registrar/tests/test_admin_request.py |  4 +++-
 src/registrar/tests/test_emails.py        |  1 -
 src/registrar/tests/test_views.py         | 22 ----------------------
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 5a1236d49..5b688343a 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -35,6 +35,7 @@ from .common import (
     GenericTestHelper,
 )
 from unittest.mock import patch
+from waffle.testutils import override_flag
 
 from django.conf import settings
 import boto3_mocking  # type: ignore
@@ -149,7 +150,7 @@ class TestDomainRequestAdmin(MockEppLib):
 
         # These should exist in the response
         expected_values = [
-            ("creator", "Person who submitted the domain request; will receive email updates"),
+            ("creator", "Person who submitted the domain request. Will receive email updates"),
             ("approved_domain", "Domain associated with this request; will be blank until request is approved"),
             ("no_other_contacts_rationale", "Required if creator does not list other employees"),
             ("alternative_domains", "Other domain names the creator provided for consideration"),
@@ -894,6 +895,7 @@ class TestDomainRequestAdmin(MockEppLib):
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.SUBMITTED)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 3)
 
+    @override_flag("profile_feature", True)
     @less_console_noise_decorator
     def test_save_model_sends_approved_email(self):
         """When transitioning to approved on a domain request,
diff --git a/src/registrar/tests/test_emails.py b/src/registrar/tests/test_emails.py
index 8cf707004..cc8b0c4b1 100644
--- a/src/registrar/tests/test_emails.py
+++ b/src/registrar/tests/test_emails.py
@@ -69,7 +69,6 @@ class TestEmails(TestCase):
 
         # check for optional things
         self.assertIn("Other employees from your organization:", body)
-        self.assertIn("Testy2 Tester2", body)
         self.assertIn("Current websites:", body)
         self.assertIn("city.com", body)
         self.assertIn("About your organization:", body)
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index f142fb966..8b2743059 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -358,10 +358,6 @@ class HomeTests(TestWithUser):
             first_name="Henry",
             last_name="Mcfakerson",
         )
-        contact_shared = Contact.objects.create(
-            first_name="Relative",
-            last_name="Aether",
-        )
 
         # Create two non-orphaned contacts
         contact_2 = Contact.objects.create(
@@ -369,12 +365,6 @@ class HomeTests(TestWithUser):
             last_name="Mars",
         )
 
-        # Attach a user object to a contact (should not be deleted)
-        contact_user, _ = Contact.objects.get_or_create(
-            first_name="Hank",
-            last_name="McFakey",
-        )
-
         site = DraftDomain.objects.create(name="igorville.gov")
         domain_request = DomainRequest.objects.create(
             creator=self.user,
@@ -407,8 +397,6 @@ class HomeTests(TestWithUser):
         # Check if the orphaned contacts were deleted
         orphan = Contact.objects.filter(id=contact.id)
         self.assertFalse(orphan.exists())
-        orphan = Contact.objects.filter(id=contact_user.id)
-        self.assertFalse(orphan.exists())
 
         try:
             edge_case = Contact.objects.filter(id=contact_2.id).get()
@@ -430,10 +418,6 @@ class HomeTests(TestWithUser):
             first_name="Henry",
             last_name="Mcfakerson",
         )
-        contact_shared = Contact.objects.create(
-            first_name="Relative",
-            last_name="Aether",
-        )
 
         # Create two non-orphaned contacts
         contact_2 = Contact.objects.create(
@@ -441,12 +425,6 @@ class HomeTests(TestWithUser):
             last_name="Mars",
         )
 
-        # Attach a user object to a contact (should not be deleted)
-        contact_user, _ = Contact.objects.get_or_create(
-            first_name="Hank",
-            last_name="McFakey",
-        )
-
         site = DraftDomain.objects.create(name="igorville.gov")
         domain_request = DomainRequest.objects.create(
             creator=self.user,

From 29de97d5321a5de823db6aecf04a04acf7f6e28a Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Tue, 27 Aug 2024 17:43:58 -0700
Subject: [PATCH 011/118] Revert deleted contact shared

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

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 8b2743059..ebe0abb59 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -358,6 +358,10 @@ class HomeTests(TestWithUser):
             first_name="Henry",
             last_name="Mcfakerson",
         )
+        contact_shared = Contact.objects.create(
+            first_name="Relative",
+            last_name="Aether",
+        )
 
         # Create two non-orphaned contacts
         contact_2 = Contact.objects.create(
@@ -425,6 +429,12 @@ class HomeTests(TestWithUser):
             last_name="Mars",
         )
 
+        # Attach a user object to a contact (should not be deleted)
+        contact_user, _ = Contact.objects.get_or_create(
+            first_name="Hank",
+            last_name="McFakey",
+        )
+
         site = DraftDomain.objects.create(name="igorville.gov")
         domain_request = DomainRequest.objects.create(
             creator=self.user,

From 5b3ae28b88c001cf8fbe289a40ff14012e0d6b72 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Tue, 27 Aug 2024 17:49:04 -0700
Subject: [PATCH 012/118] Restore variable in orphan tests

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

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index ebe0abb59..2ae582b0e 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -422,6 +422,10 @@ class HomeTests(TestWithUser):
             first_name="Henry",
             last_name="Mcfakerson",
         )
+        contact_shared = Contact.objects.create(
+            first_name="Relative",
+            last_name="Aether",
+        )
 
         # Create two non-orphaned contacts
         contact_2 = Contact.objects.create(

From 2fcad733cd405d214b2a129eef201366fe04cbd5 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Tue, 27 Aug 2024 18:16:40 -0700
Subject: [PATCH 013/118] Update email status tests

---
 src/registrar/tests/test_admin_request.py | 229 ++++++++++++++--------
 1 file changed, 150 insertions(+), 79 deletions(-)

diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 5b688343a..397de21db 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -627,28 +627,35 @@ class TestDomainRequestAdmin(MockEppLib):
     def test_action_needed_sends_reason_email_prod_bcc(self):
         """When an action needed reason is set, an email is sent out and help@get.gov
         is BCC'd in production"""
-        # Ensure there is no user with this email
-        EMAIL = "mayor@igorville.gov"
+        # Create fake creator
+        _creator = User.objects.create(
+            username="MrMeoward",
+            first_name="Meoward",
+            last_name="Jones",
+            email="meoward.jones@igorville.gov",
+            phone="(555) 123 12345",
+            title="Treat inspector",
+        )
+
         BCC_EMAIL = settings.DEFAULT_FROM_EMAIL
-        User.objects.filter(email=EMAIL).delete()
         in_review = DomainRequest.DomainRequestStatus.IN_REVIEW
         action_needed = DomainRequest.DomainRequestStatus.ACTION_NEEDED
 
         # Create a sample domain request
-        domain_request = completed_domain_request(status=in_review)
+        domain_request = completed_domain_request(status=in_review, user=_creator)
 
         # Test the email sent out for already_has_domains
         already_has_domains = DomainRequest.ActionNeededReasons.ALREADY_HAS_DOMAINS
         self.transition_state_and_send_email(domain_request, action_needed, action_needed_reason=already_has_domains)
 
-        self.assert_email_is_accurate("ORGANIZATION ALREADY HAS A .GOV DOMAIN", 0, EMAIL, bcc_email_address=BCC_EMAIL)
+        self.assert_email_is_accurate("ORGANIZATION ALREADY HAS A .GOV DOMAIN", 0, _creator.email, bcc_email_address=BCC_EMAIL)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Test the email sent out for bad_name
         bad_name = DomainRequest.ActionNeededReasons.BAD_NAME
         self.transition_state_and_send_email(domain_request, action_needed, action_needed_reason=bad_name)
         self.assert_email_is_accurate(
-            "DOMAIN NAME DOES NOT MEET .GOV REQUIREMENTS", 1, EMAIL, bcc_email_address=BCC_EMAIL
+            "DOMAIN NAME DOES NOT MEET .GOV REQUIREMENTS", 1, _creator.email, bcc_email_address=BCC_EMAIL
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
 
@@ -656,7 +663,7 @@ class TestDomainRequestAdmin(MockEppLib):
         eligibility_unclear = DomainRequest.ActionNeededReasons.ELIGIBILITY_UNCLEAR
         self.transition_state_and_send_email(domain_request, action_needed, action_needed_reason=eligibility_unclear)
         self.assert_email_is_accurate(
-            "ORGANIZATION MAY NOT MEET ELIGIBILITY REQUIREMENTS", 2, EMAIL, bcc_email_address=BCC_EMAIL
+            "ORGANIZATION MAY NOT MEET ELIGIBILITY REQUIREMENTS", 2, _creator.email, bcc_email_address=BCC_EMAIL
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 3)
 
@@ -664,7 +671,7 @@ class TestDomainRequestAdmin(MockEppLib):
         questionable_so = DomainRequest.ActionNeededReasons.QUESTIONABLE_SENIOR_OFFICIAL
         self.transition_state_and_send_email(domain_request, action_needed, action_needed_reason=questionable_so)
         self.assert_email_is_accurate(
-            "SENIOR OFFICIAL DOES NOT MEET ELIGIBILITY REQUIREMENTS", 3, EMAIL, bcc_email_address=BCC_EMAIL
+            "SENIOR OFFICIAL DOES NOT MEET ELIGIBILITY REQUIREMENTS", 3, _creator.email, bcc_email_address=BCC_EMAIL
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 4)
 
@@ -685,7 +692,7 @@ class TestDomainRequestAdmin(MockEppLib):
         )
 
         domain_request.refresh_from_db()
-        self.assert_email_is_accurate("custom email content", 4, EMAIL, bcc_email_address=BCC_EMAIL)
+        self.assert_email_is_accurate("custom email content", 4, _creator.email, bcc_email_address=BCC_EMAIL)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 5)
 
         # Tests if a new email gets sent when just the email is changed.
@@ -709,7 +716,7 @@ class TestDomainRequestAdmin(MockEppLib):
             action_needed_reason=eligibility_unclear,
             action_needed_reason_email="custom content when starting anew",
         )
-        self.assert_email_is_accurate("custom content when starting anew", 5, EMAIL, bcc_email_address=BCC_EMAIL)
+        self.assert_email_is_accurate("custom content when starting anew", 5, _creator.email, bcc_email_address=BCC_EMAIL)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 6)
 
     # def test_action_needed_sends_reason_email_prod_bcc(self):
@@ -773,22 +780,28 @@ class TestDomainRequestAdmin(MockEppLib):
         Also test that the default email set in settings is NOT BCCd on non-prod whenever
         an email does go out."""
 
-        # Ensure there is no user with this email
-        EMAIL = "mayor@igorville.gov"
-        User.objects.filter(email=EMAIL).delete()
+        # Create fake creator
+        _creator = User.objects.create(
+            username="MrMeoward",
+            first_name="Meoward",
+            last_name="Jones",
+            email="meoward.jones@igorville.gov",
+            phone="(555) 123 12345",
+            title="Treat inspector",
+        )
 
         # Create a sample domain request
-        domain_request = completed_domain_request()
+        domain_request = completed_domain_request(user=_creator)
 
         # Test Submitted Status from started
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.SUBMITTED)
-        self.assert_email_is_accurate("We received your .gov domain request.", 0, EMAIL, True)
+        self.assert_email_is_accurate("We received your .gov domain request.", 0, _creator.email, True)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Test Withdrawn Status
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.WITHDRAWN)
         self.assert_email_is_accurate(
-            "Your .gov domain request has been withdrawn and will not be reviewed by our team.", 1, EMAIL, True
+            "Your .gov domain request has been withdrawn and will not be reviewed by our team.", 1, _creator.email, True
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
 
@@ -847,30 +860,36 @@ class TestDomainRequestAdmin(MockEppLib):
         Also test that the default email set in settings IS BCCd on prod whenever
         an email does go out."""
 
-        # Ensure there is no user with this email
-        EMAIL = "mayor@igorville.gov"
-        User.objects.filter(email=EMAIL).delete()
+        # Create fake creator
+        _creator = User.objects.create(
+            username="MrMeoward",
+            first_name="Meoward",
+            last_name="Jones",
+            email="meoward.jones@igorville.gov",
+            phone="(555) 123 12345",
+            title="Treat inspector",
+        )
 
         BCC_EMAIL = settings.DEFAULT_FROM_EMAIL
 
         # Create a sample domain request
-        domain_request = completed_domain_request()
+        domain_request = completed_domain_request(user=_creator)
 
         # Test Submitted Status from started
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.SUBMITTED)
-        self.assert_email_is_accurate("We received your .gov domain request.", 0, EMAIL, False, BCC_EMAIL)
+        self.assert_email_is_accurate("We received your .gov domain request.", 0, _creator.email, False, BCC_EMAIL)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Test Withdrawn Status
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.WITHDRAWN)
         self.assert_email_is_accurate(
-            "Your .gov domain request has been withdrawn and will not be reviewed by our team.", 1, EMAIL
+            "Your .gov domain request has been withdrawn and will not be reviewed by our team.", 1, _creator.email
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
 
         # Test Submitted Status Again (from withdrawn)
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.SUBMITTED)
-        self.assert_email_is_accurate("We received your .gov domain request.", 0, EMAIL, False, BCC_EMAIL)
+        self.assert_email_is_accurate("We received your .gov domain request.", 0, _creator.email, False, BCC_EMAIL)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 3)
 
         # Move it to IN_REVIEW
@@ -901,16 +920,22 @@ class TestDomainRequestAdmin(MockEppLib):
         """When transitioning to approved on a domain request,
         an email is sent out every time."""
 
-        # Ensure there is no user with this email
-        EMAIL = "mayor@igorville.gov"
-        User.objects.filter(email=EMAIL).delete()
+        # Create fake creator
+        _creator = User.objects.create(
+            username="MrMeoward",
+            first_name="Meoward",
+            last_name="Jones",
+            email="meoward.jones@igorville.gov",
+            phone="(555) 123 12345",
+            title="Treat inspector",
+        )
 
         # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
 
         # Test Submitted Status
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.APPROVED)
-        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 0, EMAIL)
+        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 0, _creator.email)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Test Withdrawn Status
@@ -919,7 +944,7 @@ class TestDomainRequestAdmin(MockEppLib):
             DomainRequest.DomainRequestStatus.REJECTED,
             DomainRequest.RejectionReasons.DOMAIN_PURPOSE,
         )
-        self.assert_email_is_accurate("Your .gov domain request has been rejected.", 1, EMAIL)
+        self.assert_email_is_accurate("Your .gov domain request has been rejected.", 1, _creator.email)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
 
         # Test Submitted Status Again (No new email should be sent)
@@ -931,12 +956,18 @@ class TestDomainRequestAdmin(MockEppLib):
         """When transitioning to rejected on a domain request, an email is sent
         explaining why when the reason is domain purpose."""
 
-        # Ensure there is no user with this email
-        EMAIL = "mayor@igorville.gov"
-        User.objects.filter(email=EMAIL).delete()
+        # Create fake creator
+        _creator = User.objects.create(
+            username="MrMeoward",
+            first_name="Meoward",
+            last_name="Jones",
+            email="meoward.jones@igorville.gov",
+            phone="(555) 123 12345",
+            title="Treat inspector",
+        )
 
         # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
 
         # Reject for reason DOMAIN_PURPOSE and test email
         self.transition_state_and_send_email(
@@ -947,13 +978,13 @@ class TestDomainRequestAdmin(MockEppLib):
         self.assert_email_is_accurate(
             "Your domain request was rejected because the purpose you provided did not meet our \nrequirements.",
             0,
-            EMAIL,
+            _creator.email,
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Approve
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.APPROVED)
-        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 1, EMAIL)
+        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 1, _creator.email)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
 
     @less_console_noise_decorator
@@ -961,12 +992,18 @@ class TestDomainRequestAdmin(MockEppLib):
         """When transitioning to rejected on a domain request, an email is sent
         explaining why when the reason is requestor."""
 
-        # Ensure there is no user with this email
-        EMAIL = "mayor@igorville.gov"
-        User.objects.filter(email=EMAIL).delete()
+        # Create fake creator
+        _creator = User.objects.create(
+            username="MrMeoward",
+            first_name="Meoward",
+            last_name="Jones",
+            email="meoward.jones@igorville.gov",
+            phone="(555) 123 12345",
+            title="Treat inspector",
+        )
 
         # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
 
         # Reject for reason REQUESTOR and test email including dynamic organization name
         self.transition_state_and_send_email(
@@ -976,13 +1013,13 @@ class TestDomainRequestAdmin(MockEppLib):
             "Your domain request was rejected because we don’t believe you’re eligible to request a \n.gov "
             "domain on behalf of Testorg",
             0,
-            EMAIL,
+            _creator.email,
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Approve
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.APPROVED)
-        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 1, EMAIL)
+        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 1, _creator.email)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
 
     @less_console_noise_decorator
@@ -990,12 +1027,18 @@ class TestDomainRequestAdmin(MockEppLib):
         """When transitioning to rejected on a domain request, an email is sent
         explaining why when the reason is second domain."""
 
-        # Ensure there is no user with this email
-        EMAIL = "mayor@igorville.gov"
-        User.objects.filter(email=EMAIL).delete()
+        # Create fake creator
+        _creator = User.objects.create(
+            username="MrMeoward",
+            first_name="Meoward",
+            last_name="Jones",
+            email="meoward.jones@igorville.gov",
+            phone="(555) 123 12345",
+            title="Treat inspector",
+        )
 
         # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
 
         # Reject for reason SECOND_DOMAIN_REASONING and test email including dynamic organization name
         self.transition_state_and_send_email(
@@ -1003,25 +1046,30 @@ class TestDomainRequestAdmin(MockEppLib):
             DomainRequest.DomainRequestStatus.REJECTED,
             DomainRequest.RejectionReasons.SECOND_DOMAIN_REASONING,
         )
-        self.assert_email_is_accurate("Your domain request was rejected because Testorg has a .gov domain.", 0, EMAIL)
+        self.assert_email_is_accurate("Your domain request was rejected because Testorg has a .gov domain.", 0, _creator.email)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Approve
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.APPROVED)
-        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 1, EMAIL)
+        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 1, _creator.email)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
 
     @less_console_noise_decorator
     def test_save_model_sends_rejected_email_contacts_or_org_legitimacy(self):
         """When transitioning to rejected on a domain request, an email is sent
         explaining why when the reason is contacts or org legitimacy."""
-
-        # Ensure there is no user with this email
-        EMAIL = "mayor@igorville.gov"
-        User.objects.filter(email=EMAIL).delete()
+        # Create fake creator
+        _creator = User.objects.create(
+            username="MrMeoward",
+            first_name="Meoward",
+            last_name="Jones",
+            email="meoward.jones@igorville.gov",
+            phone="(555) 123 12345",
+            title="Treat inspector",
+        )
 
         # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
 
         # Reject for reason CONTACTS_OR_ORGANIZATION_LEGITIMACY and test email including dynamic organization name
         self.transition_state_and_send_email(
@@ -1033,13 +1081,13 @@ class TestDomainRequestAdmin(MockEppLib):
             "Your domain request was rejected because we could not verify the organizational \n"
             "contacts you provided. If you have questions or comments, reply to this email.",
             0,
-            EMAIL,
+            _creator.email,
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Approve
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.APPROVED)
-        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 1, EMAIL)
+        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 1, _creator.email)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
 
     @less_console_noise_decorator
@@ -1047,12 +1095,18 @@ class TestDomainRequestAdmin(MockEppLib):
         """When transitioning to rejected on a domain request, an email is sent
         explaining why when the reason is org eligibility."""
 
-        # Ensure there is no user with this email
-        EMAIL = "mayor@igorville.gov"
-        User.objects.filter(email=EMAIL).delete()
+        # Create fake creator
+        _creator = User.objects.create(
+            username="MrMeoward",
+            first_name="Meoward",
+            last_name="Jones",
+            email="meoward.jones@igorville.gov",
+            phone="(555) 123 12345",
+            title="Treat inspector",
+        )
 
         # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
 
         # Reject for reason ORGANIZATION_ELIGIBILITY and test email including dynamic organization name
         self.transition_state_and_send_email(
@@ -1064,26 +1118,31 @@ class TestDomainRequestAdmin(MockEppLib):
             "Your domain request was rejected because we determined that Testorg is not \neligible for "
             "a .gov domain.",
             0,
-            EMAIL,
+            _creator.email,
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Approve
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.APPROVED)
-        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 1, EMAIL)
+        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 1, _creator.email)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
 
     @less_console_noise_decorator
     def test_save_model_sends_rejected_email_naming(self):
         """When transitioning to rejected on a domain request, an email is sent
         explaining why when the reason is naming."""
-
-        # Ensure there is no user with this email
-        EMAIL = "mayor@igorville.gov"
-        User.objects.filter(email=EMAIL).delete()
+        # Create fake creator
+        _creator = User.objects.create(
+            username="MrMeoward",
+            first_name="Meoward",
+            last_name="Jones",
+            email="meoward.jones@igorville.gov",
+            phone="(555) 123 12345",
+            title="Treat inspector",
+        )
 
         # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
 
         # Reject for reason NAMING_REQUIREMENTS and test email including dynamic organization name
         self.transition_state_and_send_email(
@@ -1092,13 +1151,13 @@ class TestDomainRequestAdmin(MockEppLib):
             DomainRequest.RejectionReasons.NAMING_REQUIREMENTS,
         )
         self.assert_email_is_accurate(
-            "Your domain request was rejected because it does not meet our naming requirements.", 0, EMAIL
+            "Your domain request was rejected because it does not meet our naming requirements.", 0, _creator.email
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Approve
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.APPROVED)
-        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 1, EMAIL)
+        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 1, _creator.email)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
 
     @less_console_noise_decorator
@@ -1106,12 +1165,18 @@ class TestDomainRequestAdmin(MockEppLib):
         """When transitioning to rejected on a domain request, an email is sent
         explaining why when the reason is other."""
 
-        # Ensure there is no user with this email
-        EMAIL = "mayor@igorville.gov"
-        User.objects.filter(email=EMAIL).delete()
+        # Create fake creator
+        _creator = User.objects.create(
+            username="MrMeoward",
+            first_name="Meoward",
+            last_name="Jones",
+            email="meoward.jones@igorville.gov",
+            phone="(555) 123 12345",
+            title="Treat inspector",
+        )
 
         # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
 
         # Reject for reason NAMING_REQUIREMENTS and test email including dynamic organization name
         self.transition_state_and_send_email(
@@ -1119,12 +1184,12 @@ class TestDomainRequestAdmin(MockEppLib):
             DomainRequest.DomainRequestStatus.REJECTED,
             DomainRequest.RejectionReasons.OTHER,
         )
-        self.assert_email_is_accurate("Choosing a .gov domain name", 0, EMAIL)
+        self.assert_email_is_accurate("Choosing a .gov domain name", 0, _creator.email)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Approve
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.APPROVED)
-        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 1, EMAIL)
+        self.assert_email_is_accurate("Congratulations! Your .gov domain request has been approved.", 1, _creator.email)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
 
     @less_console_noise_decorator
@@ -1186,23 +1251,29 @@ class TestDomainRequestAdmin(MockEppLib):
         """When transitioning to withdrawn on a domain request,
         an email is sent out every time."""
 
-        # Ensure there is no user with this email
-        EMAIL = "mayor@igorville.gov"
-        User.objects.filter(email=EMAIL).delete()
+        # Create fake creator
+        _creator = User.objects.create(
+            username="MrMeoward",
+            first_name="Meoward",
+            last_name="Jones",
+            email="meoward.jones@igorville.gov",
+            phone="(555) 123 12345",
+            title="Treat inspector",
+        )
 
         # Create a sample domain request
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
 
         # Test Submitted Status
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.WITHDRAWN)
         self.assert_email_is_accurate(
-            "Your .gov domain request has been withdrawn and will not be reviewed by our team.", 0, EMAIL
+            "Your .gov domain request has been withdrawn and will not be reviewed by our team.", 0, _creator.email
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Test Withdrawn Status
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.SUBMITTED)
-        self.assert_email_is_accurate("We received your .gov domain request.", 1, EMAIL)
+        self.assert_email_is_accurate("We received your .gov domain request.", 1, _creator.email)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
 
         # Test Submitted Status Again (No new email should be sent)

From a9ab88286641d544cfa3bb6d414a335b7a69514b Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Tue, 27 Aug 2024 21:25:33 -0700
Subject: [PATCH 014/118] Refactor email tests to deprecate submitter

---
 src/registrar/tests/test_admin_request.py | 12 +++++++---
 src/registrar/tests/test_emails.py        |  5 +---
 src/registrar/tests/test_models.py        | 28 ++++++++++++++---------
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 397de21db..d363e2aa7 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -648,7 +648,9 @@ class TestDomainRequestAdmin(MockEppLib):
         already_has_domains = DomainRequest.ActionNeededReasons.ALREADY_HAS_DOMAINS
         self.transition_state_and_send_email(domain_request, action_needed, action_needed_reason=already_has_domains)
 
-        self.assert_email_is_accurate("ORGANIZATION ALREADY HAS A .GOV DOMAIN", 0, _creator.email, bcc_email_address=BCC_EMAIL)
+        self.assert_email_is_accurate(
+            "ORGANIZATION ALREADY HAS A .GOV DOMAIN", 0, _creator.email, bcc_email_address=BCC_EMAIL
+        )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Test the email sent out for bad_name
@@ -716,7 +718,9 @@ class TestDomainRequestAdmin(MockEppLib):
             action_needed_reason=eligibility_unclear,
             action_needed_reason_email="custom content when starting anew",
         )
-        self.assert_email_is_accurate("custom content when starting anew", 5, _creator.email, bcc_email_address=BCC_EMAIL)
+        self.assert_email_is_accurate(
+            "custom content when starting anew", 5, _creator.email, bcc_email_address=BCC_EMAIL
+        )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 6)
 
     # def test_action_needed_sends_reason_email_prod_bcc(self):
@@ -1046,7 +1050,9 @@ class TestDomainRequestAdmin(MockEppLib):
             DomainRequest.DomainRequestStatus.REJECTED,
             DomainRequest.RejectionReasons.SECOND_DOMAIN_REASONING,
         )
-        self.assert_email_is_accurate("Your domain request was rejected because Testorg has a .gov domain.", 0, _creator.email)
+        self.assert_email_is_accurate(
+            "Your domain request was rejected because Testorg has a .gov domain.", 0, _creator.email
+        )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Approve
diff --git a/src/registrar/tests/test_emails.py b/src/registrar/tests/test_emails.py
index cc8b0c4b1..0fda9baee 100644
--- a/src/registrar/tests/test_emails.py
+++ b/src/registrar/tests/test_emails.py
@@ -111,9 +111,7 @@ class TestEmails(TestCase):
         _, kwargs = self.mock_client.send_email.call_args
         body = kwargs["Content"]["Simple"]["Body"]["Text"]["Data"]
         self.assertIn("Other employees from your organization:", body)
-        # spacing should be right between adjacent elements
-        self.assertRegex(body, r"5556\n\nOther employees")
-        self.assertRegex(body, r"5557\n\nAnything else")
+        # spacing should be right between adjacent elements        self.assertRegex(body, r"5557\n\nAnything else")
 
     @boto3_mocking.patching
     @less_console_noise_decorator
@@ -125,7 +123,6 @@ class TestEmails(TestCase):
         _, kwargs = self.mock_client.send_email.call_args
         body = kwargs["Content"]["Simple"]["Body"]["Text"]["Data"]
         # spacing should be right between adjacent elements
-        self.assertRegex(body, r"5556\n\nOther employees")
         self.assertRegex(body, r"None\n\nAnything else")
 
     @boto3_mocking.patching
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index f4dd14ae0..e0794dab4 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -257,7 +257,9 @@ class TestDomainRequest(TestCase):
     def test_submit_from_started_sends_email(self):
         msg = "Create a domain request and submit it and see if email was sent."
         domain_request = completed_domain_request(user=self.dummy_user_2)
-        self.check_email_sent(domain_request, msg, "submit", 1, expected_content="Hello")
+        self.check_email_sent(
+            domain_request, msg, "submit", 1, expected_content="Hi", expected_email=self.dummy_user_2.email
+        )
 
     @override_flag("profile_feature", active=True)
     @less_console_noise_decorator
@@ -272,10 +274,9 @@ class TestDomainRequest(TestCase):
     @less_console_noise_decorator
     def test_submit_from_withdrawn_sends_email(self):
         msg = "Create a withdrawn domain request and submit it and see if email was sent."
-        domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.WITHDRAWN
-        )
-        self.check_email_sent(domain_request, msg, "submit", 1, expected_content="Hello")
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.WITHDRAWN, user=user)
+        self.check_email_sent(domain_request, msg, "submit", 1, expected_content="Hi", expected_email=user.email)
 
     @less_console_noise_decorator
     def test_submit_from_action_needed_does_not_send_email(self):
@@ -292,20 +293,25 @@ class TestDomainRequest(TestCase):
     @less_console_noise_decorator
     def test_approve_sends_email(self):
         msg = "Create a domain request and approve it and see if email was sent."
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
-        self.check_email_sent(domain_request, msg, "approve", 1, expected_content="Hello")
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=user)
+        self.check_email_sent(domain_request, msg, "approve", 1, expected_content="approved", expected_email=user.email)
 
     @less_console_noise_decorator
     def test_withdraw_sends_email(self):
         msg = "Create a domain request and withdraw it and see if email was sent."
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
-        self.check_email_sent(domain_request, msg, "withdraw", 1, expected_content="Hello")
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=user)
+        self.check_email_sent(
+            domain_request, msg, "withdraw", 1, expected_content="withdrawn", expected_email=user.email
+        )
 
     @less_console_noise_decorator
     def test_reject_sends_email(self):
         msg = "Create a domain request and reject it and see if email was sent."
-        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED)
-        self.check_email_sent(domain_request, msg, "reject", 1, expected_content="Hello")
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED, user=user)
+        self.check_email_sent(domain_request, msg, "reject", 1, expected_content="rejected", expected_email=user.email)
 
     @less_console_noise_decorator
     def test_reject_with_prejudice_does_not_send_email(self):

From a431b41e6e461d3326dee4af49bcf0babaa28d92 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Tue, 27 Aug 2024 21:32:21 -0700
Subject: [PATCH 015/118] Fix linting

---
 src/registrar/models/domain_request.py    | 2 --
 src/registrar/tests/common.py             | 1 -
 src/registrar/tests/test_admin.py         | 2 +-
 src/registrar/tests/test_views_request.py | 2 +-
 src/registrar/views/domain.py             | 2 --
 src/registrar/views/domain_request.py     | 2 --
 6 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index 1c4cbb355..c83af8ff0 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -6,7 +6,6 @@ from django.conf import settings
 from django.db import models
 from django_fsm import FSMField, transition  # type: ignore
 from django.utils import timezone
-from waffle import flag_is_active
 from registrar.models.domain import Domain
 from registrar.models.federal_agency import FederalAgency
 from registrar.models.utility.generic_helper import CreateOrUpdateOrganizationTypeHelper
@@ -1207,7 +1206,6 @@ class DomainRequest(TimeStampedModel):
         return self.is_policy_acknowledged is not None
 
     def _is_general_form_complete(self, request):
-        has_profile_feature_flag = flag_is_active(request, "profile_feature")
         return (
             self._is_creator_complete()
             and self._is_organization_name_and_address_complete()
diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py
index ea2462dfb..566f9b3cf 100644
--- a/src/registrar/tests/common.py
+++ b/src/registrar/tests/common.py
@@ -918,7 +918,6 @@ def completed_domain_request(  # noqa
     domain, _ = DraftDomain.objects.get_or_create(name=name)
     alt, _ = Website.objects.get_or_create(website="city1.gov")
     current, _ = Website.objects.get_or_create(website="city.com")
-    creator = user
     other, _ = Contact.objects.get_or_create(
         first_name="Testy",
         last_name="Tester",
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 4cce3ed14..3add7a201 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -60,7 +60,7 @@ from .common import (
 )
 from django.contrib.sessions.backends.db import SessionStore
 from django.contrib.auth import get_user_model
-from unittest.mock import patch, Mock
+from unittest.mock import Mock
 
 import logging
 
diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index fab64180f..56c7b838f 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -2242,7 +2242,7 @@ class DomainRequestTests(TestWithUser, WebTest):
         session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
         self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
 
-        profile_page = self.app.get(f"/user-profile")
+        profile_page = self.app.get("/user-profile")
         self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
 
         profile_form = profile_page.forms[0]
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 4de2ad31e..260d6c8f4 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -40,7 +40,6 @@ from registrar.models.utility.contact_error import ContactError
 from registrar.views.utility.permission_views import UserDomainRolePermissionDeleteView
 
 from ..forms import (
-    UserForm,
     SeniorOfficialContactForm,
     DomainOrgNameAddressForm,
     DomainAddUserForm,
@@ -59,7 +58,6 @@ from epplibwrapper import (
 
 from ..utility.email import send_templated_email, EmailSendingError
 from .utility import DomainPermissionView, DomainInvitationPermissionDeleteView
-from waffle.decorators import waffle_flag
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 05f4e38ff..f1cd5fbbf 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -22,8 +22,6 @@ from .utility import (
     DomainRequestWizardPermissionView,
 )
 
-from waffle.decorators import flag_is_active, waffle_flag
-
 logger = logging.getLogger(__name__)
 
 

From 71d44353d10c714a03a61dd0d21c55038903758f Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Wed, 28 Aug 2024 16:30:43 -0700
Subject: [PATCH 016/118] Remove submitter refs in docs

---
 docs/architecture/diagrams/model_timeline.md |  3 +--
 docs/architecture/diagrams/models_diagram.md |  2 --
 docs/developer/generating-emails-guide.md    |  8 ++++----
 src/registrar/tests/test_models.py           |  2 +-
 src/registrar/tests/test_views_request.py    | 14 +++++---------
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/docs/architecture/diagrams/model_timeline.md b/docs/architecture/diagrams/model_timeline.md
index f05b9e056..eed2610eb 100644
--- a/docs/architecture/diagrams/model_timeline.md
+++ b/docs/architecture/diagrams/model_timeline.md
@@ -42,7 +42,6 @@ class DomainRequest {
   creator (User)
   investigator (User)
   senior_official (Contact)
-  submitter (Contact)
   other_contacts (Contacts)
   approved_domain (Domain)
   requested_domain (DraftDomain)
@@ -80,7 +79,7 @@ class Contact {
   --
 }
 
-DomainRequest *-r-* Contact : senior_official, submitter, other_contacts
+DomainRequest *-r-* Contact : senior_official, other_contacts
 
 class DraftDomain {
   Requested domain
diff --git a/docs/architecture/diagrams/models_diagram.md b/docs/architecture/diagrams/models_diagram.md
index 455f8fb09..1e9d3089e 100644
--- a/docs/architecture/diagrams/models_diagram.md
+++ b/docs/architecture/diagrams/models_diagram.md
@@ -179,7 +179,6 @@ class "registrar.DomainRequest <Registrar>" as registrar.DomainRequest #d6f4e9 {
     ~ senior_official (ForeignKey)
     ~ approved_domain (OneToOneField)
     ~ requested_domain (OneToOneField)
-    ~ submitter (ForeignKey)
     + purpose (TextField)
     + no_other_contacts_rationale (TextField)
     + anything_else (TextField)
@@ -236,7 +235,6 @@ class "registrar.DomainInformation <Registrar>" as registrar.DomainInformation #
     + about_your_organization (TextField)
     ~ senior_official (ForeignKey)
     ~ domain (OneToOneField)
-    ~ submitter (ForeignKey)
     + purpose (TextField)
     + no_other_contacts_rationale (TextField)
     + anything_else (TextField)
diff --git a/docs/developer/generating-emails-guide.md b/docs/developer/generating-emails-guide.md
index dd0a55e64..cc5f9d41b 100644
--- a/docs/developer/generating-emails-guide.md
+++ b/docs/developer/generating-emails-guide.md
@@ -14,7 +14,7 @@
 - Starting Location: Home page
 - Workflow: (Domain requests Table) Manage domain
 - Workflow Step: Click "Manage" -> Click "Withdraw request" -> (confirmation prompt) -> Click "Withdraw request" (inside prompt)
-- Notes: You can also do this through Django Admin by switching a domain of status "submitted" to "withdrawn", but you need to be the submitter (email listed on Your Contact Information).
+- Notes: You can also do this through Django Admin by switching a domain of status "submitted" to "withdrawn", but you need to be the creator.
 - [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/domain_request_withdrawn.txt)
 
 ### Domain Request Withdrawn Subject
@@ -25,7 +25,7 @@
 - Starting Location: Django Admin
 - Workflow: Analyst Admin
 - Workflow Step: Click "domain requests" -> Click a domain request in a status of "submitted", "In review", "rejected", or "ineligible" -> Click status dropdown -> (select "approved") -> click "Save"
-- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information). To test this with your own email, you need to create a domain request, then set the status to "approved". This will send you an email.
+- Notes: Note that this will send an email to the creator. To test this with your own email, you need to create a domain request, then set the status to "approved". This will send you an email.
 - [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_approved.txt)
 
 ### Status Change Approved Subject
@@ -36,7 +36,7 @@
 - Starting Location: Django Admin
 - Workflow: Analyst Admin
 - Workflow Step: Click "domain requests" -> Click a domain request in a status of "In review", or "approved" -> Click status dropdown -> (select "rejected") -> click "Save"
-- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information). To test this with your own email, you need to create a domain request, then set the status to "in review" (and click save). Then, go back to the same application and set the status to "rejected". This will send you an email.
+- Notes: Note that this will send an email to the creator. To test this with your own email, you need to create a domain request, then set the status to "in review" (and click save). Then, go back to the same application and set the status to "rejected". This will send you an email.
 - [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_rejected.txt)
 
 ### Status Change Rejected Subject
@@ -47,7 +47,7 @@
 - Starting Location: Home Page
 - Workflow: Start domain request
 - Workflow Step: Click "Start a new domain request" -> (fill out the form) -> On the last step ("Review and submit your domain request "), click "Submit your domain request"
-- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information)
+- Notes: Note that this will send an email to the creator.
 - [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/submission_confirmation.txt)
 
 ### Submission Confirmation Subject
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index e0794dab4..cdc7d2a00 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -221,7 +221,7 @@ class TestDomainRequest(TestCase):
         site = DraftDomain.objects.create(name="igorville.gov")
         domain_request = DomainRequest.objects.create(creator=user, requested_domain=site)
 
-        # no submitter email so this emits a log warning
+        # no email sent to creator so this emits a log warning
 
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
             with less_console_noise():
diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 56c7b838f..8718abda7 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -2206,15 +2206,13 @@ class DomainRequestTests(TestWithUser, WebTest):
 
     @override_flag("profile_feature", active=True)
     @less_console_noise_decorator
-    def test_edit_submitter_in_place(self):
+    def test_edit_creator_in_place(self):
         """When you:
-            1. edit a submitter (your contact) which is not joined to another model,
+            1. edit a your user profile information,
             2. then submit,
-        the domain request is linked to the existing submitter, and the submitter updated."""
+        the domain request also updates its creator data to reflect user profile changes."""
 
-        # Populate the database with a domain request that
-        # has a submitter
-        # We'll do it from scratch
+        # Populate the database with a domain request 
         domain_request, _ = DomainRequest.objects.get_or_create(
             generic_org_type="federal",
             federal_type="executive",
@@ -2229,8 +2227,6 @@ class DomainRequestTests(TestWithUser, WebTest):
             status="started",
         )
 
-        # submitter_pk is the initial pk of the submitter. set it before update
-        # to be able to verify after update that the same contact object is in place
         creator_pk = self.user.id
 
         # prime the form by visiting /edit
@@ -2946,7 +2942,7 @@ class TestWizardUnlockingSteps(TestWithUser, WebTest):
             # Now 'detail_page' contains the response after following the redirect
             self.assertEqual(detail_page.status_code, 200)
 
-            # 5 unlocked steps (so, domain, submitter, other contacts, and current sites
+            # 5 unlocked steps (so, domain, other contacts, and current sites
             # which unlocks if domain exists), one active step, the review step is locked
             self.assertContains(detail_page, "#check_circle", count=4)
             # Type of organization

From 2d52e02b59a8fd9987b1c433efbdef26fb8b41ed Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 09:29:16 -0700
Subject: [PATCH 017/118] Save progress

---
 src/.zshrc                       |    1 +
 src/Pipfile.lock                 | 1367 ++++++++++++++----------------
 src/models_diagram.puml          |  463 ++++++++++
 src/registrar/config/settings.py |    4 +-
 src/requirements.txt             |   67 +-
 5 files changed, 1133 insertions(+), 769 deletions(-)
 create mode 100644 src/.zshrc
 create mode 100644 src/models_diagram.puml

diff --git a/src/.zshrc b/src/.zshrc
new file mode 100644
index 000000000..45a622a14
--- /dev/null
+++ b/src/.zshrc
@@ -0,0 +1 @@
+export DOCKER_DEFAULT_PLATFORM=linux/amd64
diff --git a/src/Pipfile.lock b/src/Pipfile.lock
index a42563c63..09ac4a934 100644
--- a/src/Pipfile.lock
+++ b/src/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "9095c4f98f58a9502444584067a63f329d5a5fc4b49454c4e129bda09552d19d"
+            "sha256": "2799ab9e493352740c6946e604ccc075c5c16359c809753296091bbe2b9fd837"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -16,11 +16,11 @@
     "default": {
         "annotated-types": {
             "hashes": [
-                "sha256:0641064de18ba7a25dee8f96403ebc39113d0cb953a01429249d5c7564666a43",
-                "sha256:563339e807e53ffd9c267e99fc6d9ea23eb8443c08f112651963e24e22f84a5d"
+                "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53",
+                "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.6.0"
+            "version": "==0.7.0"
         },
         "asgiref": {
             "hashes": [
@@ -32,37 +32,37 @@
         },
         "boto3": {
             "hashes": [
-                "sha256:decf52f8d5d8a1b10c9ff2a0e96ee207ed79e33d2e53fdf0880a5cbef70785e0",
-                "sha256:e836b71d79671270fccac0a4d4c8ec239a6b82ea47c399b64675aa597d0ee63b"
+                "sha256:06eac4757de2a9c6020381205cb902f05964caad80b56e58c8931284a133b4cb",
+                "sha256:b9587131372a808bf6f99c5ed8b11be55cd113261cc3b437a917b4acc6c30bfe"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==1.34.95"
+            "version": "==1.35.8"
         },
         "botocore": {
             "hashes": [
-                "sha256:6bd76a2eadb42b91fa3528392e981ad5b4dfdee3968fa5b904278acf6cbf15ff",
-                "sha256:ead5823e0dd6751ece5498cb979fd9abf190e691c8833bcac6876fd6ca261fa7"
+                "sha256:4b820cf680ab5d778bd2fe4feeef1ff8a2b96d5c535d4638ab30f703ade282f8",
+                "sha256:adf389eb8fd87775f193300e3431d1353f925807ad3a39958172cb644f0d60a1"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==1.34.95"
+            "version": "==1.35.8"
         },
         "cachetools": {
             "hashes": [
-                "sha256:0abad1021d3f8325b2fc1d2e9c8b9c9d57b04c3932657a72465447332c24d945",
-                "sha256:ba29e2dfa0b8b556606f097407ed1aa62080ee108ab0dc5ec9d6a723a007d105"
+                "sha256:02134e8439cdc2ffb62023ce1debca2944c3f289d66bb17ead3ab3dede74b292",
+                "sha256:2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==5.3.3"
+            "version": "==5.5.0"
         },
         "certifi": {
             "hashes": [
-                "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f",
-                "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1"
+                "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b",
+                "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==2024.2.2"
+            "version": "==2024.7.4"
         },
         "cfenv": {
             "hashes": [
@@ -74,61 +74,76 @@
         },
         "cffi": {
             "hashes": [
-                "sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc",
-                "sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a",
-                "sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417",
-                "sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab",
-                "sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520",
-                "sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36",
-                "sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743",
-                "sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8",
-                "sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed",
-                "sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684",
-                "sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56",
-                "sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324",
-                "sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d",
-                "sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235",
-                "sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e",
-                "sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088",
-                "sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000",
-                "sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7",
-                "sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e",
-                "sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673",
-                "sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c",
-                "sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe",
-                "sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2",
-                "sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098",
-                "sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8",
-                "sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a",
-                "sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0",
-                "sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b",
-                "sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896",
-                "sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e",
-                "sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9",
-                "sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2",
-                "sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b",
-                "sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6",
-                "sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404",
-                "sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f",
-                "sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0",
-                "sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4",
-                "sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc",
-                "sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936",
-                "sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba",
-                "sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872",
-                "sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb",
-                "sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614",
-                "sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1",
-                "sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d",
-                "sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969",
-                "sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b",
-                "sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4",
-                "sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627",
-                "sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956",
-                "sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357"
+                "sha256:011aff3524d578a9412c8b3cfaa50f2c0bd78e03eb7af7aa5e0df59b158efb2f",
+                "sha256:0a048d4f6630113e54bb4b77e315e1ba32a5a31512c31a273807d0027a7e69ab",
+                "sha256:0bb15e7acf8ab35ca8b24b90af52c8b391690ef5c4aec3d31f38f0d37d2cc499",
+                "sha256:0d46ee4764b88b91f16661a8befc6bfb24806d885e27436fdc292ed7e6f6d058",
+                "sha256:0e60821d312f99d3e1569202518dddf10ae547e799d75aef3bca3a2d9e8ee693",
+                "sha256:0fdacad9e0d9fc23e519efd5ea24a70348305e8d7d85ecbb1a5fa66dc834e7fb",
+                "sha256:14b9cbc8f7ac98a739558eb86fabc283d4d564dafed50216e7f7ee62d0d25377",
+                "sha256:17c6d6d3260c7f2d94f657e6872591fe8733872a86ed1345bda872cfc8c74885",
+                "sha256:1a2ddbac59dc3716bc79f27906c010406155031a1c801410f1bafff17ea304d2",
+                "sha256:2404f3de742f47cb62d023f0ba7c5a916c9c653d5b368cc966382ae4e57da401",
+                "sha256:24658baf6224d8f280e827f0a50c46ad819ec8ba380a42448e24459daf809cf4",
+                "sha256:24aa705a5f5bd3a8bcfa4d123f03413de5d86e497435693b638cbffb7d5d8a1b",
+                "sha256:2770bb0d5e3cc0e31e7318db06efcbcdb7b31bcb1a70086d3177692a02256f59",
+                "sha256:331ad15c39c9fe9186ceaf87203a9ecf5ae0ba2538c9e898e3a6967e8ad3db6f",
+                "sha256:3aa9d43b02a0c681f0bfbc12d476d47b2b2b6a3f9287f11ee42989a268a1833c",
+                "sha256:41f4915e09218744d8bae14759f983e466ab69b178de38066f7579892ff2a555",
+                "sha256:4304d4416ff032ed50ad6bb87416d802e67139e31c0bde4628f36a47a3164bfa",
+                "sha256:435a22d00ec7d7ea533db494da8581b05977f9c37338c80bc86314bec2619424",
+                "sha256:45f7cd36186db767d803b1473b3c659d57a23b5fa491ad83c6d40f2af58e4dbb",
+                "sha256:48b389b1fd5144603d61d752afd7167dfd205973a43151ae5045b35793232aa2",
+                "sha256:4e67d26532bfd8b7f7c05d5a766d6f437b362c1bf203a3a5ce3593a645e870b8",
+                "sha256:516a405f174fd3b88829eabfe4bb296ac602d6a0f68e0d64d5ac9456194a5b7e",
+                "sha256:5ba5c243f4004c750836f81606a9fcb7841f8874ad8f3bf204ff5e56332b72b9",
+                "sha256:5bdc0f1f610d067c70aa3737ed06e2726fd9d6f7bfee4a351f4c40b6831f4e82",
+                "sha256:6107e445faf057c118d5050560695e46d272e5301feffda3c41849641222a828",
+                "sha256:6327b572f5770293fc062a7ec04160e89741e8552bf1c358d1a23eba68166759",
+                "sha256:669b29a9eca6146465cc574659058ed949748f0809a2582d1f1a324eb91054dc",
+                "sha256:6ce01337d23884b21c03869d2f68c5523d43174d4fc405490eb0091057943118",
+                "sha256:6d872186c1617d143969defeadac5a904e6e374183e07977eedef9c07c8953bf",
+                "sha256:6f76a90c345796c01d85e6332e81cab6d70de83b829cf1d9762d0a3da59c7932",
+                "sha256:70d2aa9fb00cf52034feac4b913181a6e10356019b18ef89bc7c12a283bf5f5a",
+                "sha256:7cbc78dc018596315d4e7841c8c3a7ae31cc4d638c9b627f87d52e8abaaf2d29",
+                "sha256:856bf0924d24e7f93b8aee12a3a1095c34085600aa805693fb7f5d1962393206",
+                "sha256:8a98748ed1a1df4ee1d6f927e151ed6c1a09d5ec21684de879c7ea6aa96f58f2",
+                "sha256:93a7350f6706b31f457c1457d3a3259ff9071a66f312ae64dc024f049055f72c",
+                "sha256:964823b2fc77b55355999ade496c54dde161c621cb1f6eac61dc30ed1b63cd4c",
+                "sha256:a003ac9edc22d99ae1286b0875c460351f4e101f8c9d9d2576e78d7e048f64e0",
+                "sha256:a0ce71725cacc9ebf839630772b07eeec220cbb5f03be1399e0457a1464f8e1a",
+                "sha256:a47eef975d2b8b721775a0fa286f50eab535b9d56c70a6e62842134cf7841195",
+                "sha256:a8b5b9712783415695663bd463990e2f00c6750562e6ad1d28e072a611c5f2a6",
+                "sha256:a9015f5b8af1bb6837a3fcb0cdf3b874fe3385ff6274e8b7925d81ccaec3c5c9",
+                "sha256:aec510255ce690d240f7cb23d7114f6b351c733a74c279a84def763660a2c3bc",
+                "sha256:b00e7bcd71caa0282cbe3c90966f738e2db91e64092a877c3ff7f19a1628fdcb",
+                "sha256:b50aaac7d05c2c26dfd50c3321199f019ba76bb650e346a6ef3616306eed67b0",
+                "sha256:b7b6ea9e36d32582cda3465f54c4b454f62f23cb083ebc7a94e2ca6ef011c3a7",
+                "sha256:bb9333f58fc3a2296fb1d54576138d4cf5d496a2cc118422bd77835e6ae0b9cb",
+                "sha256:c1c13185b90bbd3f8b5963cd8ce7ad4ff441924c31e23c975cb150e27c2bf67a",
+                "sha256:c3b8bd3133cd50f6b637bb4322822c94c5ce4bf0d724ed5ae70afce62187c492",
+                "sha256:c5d97162c196ce54af6700949ddf9409e9833ef1003b4741c2b39ef46f1d9720",
+                "sha256:c815270206f983309915a6844fe994b2fa47e5d05c4c4cef267c3b30e34dbe42",
+                "sha256:cab2eba3830bf4f6d91e2d6718e0e1c14a2f5ad1af68a89d24ace0c6b17cced7",
+                "sha256:d1df34588123fcc88c872f5acb6f74ae59e9d182a2707097f9e28275ec26a12d",
+                "sha256:d6bdcd415ba87846fd317bee0774e412e8792832e7805938987e4ede1d13046d",
+                "sha256:db9a30ec064129d605d0f1aedc93e00894b9334ec74ba9c6bdd08147434b33eb",
+                "sha256:dbc183e7bef690c9abe5ea67b7b60fdbca81aa8da43468287dae7b5c046107d4",
+                "sha256:dca802c8db0720ce1c49cce1149ff7b06e91ba15fa84b1d59144fef1a1bc7ac2",
+                "sha256:dec6b307ce928e8e112a6bb9921a1cb00a0e14979bf28b98e084a4b8a742bd9b",
+                "sha256:df8bb0010fdd0a743b7542589223a2816bdde4d94bb5ad67884348fa2c1c67e8",
+                "sha256:e4094c7b464cf0a858e75cd14b03509e84789abf7b79f8537e6a72152109c76e",
+                "sha256:e4760a68cab57bfaa628938e9c2971137e05ce48e762a9cb53b76c9b569f1204",
+                "sha256:eb09b82377233b902d4c3fbeeb7ad731cdab579c6c6fda1f763cd779139e47c3",
+                "sha256:eb862356ee9391dc5a0b3cbc00f416b48c1b9a52d252d898e5b7696a5f9fe150",
+                "sha256:ef9528915df81b8f4c7612b19b8628214c65c9b7f74db2e34a646a0a2a0da2d4",
+                "sha256:f3157624b7558b914cb039fd1af735e5e8049a87c817cc215109ad1c8779df76",
+                "sha256:f3e0992f23bbb0be00a921eae5363329253c3b86287db27092461c887b791e5e",
+                "sha256:f9338cc05451f1942d0d8203ec2c346c830f8e86469903d5126c1f0a13a2bcbb",
+                "sha256:ffef8fd58a36fb5f1196919638f73dd3ae0db1a878982b27a9a5a176ede4ba91"
             ],
             "markers": "platform_python_implementation != 'PyPy'",
-            "version": "==1.16.0"
+            "version": "==1.17.0"
         },
         "charset-normalizer": {
             "hashes": [
@@ -228,41 +243,36 @@
         },
         "cryptography": {
             "hashes": [
-                "sha256:0270572b8bd2c833c3981724b8ee9747b3ec96f699a9665470018594301439ee",
-                "sha256:111a0d8553afcf8eb02a4fea6ca4f59d48ddb34497aa8706a6cf536f1a5ec576",
-                "sha256:16a48c23a62a2f4a285699dba2e4ff2d1cff3115b9df052cdd976a18856d8e3d",
-                "sha256:1b95b98b0d2af784078fa69f637135e3c317091b615cd0905f8b8a087e86fa30",
-                "sha256:1f71c10d1e88467126f0efd484bd44bca5e14c664ec2ede64c32f20875c0d413",
-                "sha256:2424ff4c4ac7f6b8177b53c17ed5d8fa74ae5955656867f5a8affaca36a27abb",
-                "sha256:2bce03af1ce5a5567ab89bd90d11e7bbdff56b8af3acbbec1faded8f44cb06da",
-                "sha256:329906dcc7b20ff3cad13c069a78124ed8247adcac44b10bea1130e36caae0b4",
-                "sha256:37dd623507659e08be98eec89323469e8c7b4c1407c85112634ae3dbdb926fdd",
-                "sha256:3eaafe47ec0d0ffcc9349e1708be2aaea4c6dd4978d76bf6eb0cb2c13636c6fc",
-                "sha256:5e6275c09d2badf57aea3afa80d975444f4be8d3bc58f7f80d2a484c6f9485c8",
-                "sha256:6fe07eec95dfd477eb9530aef5bead34fec819b3aaf6c5bd6d20565da607bfe1",
-                "sha256:7367d7b2eca6513681127ebad53b2582911d1736dc2ffc19f2c3ae49997496bc",
-                "sha256:7cde5f38e614f55e28d831754e8a3bacf9ace5d1566235e39d91b35502d6936e",
-                "sha256:9481ffe3cf013b71b2428b905c4f7a9a4f76ec03065b05ff499bb5682a8d9ad8",
-                "sha256:98d8dc6d012b82287f2c3d26ce1d2dd130ec200c8679b6213b3c73c08b2b7940",
-                "sha256:a011a644f6d7d03736214d38832e030d8268bcff4a41f728e6030325fea3e400",
-                "sha256:a2913c5375154b6ef2e91c10b5720ea6e21007412f6437504ffea2109b5a33d7",
-                "sha256:a30596bae9403a342c978fb47d9b0ee277699fa53bbafad14706af51fe543d16",
-                "sha256:b03c2ae5d2f0fc05f9a2c0c997e1bc18c8229f392234e8a0194f202169ccd278",
-                "sha256:b6cd2203306b63e41acdf39aa93b86fb566049aeb6dc489b70e34bcd07adca74",
-                "sha256:b7ffe927ee6531c78f81aa17e684e2ff617daeba7f189f911065b2ea2d526dec",
-                "sha256:b8cac287fafc4ad485b8a9b67d0ee80c66bf3574f655d3b97ef2e1082360faf1",
-                "sha256:ba334e6e4b1d92442b75ddacc615c5476d4ad55cc29b15d590cc6b86efa487e2",
-                "sha256:ba3e4a42397c25b7ff88cdec6e2a16c2be18720f317506ee25210f6d31925f9c",
-                "sha256:c41fb5e6a5fe9ebcd58ca3abfeb51dffb5d83d6775405305bfa8715b76521922",
-                "sha256:cd2030f6650c089aeb304cf093f3244d34745ce0cfcc39f20c6fbfe030102e2a",
-                "sha256:cd65d75953847815962c84a4654a84850b2bb4aed3f26fadcc1c13892e1e29f6",
-                "sha256:e4985a790f921508f36f81831817cbc03b102d643b5fcb81cd33df3fa291a1a1",
-                "sha256:e807b3188f9eb0eaa7bbb579b462c5ace579f1cedb28107ce8b48a9f7ad3679e",
-                "sha256:f12764b8fffc7a123f641d7d049d382b73f96a34117e0b637b80643169cec8ac",
-                "sha256:f8837fe1d6ac4a8052a9a8ddab256bc006242696f03368a4009be7ee3075cdb7"
+                "sha256:0663585d02f76929792470451a5ba64424acc3cd5227b03921dab0e2f27b1709",
+                "sha256:08a24a7070b2b6804c1940ff0f910ff728932a9d0e80e7814234269f9d46d069",
+                "sha256:232ce02943a579095a339ac4b390fbbe97f5b5d5d107f8a08260ea2768be8cc2",
+                "sha256:2905ccf93a8a2a416f3ec01b1a7911c3fe4073ef35640e7ee5296754e30b762b",
+                "sha256:299d3da8e00b7e2b54bb02ef58d73cd5f55fb31f33ebbf33bd00d9aa6807df7e",
+                "sha256:2c6d112bf61c5ef44042c253e4859b3cbbb50df2f78fa8fae6747a7814484a70",
+                "sha256:31e44a986ceccec3d0498e16f3d27b2ee5fdf69ce2ab89b52eaad1d2f33d8778",
+                "sha256:3d9a1eca329405219b605fac09ecfc09ac09e595d6def650a437523fcd08dd22",
+                "sha256:3dcdedae5c7710b9f97ac6bba7e1052b95c7083c9d0e9df96e02a1932e777895",
+                "sha256:47ca71115e545954e6c1d207dd13461ab81f4eccfcb1345eac874828b5e3eaaf",
+                "sha256:4a997df8c1c2aae1e1e5ac49c2e4f610ad037fc5a3aadc7b64e39dea42249431",
+                "sha256:51956cf8730665e2bdf8ddb8da0056f699c1a5715648c1b0144670c1ba00b48f",
+                "sha256:5bcb8a5620008a8034d39bce21dc3e23735dfdb6a33a06974739bfa04f853947",
+                "sha256:64c3f16e2a4fc51c0d06af28441881f98c5d91009b8caaff40cf3548089e9c74",
+                "sha256:6e2b11c55d260d03a8cf29ac9b5e0608d35f08077d8c087be96287f43af3ccdc",
+                "sha256:7b3f5fe74a5ca32d4d0f302ffe6680fcc5c28f8ef0dc0ae8f40c0f3a1b4fca66",
+                "sha256:844b6d608374e7d08f4f6e6f9f7b951f9256db41421917dfb2d003dde4cd6b66",
+                "sha256:9a8d6802e0825767476f62aafed40532bd435e8a5f7d23bd8b4f5fd04cc80ecf",
+                "sha256:aae4d918f6b180a8ab8bf6511a419473d107df4dbb4225c7b48c5c9602c38c7f",
+                "sha256:ac1955ce000cb29ab40def14fd1bbfa7af2017cca696ee696925615cafd0dce5",
+                "sha256:b88075ada2d51aa9f18283532c9f60e72170041bba88d7f37e49cbb10275299e",
+                "sha256:cb013933d4c127349b3948aa8aaf2f12c0353ad0eccd715ca789c8a0f671646f",
+                "sha256:cc70b4b581f28d0a254d006f26949245e3657d40d8857066c2ae22a61222ef55",
+                "sha256:e9c5266c432a1e23738d178e51c2c7a5e2ddf790f248be939448c0ba2021f9d1",
+                "sha256:ea9e57f8ea880eeea38ab5abf9fbe39f923544d7884228ec67d666abd60f5a47",
+                "sha256:ee0c405832ade84d4de74b9029bedb7b31200600fa524d218fc29bfa371e97f5",
+                "sha256:fdcb265de28585de5b859ae13e3846a8e805268a823a12a4da2597f1f5afc9f0"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==42.0.5"
+            "version": "==43.0.0"
         },
         "defusedxml": {
             "hashes": [
@@ -282,10 +292,10 @@
         },
         "dj-database-url": {
             "hashes": [
-                "sha256:04bc34b248d4c21aaa13e4ab419ae6575ef5f10f3df735ce7da97722caa356e0",
-                "sha256:f2042cefe1086e539c9da39fad5ad7f61173bf79665e69bf7e4de55fa88b135f"
+                "sha256:3e792567b0aa9a4884860af05fe2aa4968071ad351e033b6db632f97ac6db9de",
+                "sha256:9f9b05058ddf888f1e6f840048b8d705ff9395e3b52a07165daa3d8b9360551b"
             ],
-            "version": "==2.1.0"
+            "version": "==2.2.0"
         },
         "dj-email-url": {
             "hashes": [
@@ -337,12 +347,12 @@
         },
         "django-cors-headers": {
             "hashes": [
-                "sha256:0b1fd19297e37417fc9f835d39e45c8c642938ddba1acce0c1753d3edef04f36",
-                "sha256:0bf65ef45e606aff1994d35503e6b677c0b26cafff6506f8fd7187f3be840207"
+                "sha256:5c6e3b7fe870876a1efdfeb4f433782c3524078fa0dc9e0195f6706ce7a242f6",
+                "sha256:92cf4633e22af67a230a1456cb1b7a02bb213d6536d2dcb2a4a24092ea9cebc2"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==4.3.1"
+            "version": "==4.4.0"
         },
         "django-csp": {
             "hashes": [
@@ -362,12 +372,12 @@
         },
         "django-import-export": {
             "hashes": [
-                "sha256:2eac09e8cec8670f36e24314760448011ad23c51e8fb930d55f50d0c3c926da0",
-                "sha256:4deabc557801d368093608c86fd0f4831bc9540e2ea41ca2f023e2efb3eb6f48"
+                "sha256:16ecc5a9f0df46bde6eb278a3e65ebda0ee1db55656f36440e9fb83f40ab85a3",
+                "sha256:730ae2443a02b1ba27d8dba078a27ae9123adfcabb78161b4f130843607b3df9"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==3.3.8"
+            "version": "==4.1.1"
         },
         "django-login-required-middleware": {
             "hashes": [
@@ -381,11 +391,11 @@
                 "phonenumberslite"
             ],
             "hashes": [
-                "sha256:bc6eaa49d1f9d870944f5280258db511e3a1ba5e2fbbed255488dceacae45d06",
-                "sha256:f9cdb3de085f99c249328293a3b93d4e5fa440c0c8e3b99eb0d0f54748629797"
+                "sha256:196c917b70c01a98e327f482eb8a4a4a55a29891db551f99078585397370b3ba",
+                "sha256:8a560fe1b01b94c9de8cde22bc373b695f023cc6df4baba00264cb079da9f631"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==7.3.0"
+            "version": "==8.0.0"
         },
         "django-waffle": {
             "hashes": [
@@ -416,22 +426,14 @@
             "markers": "python_version >= '3.8'",
             "version": "==11.0.0"
         },
-        "et-xmlfile": {
-            "hashes": [
-                "sha256:8eb9e2bc2f8c97e37a2dc85a09ecdcdec9d8a396530a6d5a33b30b9a92da0c5c",
-                "sha256:a2ba85d1d6a74ef63837eed693bcb89c3f752169b0e3e7ae5b16ca5e1b3deada"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==1.1.0"
-        },
         "faker": {
             "hashes": [
-                "sha256:87ef41e24b39a5be66ecd874af86f77eebd26782a2681200e86c5326340a95d3",
-                "sha256:e23a2b74888885c3d23a9237bacb823041291c03d609a39acb9ebe6c123f3986"
+                "sha256:0d3c0399204aaf8205cc1750db443474ca0436f177126b2c27b798e8336cc74f",
+                "sha256:6a3a08be54c37e05f7943d7ba5211d252c1de737687a46ad6f29209d8d5db11f"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==25.0.0"
+            "version": "==28.0.0"
         },
         "fred-epplib": {
             "git": "https://github.com/cisagov/epplib.git",
@@ -567,20 +569,20 @@
         },
         "gunicorn": {
             "hashes": [
-                "sha256:350679f91b24062c86e386e198a15438d53a7a8207235a78ba1b53df4c4378d9",
-                "sha256:4a0b436239ff76fb33f11c07a16482c521a7e09c1ce3cc293c2330afe01bec63"
+                "sha256:ec400d38950de4dfd418cff8328b2c8faed0edb0d517d3394e457c317908ca4d",
+                "sha256:f014447a0101dc57e294f6c18ca6b40227a4c90e9bdb586042628030cba004ec"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==22.0.0"
+            "version": "==23.0.0"
         },
         "idna": {
             "hashes": [
-                "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc",
-                "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"
+                "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac",
+                "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"
             ],
-            "markers": "python_version >= '3.5'",
-            "version": "==3.7"
+            "markers": "python_version >= '3.6'",
+            "version": "==3.8"
         },
         "jmespath": {
             "hashes": [
@@ -592,177 +594,155 @@
         },
         "lxml": {
             "hashes": [
-                "sha256:04ab5415bf6c86e0518d57240a96c4d1fcfc3cb370bb2ac2a732b67f579e5a04",
-                "sha256:057cdc6b86ab732cf361f8b4d8af87cf195a1f6dc5b0ff3de2dced242c2015e0",
-                "sha256:058a1308914f20784c9f4674036527e7c04f7be6fb60f5d61353545aa7fcb739",
-                "sha256:08802f0c56ed150cc6885ae0788a321b73505d2263ee56dad84d200cab11c07a",
-                "sha256:0a15438253b34e6362b2dc41475e7f80de76320f335e70c5528b7148cac253a1",
-                "sha256:0c3f67e2aeda739d1cc0b1102c9a9129f7dc83901226cc24dd72ba275ced4218",
-                "sha256:0e7259016bc4345a31af861fdce942b77c99049d6c2107ca07dc2bba2435c1d9",
-                "sha256:0ed777c1e8c99b63037b91f9d73a6aad20fd035d77ac84afcc205225f8f41188",
-                "sha256:0f5d65c39f16717a47c36c756af0fb36144069c4718824b7533f803ecdf91138",
-                "sha256:0f8c09ed18ecb4ebf23e02b8e7a22a05d6411911e6fabef3a36e4f371f4f2585",
-                "sha256:11a04306fcba10cd9637e669fd73aa274c1c09ca64af79c041aa820ea992b637",
-                "sha256:1ae67b4e737cddc96c99461d2f75d218bdf7a0c3d3ad5604d1f5e7464a2f9ffe",
-                "sha256:1c5bb205e9212d0ebddf946bc07e73fa245c864a5f90f341d11ce7b0b854475d",
-                "sha256:1f7785f4f789fdb522729ae465adcaa099e2a3441519df750ebdccc481d961a1",
-                "sha256:200e63525948e325d6a13a76ba2911f927ad399ef64f57898cf7c74e69b71095",
-                "sha256:21c2e6b09565ba5b45ae161b438e033a86ad1736b8c838c766146eff8ceffff9",
-                "sha256:2213afee476546a7f37c7a9b4ad4d74b1e112a6fafffc9185d6d21f043128c81",
-                "sha256:27aa20d45c2e0b8cd05da6d4759649170e8dfc4f4e5ef33a34d06f2d79075d57",
-                "sha256:2a66bf12fbd4666dd023b6f51223aed3d9f3b40fef06ce404cb75bafd3d89536",
-                "sha256:2c9d147f754b1b0e723e6afb7ba1566ecb162fe4ea657f53d2139bbf894d050a",
-                "sha256:2ddfe41ddc81f29a4c44c8ce239eda5ade4e7fc305fb7311759dd6229a080052",
-                "sha256:31e9a882013c2f6bd2f2c974241bf4ba68c85eba943648ce88936d23209a2e01",
-                "sha256:3249cc2989d9090eeac5467e50e9ec2d40704fea9ab72f36b034ea34ee65ca98",
-                "sha256:3545039fa4779be2df51d6395e91a810f57122290864918b172d5dc7ca5bb433",
-                "sha256:394ed3924d7a01b5bd9a0d9d946136e1c2f7b3dc337196d99e61740ed4bc6fe1",
-                "sha256:3a6b45da02336895da82b9d472cd274b22dc27a5cea1d4b793874eead23dd14f",
-                "sha256:3a74c4f27167cb95c1d4af1c0b59e88b7f3e0182138db2501c353555f7ec57f4",
-                "sha256:3d0c3dd24bb4605439bf91068598d00c6370684f8de4a67c2992683f6c309d6b",
-                "sha256:3dbe858ee582cbb2c6294dc85f55b5f19c918c2597855e950f34b660f1a5ede6",
-                "sha256:3dc773b2861b37b41a6136e0b72a1a44689a9c4c101e0cddb6b854016acc0aa8",
-                "sha256:3f7765e69bbce0906a7c74d5fe46d2c7a7596147318dbc08e4a2431f3060e306",
-                "sha256:417d14450f06d51f363e41cace6488519038f940676ce9664b34ebf5653433a5",
-                "sha256:44f6c7caff88d988db017b9b0e4ab04934f11e3e72d478031efc7edcac6c622f",
-                "sha256:491755202eb21a5e350dae00c6d9a17247769c64dcf62d8c788b5c135e179dc4",
-                "sha256:4951e4f7a5680a2db62f7f4ab2f84617674d36d2d76a729b9a8be4b59b3659be",
-                "sha256:52421b41ac99e9d91934e4d0d0fe7da9f02bfa7536bb4431b4c05c906c8c6919",
-                "sha256:530e7c04f72002d2f334d5257c8a51bf409db0316feee7c87e4385043be136af",
-                "sha256:533658f8fbf056b70e434dff7e7aa611bcacb33e01f75de7f821810e48d1bb66",
-                "sha256:5670fb70a828663cc37552a2a85bf2ac38475572b0e9b91283dc09efb52c41d1",
-                "sha256:56c22432809085b3f3ae04e6e7bdd36883d7258fcd90e53ba7b2e463efc7a6af",
-                "sha256:58278b29cb89f3e43ff3e0c756abbd1518f3ee6adad9e35b51fb101c1c1daaec",
-                "sha256:588008b8497667f1ddca7c99f2f85ce8511f8f7871b4a06ceede68ab62dff64b",
-                "sha256:59565f10607c244bc4c05c0c5fa0c190c990996e0c719d05deec7030c2aa8289",
-                "sha256:59689a75ba8d7ffca577aefd017d08d659d86ad4585ccc73e43edbfc7476781a",
-                "sha256:5aea8212fb823e006b995c4dda533edcf98a893d941f173f6c9506126188860d",
-                "sha256:5c670c0406bdc845b474b680b9a5456c561c65cf366f8db5a60154088c92d102",
-                "sha256:5ca1e8188b26a819387b29c3895c47a5e618708fe6f787f3b1a471de2c4a94d9",
-                "sha256:5d077bc40a1fe984e1a9931e801e42959a1e6598edc8a3223b061d30fbd26bbc",
-                "sha256:5d5792e9b3fb8d16a19f46aa8208987cfeafe082363ee2745ea8b643d9cc5b45",
-                "sha256:5dd1537e7cc06efd81371f5d1a992bd5ab156b2b4f88834ca852de4a8ea523fa",
-                "sha256:5ea7b6766ac2dfe4bcac8b8595107665a18ef01f8c8343f00710b85096d1b53a",
-                "sha256:622020d4521e22fb371e15f580d153134bfb68d6a429d1342a25f051ec72df1c",
-                "sha256:627402ad8dea044dde2eccde4370560a2b750ef894c9578e1d4f8ffd54000461",
-                "sha256:644df54d729ef810dcd0f7732e50e5ad1bd0a135278ed8d6bcb06f33b6b6f708",
-                "sha256:64641a6068a16201366476731301441ce93457eb8452056f570133a6ceb15fca",
-                "sha256:64c2baa7774bc22dd4474248ba16fe1a7f611c13ac6123408694d4cc93d66dbd",
-                "sha256:6588c459c5627fefa30139be4d2e28a2c2a1d0d1c265aad2ba1935a7863a4913",
-                "sha256:66bc5eb8a323ed9894f8fa0ee6cb3e3fb2403d99aee635078fd19a8bc7a5a5da",
-                "sha256:68a2610dbe138fa8c5826b3f6d98a7cfc29707b850ddcc3e21910a6fe51f6ca0",
-                "sha256:6935bbf153f9a965f1e07c2649c0849d29832487c52bb4a5c5066031d8b44fd5",
-                "sha256:6992030d43b916407c9aa52e9673612ff39a575523c5f4cf72cdef75365709a5",
-                "sha256:6a014510830df1475176466b6087fc0c08b47a36714823e58d8b8d7709132a96",
-                "sha256:6ab833e4735a7e5533711a6ea2df26459b96f9eec36d23f74cafe03631647c41",
-                "sha256:6cc6ee342fb7fa2471bd9b6d6fdfc78925a697bf5c2bcd0a302e98b0d35bfad3",
-                "sha256:6cf58416653c5901e12624e4013708b6e11142956e7f35e7a83f1ab02f3fe456",
-                "sha256:70a9768e1b9d79edca17890175ba915654ee1725975d69ab64813dd785a2bd5c",
-                "sha256:70ac664a48aa64e5e635ae5566f5227f2ab7f66a3990d67566d9907edcbbf867",
-                "sha256:71e97313406ccf55d32cc98a533ee05c61e15d11b99215b237346171c179c0b0",
-                "sha256:7221d49259aa1e5a8f00d3d28b1e0b76031655ca74bb287123ef56c3db92f213",
-                "sha256:74b28c6334cca4dd704e8004cba1955af0b778cf449142e581e404bd211fb619",
-                "sha256:764b521b75701f60683500d8621841bec41a65eb739b8466000c6fdbc256c240",
-                "sha256:78bfa756eab503673991bdcf464917ef7845a964903d3302c5f68417ecdc948c",
-                "sha256:794f04eec78f1d0e35d9e0c36cbbb22e42d370dda1609fb03bcd7aeb458c6377",
-                "sha256:79bd05260359170f78b181b59ce871673ed01ba048deef4bf49a36ab3e72e80b",
-                "sha256:7a7efd5b6d3e30d81ec68ab8a88252d7c7c6f13aaa875009fe3097eb4e30b84c",
-                "sha256:7c17b64b0a6ef4e5affae6a3724010a7a66bda48a62cfe0674dabd46642e8b54",
-                "sha256:804f74efe22b6a227306dd890eecc4f8c59ff25ca35f1f14e7482bbce96ef10b",
-                "sha256:853e074d4931dbcba7480d4dcab23d5c56bd9607f92825ab80ee2bd916edea53",
-                "sha256:857500f88b17a6479202ff5fe5f580fc3404922cd02ab3716197adf1ef628029",
-                "sha256:865bad62df277c04beed9478fe665b9ef63eb28fe026d5dedcb89b537d2e2ea6",
-                "sha256:88e22fc0a6684337d25c994381ed8a1580a6f5ebebd5ad41f89f663ff4ec2885",
-                "sha256:8b9c07e7a45bb64e21df4b6aa623cb8ba214dfb47d2027d90eac197329bb5e94",
-                "sha256:8de8f9d6caa7f25b204fc861718815d41cbcf27ee8f028c89c882a0cf4ae4134",
-                "sha256:8e77c69d5892cb5ba71703c4057091e31ccf534bd7f129307a4d084d90d014b8",
-                "sha256:9123716666e25b7b71c4e1789ec829ed18663152008b58544d95b008ed9e21e9",
-                "sha256:958244ad566c3ffc385f47dddde4145088a0ab893504b54b52c041987a8c1863",
-                "sha256:96323338e6c14e958d775700ec8a88346014a85e5de73ac7967db0367582049b",
-                "sha256:9676bfc686fa6a3fa10cd4ae6b76cae8be26eb5ec6811d2a325636c460da1806",
-                "sha256:9b0ff53900566bc6325ecde9181d89afadc59c5ffa39bddf084aaedfe3b06a11",
-                "sha256:9b9ec9c9978b708d488bec36b9e4c94d88fd12ccac3e62134a9d17ddba910ea9",
-                "sha256:9c6ad0fbf105f6bcc9300c00010a2ffa44ea6f555df1a2ad95c88f5656104817",
-                "sha256:9ca66b8e90daca431b7ca1408cae085d025326570e57749695d6a01454790e95",
-                "sha256:9e2addd2d1866fe112bc6f80117bcc6bc25191c5ed1bfbcf9f1386a884252ae8",
-                "sha256:a0af35bd8ebf84888373630f73f24e86bf016642fb8576fba49d3d6b560b7cbc",
-                "sha256:a2b44bec7adf3e9305ce6cbfa47a4395667e744097faed97abb4728748ba7d47",
-                "sha256:a2dfe7e2473f9b59496247aad6e23b405ddf2e12ef0765677b0081c02d6c2c0b",
-                "sha256:a55ee573116ba208932e2d1a037cc4b10d2c1cb264ced2184d00b18ce585b2c0",
-                "sha256:a7baf9ffc238e4bf401299f50e971a45bfcc10a785522541a6e3179c83eabf0a",
-                "sha256:a8d5c70e04aac1eda5c829a26d1f75c6e5286c74743133d9f742cda8e53b9c2f",
-                "sha256:a91481dbcddf1736c98a80b122afa0f7296eeb80b72344d7f45dc9f781551f56",
-                "sha256:ab31a88a651039a07a3ae327d68ebdd8bc589b16938c09ef3f32a4b809dc96ef",
-                "sha256:abc25c3cab9ec7fcd299b9bcb3b8d4a1231877e425c650fa1c7576c5107ab851",
-                "sha256:adfb84ca6b87e06bc6b146dc7da7623395db1e31621c4785ad0658c5028b37d7",
-                "sha256:afbbdb120d1e78d2ba8064a68058001b871154cc57787031b645c9142b937a62",
-                "sha256:afd5562927cdef7c4f5550374acbc117fd4ecc05b5007bdfa57cc5355864e0a4",
-                "sha256:b070bbe8d3f0f6147689bed981d19bbb33070225373338df755a46893528104a",
-                "sha256:b0b58fbfa1bf7367dde8a557994e3b1637294be6cf2169810375caf8571a085c",
-                "sha256:b560e3aa4b1d49e0e6c847d72665384db35b2f5d45f8e6a5c0072e0283430533",
-                "sha256:b6241d4eee5f89453307c2f2bfa03b50362052ca0af1efecf9fef9a41a22bb4f",
-                "sha256:b6787b643356111dfd4032b5bffe26d2f8331556ecb79e15dacb9275da02866e",
-                "sha256:bcbf4af004f98793a95355980764b3d80d47117678118a44a80b721c9913436a",
-                "sha256:beb72935a941965c52990f3a32d7f07ce869fe21c6af8b34bf6a277b33a345d3",
-                "sha256:bf2e2458345d9bffb0d9ec16557d8858c9c88d2d11fed53998512504cd9df49b",
-                "sha256:c2d35a1d047efd68027817b32ab1586c1169e60ca02c65d428ae815b593e65d4",
-                "sha256:c38d7b9a690b090de999835f0443d8aa93ce5f2064035dfc48f27f02b4afc3d0",
-                "sha256:c6f2c8372b98208ce609c9e1d707f6918cc118fea4e2c754c9f0812c04ca116d",
-                "sha256:c817d420c60a5183953c783b0547d9eb43b7b344a2c46f69513d5952a78cddf3",
-                "sha256:c8ba129e6d3b0136a0f50345b2cb3db53f6bda5dd8c7f5d83fbccba97fb5dcb5",
-                "sha256:c94e75445b00319c1fad60f3c98b09cd63fe1134a8a953dcd48989ef42318534",
-                "sha256:cc4691d60512798304acb9207987e7b2b7c44627ea88b9d77489bbe3e6cc3bd4",
-                "sha256:cc518cea79fd1e2f6c90baafa28906d4309d24f3a63e801d855e7424c5b34144",
-                "sha256:cd53553ddad4a9c2f1f022756ae64abe16da1feb497edf4d9f87f99ec7cf86bd",
-                "sha256:cf22b41fdae514ee2f1691b6c3cdeae666d8b7fa9434de445f12bbeee0cf48dd",
-                "sha256:d38c8f50ecf57f0463399569aa388b232cf1a2ffb8f0a9a5412d0db57e054860",
-                "sha256:d3be9b2076112e51b323bdf6d5a7f8a798de55fb8d95fcb64bd179460cdc0704",
-                "sha256:d4f2cc7060dc3646632d7f15fe68e2fa98f58e35dd5666cd525f3b35d3fed7f8",
-                "sha256:d7520db34088c96cc0e0a3ad51a4fd5b401f279ee112aa2b7f8f976d8582606d",
-                "sha256:d793bebb202a6000390a5390078e945bbb49855c29c7e4d56a85901326c3b5d9",
-                "sha256:da052e7962ea2d5e5ef5bc0355d55007407087392cf465b7ad84ce5f3e25fe0f",
-                "sha256:dae0ed02f6b075426accbf6b2863c3d0a7eacc1b41fb40f2251d931e50188dad",
-                "sha256:ddc678fb4c7e30cf830a2b5a8d869538bc55b28d6c68544d09c7d0d8f17694dc",
-                "sha256:df2e6f546c4df14bc81f9498bbc007fbb87669f1bb707c6138878c46b06f6510",
-                "sha256:e02c5175f63effbd7c5e590399c118d5db6183bbfe8e0d118bdb5c2d1b48d937",
-                "sha256:e196a4ff48310ba62e53a8e0f97ca2bca83cdd2fe2934d8b5cb0df0a841b193a",
-                "sha256:e233db59c8f76630c512ab4a4daf5a5986da5c3d5b44b8e9fc742f2a24dbd460",
-                "sha256:e32be23d538753a8adb6c85bd539f5fd3b15cb987404327c569dfc5fd8366e85",
-                "sha256:e3d30321949861404323c50aebeb1943461a67cd51d4200ab02babc58bd06a86",
-                "sha256:e89580a581bf478d8dcb97d9cd011d567768e8bc4095f8557b21c4d4c5fea7d0",
-                "sha256:e998e304036198b4f6914e6a1e2b6f925208a20e2042563d9734881150c6c246",
-                "sha256:ec42088248c596dbd61d4ae8a5b004f97a4d91a9fd286f632e42e60b706718d7",
-                "sha256:efa7b51824aa0ee957ccd5a741c73e6851de55f40d807f08069eb4c5a26b2baa",
-                "sha256:f0a1bc63a465b6d72569a9bba9f2ef0334c4e03958e043da1920299100bc7c08",
-                "sha256:f18a5a84e16886898e51ab4b1d43acb3083c39b14c8caeb3589aabff0ee0b270",
-                "sha256:f2a9efc53d5b714b8df2b4b3e992accf8ce5bbdfe544d74d5c6766c9e1146a3a",
-                "sha256:f3bbbc998d42f8e561f347e798b85513ba4da324c2b3f9b7969e9c45b10f6169",
-                "sha256:f42038016852ae51b4088b2862126535cc4fc85802bfe30dea3500fdfaf1864e",
-                "sha256:f443cdef978430887ed55112b491f670bba6462cea7a7742ff8f14b7abb98d75",
-                "sha256:f51969bac61441fd31f028d7b3b45962f3ecebf691a510495e5d2cd8c8092dbd",
-                "sha256:f8aca2e3a72f37bfc7b14ba96d4056244001ddcc18382bd0daa087fd2e68a354",
-                "sha256:f9737bf36262046213a28e789cc82d82c6ef19c85a0cf05e75c670a33342ac2c",
-                "sha256:fd6037392f2d57793ab98d9e26798f44b8b4da2f2464388588f48ac52c489ea1",
-                "sha256:feaa45c0eae424d3e90d78823f3828e7dc42a42f21ed420db98da2c4ecf0a2cb",
-                "sha256:ff097ae562e637409b429a7ac958a20aab237a0378c42dabaa1e3abf2f896e5f",
-                "sha256:ff46d772d5f6f73564979cd77a4fffe55c916a05f3cb70e7c9c0590059fb29ef"
+                "sha256:01220dca0d066d1349bd6a1726856a78f7929f3878f7e2ee83c296c69495309e",
+                "sha256:02ced472497b8362c8e902ade23e3300479f4f43e45f4105c85ef43b8db85229",
+                "sha256:052d99051e77a4f3e8482c65014cf6372e61b0a6f4fe9edb98503bb5364cfee3",
+                "sha256:07da23d7ee08577760f0a71d67a861019103e4812c87e2fab26b039054594cc5",
+                "sha256:094cb601ba9f55296774c2d57ad68730daa0b13dc260e1f941b4d13678239e70",
+                "sha256:0a7056921edbdd7560746f4221dca89bb7a3fe457d3d74267995253f46343f15",
+                "sha256:0c120f43553ec759f8de1fee2f4794452b0946773299d44c36bfe18e83caf002",
+                "sha256:0d7b36afa46c97875303a94e8f3ad932bf78bace9e18e603f2085b652422edcd",
+                "sha256:0fdf3a3059611f7585a78ee10399a15566356116a4288380921a4b598d807a22",
+                "sha256:109fa6fede314cc50eed29e6e56c540075e63d922455346f11e4d7a036d2b8cf",
+                "sha256:146173654d79eb1fc97498b4280c1d3e1e5d58c398fa530905c9ea50ea849b22",
+                "sha256:1473427aff3d66a3fa2199004c3e601e6c4500ab86696edffdbc84954c72d832",
+                "sha256:1483fd3358963cc5c1c9b122c80606a3a79ee0875bcac0204149fa09d6ff2727",
+                "sha256:168f2dfcfdedf611eb285efac1516c8454c8c99caf271dccda8943576b67552e",
+                "sha256:17e8d968d04a37c50ad9c456a286b525d78c4a1c15dd53aa46c1d8e06bf6fa30",
+                "sha256:18feb4b93302091b1541221196a2155aa296c363fd233814fa11e181adebc52f",
+                "sha256:1afe0a8c353746e610bd9031a630a95bcfb1a720684c3f2b36c4710a0a96528f",
+                "sha256:1d04f064bebdfef9240478f7a779e8c5dc32b8b7b0b2fc6a62e39b928d428e51",
+                "sha256:1fdc9fae8dd4c763e8a31e7630afef517eab9f5d5d31a278df087f307bf601f4",
+                "sha256:1ffc23010330c2ab67fac02781df60998ca8fe759e8efde6f8b756a20599c5de",
+                "sha256:20094fc3f21ea0a8669dc4c61ed7fa8263bd37d97d93b90f28fc613371e7a875",
+                "sha256:213261f168c5e1d9b7535a67e68b1f59f92398dd17a56d934550837143f79c42",
+                "sha256:218c1b2e17a710e363855594230f44060e2025b05c80d1f0661258142b2add2e",
+                "sha256:23e0553b8055600b3bf4a00b255ec5c92e1e4aebf8c2c09334f8368e8bd174d6",
+                "sha256:25f1b69d41656b05885aa185f5fdf822cb01a586d1b32739633679699f220391",
+                "sha256:2b3778cb38212f52fac9fe913017deea2fdf4eb1a4f8e4cfc6b009a13a6d3fcc",
+                "sha256:2bc9fd5ca4729af796f9f59cd8ff160fe06a474da40aca03fcc79655ddee1a8b",
+                "sha256:2c226a06ecb8cdef28845ae976da407917542c5e6e75dcac7cc33eb04aaeb237",
+                "sha256:2c3406b63232fc7e9b8783ab0b765d7c59e7c59ff96759d8ef9632fca27c7ee4",
+                "sha256:2c86bf781b12ba417f64f3422cfc302523ac9cd1d8ae8c0f92a1c66e56ef2e86",
+                "sha256:2d9b8d9177afaef80c53c0a9e30fa252ff3036fb1c6494d427c066a4ce6a282f",
+                "sha256:2dec2d1130a9cda5b904696cec33b2cfb451304ba9081eeda7f90f724097300a",
+                "sha256:2dfab5fa6a28a0b60a20638dc48e6343c02ea9933e3279ccb132f555a62323d8",
+                "sha256:2ecdd78ab768f844c7a1d4a03595038c166b609f6395e25af9b0f3f26ae1230f",
+                "sha256:315f9542011b2c4e1d280e4a20ddcca1761993dda3afc7a73b01235f8641e903",
+                "sha256:36aef61a1678cb778097b4a6eeae96a69875d51d1e8f4d4b491ab3cfb54b5a03",
+                "sha256:384aacddf2e5813a36495233b64cb96b1949da72bef933918ba5c84e06af8f0e",
+                "sha256:3879cc6ce938ff4eb4900d901ed63555c778731a96365e53fadb36437a131a99",
+                "sha256:3c174dc350d3ec52deb77f2faf05c439331d6ed5e702fc247ccb4e6b62d884b7",
+                "sha256:3eb44520c4724c2e1a57c0af33a379eee41792595023f367ba3952a2d96c2aab",
+                "sha256:406246b96d552e0503e17a1006fd27edac678b3fcc9f1be71a2f94b4ff61528d",
+                "sha256:41ce1f1e2c7755abfc7e759dc34d7d05fd221723ff822947132dc934d122fe22",
+                "sha256:423b121f7e6fa514ba0c7918e56955a1d4470ed35faa03e3d9f0e3baa4c7e492",
+                "sha256:44264ecae91b30e5633013fb66f6ddd05c006d3e0e884f75ce0b4755b3e3847b",
+                "sha256:482c2f67761868f0108b1743098640fbb2a28a8e15bf3f47ada9fa59d9fe08c3",
+                "sha256:4b0c7a688944891086ba192e21c5229dea54382f4836a209ff8d0a660fac06be",
+                "sha256:4c1fefd7e3d00921c44dc9ca80a775af49698bbfd92ea84498e56acffd4c5469",
+                "sha256:4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f",
+                "sha256:501d0d7e26b4d261fca8132854d845e4988097611ba2531408ec91cf3fd9d20a",
+                "sha256:516f491c834eb320d6c843156440fe7fc0d50b33e44387fcec5b02f0bc118a4c",
+                "sha256:51806cfe0279e06ed8500ce19479d757db42a30fd509940b1701be9c86a5ff9a",
+                "sha256:562e7494778a69086f0312ec9689f6b6ac1c6b65670ed7d0267e49f57ffa08c4",
+                "sha256:56b9861a71575f5795bde89256e7467ece3d339c9b43141dbdd54544566b3b94",
+                "sha256:5b8f5db71b28b8c404956ddf79575ea77aa8b1538e8b2ef9ec877945b3f46442",
+                "sha256:5c2fb570d7823c2bbaf8b419ba6e5662137f8166e364a8b2b91051a1fb40ab8b",
+                "sha256:5c54afdcbb0182d06836cc3d1be921e540be3ebdf8b8a51ee3ef987537455f84",
+                "sha256:5d6a6972b93c426ace71e0be9a6f4b2cfae9b1baed2eed2006076a746692288c",
+                "sha256:609251a0ca4770e5a8768ff902aa02bf636339c5a93f9349b48eb1f606f7f3e9",
+                "sha256:62d172f358f33a26d6b41b28c170c63886742f5b6772a42b59b4f0fa10526cb1",
+                "sha256:62f7fdb0d1ed2065451f086519865b4c90aa19aed51081979ecd05a21eb4d1be",
+                "sha256:658f2aa69d31e09699705949b5fc4719cbecbd4a97f9656a232e7d6c7be1a367",
+                "sha256:65ab5685d56914b9a2a34d67dd5488b83213d680b0c5d10b47f81da5a16b0b0e",
+                "sha256:68934b242c51eb02907c5b81d138cb977b2129a0a75a8f8b60b01cb8586c7b21",
+                "sha256:68b87753c784d6acb8a25b05cb526c3406913c9d988d51f80adecc2b0775d6aa",
+                "sha256:69959bd3167b993e6e710b99051265654133a98f20cec1d9b493b931942e9c16",
+                "sha256:6a7095eeec6f89111d03dabfe5883a1fd54da319c94e0fb104ee8f23616b572d",
+                "sha256:6b038cc86b285e4f9fea2ba5ee76e89f21ed1ea898e287dc277a25884f3a7dfe",
+                "sha256:6ba0d3dcac281aad8a0e5b14c7ed6f9fa89c8612b47939fc94f80b16e2e9bc83",
+                "sha256:6e91cf736959057f7aac7adfc83481e03615a8e8dd5758aa1d95ea69e8931dba",
+                "sha256:6ee8c39582d2652dcd516d1b879451500f8db3fe3607ce45d7c5957ab2596040",
+                "sha256:6f651ebd0b21ec65dfca93aa629610a0dbc13dbc13554f19b0113da2e61a4763",
+                "sha256:71a8dd38fbd2f2319136d4ae855a7078c69c9a38ae06e0c17c73fd70fc6caad8",
+                "sha256:74068c601baff6ff021c70f0935b0c7bc528baa8ea210c202e03757c68c5a4ff",
+                "sha256:7437237c6a66b7ca341e868cda48be24b8701862757426852c9b3186de1da8a2",
+                "sha256:747a3d3e98e24597981ca0be0fd922aebd471fa99d0043a3842d00cdcad7ad6a",
+                "sha256:74bcb423462233bc5d6066e4e98b0264e7c1bed7541fff2f4e34fe6b21563c8b",
+                "sha256:78d9b952e07aed35fe2e1a7ad26e929595412db48535921c5013edc8aa4a35ce",
+                "sha256:7b1cd427cb0d5f7393c31b7496419da594fe600e6fdc4b105a54f82405e6626c",
+                "sha256:7d3d1ca42870cdb6d0d29939630dbe48fa511c203724820fc0fd507b2fb46577",
+                "sha256:7e2f58095acc211eb9d8b5771bf04df9ff37d6b87618d1cbf85f92399c98dae8",
+                "sha256:7f41026c1d64043a36fda21d64c5026762d53a77043e73e94b71f0521939cc71",
+                "sha256:81b4e48da4c69313192d8c8d4311e5d818b8be1afe68ee20f6385d0e96fc9512",
+                "sha256:86a6b24b19eaebc448dc56b87c4865527855145d851f9fc3891673ff97950540",
+                "sha256:874a216bf6afaf97c263b56371434e47e2c652d215788396f60477540298218f",
+                "sha256:89e043f1d9d341c52bf2af6d02e6adde62e0a46e6755d5eb60dc6e4f0b8aeca2",
+                "sha256:8c72e9563347c7395910de6a3100a4840a75a6f60e05af5e58566868d5eb2d6a",
+                "sha256:8dc2c0395bea8254d8daebc76dcf8eb3a95ec2a46fa6fae5eaccee366bfe02ce",
+                "sha256:8f0de2d390af441fe8b2c12626d103540b5d850d585b18fcada58d972b74a74e",
+                "sha256:92e67a0be1639c251d21e35fe74df6bcc40cba445c2cda7c4a967656733249e2",
+                "sha256:94d6c3782907b5e40e21cadf94b13b0842ac421192f26b84c45f13f3c9d5dc27",
+                "sha256:97acf1e1fd66ab53dacd2c35b319d7e548380c2e9e8c54525c6e76d21b1ae3b1",
+                "sha256:9ada35dd21dc6c039259596b358caab6b13f4db4d4a7f8665764d616daf9cc1d",
+                "sha256:9c52100e2c2dbb0649b90467935c4b0de5528833c76a35ea1a2691ec9f1ee7a1",
+                "sha256:9e41506fec7a7f9405b14aa2d5c8abbb4dbbd09d88f9496958b6d00cb4d45330",
+                "sha256:9e4b47ac0f5e749cfc618efdf4726269441014ae1d5583e047b452a32e221920",
+                "sha256:9fb81d2824dff4f2e297a276297e9031f46d2682cafc484f49de182aa5e5df99",
+                "sha256:a0eabd0a81625049c5df745209dc7fcef6e2aea7793e5f003ba363610aa0a3ff",
+                "sha256:a3d819eb6f9b8677f57f9664265d0a10dd6551d227afb4af2b9cd7bdc2ccbf18",
+                "sha256:a87de7dd873bf9a792bf1e58b1c3887b9264036629a5bf2d2e6579fe8e73edff",
+                "sha256:aa617107a410245b8660028a7483b68e7914304a6d4882b5ff3d2d3eb5948d8c",
+                "sha256:aac0bbd3e8dd2d9c45ceb82249e8bdd3ac99131a32b4d35c8af3cc9db1657179",
+                "sha256:ab6dd83b970dc97c2d10bc71aa925b84788c7c05de30241b9e96f9b6d9ea3080",
+                "sha256:ace2c2326a319a0bb8a8b0e5b570c764962e95818de9f259ce814ee666603f19",
+                "sha256:ae5fe5c4b525aa82b8076c1a59d642c17b6e8739ecf852522c6321852178119d",
+                "sha256:b11a5d918a6216e521c715b02749240fb07ae5a1fefd4b7bf12f833bc8b4fe70",
+                "sha256:b1c8c20847b9f34e98080da785bb2336ea982e7f913eed5809e5a3c872900f32",
+                "sha256:b369d3db3c22ed14c75ccd5af429086f166a19627e84a8fdade3f8f31426e52a",
+                "sha256:b710bc2b8292966b23a6a0121f7a6c51d45d2347edcc75f016ac123b8054d3f2",
+                "sha256:bd96517ef76c8654446fc3db9242d019a1bb5fe8b751ba414765d59f99210b79",
+                "sha256:c00f323cc00576df6165cc9d21a4c21285fa6b9989c5c39830c3903dc4303ef3",
+                "sha256:c162b216070f280fa7da844531169be0baf9ccb17263cf5a8bf876fcd3117fa5",
+                "sha256:c1a69e58a6bb2de65902051d57fde951febad631a20a64572677a1052690482f",
+                "sha256:c1f794c02903c2824fccce5b20c339a1a14b114e83b306ff11b597c5f71a1c8d",
+                "sha256:c24037349665434f375645fa9d1f5304800cec574d0310f618490c871fd902b3",
+                "sha256:c300306673aa0f3ed5ed9372b21867690a17dba38c68c44b287437c362ce486b",
+                "sha256:c56a1d43b2f9ee4786e4658c7903f05da35b923fb53c11025712562d5cc02753",
+                "sha256:c6379f35350b655fd817cd0d6cbeef7f265f3ae5fedb1caae2eb442bbeae9ab9",
+                "sha256:c802e1c2ed9f0c06a65bc4ed0189d000ada8049312cfeab6ca635e39c9608957",
+                "sha256:cb83f8a875b3d9b458cada4f880fa498646874ba4011dc974e071a0a84a1b033",
+                "sha256:cf120cce539453ae086eacc0130a324e7026113510efa83ab42ef3fcfccac7fb",
+                "sha256:dd36439be765e2dde7660212b5275641edbc813e7b24668831a5c8ac91180656",
+                "sha256:dd5350b55f9fecddc51385463a4f67a5da829bc741e38cf689f38ec9023f54ab",
+                "sha256:df5c7333167b9674aa8ae1d4008fa4bc17a313cc490b2cca27838bbdcc6bb15b",
+                "sha256:e63601ad5cd8f860aa99d109889b5ac34de571c7ee902d6812d5d9ddcc77fa7d",
+                "sha256:e92ce66cd919d18d14b3856906a61d3f6b6a8500e0794142338da644260595cd",
+                "sha256:e99f5507401436fdcc85036a2e7dc2e28d962550afe1cbfc07c40e454256a859",
+                "sha256:ea2e2f6f801696ad7de8aec061044d6c8c0dd4037608c7cab38a9a4d316bfb11",
+                "sha256:eafa2c8658f4e560b098fe9fc54539f86528651f61849b22111a9b107d18910c",
+                "sha256:ecd4ad8453ac17bc7ba3868371bffb46f628161ad0eefbd0a855d2c8c32dd81a",
+                "sha256:ee70d08fd60c9565ba8190f41a46a54096afa0eeb8f76bd66f2c25d3b1b83005",
+                "sha256:eec1bb8cdbba2925bedc887bc0609a80e599c75b12d87ae42ac23fd199445654",
+                "sha256:ef0c1fe22171dd7c7c27147f2e9c3e86f8bdf473fed75f16b0c2e84a5030ce80",
+                "sha256:f2901429da1e645ce548bf9171784c0f74f0718c3f6150ce166be39e4dd66c3e",
+                "sha256:f422a209d2455c56849442ae42f25dbaaba1c6c3f501d58761c619c7836642ec",
+                "sha256:f65e5120863c2b266dbcc927b306c5b78e502c71edf3295dfcb9501ec96e5fc7",
+                "sha256:f7d4a670107d75dfe5ad080bed6c341d18c4442f9378c9f58e5851e86eb79965",
+                "sha256:f914c03e6a31deb632e2daa881fe198461f4d06e57ac3d0e05bbcab8eae01945",
+                "sha256:fb66442c2546446944437df74379e9cf9e9db353e61301d1a0e26482f43f0dd8"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==5.2.1"
+            "version": "==5.3.0"
         },
         "mako": {
             "hashes": [
-                "sha256:5324b88089a8978bf76d1629774fcc2f1c07b82acdf00f4c5dd8ceadfffc4b40",
-                "sha256:e16c01d9ab9c11f7290eef1cfefc093fb5a45ee4a3da09e2fec2e4d1bae54e73"
+                "sha256:260f1dbc3a519453a9c856dedfe4beb4e50bd5a26d96386cb6c80856556bb91a",
+                "sha256:48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==1.3.3"
-        },
-        "markuppy": {
-            "hashes": [
-                "sha256:1adee2c0a542af378fe84548ff6f6b0168f3cb7f426b46961038a2bcfaad0d5f"
-            ],
-            "version": "==1.14"
+            "version": "==1.3.5"
         },
         "markupsafe": {
             "hashes": [
@@ -832,18 +812,11 @@
         },
         "marshmallow": {
             "hashes": [
-                "sha256:4e65e9e0d80fc9e609574b9983cf32579f305c718afb30d7233ab818571768c3",
-                "sha256:f085493f79efb0644f270a9bf2892843142d80d7174bbbd2f3713f2a589dc633"
+                "sha256:4972f529104a220bb8637d595aa4c9762afbe7f7a77d82dc58c1615d70c5823e",
+                "sha256:71a2dce49ef901c3f97ed296ae5051135fd3febd2bf43afe0ae9a82143a494d9"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==3.21.1"
-        },
-        "odfpy": {
-            "hashes": [
-                "sha256:db766a6e59c5103212f3cc92ec8dd50a0f3a02790233ed0b52148b70d3c438ec",
-                "sha256:fc3b8d1bc098eba4a0fda865a76d9d1e577c4ceec771426bcb169a82c5e9dfe0"
-            ],
-            "version": "==1.4.1"
+            "version": "==3.22.0"
         },
         "oic": {
             "hashes": [
@@ -854,13 +827,6 @@
             "markers": "python_version ~= '3.8'",
             "version": "==1.7.0"
         },
-        "openpyxl": {
-            "hashes": [
-                "sha256:a6f5977418eff3b2d5500d54d9db50c8277a368436f4e4f8ddb1be3422870184",
-                "sha256:f91456ead12ab3c6c2e9491cf33ba6d08357d802192379bb482f1033ade496f5"
-            ],
-            "version": "==3.1.2"
-        },
         "orderedmultidict": {
             "hashes": [
                 "sha256:04070bbb5e87291cc9bfa51df413677faf2141c73c61d2a5f7b26bea3cd882ad",
@@ -870,18 +836,18 @@
         },
         "packaging": {
             "hashes": [
-                "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5",
-                "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"
+                "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002",
+                "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==24.0"
+            "markers": "python_version >= '3.8'",
+            "version": "==24.1"
         },
         "phonenumberslite": {
             "hashes": [
-                "sha256:343b300d9c8ac4dca84e6b922ec51c3d838f2feabf9dd2418da64b639d220879",
-                "sha256:64b513134b785fbeeaf4cc020e18d384541c4118ed3ece2118437d996f435ca0"
+                "sha256:63d650f2fe464602c8b01b7e0cda6b7057811a2410cbd1d21d90374642abdc51",
+                "sha256:ab6aa6e5fa115c89ea63e3c316c764ff449f8ecb826499cfc925f6a39f29e174"
             ],
-            "version": "==8.13.35"
+            "version": "==8.13.44"
         },
         "psycopg2-binary": {
             "hashes": [
@@ -1011,104 +977,114 @@
         },
         "pydantic": {
             "hashes": [
-                "sha256:e029badca45266732a9a79898a15ae2e8b14840b1eabbb25844be28f0b33f3d5",
-                "sha256:e9dbb5eada8abe4d9ae5f46b9939aead650cd2b68f249bb3a8139dbe125803cc"
+                "sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a",
+                "sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.7.1"
+            "version": "==2.8.2"
         },
         "pydantic-core": {
             "hashes": [
-                "sha256:0098300eebb1c837271d3d1a2cd2911e7c11b396eac9661655ee524a7f10587b",
-                "sha256:042473b6280246b1dbf530559246f6842b56119c2926d1e52b631bdc46075f2a",
-                "sha256:05b7133a6e6aeb8df37d6f413f7705a37ab4031597f64ab56384c94d98fa0e90",
-                "sha256:0680b1f1f11fda801397de52c36ce38ef1c1dc841a0927a94f226dea29c3ae3d",
-                "sha256:0d69b4c2f6bb3e130dba60d34c0845ba31b69babdd3f78f7c0c8fae5021a253e",
-                "sha256:1404c69d6a676245199767ba4f633cce5f4ad4181f9d0ccb0577e1f66cf4c46d",
-                "sha256:182245ff6b0039e82b6bb585ed55a64d7c81c560715d1bad0cbad6dfa07b4027",
-                "sha256:1a388a77e629b9ec814c1b1e6b3b595fe521d2cdc625fcca26fbc2d44c816804",
-                "sha256:1d90c3265ae107f91a4f279f4d6f6f1d4907ac76c6868b27dc7fb33688cfb347",
-                "sha256:20aca1e2298c56ececfd8ed159ae4dde2df0781988c97ef77d5c16ff4bd5b400",
-                "sha256:219da3f096d50a157f33645a1cf31c0ad1fe829a92181dd1311022f986e5fbe3",
-                "sha256:22057013c8c1e272eb8d0eebc796701167d8377441ec894a8fed1af64a0bf399",
-                "sha256:223ee893d77a310a0391dca6df00f70bbc2f36a71a895cecd9a0e762dc37b349",
-                "sha256:224c421235f6102e8737032483f43c1a8cfb1d2f45740c44166219599358c2cd",
-                "sha256:2334ce8c673ee93a1d6a65bd90327588387ba073c17e61bf19b4fd97d688d63c",
-                "sha256:269322dcc3d8bdb69f054681edff86276b2ff972447863cf34c8b860f5188e2e",
-                "sha256:2728b01246a3bba6de144f9e3115b532ee44bd6cf39795194fb75491824a1413",
-                "sha256:2b8ed04b3582771764538f7ee7001b02e1170223cf9b75dff0bc698fadb00cf3",
-                "sha256:2e29d20810dfc3043ee13ac7d9e25105799817683348823f305ab3f349b9386e",
-                "sha256:36789b70d613fbac0a25bb07ab3d9dba4d2e38af609c020cf4d888d165ee0bf3",
-                "sha256:390193c770399861d8df9670fb0d1874f330c79caaca4642332df7c682bf6b91",
-                "sha256:3a6515ebc6e69d85502b4951d89131ca4e036078ea35533bb76327f8424531ce",
-                "sha256:3f9a801e7c8f1ef8718da265bba008fa121243dfe37c1cea17840b0944dfd72c",
-                "sha256:43f0f463cf89ace478de71a318b1b4f05ebc456a9b9300d027b4b57c1a2064fb",
-                "sha256:4456f2dca97c425231d7315737d45239b2b51a50dc2b6f0c2bb181fce6207664",
-                "sha256:470b94480bb5ee929f5acba6995251ada5e059a5ef3e0dfc63cca287283ebfa6",
-                "sha256:4774f3184d2ef3e14e8693194f661dea5a4d6ca4e3dc8e39786d33a94865cefd",
-                "sha256:4b4356d3538c3649337df4074e81b85f0616b79731fe22dd11b99499b2ebbdf3",
-                "sha256:553ef617b6836fc7e4df130bb851e32fe357ce36336d897fd6646d6058d980af",
-                "sha256:6132dd3bd52838acddca05a72aafb6eab6536aa145e923bb50f45e78b7251043",
-                "sha256:6a46e22a707e7ad4484ac9ee9f290f9d501df45954184e23fc29408dfad61350",
-                "sha256:6e5c584d357c4e2baf0ff7baf44f4994be121e16a2c88918a5817331fc7599d7",
-                "sha256:75250dbc5290e3f1a0f4618db35e51a165186f9034eff158f3d490b3fed9f8a0",
-                "sha256:75f7e9488238e920ab6204399ded280dc4c307d034f3924cd7f90a38b1829563",
-                "sha256:78363590ef93d5d226ba21a90a03ea89a20738ee5b7da83d771d283fd8a56761",
-                "sha256:7ca4ae5a27ad7a4ee5170aebce1574b375de390bc01284f87b18d43a3984df72",
-                "sha256:800d60565aec896f25bc3cfa56d2277d52d5182af08162f7954f938c06dc4ee3",
-                "sha256:82d5d4d78e4448683cb467897fe24e2b74bb7b973a541ea1dcfec1d3cbce39fb",
-                "sha256:852e966fbd035a6468fc0a3496589b45e2208ec7ca95c26470a54daed82a0788",
-                "sha256:868649da93e5a3d5eacc2b5b3b9235c98ccdbfd443832f31e075f54419e1b96b",
-                "sha256:886eec03591b7cf058467a70a87733b35f44707bd86cf64a615584fd72488b7c",
-                "sha256:8b172601454f2d7701121bbec3425dd71efcb787a027edf49724c9cefc14c038",
-                "sha256:95b9d5e72481d3780ba3442eac863eae92ae43a5f3adb5b4d0a1de89d42bb250",
-                "sha256:98758d627ff397e752bc339272c14c98199c613f922d4a384ddc07526c86a2ec",
-                "sha256:997abc4df705d1295a42f95b4eec4950a37ad8ae46d913caeee117b6b198811c",
-                "sha256:9b5155ff768083cb1d62f3e143b49a8a3432e6789a3abee8acd005c3c7af1c74",
-                "sha256:9e08e867b306f525802df7cd16c44ff5ebbe747ff0ca6cf3fde7f36c05a59a81",
-                "sha256:9fdad8e35f278b2c3eb77cbdc5c0a49dada440657bf738d6905ce106dc1de439",
-                "sha256:a1874c6dd4113308bd0eb568418e6114b252afe44319ead2b4081e9b9521fe75",
-                "sha256:a8309f67285bdfe65c372ea3722b7a5642680f3dba538566340a9d36e920b5f0",
-                "sha256:ae0a8a797a5e56c053610fa7be147993fe50960fa43609ff2a9552b0e07013e8",
-                "sha256:b14d82cdb934e99dda6d9d60dc84a24379820176cc4a0d123f88df319ae9c150",
-                "sha256:b1bd7e47b1558ea872bd16c8502c414f9e90dcf12f1395129d7bb42a09a95438",
-                "sha256:b3ef08e20ec49e02d5c6717a91bb5af9b20f1805583cb0adfe9ba2c6b505b5ae",
-                "sha256:b89ed9eb7d616ef5714e5590e6cf7f23b02d0d539767d33561e3675d6f9e3857",
-                "sha256:c4fcf5cd9c4b655ad666ca332b9a081112cd7a58a8b5a6ca7a3104bc950f2038",
-                "sha256:c6fdc8627910eed0c01aed6a390a252fe3ea6d472ee70fdde56273f198938374",
-                "sha256:c9bd70772c720142be1020eac55f8143a34ec9f82d75a8e7a07852023e46617f",
-                "sha256:ca7b0c1f1c983e064caa85f3792dd2fe3526b3505378874afa84baf662e12241",
-                "sha256:cbca948f2d14b09d20268cda7b0367723d79063f26c4ffc523af9042cad95592",
-                "sha256:cc1cfd88a64e012b74e94cd00bbe0f9c6df57049c97f02bb07d39e9c852e19a4",
-                "sha256:ccdd111c03bfd3666bd2472b674c6899550e09e9f298954cfc896ab92b5b0e6d",
-                "sha256:cfeecd1ac6cc1fb2692c3d5110781c965aabd4ec5d32799773ca7b1456ac636b",
-                "sha256:d4d938ec0adf5167cb335acb25a4ee69a8107e4984f8fbd2e897021d9e4ca21b",
-                "sha256:d7d904828195733c183d20a54230c0df0eb46ec746ea1a666730787353e87182",
-                "sha256:d91cb5ea8b11607cc757675051f61b3d93f15eca3cefb3e6c704a5d6e8440f4e",
-                "sha256:d9319e499827271b09b4e411905b24a426b8fb69464dfa1696258f53a3334641",
-                "sha256:e0e8b1be28239fc64a88a8189d1df7fad8be8c1ae47fcc33e43d4be15f99cc70",
-                "sha256:e18609ceaa6eed63753037fc06ebb16041d17d28199ae5aba0052c51449650a9",
-                "sha256:e1b395e58b10b73b07b7cf740d728dd4ff9365ac46c18751bf8b3d8cca8f625a",
-                "sha256:e23ec367a948b6d812301afc1b13f8094ab7b2c280af66ef450efc357d2ae543",
-                "sha256:e25add29b8f3b233ae90ccef2d902d0ae0432eb0d45370fe315d1a5cf231004b",
-                "sha256:e6dac87ddb34aaec85f873d737e9d06a3555a1cc1a8e0c44b7f8d5daeb89d86f",
-                "sha256:ef26c9e94a8c04a1b2924149a9cb081836913818e55681722d7f29af88fe7b38",
-                "sha256:eff2de745698eb46eeb51193a9f41d67d834d50e424aef27df2fcdee1b153845",
-                "sha256:f0a21cbaa69900cbe1a2e7cad2aa74ac3cf21b10c3efb0fa0b80305274c0e8a2",
-                "sha256:f459a5ce8434614dfd39bbebf1041952ae01da6bed9855008cb33b875cb024c0",
-                "sha256:f93a8a2e3938ff656a7c1bc57193b1319960ac015b6e87d76c76bf14fe0244b4",
-                "sha256:fb2bd7be70c0fe4dfd32c951bc813d9fe6ebcbfdd15a07527796c8204bd36242"
+                "sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d",
+                "sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f",
+                "sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686",
+                "sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482",
+                "sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006",
+                "sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83",
+                "sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6",
+                "sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88",
+                "sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86",
+                "sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a",
+                "sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6",
+                "sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a",
+                "sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6",
+                "sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6",
+                "sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43",
+                "sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c",
+                "sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4",
+                "sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e",
+                "sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203",
+                "sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd",
+                "sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1",
+                "sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24",
+                "sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc",
+                "sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc",
+                "sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3",
+                "sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598",
+                "sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98",
+                "sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331",
+                "sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2",
+                "sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a",
+                "sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6",
+                "sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688",
+                "sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91",
+                "sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa",
+                "sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b",
+                "sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0",
+                "sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840",
+                "sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c",
+                "sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd",
+                "sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3",
+                "sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231",
+                "sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1",
+                "sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953",
+                "sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250",
+                "sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a",
+                "sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2",
+                "sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20",
+                "sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434",
+                "sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab",
+                "sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703",
+                "sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a",
+                "sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2",
+                "sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac",
+                "sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611",
+                "sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121",
+                "sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e",
+                "sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b",
+                "sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09",
+                "sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906",
+                "sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9",
+                "sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7",
+                "sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b",
+                "sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987",
+                "sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c",
+                "sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b",
+                "sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e",
+                "sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237",
+                "sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1",
+                "sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19",
+                "sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b",
+                "sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad",
+                "sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0",
+                "sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94",
+                "sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312",
+                "sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f",
+                "sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669",
+                "sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1",
+                "sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe",
+                "sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99",
+                "sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a",
+                "sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a",
+                "sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52",
+                "sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c",
+                "sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad",
+                "sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1",
+                "sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a",
+                "sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f",
+                "sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a",
+                "sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.18.2"
+            "version": "==2.20.1"
         },
         "pydantic-settings": {
             "hashes": [
-                "sha256:00b9f6a5e95553590434c0fa01ead0b216c3e10bc54ae02e37f359948643c5ed",
-                "sha256:0235391d26db4d2190cb9b31051c4b46882d28a51533f97440867f012d4da091"
+                "sha256:bb6849dc067f1687574c12a639e231f3a6feeed0a12d710c1382045c5db1c315",
+                "sha256:ed81c3a0f46392b4d7c0a565c05884e6e54b3456e6f0fe4d8814981172dc9a88"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.2.1"
+            "version": "==2.4.0"
         },
         "pyjwkest": {
             "hashes": [
@@ -1133,62 +1109,6 @@
             "markers": "python_version >= '3.8'",
             "version": "==1.0.1"
         },
-        "pyyaml": {
-            "hashes": [
-                "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5",
-                "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc",
-                "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df",
-                "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741",
-                "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206",
-                "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27",
-                "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595",
-                "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62",
-                "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98",
-                "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696",
-                "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290",
-                "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9",
-                "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d",
-                "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6",
-                "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867",
-                "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47",
-                "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486",
-                "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6",
-                "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3",
-                "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007",
-                "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938",
-                "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0",
-                "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c",
-                "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735",
-                "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d",
-                "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28",
-                "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4",
-                "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba",
-                "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8",
-                "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef",
-                "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5",
-                "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd",
-                "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3",
-                "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0",
-                "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515",
-                "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c",
-                "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c",
-                "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924",
-                "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34",
-                "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43",
-                "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859",
-                "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673",
-                "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54",
-                "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a",
-                "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b",
-                "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab",
-                "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa",
-                "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c",
-                "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585",
-                "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d",
-                "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"
-            ],
-            "version": "==6.0.1"
-        },
         "pyzipper": {
             "hashes": [
                 "sha256:0adca90a00c36a93fbe49bfa8c5add452bfe4ef85a1b8e3638739dd1c7b26bfc",
@@ -1200,28 +1120,28 @@
         },
         "requests": {
             "hashes": [
-                "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f",
-                "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"
+                "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760",
+                "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==2.31.0"
+            "markers": "python_version >= '3.8'",
+            "version": "==2.32.3"
         },
         "s3transfer": {
             "hashes": [
-                "sha256:5683916b4c724f799e600f41dd9e10a9ff19871bf87623cc8f491cb4f5fa0a19",
-                "sha256:ceb252b11bcf87080fb7850a224fb6e05c8a776bab8f2b64b7f25b969464839d"
+                "sha256:0711534e9356d3cc692fdde846b4a1e4b0cb6519971860796e6bc4c7aea00ef6",
+                "sha256:eca1c20de70a39daee580aef4986996620f365c4e0fda6a86100231d62f1bf69"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.10.1"
+            "version": "==0.10.2"
         },
         "setuptools": {
             "hashes": [
-                "sha256:6c1fccdac05a97e598fb0ae3bbed5904ccb317337a51139dcd51453611bbb987",
-                "sha256:c636ac361bc47580504644275c9ad802c50415c7522212252c033bd15f301f32"
+                "sha256:0274581a0037b638b9fc1c6883cc71c0210865aaa76073f7882376b641b84e8f",
+                "sha256:a85e96b8be2b906f3e3e789adec6a9323abf79758ecfa3065bd740d81158b11e"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==69.5.1"
+            "version": "==74.0.0"
         },
         "six": {
             "hashes": [
@@ -1233,11 +1153,11 @@
         },
         "sqlparse": {
             "hashes": [
-                "sha256:714d0a4932c059d16189f58ef5411ec2287a4360f17cdd0edd2d09d4c5087c93",
-                "sha256:c204494cd97479d0e39f28c93d46c0b2d5959c7b9ab904762ea6c7af211c8663"
+                "sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4",
+                "sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.5.0"
+            "version": "==0.5.1"
         },
         "tablib": {
             "extras": [
@@ -1265,43 +1185,29 @@
         },
         "typing-extensions": {
             "hashes": [
-                "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0",
-                "sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a"
+                "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
+                "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==4.11.0"
+            "version": "==4.12.2"
         },
         "urllib3": {
             "hashes": [
-                "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d",
-                "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"
+                "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
+                "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.2.1"
+            "version": "==2.2.2"
         },
         "whitenoise": {
             "hashes": [
-                "sha256:8998f7370973447fac1e8ef6e8ded2c5209a7b1f67c1012866dbcd09681c3251",
-                "sha256:b1f9db9bf67dc183484d760b99f4080185633136a273a03f6436034a41064146"
+                "sha256:58c7a6cd811e275a6c91af22e96e87da0b1109e9a53bb7464116ef4c963bf636",
+                "sha256:a1ae85e01fdc9815d12fa33f17765bc132ed2c54fa76daf9e39e879dd93566f6"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==6.6.0"
-        },
-        "xlrd": {
-            "hashes": [
-                "sha256:6a33ee89877bd9abc1158129f6e94be74e2679636b8a205b43b85206c3f0bbdd",
-                "sha256:f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88"
-            ],
-            "version": "==2.0.1"
-        },
-        "xlwt": {
-            "hashes": [
-                "sha256:a082260524678ba48a297d922cc385f58278b8aa68741596a87de01a9c628b2e",
-                "sha256:c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88"
-            ],
-            "version": "==1.3.0"
+            "version": "==6.7.0"
         },
         "zope.event": {
             "hashes": [
@@ -1313,45 +1219,43 @@
         },
         "zope.interface": {
             "hashes": [
-                "sha256:014bb94fe6bf1786da1aa044eadf65bc6437bcb81c451592987e5be91e70a91e",
-                "sha256:01a0b3dd012f584afcf03ed814bce0fc40ed10e47396578621509ac031be98bf",
-                "sha256:10cde8dc6b2fd6a1d0b5ca4be820063e46ddba417ab82bcf55afe2227337b130",
-                "sha256:187f7900b63845dcdef1be320a523dbbdba94d89cae570edc2781eb55f8c2f86",
-                "sha256:1b0c4c90e5eefca2c3e045d9f9ed9f1e2cdbe70eb906bff6b247e17119ad89a1",
-                "sha256:22e8a218e8e2d87d4d9342aa973b7915297a08efbebea5b25900c73e78ed468e",
-                "sha256:26c9a37fb395a703e39b11b00b9e921c48f82b6e32cc5851ad5d0618cd8876b5",
-                "sha256:2bb78c12c1ad3a20c0d981a043d133299117b6854f2e14893b156979ed4e1d2c",
-                "sha256:2c3cfb272bcb83650e6695d49ae0d14dd06dc694789a3d929f23758557a23d92",
-                "sha256:2f32010ffb87759c6a3ad1c65ed4d2e38e51f6b430a1ca11cee901ec2b42e021",
-                "sha256:3c8731596198198746f7ce2a4487a0edcbc9ea5e5918f0ab23c4859bce56055c",
-                "sha256:40aa8c8e964d47d713b226c5baf5f13cdf3a3169c7a2653163b17ff2e2334d10",
-                "sha256:4137025731e824eee8d263b20682b28a0bdc0508de9c11d6c6be54163e5b7c83",
-                "sha256:46034be614d1f75f06e7dcfefba21d609b16b38c21fc912b01a99cb29e58febb",
-                "sha256:483e118b1e075f1819b3c6ace082b9d7d3a6a5eb14b2b375f1b80a0868117920",
-                "sha256:4d6b229f5e1a6375f206455cc0a63a8e502ed190fe7eb15e94a312dc69d40299",
-                "sha256:567d54c06306f9c5b6826190628d66753b9f2b0422f4c02d7c6d2b97ebf0a24e",
-                "sha256:5683aa8f2639016fd2b421df44301f10820e28a9b96382a6e438e5c6427253af",
-                "sha256:600101f43a7582d5b9504a7c629a1185a849ce65e60fca0f6968dfc4b76b6d39",
-                "sha256:62e32f02b3f26204d9c02c3539c802afc3eefb19d601a0987836ed126efb1f21",
-                "sha256:69dedb790530c7ca5345899a1b4cb837cc53ba669051ea51e8c18f82f9389061",
-                "sha256:72d5efecad16c619a97744a4f0b67ce1bcc88115aa82fcf1dc5be9bb403bcc0b",
-                "sha256:8d407e0fd8015f6d5dfad481309638e1968d70e6644e0753f229154667dd6cd5",
-                "sha256:a058e6cf8d68a5a19cb5449f42a404f0d6c2778b897e6ce8fadda9cea308b1b0",
-                "sha256:a1adc14a2a9d5e95f76df625a9b39f4709267a483962a572e3f3001ef90ea6e6",
-                "sha256:a56fe1261230093bfeedc1c1a6cd6f3ec568f9b07f031c9a09f46b201f793a85",
-                "sha256:ad4524289d8dbd6fb5aa17aedb18f5643e7d48358f42c007a5ee51a2afc2a7c5",
-                "sha256:afa0491a9f154cf8519a02026dc85a416192f4cb1efbbf32db4a173ba28b289a",
-                "sha256:bf34840e102d1d0b2d39b1465918d90b312b1119552cebb61a242c42079817b9",
-                "sha256:c40df4aea777be321b7e68facb901bc67317e94b65d9ab20fb96e0eb3c0b60a1",
-                "sha256:d0e7321557c702bd92dac3c66a2f22b963155fdb4600133b6b29597f62b71b12",
-                "sha256:d165d7774d558ea971cb867739fb334faf68fc4756a784e689e11efa3becd59e",
-                "sha256:e78a183a3c2f555c2ad6aaa1ab572d1c435ba42f1dc3a7e8c82982306a19b785",
-                "sha256:e8fa0fb05083a1a4216b4b881fdefa71c5d9a106e9b094cd4399af6b52873e91",
-                "sha256:f83d6b4b22262d9a826c3bd4b2fbfafe1d0000f085ef8e44cd1328eea274ae6a",
-                "sha256:f95bebd0afe86b2adc074df29edb6848fc4d474ff24075e2c263d698774e108d"
+                "sha256:01e6e58078ad2799130c14a1d34ec89044ada0e1495329d72ee0407b9ae5100d",
+                "sha256:064ade95cb54c840647205987c7b557f75d2b2f7d1a84bfab4cf81822ef6e7d1",
+                "sha256:11fa1382c3efb34abf16becff8cb214b0b2e3144057c90611621f2d186b7e1b7",
+                "sha256:1bee1b722077d08721005e8da493ef3adf0b7908e0cd85cc7dc836ac117d6f32",
+                "sha256:1eeeb92cb7d95c45e726e3c1afe7707919370addae7ed14f614e22217a536958",
+                "sha256:21a207c6b2c58def5011768140861a73f5240f4f39800625072ba84e76c9da0b",
+                "sha256:2545d6d7aac425d528cd9bf0d9e55fcd47ab7fd15f41a64b1c4bf4c6b24946dc",
+                "sha256:2c4316a30e216f51acbd9fb318aa5af2e362b716596d82cbb92f9101c8f8d2e7",
+                "sha256:35062d93bc49bd9b191331c897a96155ffdad10744ab812485b6bad5b588d7e4",
+                "sha256:382d31d1e68877061daaa6499468e9eb38eb7625d4369b1615ac08d3860fe896",
+                "sha256:3aa8fcbb0d3c2be1bfd013a0f0acd636f6ed570c287743ae2bbd467ee967154d",
+                "sha256:3d4b91821305c8d8f6e6207639abcbdaf186db682e521af7855d0bea3047c8ca",
+                "sha256:3de1d553ce72868b77a7e9d598c9bff6d3816ad2b4cc81c04f9d8914603814f3",
+                "sha256:3fcdc76d0cde1c09c37b7c6b0f8beba2d857d8417b055d4f47df9c34ec518bdd",
+                "sha256:5112c530fa8aa2108a3196b9c2f078f5738c1c37cfc716970edc0df0414acda8",
+                "sha256:53d678bb1c3b784edbfb0adeebfeea6bf479f54da082854406a8f295d36f8386",
+                "sha256:6195c3c03fef9f87c0dbee0b3b6451df6e056322463cf35bca9a088e564a3c58",
+                "sha256:6d04b11ea47c9c369d66340dbe51e9031df2a0de97d68f442305ed7625ad6493",
+                "sha256:6dd647fcd765030638577fe6984284e0ebba1a1008244c8a38824be096e37fe3",
+                "sha256:799ef7a444aebbad5a145c3b34bff012b54453cddbde3332d47ca07225792ea4",
+                "sha256:7d92920416f31786bc1b2f34cc4fc4263a35a407425319572cbf96b51e835cd3",
+                "sha256:7e0c151a6c204f3830237c59ee4770cc346868a7a1af6925e5e38650141a7f05",
+                "sha256:84f8794bd59ca7d09d8fce43ae1b571be22f52748169d01a13d3ece8394d8b5b",
+                "sha256:95e5913ec718010dc0e7c215d79a9683b4990e7026828eedfda5268e74e73e11",
+                "sha256:9b9369671a20b8d039b8e5a1a33abd12e089e319a3383b4cc0bf5c67bd05fe7b",
+                "sha256:ab985c566a99cc5f73bc2741d93f1ed24a2cc9da3890144d37b9582965aff996",
+                "sha256:af94e429f9d57b36e71ef4e6865182090648aada0cb2d397ae2b3f7fc478493a",
+                "sha256:c96b3e6b0d4f6ddfec4e947130ec30bd2c7b19db6aa633777e46c8eecf1d6afd",
+                "sha256:cd2690d4b08ec9eaf47a85914fe513062b20da78d10d6d789a792c0b20307fb1",
+                "sha256:d3b7ce6d46fb0e60897d62d1ff370790ce50a57d40a651db91a3dde74f73b738",
+                "sha256:d976fa7b5faf5396eb18ce6c132c98e05504b52b60784e3401f4ef0b2e66709b",
+                "sha256:db6237e8fa91ea4f34d7e2d16d74741187e9105a63bbb5686c61fea04cdbacca",
+                "sha256:ecd32f30f40bfd8511b17666895831a51b532e93fc106bfa97f366589d3e4e0e",
+                "sha256:f418c88f09c3ba159b95a9d1cfcdbe58f208443abb1f3109f4b9b12fd60b187c"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==6.3"
+            "markers": "python_version >= '3.8'",
+            "version": "==7.0.3"
         }
     },
     "develop": {
@@ -1365,12 +1269,12 @@
         },
         "bandit": {
             "hashes": [
-                "sha256:36de50f720856ab24a24dbaa5fee2c66050ed97c1477e0a1159deab1775eab6b",
-                "sha256:509f7af645bc0cd8fd4587abc1a038fc795636671ee8204d502b933aee44f381"
+                "sha256:52077cb339000f337fb25f7e045995c4ad01511e716e5daac37014b9752de8ec",
+                "sha256:7c395a436743018f7be0a4cbb0a4ea9b902b6d87264ddecf8cfdc73b4f78ff61"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==1.7.8"
+            "version": "==1.7.9"
         },
         "beautifulsoup4": {
             "hashes": [
@@ -1382,49 +1286,49 @@
         },
         "black": {
             "hashes": [
-                "sha256:257d724c2c9b1660f353b36c802ccece186a30accc7742c176d29c146df6e474",
-                "sha256:37aae07b029fa0174d39daf02748b379399b909652a806e5708199bd93899da1",
-                "sha256:415e686e87dbbe6f4cd5ef0fbf764af7b89f9057b97c908742b6008cc554b9c0",
-                "sha256:48a85f2cb5e6799a9ef05347b476cce6c182d6c71ee36925a6c194d074336ef8",
-                "sha256:7768a0dbf16a39aa5e9a3ded568bb545c8c2727396d063bbaf847df05b08cd96",
-                "sha256:7e122b1c4fb252fd85df3ca93578732b4749d9be076593076ef4d07a0233c3e1",
-                "sha256:88c57dc656038f1ab9f92b3eb5335ee9b021412feaa46330d5eba4e51fe49b04",
-                "sha256:8e537d281831ad0e71007dcdcbe50a71470b978c453fa41ce77186bbe0ed6021",
-                "sha256:98e123f1d5cfd42f886624d84464f7756f60ff6eab89ae845210631714f6db94",
-                "sha256:accf49e151c8ed2c0cdc528691838afd217c50412534e876a19270fea1e28e2d",
-                "sha256:b1530ae42e9d6d5b670a34db49a94115a64596bc77710b1d05e9801e62ca0a7c",
-                "sha256:b9176b9832e84308818a99a561e90aa479e73c523b3f77afd07913380ae2eab7",
-                "sha256:bdde6f877a18f24844e381d45e9947a49e97933573ac9d4345399be37621e26c",
-                "sha256:be8bef99eb46d5021bf053114442914baeb3649a89dc5f3a555c88737e5e98fc",
-                "sha256:bf10f7310db693bb62692609b397e8d67257c55f949abde4c67f9cc574492cc7",
-                "sha256:c872b53057f000085da66a19c55d68f6f8ddcac2642392ad3a355878406fbd4d",
-                "sha256:d36ed1124bb81b32f8614555b34cc4259c3fbc7eec17870e8ff8ded335b58d8c",
-                "sha256:da33a1a5e49c4122ccdfd56cd021ff1ebc4a1ec4e2d01594fef9b6f267a9e741",
-                "sha256:dd1b5a14e417189db4c7b64a6540f31730713d173f0b63e55fabd52d61d8fdce",
-                "sha256:e151054aa00bad1f4e1f04919542885f89f5f7d086b8a59e5000e6c616896ffb",
-                "sha256:eaea3008c281f1038edb473c1aa8ed8143a5535ff18f978a318f10302b254063",
-                "sha256:ef703f83fc32e131e9bcc0a5094cfe85599e7109f896fe8bc96cc402f3eb4b6e"
+                "sha256:09cdeb74d494ec023ded657f7092ba518e8cf78fa8386155e4a03fdcc44679e6",
+                "sha256:1f13f7f386f86f8121d76599114bb8c17b69d962137fc70efe56137727c7047e",
+                "sha256:2500945420b6784c38b9ee885af039f5e7471ef284ab03fa35ecdde4688cd83f",
+                "sha256:2b59b250fdba5f9a9cd9d0ece6e6d993d91ce877d121d161e4698af3eb9c1018",
+                "sha256:3c4285573d4897a7610054af5a890bde7c65cb466040c5f0c8b732812d7f0e5e",
+                "sha256:505289f17ceda596658ae81b61ebbe2d9b25aa78067035184ed0a9d855d18afd",
+                "sha256:62e8730977f0b77998029da7971fa896ceefa2c4c4933fcd593fa599ecbf97a4",
+                "sha256:649f6d84ccbae73ab767e206772cc2d7a393a001070a4c814a546afd0d423aed",
+                "sha256:6e55d30d44bed36593c3163b9bc63bf58b3b30e4611e4d88a0c3c239930ed5b2",
+                "sha256:707a1ca89221bc8a1a64fb5e15ef39cd755633daa672a9db7498d1c19de66a42",
+                "sha256:72901b4913cbac8972ad911dc4098d5753704d1f3c56e44ae8dce99eecb0e3af",
+                "sha256:73bbf84ed136e45d451a260c6b73ed674652f90a2b3211d6a35e78054563a9bb",
+                "sha256:7c046c1d1eeb7aea9335da62472481d3bbf3fd986e093cffd35f4385c94ae368",
+                "sha256:81c6742da39f33b08e791da38410f32e27d632260e599df7245cccee2064afeb",
+                "sha256:837fd281f1908d0076844bc2b801ad2d369c78c45cf800cad7b61686051041af",
+                "sha256:972085c618ee94f402da1af548a4f218c754ea7e5dc70acb168bfaca4c2542ed",
+                "sha256:9e84e33b37be070ba135176c123ae52a51f82306def9f7d063ee302ecab2cf47",
+                "sha256:b19c9ad992c7883ad84c9b22aaa73562a16b819c1d8db7a1a1a49fb7ec13c7d2",
+                "sha256:d6417535d99c37cee4091a2f24eb2b6d5ec42b144d50f1f2e436d9fe1916fe1a",
+                "sha256:eab4dd44ce80dea27dc69db40dab62d4ca96112f87996bca68cd75639aeb2e4c",
+                "sha256:f490dbd59680d809ca31efdae20e634f3fae27fba3ce0ba3208333b713bc3920",
+                "sha256:fb6e2c0b86bbd43dee042e48059c9ad7830abd5c94b0bc518c0eeec57c3eddc1"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==24.4.2"
+            "version": "==24.8.0"
         },
         "blinker": {
             "hashes": [
-                "sha256:5f1cdeff423b77c31b89de0565cd03e5275a03028f44b2b15f912632a58cced6",
-                "sha256:da44ec748222dcd0105ef975eed946da197d5bdf8bafb6aa92f5bc89da63fa25"
+                "sha256:1779309f71bf239144b9399d06ae925637cf6634cf6bd131104184531bf67c01",
+                "sha256:8f77b09d3bf7c795e969e9486f39c2c5e9c39d4ee07424be2bc594ece9642d83"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==1.8.1"
+            "version": "==1.8.2"
         },
         "boto3": {
             "hashes": [
-                "sha256:decf52f8d5d8a1b10c9ff2a0e96ee207ed79e33d2e53fdf0880a5cbef70785e0",
-                "sha256:e836b71d79671270fccac0a4d4c8ec239a6b82ea47c399b64675aa597d0ee63b"
+                "sha256:06eac4757de2a9c6020381205cb902f05964caad80b56e58c8931284a133b4cb",
+                "sha256:b9587131372a808bf6f99c5ed8b11be55cd113261cc3b437a917b4acc6c30bfe"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==1.34.95"
+            "version": "==1.35.8"
         },
         "boto3-mocking": {
             "hashes": [
@@ -1437,28 +1341,28 @@
         },
         "boto3-stubs": {
             "hashes": [
-                "sha256:412006b27ee707e9b51a084b02ac92b143af8a3b56727582afec2a76ce93c3b6",
-                "sha256:4fb5830626de42446c238ca72ca1a53e461281396007fb900edf50ceeb044a10"
+                "sha256:cfe2c813d8a43b91cccd7d1d4230b781fe3572e2d13e42d5ba60d78b42638bc8",
+                "sha256:e5767b1aabdbc5e84915e533f852605bbb07cfe1b86fe172ab27654a2f24b48d"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==1.34.95"
+            "version": "==1.35.8"
         },
         "botocore": {
             "hashes": [
-                "sha256:6bd76a2eadb42b91fa3528392e981ad5b4dfdee3968fa5b904278acf6cbf15ff",
-                "sha256:ead5823e0dd6751ece5498cb979fd9abf190e691c8833bcac6876fd6ca261fa7"
+                "sha256:4b820cf680ab5d778bd2fe4feeef1ff8a2b96d5c535d4638ab30f703ade282f8",
+                "sha256:adf389eb8fd87775f193300e3431d1353f925807ad3a39958172cb644f0d60a1"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==1.34.95"
+            "version": "==1.35.8"
         },
         "botocore-stubs": {
             "hashes": [
-                "sha256:64d80a3467e3b19939e9c2750af33328b3087f8f524998dbdf7ed168227f507d",
-                "sha256:b0345f55babd8b901c53804fc5c326a4a0bd2e23e3b71f9ea5d9f7663466e6ba"
+                "sha256:a49f9db19259dc280fee73d74f3a171310f3916a12e679b6c4bf8f719cb37461",
+                "sha256:dac2ebedcd8b0c98be89d6e708fa9ce6d5d12e1bc6b629e77ae8c0d289088c49"
             ],
-            "markers": "python_version >= '3.8' and python_version < '4.0'",
-            "version": "==1.34.94"
+            "markers": "python_version >= '3.8'",
+            "version": "==1.35.8"
         },
         "click": {
             "hashes": [
@@ -1479,36 +1383,36 @@
         },
         "django-debug-toolbar": {
             "hashes": [
-                "sha256:0b0dddee5ea29b9cb678593bc0d7a6d76b21d7799cb68e091a2148341a80f3c4",
-                "sha256:e09b7dcb8417b743234dfc57c95a7c1d1d87a88844abd13b4c5387f807b31bf6"
+                "sha256:36e421cb908c2f0675e07f9f41e3d1d8618dc386392ec82d23bcfcd5d29c7044",
+                "sha256:3beb671c9ec44ffb817fad2780667f172bd1c067dbcabad6268ce39a81335f45"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==4.3.0"
+            "version": "==4.4.6"
         },
         "django-model2puml": {
             "hashes": [
-                "sha256:6e773d742e556020a04d3216ce5dee5d3551da162e2d42a997f85b4ed1854771"
+                "sha256:f7ef57efbf261e8e0f90043c2be379e9457b30603ccc01fe7a01c233d0dfa27c"
             ],
             "index": "pypi",
-            "version": "==0.4.1"
+            "version": "==0.5.1"
         },
         "django-stubs": {
             "hashes": [
-                "sha256:084484cbe16a6d388e80ec687e46f529d67a232f3befaf55c936b3b476be289d",
-                "sha256:b8a792bee526d6cab31e197cb414ee7fa218abd931a50948c66a80b3a2548621"
+                "sha256:78e3764488fdfd2695f12502136548ec22f8d4b1780541a835042b8238d11514",
+                "sha256:c2502f5ecbae50c68f9a86d52b5b2447d8648fd205036dad0ccb41e19a445927"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==5.0.0"
+            "version": "==5.0.4"
         },
         "django-stubs-ext": {
             "hashes": [
-                "sha256:5bacfbb498a206d5938454222b843d81da79ea8b6fcd1a59003f529e775bc115",
-                "sha256:8e1334fdf0c8bff87e25d593b33d4247487338aaed943037826244ff788b56a8"
+                "sha256:85da065224204774208be29c7d02b4482d5a69218a728465c2fbe41725fdc819",
+                "sha256:910cbaff3d1e8e806a5c27d5ddd4088535aae8371ea921b7fd680fdfa5f14e30"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==5.0.0"
+            "version": "==5.0.4"
         },
         "django-webtest": {
             "hashes": [
@@ -1520,12 +1424,12 @@
         },
         "flake8": {
             "hashes": [
-                "sha256:33f96621059e65eec474169085dc92bf26e7b2d47366b70be2f67ab80dc25132",
-                "sha256:a6dfbb75e03252917f2473ea9653f7cd799c3064e54d4c8140044c5c065f53c3"
+                "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38",
+                "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213"
             ],
             "index": "pypi",
             "markers": "python_full_version >= '3.8.1'",
-            "version": "==7.0.0"
+            "version": "==7.1.1"
         },
         "jmespath": {
             "hashes": [
@@ -1561,37 +1465,37 @@
         },
         "mypy": {
             "hashes": [
-                "sha256:075cbf81f3e134eadaf247de187bd604748171d6b79736fa9b6c9685b4083061",
-                "sha256:12b6bfc1b1a66095ab413160a6e520e1dc076a28f3e22f7fb25ba3b000b4ef99",
-                "sha256:1ec404a7cbe9fc0e92cb0e67f55ce0c025014e26d33e54d9e506a0f2d07fe5de",
-                "sha256:28d0e038361b45f099cc086d9dd99c15ff14d0188f44ac883010e172ce86c38a",
-                "sha256:2b0695d605ddcd3eb2f736cd8b4e388288c21e7de85001e9f85df9187f2b50f9",
-                "sha256:3236a4c8f535a0631f85f5fcdffba71c7feeef76a6002fcba7c1a8e57c8be1ec",
-                "sha256:3be66771aa5c97602f382230165b856c231d1277c511c9a8dd058be4784472e1",
-                "sha256:3d087fcbec056c4ee34974da493a826ce316947485cef3901f511848e687c131",
-                "sha256:3f298531bca95ff615b6e9f2fc0333aae27fa48052903a0ac90215021cdcfa4f",
-                "sha256:4a2b5cdbb5dd35aa08ea9114436e0d79aceb2f38e32c21684dcf8e24e1e92821",
-                "sha256:4cf18f9d0efa1b16478c4c129eabec36148032575391095f73cae2e722fcf9d5",
-                "sha256:8b2cbaca148d0754a54d44121b5825ae71868c7592a53b7292eeb0f3fdae95ee",
-                "sha256:8f55583b12156c399dce2df7d16f8a5095291354f1e839c252ec6c0611e86e2e",
-                "sha256:92f93b21c0fe73dc00abf91022234c79d793318b8a96faac147cd579c1671746",
-                "sha256:9e36fb078cce9904c7989b9693e41cb9711e0600139ce3970c6ef814b6ebc2b2",
-                "sha256:9fd50226364cd2737351c79807775136b0abe084433b55b2e29181a4c3c878c0",
-                "sha256:a781f6ad4bab20eef8b65174a57e5203f4be627b46291f4589879bf4e257b97b",
-                "sha256:a87dbfa85971e8d59c9cc1fcf534efe664d8949e4c0b6b44e8ca548e746a8d53",
-                "sha256:b808e12113505b97d9023b0b5e0c0705a90571c6feefc6f215c1df9381256e30",
-                "sha256:bc6ac273b23c6b82da3bb25f4136c4fd42665f17f2cd850771cb600bdd2ebeda",
-                "sha256:cd777b780312ddb135bceb9bc8722a73ec95e042f911cc279e2ec3c667076051",
-                "sha256:da1cbf08fb3b851ab3b9523a884c232774008267b1f83371ace57f412fe308c2",
-                "sha256:e22e1527dc3d4aa94311d246b59e47f6455b8729f4968765ac1eacf9a4760bc7",
-                "sha256:f8c083976eb530019175aabadb60921e73b4f45736760826aa1689dda8208aee",
-                "sha256:f90cff89eea89273727d8783fef5d4a934be2fdca11b47def50cf5d311aff727",
-                "sha256:fa7ef5244615a2523b56c034becde4e9e3f9b034854c93639adb667ec9ec2976",
-                "sha256:fcfc70599efde5c67862a07a1aaf50e55bce629ace26bb19dc17cece5dd31ca4"
+                "sha256:06d26c277962f3fb50e13044674aa10553981ae514288cb7d0a738f495550b36",
+                "sha256:2ff93107f01968ed834f4256bc1fc4475e2fecf6c661260066a985b52741ddce",
+                "sha256:36383a4fcbad95f2657642a07ba22ff797de26277158f1cc7bd234821468b1b6",
+                "sha256:37c7fa6121c1cdfcaac97ce3d3b5588e847aa79b580c1e922bb5d5d2902df19b",
+                "sha256:3a66169b92452f72117e2da3a576087025449018afc2d8e9bfe5ffab865709ca",
+                "sha256:3f14cd3d386ac4d05c5a39a51b84387403dadbd936e17cb35882134d4f8f0d24",
+                "sha256:41ea707d036a5307ac674ea172875f40c9d55c5394f888b168033177fce47383",
+                "sha256:478db5f5036817fe45adb7332d927daa62417159d49783041338921dcf646fc7",
+                "sha256:4a8a53bc3ffbd161b5b2a4fff2f0f1e23a33b0168f1c0778ec70e1a3d66deb86",
+                "sha256:539c570477a96a4e6fb718b8d5c3e0c0eba1f485df13f86d2970c91f0673148d",
+                "sha256:57555a7715c0a34421013144a33d280e73c08df70f3a18a552938587ce9274f4",
+                "sha256:6e658bd2d20565ea86da7d91331b0eed6d2eee22dc031579e6297f3e12c758c8",
+                "sha256:6e7184632d89d677973a14d00ae4d03214c8bc301ceefcdaf5c474866814c987",
+                "sha256:75746e06d5fa1e91bfd5432448d00d34593b52e7e91a187d981d08d1f33d4385",
+                "sha256:7f9993ad3e0ffdc95c2a14b66dee63729f021968bff8ad911867579c65d13a79",
+                "sha256:801780c56d1cdb896eacd5619a83e427ce436d86a3bdf9112527f24a66618fef",
+                "sha256:801ca29f43d5acce85f8e999b1e431fb479cb02d0e11deb7d2abb56bdaf24fd6",
+                "sha256:969ea3ef09617aff826885a22ece0ddef69d95852cdad2f60c8bb06bf1f71f70",
+                "sha256:a976775ab2256aadc6add633d44f100a2517d2388906ec4f13231fafbb0eccca",
+                "sha256:af8d155170fcf87a2afb55b35dc1a0ac21df4431e7d96717621962e4b9192e70",
+                "sha256:b499bc07dbdcd3de92b0a8b29fdf592c111276f6a12fe29c30f6c417dd546d12",
+                "sha256:cd953f221ac1379050a8a646585a29574488974f79d8082cedef62744f0a0104",
+                "sha256:d42a6dd818ffce7be66cce644f1dff482f1d97c53ca70908dff0b9ddc120b77a",
+                "sha256:e8960dbbbf36906c5c0b7f4fbf2f0c7ffb20f4898e6a879fcf56a41a08b0d318",
+                "sha256:edb91dded4df17eae4537668b23f0ff6baf3707683734b6a818d5b9d0c0c31a1",
+                "sha256:ee23de8530d99b6db0573c4ef4bd8f39a2a6f9b60655bf7a1357e585a3486f2b",
+                "sha256:f7821776e5c4286b6a13138cc935e2e9b6fde05e081bdebf5cdb2bb97c9df81d"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==1.10.0"
+            "version": "==1.11.2"
         },
         "mypy-extensions": {
             "hashes": [
@@ -1611,11 +1515,11 @@
         },
         "packaging": {
             "hashes": [
-                "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5",
-                "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"
+                "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002",
+                "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==24.0"
+            "markers": "python_version >= '3.8'",
+            "version": "==24.1"
         },
         "pathspec": {
             "hashes": [
@@ -1627,27 +1531,27 @@
         },
         "pbr": {
             "hashes": [
-                "sha256:4a7317d5e3b17a3dccb6a8cfe67dab65b20551404c52c8ed41279fa4f0cb4cda",
-                "sha256:d1377122a5a00e2f940ee482999518efe16d745d423a670c27773dfbc3c9a7d9"
+                "sha256:788183e382e3d1d7707db08978239965e8b9e4e5ed42669bf4758186734d5f24",
+                "sha256:a776ae228892d8013649c0aeccbb3d5f99ee15e005a4cbb7e61d55a067b28a2a"
             ],
             "markers": "python_version >= '2.6'",
-            "version": "==6.0.0"
+            "version": "==6.1.0"
         },
         "platformdirs": {
             "hashes": [
-                "sha256:031cd18d4ec63ec53e82dceaac0417d218a6863f7745dfcc9efe7793b7039bdf",
-                "sha256:17d5a1161b3fd67b390023cb2d3b026bbd40abde6fdb052dfbd3a29c3ba22ee1"
+                "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee",
+                "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==4.2.1"
+            "version": "==4.2.2"
         },
         "pycodestyle": {
             "hashes": [
-                "sha256:41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f",
-                "sha256:44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67"
+                "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3",
+                "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.11.1"
+            "version": "==2.12.1"
         },
         "pyflakes": {
             "hashes": [
@@ -1659,11 +1563,11 @@
         },
         "pygments": {
             "hashes": [
-                "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c",
-                "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"
+                "sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199",
+                "sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==2.17.2"
+            "markers": "python_version >= '3.8'",
+            "version": "==2.18.0"
         },
         "python-dateutil": {
             "hashes": [
@@ -1675,75 +1579,78 @@
         },
         "pyyaml": {
             "hashes": [
-                "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5",
-                "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc",
-                "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df",
-                "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741",
-                "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206",
-                "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27",
-                "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595",
-                "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62",
-                "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98",
-                "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696",
-                "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290",
-                "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9",
-                "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d",
-                "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6",
-                "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867",
-                "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47",
-                "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486",
-                "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6",
-                "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3",
-                "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007",
-                "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938",
-                "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0",
-                "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c",
-                "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735",
-                "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d",
-                "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28",
-                "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4",
-                "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba",
-                "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8",
-                "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef",
-                "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5",
-                "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd",
-                "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3",
-                "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0",
-                "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515",
-                "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c",
-                "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c",
-                "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924",
-                "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34",
-                "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43",
-                "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859",
-                "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673",
-                "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54",
-                "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a",
-                "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b",
-                "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab",
-                "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa",
-                "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c",
-                "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585",
-                "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d",
-                "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"
+                "sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff",
+                "sha256:0833f8694549e586547b576dcfaba4a6b55b9e96098b36cdc7ebefe667dfed48",
+                "sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086",
+                "sha256:0b69e4ce7a131fe56b7e4d770c67429700908fc0752af059838b1cfb41960e4e",
+                "sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133",
+                "sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5",
+                "sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484",
+                "sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee",
+                "sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5",
+                "sha256:23502f431948090f597378482b4812b0caae32c22213aecf3b55325e049a6c68",
+                "sha256:24471b829b3bf607e04e88d79542a9d48bb037c2267d7927a874e6c205ca7e9a",
+                "sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf",
+                "sha256:2e99c6826ffa974fe6e27cdb5ed0021786b03fc98e5ee3c5bfe1fd5015f42b99",
+                "sha256:39693e1f8320ae4f43943590b49779ffb98acb81f788220ea932a6b6c51004d8",
+                "sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85",
+                "sha256:3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19",
+                "sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc",
+                "sha256:43fa96a3ca0d6b1812e01ced1044a003533c47f6ee8aca31724f78e93ccc089a",
+                "sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1",
+                "sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317",
+                "sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c",
+                "sha256:6395c297d42274772abc367baaa79683958044e5d3835486c16da75d2a694631",
+                "sha256:688ba32a1cffef67fd2e9398a2efebaea461578b0923624778664cc1c914db5d",
+                "sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652",
+                "sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5",
+                "sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e",
+                "sha256:7c36280e6fb8385e520936c3cb3b8042851904eba0e58d277dca80a5cfed590b",
+                "sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8",
+                "sha256:80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476",
+                "sha256:82d09873e40955485746739bcb8b4586983670466c23382c19cffecbf1fd8706",
+                "sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563",
+                "sha256:8824b5a04a04a047e72eea5cec3bc266db09e35de6bdfe34c9436ac5ee27d237",
+                "sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b",
+                "sha256:9056c1ecd25795207ad294bcf39f2db3d845767be0ea6e6a34d856f006006083",
+                "sha256:936d68689298c36b53b29f23c6dbb74de12b4ac12ca6cfe0e047bedceea56180",
+                "sha256:9b22676e8097e9e22e36d6b7bda33190d0d400f345f23d4065d48f4ca7ae0425",
+                "sha256:a4d3091415f010369ae4ed1fc6b79def9416358877534caf6a0fdd2146c87a3e",
+                "sha256:a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f",
+                "sha256:a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725",
+                "sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183",
+                "sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab",
+                "sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774",
+                "sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725",
+                "sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e",
+                "sha256:d7fded462629cfa4b685c5416b949ebad6cec74af5e2d42905d41e257e0869f5",
+                "sha256:d84a1718ee396f54f3a086ea0a66d8e552b2ab2017ef8b420e92edbc841c352d",
+                "sha256:d8e03406cac8513435335dbab54c0d385e4a49e4945d2909a581c83647ca0290",
+                "sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44",
+                "sha256:ec031d5d2feb36d1d1a24380e4db6d43695f3748343d99434e6f5f9156aaa2ed",
+                "sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4",
+                "sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba",
+                "sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12",
+                "sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4"
             ],
-            "version": "==6.0.1"
+            "markers": "python_version >= '3.8'",
+            "version": "==6.0.2"
         },
         "rich": {
             "hashes": [
-                "sha256:4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222",
-                "sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432"
+                "sha256:2e85306a063b9492dffc86278197a60cbece75bcb766022f3436f567cae11bdc",
+                "sha256:a5ac1f1cd448ade0d59cc3356f7db7a7ccda2c8cbae9c7a90c28ff463d3e91f4"
             ],
             "markers": "python_full_version >= '3.7.0'",
-            "version": "==13.7.1"
+            "version": "==13.8.0"
         },
         "s3transfer": {
             "hashes": [
-                "sha256:5683916b4c724f799e600f41dd9e10a9ff19871bf87623cc8f491cb4f5fa0a19",
-                "sha256:ceb252b11bcf87080fb7850a224fb6e05c8a776bab8f2b64b7f25b969464839d"
+                "sha256:0711534e9356d3cc692fdde846b4a1e4b0cb6519971860796e6bc4c7aea00ef6",
+                "sha256:eca1c20de70a39daee580aef4986996620f365c4e0fda6a86100231d62f1bf69"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.10.1"
+            "version": "==0.10.2"
         },
         "six": {
             "hashes": [
@@ -1755,27 +1662,27 @@
         },
         "soupsieve": {
             "hashes": [
-                "sha256:5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690",
-                "sha256:eaa337ff55a1579b6549dc679565eac1e3d000563bcb1c8ab0d0fefbc0c2cdc7"
+                "sha256:e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb",
+                "sha256:e72c4ff06e4fb6e4b5a9f0f55fe6e81514581fca1515028625d0f299c602ccc9"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.5"
+            "version": "==2.6"
         },
         "sqlparse": {
             "hashes": [
-                "sha256:714d0a4932c059d16189f58ef5411ec2287a4360f17cdd0edd2d09d4c5087c93",
-                "sha256:c204494cd97479d0e39f28c93d46c0b2d5959c7b9ab904762ea6c7af211c8663"
+                "sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4",
+                "sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.5.0"
+            "version": "==0.5.1"
         },
         "stevedore": {
             "hashes": [
-                "sha256:1c15d95766ca0569cad14cb6272d4d31dae66b011a929d7c18219c176ea1b5c9",
-                "sha256:46b93ca40e1114cea93d738a6c1e365396981bb6bb78c27045b7587c9473544d"
+                "sha256:1efd34ca08f474dad08d9b19e934a22c68bb6fe416926479ba29e5013bcc8f78",
+                "sha256:9a64265f4060312828151c204efbe9b7a9852a0d9228756344dbc7e4023e375a"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==5.2.0"
+            "version": "==5.3.0"
         },
         "tomli": {
             "hashes": [
@@ -1787,62 +1694,62 @@
         },
         "types-awscrt": {
             "hashes": [
-                "sha256:3ae374b553e7228ba41a528cf42bd0b2ad7303d806c73eff4aaaac1515e3ea4e",
-                "sha256:64898a2f4a2468f66233cb8c29c5f66de907cf80ba1ef5bb1359aef2f81bb521"
+                "sha256:0839fe12f0f914d8f7d63ed777c728cb4eccc2d5d79a26e377d12b0604e7bf0e",
+                "sha256:84a9f4f422ec525c314fdf54c23a1e73edfbcec968560943ca2d41cfae623b38"
             ],
             "markers": "python_version >= '3.7' and python_version < '4.0'",
-            "version": "==0.20.9"
+            "version": "==0.21.2"
         },
         "types-cachetools": {
             "hashes": [
-                "sha256:27c982cdb9cf3fead8b0089ee6b895715ecc99dac90ec29e2cab56eb1aaf4199",
-                "sha256:98c069dc7fc087b1b061703369c80751b0a0fc561f6fb072b554e5eee23773a0"
+                "sha256:b888ab5c1a48116f7799cd5004b18474cd82b5463acb5ffb2db2fc9c7b053bc0",
+                "sha256:efb2ed8bf27a4b9d3ed70d33849f536362603a90b8090a328acf0cd42fda82e2"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==5.3.0.7"
+            "markers": "python_version >= '3.8'",
+            "version": "==5.5.0.20240820"
         },
         "types-pyyaml": {
             "hashes": [
-                "sha256:a9e0f0f88dc835739b0c1ca51ee90d04ca2a897a71af79de9aec5f38cb0a5342",
-                "sha256:b845b06a1c7e54b8e5b4c683043de0d9caf205e7434b3edc678ff2411979b8f6"
+                "sha256:b8f76ddbd7f65440a8bda5526a9607e4c7a322dc2f8e1a8c405644f9a6f4b9af",
+                "sha256:deda34c5c655265fc517b546c902aa6eed2ef8d3e921e4765fe606fe2afe8d35"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==6.0.12.20240311"
+            "version": "==6.0.12.20240808"
         },
         "types-requests": {
             "hashes": [
-                "sha256:4428df33c5503945c74b3f42e82b181e86ec7b724620419a2966e2de604ce1a1",
-                "sha256:6216cdac377c6b9a040ac1c0404f7284bd13199c0e1bb235f4324627e8898cf5"
+                "sha256:90c079ff05e549f6bf50e02e910210b98b8ff1ebdd18e19c873cd237737c1358",
+                "sha256:f754283e152c752e46e70942fa2a146b5bc70393522257bb85bd1ef7e019dcc3"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==2.31.0.20240406"
+            "version": "==2.32.0.20240712"
         },
         "types-s3transfer": {
             "hashes": [
-                "sha256:02154cce46528287ad76ad1a0153840e0492239a0887e8833466eccf84b98da0",
-                "sha256:49a7c81fa609ac1532f8de3756e64b58afcecad8767933310228002ec7adff74"
+                "sha256:60167a3bfb5c536ec6cdb5818f7f9a28edca9dc3e0b5ff85ae374526fc5e576e",
+                "sha256:7a3fec8cd632e2b5efb665a355ef93c2a87fdd5a45b74a949f95a9e628a86356"
             ],
-            "markers": "python_version >= '3.8' and python_version < '4.0'",
-            "version": "==0.10.1"
+            "markers": "python_version >= '3.8'",
+            "version": "==0.10.2"
         },
         "typing-extensions": {
             "hashes": [
-                "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0",
-                "sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a"
+                "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
+                "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==4.11.0"
+            "version": "==4.12.2"
         },
         "urllib3": {
             "hashes": [
-                "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d",
-                "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"
+                "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
+                "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.2.1"
+            "version": "==2.2.2"
         },
         "waitress": {
             "hashes": [
@@ -1854,11 +1761,11 @@
         },
         "webob": {
             "hashes": [
-                "sha256:73aae30359291c14fa3b956f8b5ca31960e420c28c1bec002547fb04928cf89b",
-                "sha256:b64ef5141be559cfade448f044fa45c2260351edcb6a8ef6b7e00c7dcef0c323"
+                "sha256:2abc1555e118fc251e705fc6dc66c7f5353bb9fbfab6d20e22f1c02b4b71bcee",
+                "sha256:b60ba63f05c0cf61e086a10c3781a41fcfe30027753a8ae6d819c77592ce83ea"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==1.8.7"
+            "version": "==1.8.8"
         },
         "webtest": {
             "hashes": [
diff --git a/src/models_diagram.puml b/src/models_diagram.puml
new file mode 100644
index 000000000..84c3cea39
--- /dev/null
+++ b/src/models_diagram.puml
@@ -0,0 +1,463 @@
+@startuml 
+class "registrar.Contact <Registrar>" as registrar.Contact #d6f4e9 {
+    contact
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + first_name (CharField)
+    + middle_name (CharField)
+    + last_name (CharField)
+    + title (CharField)
+    + email (EmailField)
+    + phone (PhoneNumberField)
+    --
+}
+
+
+class "registrar.Host <Registrar>" as registrar.Host #d6f4e9 {
+    host
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + name (CharField)
+    ~ domain (ForeignKey)
+    --
+}
+registrar.Host -- registrar.Domain
+
+
+class "registrar.HostIP <Registrar>" as registrar.HostIP #d6f4e9 {
+    host ip
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + address (CharField)
+    ~ host (ForeignKey)
+    --
+}
+registrar.HostIP -- registrar.Host
+
+
+class "registrar.PublicContact <Registrar>" as registrar.PublicContact #d6f4e9 {
+    public contact
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + contact_type (CharField)
+    + registry_id (CharField)
+    ~ domain (ForeignKey)
+    + name (CharField)
+    + org (CharField)
+    + street1 (CharField)
+    + street2 (CharField)
+    + street3 (CharField)
+    + city (CharField)
+    + sp (CharField)
+    + pc (CharField)
+    + cc (CharField)
+    + email (EmailField)
+    + voice (CharField)
+    + fax (CharField)
+    + pw (CharField)
+    --
+}
+registrar.PublicContact -- registrar.Domain
+
+
+class "registrar.UserDomainRole <Registrar>" as registrar.UserDomainRole #d6f4e9 {
+    user domain role
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    ~ user (ForeignKey)
+    ~ domain (ForeignKey)
+    + role (TextField)
+    --
+}
+registrar.UserDomainRole -- registrar.User
+registrar.UserDomainRole -- registrar.Domain
+
+
+class "registrar.Domain <Registrar>" as registrar.Domain #d6f4e9 {
+    domain
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + name (DomainField)
+    + state (FSMField)
+    + expiration_date (DateField)
+    + security_contact_registry_id (TextField)
+    + deleted (DateField)
+    + first_ready (DateField)
+    + dsdata_last_change (TextField)
+    --
+}
+
+
+class "registrar.FederalAgency <Registrar>" as registrar.FederalAgency #d6f4e9 {
+    Federal agency
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + agency (CharField)
+    + federal_type (CharField)
+    + initials (CharField)
+    + is_fceb (BooleanField)
+    --
+}
+
+
+class "registrar.DomainRequest <Registrar>" as registrar.DomainRequest #d6f4e9 {
+    domain request
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + status (FSMField)
+    + rejection_reason (TextField)
+    + action_needed_reason (TextField)
+    + action_needed_reason_email (TextField)
+    ~ federal_agency (ForeignKey)
+    ~ portfolio (ForeignKey)
+    ~ sub_organization (ForeignKey)
+    ~ creator (ForeignKey)
+    ~ investigator (ForeignKey)
+    + generic_org_type (CharField)
+    + is_election_board (BooleanField)
+    + organization_type (CharField)
+    + federally_recognized_tribe (BooleanField)
+    + state_recognized_tribe (BooleanField)
+    + tribe_name (CharField)
+    + federal_type (CharField)
+    + organization_name (CharField)
+    + address_line1 (CharField)
+    + address_line2 (CharField)
+    + city (CharField)
+    + state_territory (CharField)
+    + zipcode (CharField)
+    + urbanization (CharField)
+    + about_your_organization (TextField)
+    ~ senior_official (ForeignKey)
+    ~ approved_domain (OneToOneField)
+    ~ requested_domain (OneToOneField)
+    + purpose (TextField)
+    + no_other_contacts_rationale (TextField)
+    + anything_else (TextField)
+    + has_anything_else_text (BooleanField)
+    + cisa_representative_email (EmailField)
+    + cisa_representative_first_name (CharField)
+    + cisa_representative_last_name (CharField)
+    + has_cisa_representative (BooleanField)
+    + is_policy_acknowledged (BooleanField)
+    + submission_date (DateField)
+    + notes (TextField)
+    # current_websites (ManyToManyField)
+    # alternative_domains (ManyToManyField)
+    # other_contacts (ManyToManyField)
+    --
+}
+registrar.DomainRequest -- registrar.FederalAgency
+registrar.DomainRequest -- registrar.Portfolio
+registrar.DomainRequest -- registrar.Suborganization
+registrar.DomainRequest -- registrar.User
+registrar.DomainRequest -- registrar.User
+registrar.DomainRequest -- registrar.Contact
+registrar.DomainRequest -- registrar.Domain
+registrar.DomainRequest -- registrar.DraftDomain
+registrar.DomainRequest *--* registrar.Website
+registrar.DomainRequest *--* registrar.Website
+registrar.DomainRequest *--* registrar.Contact
+
+
+class "registrar.DomainInformation <Registrar>" as registrar.DomainInformation #d6f4e9 {
+    domain information
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    ~ federal_agency (ForeignKey)
+    ~ creator (ForeignKey)
+    ~ portfolio (ForeignKey)
+    ~ sub_organization (ForeignKey)
+    ~ domain_request (OneToOneField)
+    + generic_org_type (CharField)
+    + organization_type (CharField)
+    + federally_recognized_tribe (BooleanField)
+    + state_recognized_tribe (BooleanField)
+    + tribe_name (CharField)
+    + federal_type (CharField)
+    + is_election_board (BooleanField)
+    + organization_name (CharField)
+    + address_line1 (CharField)
+    + address_line2 (CharField)
+    + city (CharField)
+    + state_territory (CharField)
+    + zipcode (CharField)
+    + urbanization (CharField)
+    + about_your_organization (TextField)
+    ~ senior_official (ForeignKey)
+    ~ domain (OneToOneField)
+    + purpose (TextField)
+    + no_other_contacts_rationale (TextField)
+    + anything_else (TextField)
+    + has_anything_else_text (BooleanField)
+    + cisa_representative_email (EmailField)
+    + cisa_representative_first_name (CharField)
+    + cisa_representative_last_name (CharField)
+    + has_cisa_representative (BooleanField)
+    + is_policy_acknowledged (BooleanField)
+    + notes (TextField)
+    # other_contacts (ManyToManyField)
+    --
+}
+registrar.DomainInformation -- registrar.FederalAgency
+registrar.DomainInformation -- registrar.User
+registrar.DomainInformation -- registrar.Portfolio
+registrar.DomainInformation -- registrar.Suborganization
+registrar.DomainInformation -- registrar.DomainRequest
+registrar.DomainInformation -- registrar.Contact
+registrar.DomainInformation -- registrar.Domain
+registrar.DomainInformation *--* registrar.Contact
+
+
+class "registrar.DraftDomain <Registrar>" as registrar.DraftDomain #d6f4e9 {
+    draft domain
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + name (CharField)
+    --
+}
+
+
+class "registrar.DomainInvitation <Registrar>" as registrar.DomainInvitation #d6f4e9 {
+    domain invitation
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + email (EmailField)
+    ~ domain (ForeignKey)
+    + status (FSMField)
+    --
+}
+registrar.DomainInvitation -- registrar.Domain
+
+
+class "registrar.PortfolioInvitation <Registrar>" as registrar.PortfolioInvitation #d6f4e9 {
+    portfolio invitation
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + email (EmailField)
+    ~ portfolio (ForeignKey)
+    + portfolio_roles (ArrayField)
+    + portfolio_additional_permissions (ArrayField)
+    + status (FSMField)
+    --
+}
+registrar.PortfolioInvitation -- registrar.Portfolio
+
+
+class "registrar.TransitionDomain <Registrar>" as registrar.TransitionDomain #d6f4e9 {
+    transition domain
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + username (CharField)
+    + domain_name (CharField)
+    + status (CharField)
+    + email_sent (BooleanField)
+    + processed (BooleanField)
+    + generic_org_type (CharField)
+    + organization_name (CharField)
+    + federal_type (CharField)
+    + federal_agency (CharField)
+    + epp_creation_date (DateField)
+    + epp_expiration_date (DateField)
+    + first_name (CharField)
+    + middle_name (CharField)
+    + last_name (CharField)
+    + title (CharField)
+    + email (EmailField)
+    + phone (CharField)
+    + address_line (CharField)
+    + city (CharField)
+    + state_territory (CharField)
+    + zipcode (CharField)
+    --
+}
+
+
+class "registrar.VerifiedByStaff <Registrar>" as registrar.VerifiedByStaff #d6f4e9 {
+    verified by staff
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + email (EmailField)
+    ~ requestor (ForeignKey)
+    + notes (TextField)
+    --
+}
+registrar.VerifiedByStaff -- registrar.User
+
+
+class "registrar.User <Registrar>" as registrar.User #d6f4e9 {
+    user
+    --
+    + id (BigAutoField)
+    + password (CharField)
+    + last_login (DateTimeField)
+    + is_superuser (BooleanField)
+    + username (CharField)
+    + first_name (CharField)
+    + last_name (CharField)
+    + email (EmailField)
+    + is_staff (BooleanField)
+    + is_active (BooleanField)
+    + date_joined (DateTimeField)
+    + status (CharField)
+    ~ portfolio (ForeignKey)
+    + portfolio_roles (ArrayField)
+    + portfolio_additional_permissions (ArrayField)
+    + phone (PhoneNumberField)
+    + middle_name (CharField)
+    + title (CharField)
+    + verification_type (CharField)
+    # groups (ManyToManyField)
+    # user_permissions (ManyToManyField)
+    # domains (ManyToManyField)
+    --
+}
+registrar.User -- registrar.Portfolio
+registrar.User *--* registrar.Domain
+
+
+class "registrar.UserGroup <Registrar>" as registrar.UserGroup #d6f4e9 {
+    User group
+    --
+    - id (AutoField)
+    + name (CharField)
+    ~ group_ptr (OneToOneField)
+    # permissions (ManyToManyField)
+    --
+}
+
+
+class "registrar.Website <Registrar>" as registrar.Website #d6f4e9 {
+    website
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + website (CharField)
+    --
+}
+
+
+class "registrar.WaffleFlag <Registrar>" as registrar.WaffleFlag #d6f4e9 {
+    waffle flag
+    --
+    + id (BigAutoField)
+    + name (CharField)
+    + everyone (BooleanField)
+    + percent (DecimalField)
+    + testing (BooleanField)
+    + superusers (BooleanField)
+    + staff (BooleanField)
+    + authenticated (BooleanField)
+    + languages (TextField)
+    + rollout (BooleanField)
+    + note (TextField)
+    + created (DateTimeField)
+    + modified (DateTimeField)
+    # groups (ManyToManyField)
+    # users (ManyToManyField)
+    --
+}
+registrar.WaffleFlag *--* registrar.User
+
+
+class "registrar.Portfolio <Registrar>" as registrar.Portfolio #d6f4e9 {
+    portfolio
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    ~ creator (ForeignKey)
+    + organization_name (CharField)
+    + organization_type (CharField)
+    + notes (TextField)
+    ~ federal_agency (ForeignKey)
+    ~ senior_official (ForeignKey)
+    + address_line1 (CharField)
+    + address_line2 (CharField)
+    + city (CharField)
+    + state_territory (CharField)
+    + zipcode (CharField)
+    + urbanization (CharField)
+    + security_contact_email (EmailField)
+    --
+}
+registrar.Portfolio -- registrar.User
+registrar.Portfolio -- registrar.FederalAgency
+registrar.Portfolio -- registrar.SeniorOfficial
+
+
+class "registrar.DomainGroup <Registrar>" as registrar.DomainGroup #d6f4e9 {
+    domain group
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + name (CharField)
+    ~ portfolio (ForeignKey)
+    # domains (ManyToManyField)
+    --
+}
+registrar.DomainGroup -- registrar.Portfolio
+registrar.DomainGroup *--* registrar.DomainInformation
+
+
+class "registrar.Suborganization <Registrar>" as registrar.Suborganization #d6f4e9 {
+    suborganization
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + name (CharField)
+    ~ portfolio (ForeignKey)
+    --
+}
+registrar.Suborganization -- registrar.Portfolio
+
+
+class "registrar.SeniorOfficial <Registrar>" as registrar.SeniorOfficial #d6f4e9 {
+    senior official
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + first_name (CharField)
+    + last_name (CharField)
+    + title (CharField)
+    + phone (PhoneNumberField)
+    + email (EmailField)
+    ~ federal_agency (ForeignKey)
+    --
+}
+registrar.SeniorOfficial -- registrar.FederalAgency
+
+
+@enduml
diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py
index 73aecad7a..72bffdbb4 100644
--- a/src/registrar/config/settings.py
+++ b/src/registrar/config/settings.py
@@ -357,7 +357,7 @@ CSP_FORM_ACTION = allowed_sources
 # and inline with a nonce, as well as allowing connections back to their domain.
 # Note: If needed, we can embed chart.js instead of using the CDN
 CSP_DEFAULT_SRC = ("'self'",)
-CSP_STYLE_SRC = ["'self'", "https://www.ssa.gov/accessibility/andi/andi.css"]
+CSP_STYLE_SRC = ["'self'", "https://www.ssa.gov"]
 CSP_SCRIPT_SRC_ELEM = [
     "'self'",
     "https://www.googletagmanager.com/",
@@ -367,7 +367,7 @@ CSP_SCRIPT_SRC_ELEM = [
 ]
 CSP_CONNECT_SRC = ["'self'", "https://www.google-analytics.com/", "https://www.ssa.gov/accessibility/andi/andi.js"]
 CSP_INCLUDE_NONCE_IN = ["script-src-elem", "style-src"]
-CSP_IMG_SRC = ["'self'", "https://www.ssa.gov/accessibility/andi/icons/"]
+CSP_IMG_SRC = ["'self'", "https://www.ssa.gov"]
 
 # Cross-Origin Resource Sharing (CORS) configuration
 # Sets clients that allow access control to manage.get.gov
diff --git a/src/requirements.txt b/src/requirements.txt
index 3f7158449..4a6cec691 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -1,75 +1,68 @@
 -i https://pypi.python.org/simple
-annotated-types==0.6.0; python_version >= '3.8'
+annotated-types==0.7.0; python_version >= '3.8'
 asgiref==3.8.1; python_version >= '3.8'
-boto3==1.34.95; python_version >= '3.8'
-botocore==1.34.95; python_version >= '3.8'
-cachetools==5.3.3; python_version >= '3.7'
-certifi==2024.2.2; python_version >= '3.6'
+boto3==1.35.8; python_version >= '3.8'
+botocore==1.35.8; python_version >= '3.8'
+cachetools==5.5.0; python_version >= '3.7'
+certifi==2024.7.4; python_version >= '3.6'
 cfenv==0.5.3
-cffi==1.16.0; platform_python_implementation != 'PyPy'
+cffi==1.17.0; platform_python_implementation != 'PyPy'
 charset-normalizer==3.3.2; python_full_version >= '3.7.0'
-cryptography==42.0.5; python_version >= '3.7'
+cryptography==43.0.0; 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'
 diff-match-patch==20230430; python_version >= '3.7'
-dj-database-url==2.1.0
+dj-database-url==2.2.0
 dj-email-url==1.0.6
 django==4.2.10; python_version >= '3.8'
 django-admin-multiple-choice-list-filter==0.1.1
 django-allow-cidr==0.7.1
 django-auditlog==3.0.0; python_version >= '3.8'
 django-cache-url==3.4.5
-django-cors-headers==4.3.1; python_version >= '3.8'
+django-cors-headers==4.4.0; python_version >= '3.8'
 django-csp==3.8
 django-fsm==2.8.1
-django-import-export==3.3.8; python_version >= '3.8'
+django-import-export==4.1.1; python_version >= '3.8'
 django-login-required-middleware==0.9.0
-django-phonenumber-field[phonenumberslite]==7.3.0; python_version >= '3.8'
+django-phonenumber-field[phonenumberslite]==8.0.0; python_version >= '3.8'
 django-waffle==4.1.0; python_version >= '3.8'
 django-widget-tweaks==1.5.0; python_version >= '3.8'
 environs[django]==11.0.0; python_version >= '3.8'
-et-xmlfile==1.1.0; python_version >= '3.6'
-faker==25.0.0; python_version >= '3.8'
+faker==28.0.0; python_version >= '3.8'
 fred-epplib@ git+https://github.com/cisagov/epplib.git@d56d183f1664f34c40ca9716a3a9a345f0ef561c
 furl==2.1.3
 future==1.0.0; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
 gevent==24.2.1; python_version >= '3.8'
 greenlet==3.0.3; python_version >= '3.7'
-gunicorn==22.0.0; python_version >= '3.7'
-idna==3.7; python_version >= '3.5'
+gunicorn==23.0.0; python_version >= '3.7'
+idna==3.8; python_version >= '3.6'
 jmespath==1.0.1; python_version >= '3.7'
-lxml==5.2.1; python_version >= '3.6'
-mako==1.3.3; python_version >= '3.8'
-markuppy==1.14
+lxml==5.3.0; python_version >= '3.6'
+mako==1.3.5; python_version >= '3.8'
 markupsafe==2.1.5; python_version >= '3.7'
-marshmallow==3.21.1; python_version >= '3.8'
-odfpy==1.4.1
+marshmallow==3.22.0; python_version >= '3.8'
 oic==1.7.0; python_version ~= '3.8'
-openpyxl==3.1.2
 orderedmultidict==1.0.1
-packaging==24.0; python_version >= '3.7'
-phonenumberslite==8.13.35
+packaging==24.1; python_version >= '3.8'
+phonenumberslite==8.13.44
 psycopg2-binary==2.9.9; python_version >= '3.7'
 pycparser==2.22; python_version >= '3.8'
 pycryptodomex==3.20.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-pydantic==2.7.1; python_version >= '3.8'
-pydantic-core==2.18.2; python_version >= '3.8'
-pydantic-settings==2.2.1; python_version >= '3.8'
+pydantic==2.8.2; python_version >= '3.8'
+pydantic-core==2.20.1; python_version >= '3.8'
+pydantic-settings==2.4.0; python_version >= '3.8'
 pyjwkest==1.4.2
 python-dateutil==2.9.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 python-dotenv==1.0.1; python_version >= '3.8'
-pyyaml==6.0.1
 pyzipper==0.3.6; python_version >= '3.4'
-requests==2.31.0; python_version >= '3.7'
-s3transfer==0.10.1; python_version >= '3.8'
-setuptools==69.5.1; python_version >= '3.8'
+requests==2.32.3; python_version >= '3.8'
+s3transfer==0.10.2; python_version >= '3.8'
+setuptools==74.0.0; python_version >= '3.8'
 six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-sqlparse==0.5.0; python_version >= '3.8'
+sqlparse==0.5.1; python_version >= '3.8'
 tablib[html,ods,xls,xlsx,yaml]==3.5.0; python_version >= '3.8'
 tblib==3.0.0; python_version >= '3.8'
-typing-extensions==4.11.0; python_version >= '3.8'
-urllib3==2.2.1; python_version >= '3.8'
-whitenoise==6.6.0; python_version >= '3.8'
-xlrd==2.0.1
-xlwt==1.3.0
+typing-extensions==4.12.2; python_version >= '3.8'
+urllib3==2.2.2; python_version >= '3.8'
+whitenoise==6.7.0; python_version >= '3.8'
 zope.event==5.0; python_version >= '3.7'
-zope.interface==6.3; python_version >= '3.7'
+zope.interface==7.0.3; python_version >= '3.8'

From 171be9a642c3e178ee10199b8d6cd48a8e917791 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 09:29:39 -0700
Subject: [PATCH 018/118] Remove stragglign file

---
 src/.zshrc | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 src/.zshrc

diff --git a/src/.zshrc b/src/.zshrc
deleted file mode 100644
index 45a622a14..000000000
--- a/src/.zshrc
+++ /dev/null
@@ -1 +0,0 @@
-export DOCKER_DEFAULT_PLATFORM=linux/amd64

From 98a50fb178c22ce330294f46630640c462978589 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 09:37:53 -0700
Subject: [PATCH 019/118] Test diagram update

---
 docs/architecture/diagrams/models_diagram.md |  56 ++-
 src/models_diagram.puml                      | 463 -------------------
 2 files changed, 47 insertions(+), 472 deletions(-)
 delete mode 100644 src/models_diagram.puml

diff --git a/docs/architecture/diagrams/models_diagram.md b/docs/architecture/diagrams/models_diagram.md
index 1e9d3089e..4bbec31cc 100644
--- a/docs/architecture/diagrams/models_diagram.md
+++ b/docs/architecture/diagrams/models_diagram.md
@@ -38,7 +38,6 @@ class "registrar.Contact <Registrar>" as registrar.Contact #d6f4e9 {
     + id (BigAutoField)
     + created_at (DateTimeField)
     + updated_at (DateTimeField)
-    ~ user (OneToOneField)
     + first_name (CharField)
     + middle_name (CharField)
     + last_name (CharField)
@@ -47,7 +46,6 @@ class "registrar.Contact <Registrar>" as registrar.Contact #d6f4e9 {
     + phone (PhoneNumberField)
     --
 }
-registrar.Contact -- registrar.User
 
 
 class "registrar.Host <Registrar>" as registrar.Host #d6f4e9 {
@@ -143,6 +141,8 @@ class "registrar.FederalAgency <Registrar>" as registrar.FederalAgency #d6f4e9 {
     + updated_at (DateTimeField)
     + agency (CharField)
     + federal_type (CharField)
+    + initials (CharField)
+    + is_fceb (BooleanField)
     --
 }
 
@@ -159,6 +159,7 @@ class "registrar.DomainRequest <Registrar>" as registrar.DomainRequest #d6f4e9 {
     + action_needed_reason_email (TextField)
     ~ federal_agency (ForeignKey)
     ~ portfolio (ForeignKey)
+    ~ sub_organization (ForeignKey)
     ~ creator (ForeignKey)
     ~ investigator (ForeignKey)
     + generic_org_type (CharField)
@@ -197,12 +198,12 @@ class "registrar.DomainRequest <Registrar>" as registrar.DomainRequest #d6f4e9 {
 }
 registrar.DomainRequest -- registrar.FederalAgency
 registrar.DomainRequest -- registrar.Portfolio
+registrar.DomainRequest -- registrar.Suborganization
 registrar.DomainRequest -- registrar.User
 registrar.DomainRequest -- registrar.User
 registrar.DomainRequest -- registrar.Contact
 registrar.DomainRequest -- registrar.Domain
 registrar.DomainRequest -- registrar.DraftDomain
-registrar.DomainRequest -- registrar.Contact
 registrar.DomainRequest *--* registrar.Website
 registrar.DomainRequest *--* registrar.Website
 registrar.DomainRequest *--* registrar.Contact
@@ -217,6 +218,7 @@ class "registrar.DomainInformation <Registrar>" as registrar.DomainInformation #
     ~ federal_agency (ForeignKey)
     ~ creator (ForeignKey)
     ~ portfolio (ForeignKey)
+    ~ sub_organization (ForeignKey)
     ~ domain_request (OneToOneField)
     + generic_org_type (CharField)
     + organization_type (CharField)
@@ -251,10 +253,10 @@ class "registrar.DomainInformation <Registrar>" as registrar.DomainInformation #
 registrar.DomainInformation -- registrar.FederalAgency
 registrar.DomainInformation -- registrar.User
 registrar.DomainInformation -- registrar.Portfolio
+registrar.DomainInformation -- registrar.Suborganization
 registrar.DomainInformation -- registrar.DomainRequest
 registrar.DomainInformation -- registrar.Contact
 registrar.DomainInformation -- registrar.Domain
-registrar.DomainInformation -- registrar.Contact
 registrar.DomainInformation *--* registrar.Contact
 
 
@@ -283,6 +285,22 @@ class "registrar.DomainInvitation <Registrar>" as registrar.DomainInvitation #d6
 registrar.DomainInvitation -- registrar.Domain
 
 
+class "registrar.PortfolioInvitation <Registrar>" as registrar.PortfolioInvitation #d6f4e9 {
+    portfolio invitation
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + email (EmailField)
+    ~ portfolio (ForeignKey)
+    + portfolio_roles (ArrayField)
+    + portfolio_additional_permissions (ArrayField)
+    + status (FSMField)
+    --
+}
+registrar.PortfolioInvitation -- registrar.Portfolio
+
+
 class "registrar.TransitionDomain <Registrar>" as registrar.TransitionDomain #d6f4e9 {
     transition domain
     --
@@ -343,6 +361,9 @@ class "registrar.User <Registrar>" as registrar.User #d6f4e9 {
     + is_active (BooleanField)
     + date_joined (DateTimeField)
     + status (CharField)
+    ~ portfolio (ForeignKey)
+    + portfolio_roles (ArrayField)
+    + portfolio_additional_permissions (ArrayField)
     + phone (PhoneNumberField)
     + middle_name (CharField)
     + title (CharField)
@@ -352,6 +373,7 @@ class "registrar.User <Registrar>" as registrar.User #d6f4e9 {
     # domains (ManyToManyField)
     --
 }
+registrar.User -- registrar.Portfolio
 registrar.User *--* registrar.Domain
 
 
@@ -407,10 +429,11 @@ class "registrar.Portfolio <Registrar>" as registrar.Portfolio #d6f4e9 {
     + created_at (DateTimeField)
     + updated_at (DateTimeField)
     ~ creator (ForeignKey)
+    + organization_name (CharField)
+    + organization_type (CharField)
     + notes (TextField)
     ~ federal_agency (ForeignKey)
-    + organization_type (CharField)
-    + organization_name (CharField)
+    ~ senior_official (ForeignKey)
     + address_line1 (CharField)
     + address_line2 (CharField)
     + city (CharField)
@@ -422,6 +445,7 @@ class "registrar.Portfolio <Registrar>" as registrar.Portfolio #d6f4e9 {
 }
 registrar.Portfolio -- registrar.User
 registrar.Portfolio -- registrar.FederalAgency
+registrar.Portfolio -- registrar.SeniorOfficial
 
 
 class "registrar.DomainGroup <Registrar>" as registrar.DomainGroup #d6f4e9 {
@@ -452,7 +476,21 @@ class "registrar.Suborganization <Registrar>" as registrar.Suborganization #d6f4
 registrar.Suborganization -- registrar.Portfolio
 
 
-@enduml
-```
+class "registrar.SeniorOfficial <Registrar>" as registrar.SeniorOfficial #d6f4e9 {
+    senior official
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + first_name (CharField)
+    + last_name (CharField)
+    + title (CharField)
+    + phone (PhoneNumberField)
+    + email (EmailField)
+    ~ federal_agency (ForeignKey)
+    --
+}
+registrar.SeniorOfficial -- registrar.FederalAgency
 
-</details>
+
+@enduml
diff --git a/src/models_diagram.puml b/src/models_diagram.puml
deleted file mode 100644
index 84c3cea39..000000000
--- a/src/models_diagram.puml
+++ /dev/null
@@ -1,463 +0,0 @@
-@startuml 
-class "registrar.Contact <Registrar>" as registrar.Contact #d6f4e9 {
-    contact
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + first_name (CharField)
-    + middle_name (CharField)
-    + last_name (CharField)
-    + title (CharField)
-    + email (EmailField)
-    + phone (PhoneNumberField)
-    --
-}
-
-
-class "registrar.Host <Registrar>" as registrar.Host #d6f4e9 {
-    host
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + name (CharField)
-    ~ domain (ForeignKey)
-    --
-}
-registrar.Host -- registrar.Domain
-
-
-class "registrar.HostIP <Registrar>" as registrar.HostIP #d6f4e9 {
-    host ip
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + address (CharField)
-    ~ host (ForeignKey)
-    --
-}
-registrar.HostIP -- registrar.Host
-
-
-class "registrar.PublicContact <Registrar>" as registrar.PublicContact #d6f4e9 {
-    public contact
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + contact_type (CharField)
-    + registry_id (CharField)
-    ~ domain (ForeignKey)
-    + name (CharField)
-    + org (CharField)
-    + street1 (CharField)
-    + street2 (CharField)
-    + street3 (CharField)
-    + city (CharField)
-    + sp (CharField)
-    + pc (CharField)
-    + cc (CharField)
-    + email (EmailField)
-    + voice (CharField)
-    + fax (CharField)
-    + pw (CharField)
-    --
-}
-registrar.PublicContact -- registrar.Domain
-
-
-class "registrar.UserDomainRole <Registrar>" as registrar.UserDomainRole #d6f4e9 {
-    user domain role
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    ~ user (ForeignKey)
-    ~ domain (ForeignKey)
-    + role (TextField)
-    --
-}
-registrar.UserDomainRole -- registrar.User
-registrar.UserDomainRole -- registrar.Domain
-
-
-class "registrar.Domain <Registrar>" as registrar.Domain #d6f4e9 {
-    domain
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + name (DomainField)
-    + state (FSMField)
-    + expiration_date (DateField)
-    + security_contact_registry_id (TextField)
-    + deleted (DateField)
-    + first_ready (DateField)
-    + dsdata_last_change (TextField)
-    --
-}
-
-
-class "registrar.FederalAgency <Registrar>" as registrar.FederalAgency #d6f4e9 {
-    Federal agency
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + agency (CharField)
-    + federal_type (CharField)
-    + initials (CharField)
-    + is_fceb (BooleanField)
-    --
-}
-
-
-class "registrar.DomainRequest <Registrar>" as registrar.DomainRequest #d6f4e9 {
-    domain request
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + status (FSMField)
-    + rejection_reason (TextField)
-    + action_needed_reason (TextField)
-    + action_needed_reason_email (TextField)
-    ~ federal_agency (ForeignKey)
-    ~ portfolio (ForeignKey)
-    ~ sub_organization (ForeignKey)
-    ~ creator (ForeignKey)
-    ~ investigator (ForeignKey)
-    + generic_org_type (CharField)
-    + is_election_board (BooleanField)
-    + organization_type (CharField)
-    + federally_recognized_tribe (BooleanField)
-    + state_recognized_tribe (BooleanField)
-    + tribe_name (CharField)
-    + federal_type (CharField)
-    + organization_name (CharField)
-    + address_line1 (CharField)
-    + address_line2 (CharField)
-    + city (CharField)
-    + state_territory (CharField)
-    + zipcode (CharField)
-    + urbanization (CharField)
-    + about_your_organization (TextField)
-    ~ senior_official (ForeignKey)
-    ~ approved_domain (OneToOneField)
-    ~ requested_domain (OneToOneField)
-    + purpose (TextField)
-    + no_other_contacts_rationale (TextField)
-    + anything_else (TextField)
-    + has_anything_else_text (BooleanField)
-    + cisa_representative_email (EmailField)
-    + cisa_representative_first_name (CharField)
-    + cisa_representative_last_name (CharField)
-    + has_cisa_representative (BooleanField)
-    + is_policy_acknowledged (BooleanField)
-    + submission_date (DateField)
-    + notes (TextField)
-    # current_websites (ManyToManyField)
-    # alternative_domains (ManyToManyField)
-    # other_contacts (ManyToManyField)
-    --
-}
-registrar.DomainRequest -- registrar.FederalAgency
-registrar.DomainRequest -- registrar.Portfolio
-registrar.DomainRequest -- registrar.Suborganization
-registrar.DomainRequest -- registrar.User
-registrar.DomainRequest -- registrar.User
-registrar.DomainRequest -- registrar.Contact
-registrar.DomainRequest -- registrar.Domain
-registrar.DomainRequest -- registrar.DraftDomain
-registrar.DomainRequest *--* registrar.Website
-registrar.DomainRequest *--* registrar.Website
-registrar.DomainRequest *--* registrar.Contact
-
-
-class "registrar.DomainInformation <Registrar>" as registrar.DomainInformation #d6f4e9 {
-    domain information
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    ~ federal_agency (ForeignKey)
-    ~ creator (ForeignKey)
-    ~ portfolio (ForeignKey)
-    ~ sub_organization (ForeignKey)
-    ~ domain_request (OneToOneField)
-    + generic_org_type (CharField)
-    + organization_type (CharField)
-    + federally_recognized_tribe (BooleanField)
-    + state_recognized_tribe (BooleanField)
-    + tribe_name (CharField)
-    + federal_type (CharField)
-    + is_election_board (BooleanField)
-    + organization_name (CharField)
-    + address_line1 (CharField)
-    + address_line2 (CharField)
-    + city (CharField)
-    + state_territory (CharField)
-    + zipcode (CharField)
-    + urbanization (CharField)
-    + about_your_organization (TextField)
-    ~ senior_official (ForeignKey)
-    ~ domain (OneToOneField)
-    + purpose (TextField)
-    + no_other_contacts_rationale (TextField)
-    + anything_else (TextField)
-    + has_anything_else_text (BooleanField)
-    + cisa_representative_email (EmailField)
-    + cisa_representative_first_name (CharField)
-    + cisa_representative_last_name (CharField)
-    + has_cisa_representative (BooleanField)
-    + is_policy_acknowledged (BooleanField)
-    + notes (TextField)
-    # other_contacts (ManyToManyField)
-    --
-}
-registrar.DomainInformation -- registrar.FederalAgency
-registrar.DomainInformation -- registrar.User
-registrar.DomainInformation -- registrar.Portfolio
-registrar.DomainInformation -- registrar.Suborganization
-registrar.DomainInformation -- registrar.DomainRequest
-registrar.DomainInformation -- registrar.Contact
-registrar.DomainInformation -- registrar.Domain
-registrar.DomainInformation *--* registrar.Contact
-
-
-class "registrar.DraftDomain <Registrar>" as registrar.DraftDomain #d6f4e9 {
-    draft domain
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + name (CharField)
-    --
-}
-
-
-class "registrar.DomainInvitation <Registrar>" as registrar.DomainInvitation #d6f4e9 {
-    domain invitation
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + email (EmailField)
-    ~ domain (ForeignKey)
-    + status (FSMField)
-    --
-}
-registrar.DomainInvitation -- registrar.Domain
-
-
-class "registrar.PortfolioInvitation <Registrar>" as registrar.PortfolioInvitation #d6f4e9 {
-    portfolio invitation
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + email (EmailField)
-    ~ portfolio (ForeignKey)
-    + portfolio_roles (ArrayField)
-    + portfolio_additional_permissions (ArrayField)
-    + status (FSMField)
-    --
-}
-registrar.PortfolioInvitation -- registrar.Portfolio
-
-
-class "registrar.TransitionDomain <Registrar>" as registrar.TransitionDomain #d6f4e9 {
-    transition domain
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + username (CharField)
-    + domain_name (CharField)
-    + status (CharField)
-    + email_sent (BooleanField)
-    + processed (BooleanField)
-    + generic_org_type (CharField)
-    + organization_name (CharField)
-    + federal_type (CharField)
-    + federal_agency (CharField)
-    + epp_creation_date (DateField)
-    + epp_expiration_date (DateField)
-    + first_name (CharField)
-    + middle_name (CharField)
-    + last_name (CharField)
-    + title (CharField)
-    + email (EmailField)
-    + phone (CharField)
-    + address_line (CharField)
-    + city (CharField)
-    + state_territory (CharField)
-    + zipcode (CharField)
-    --
-}
-
-
-class "registrar.VerifiedByStaff <Registrar>" as registrar.VerifiedByStaff #d6f4e9 {
-    verified by staff
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + email (EmailField)
-    ~ requestor (ForeignKey)
-    + notes (TextField)
-    --
-}
-registrar.VerifiedByStaff -- registrar.User
-
-
-class "registrar.User <Registrar>" as registrar.User #d6f4e9 {
-    user
-    --
-    + id (BigAutoField)
-    + password (CharField)
-    + last_login (DateTimeField)
-    + is_superuser (BooleanField)
-    + username (CharField)
-    + first_name (CharField)
-    + last_name (CharField)
-    + email (EmailField)
-    + is_staff (BooleanField)
-    + is_active (BooleanField)
-    + date_joined (DateTimeField)
-    + status (CharField)
-    ~ portfolio (ForeignKey)
-    + portfolio_roles (ArrayField)
-    + portfolio_additional_permissions (ArrayField)
-    + phone (PhoneNumberField)
-    + middle_name (CharField)
-    + title (CharField)
-    + verification_type (CharField)
-    # groups (ManyToManyField)
-    # user_permissions (ManyToManyField)
-    # domains (ManyToManyField)
-    --
-}
-registrar.User -- registrar.Portfolio
-registrar.User *--* registrar.Domain
-
-
-class "registrar.UserGroup <Registrar>" as registrar.UserGroup #d6f4e9 {
-    User group
-    --
-    - id (AutoField)
-    + name (CharField)
-    ~ group_ptr (OneToOneField)
-    # permissions (ManyToManyField)
-    --
-}
-
-
-class "registrar.Website <Registrar>" as registrar.Website #d6f4e9 {
-    website
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + website (CharField)
-    --
-}
-
-
-class "registrar.WaffleFlag <Registrar>" as registrar.WaffleFlag #d6f4e9 {
-    waffle flag
-    --
-    + id (BigAutoField)
-    + name (CharField)
-    + everyone (BooleanField)
-    + percent (DecimalField)
-    + testing (BooleanField)
-    + superusers (BooleanField)
-    + staff (BooleanField)
-    + authenticated (BooleanField)
-    + languages (TextField)
-    + rollout (BooleanField)
-    + note (TextField)
-    + created (DateTimeField)
-    + modified (DateTimeField)
-    # groups (ManyToManyField)
-    # users (ManyToManyField)
-    --
-}
-registrar.WaffleFlag *--* registrar.User
-
-
-class "registrar.Portfolio <Registrar>" as registrar.Portfolio #d6f4e9 {
-    portfolio
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    ~ creator (ForeignKey)
-    + organization_name (CharField)
-    + organization_type (CharField)
-    + notes (TextField)
-    ~ federal_agency (ForeignKey)
-    ~ senior_official (ForeignKey)
-    + address_line1 (CharField)
-    + address_line2 (CharField)
-    + city (CharField)
-    + state_territory (CharField)
-    + zipcode (CharField)
-    + urbanization (CharField)
-    + security_contact_email (EmailField)
-    --
-}
-registrar.Portfolio -- registrar.User
-registrar.Portfolio -- registrar.FederalAgency
-registrar.Portfolio -- registrar.SeniorOfficial
-
-
-class "registrar.DomainGroup <Registrar>" as registrar.DomainGroup #d6f4e9 {
-    domain group
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + name (CharField)
-    ~ portfolio (ForeignKey)
-    # domains (ManyToManyField)
-    --
-}
-registrar.DomainGroup -- registrar.Portfolio
-registrar.DomainGroup *--* registrar.DomainInformation
-
-
-class "registrar.Suborganization <Registrar>" as registrar.Suborganization #d6f4e9 {
-    suborganization
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + name (CharField)
-    ~ portfolio (ForeignKey)
-    --
-}
-registrar.Suborganization -- registrar.Portfolio
-
-
-class "registrar.SeniorOfficial <Registrar>" as registrar.SeniorOfficial #d6f4e9 {
-    senior official
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + first_name (CharField)
-    + last_name (CharField)
-    + title (CharField)
-    + phone (PhoneNumberField)
-    + email (EmailField)
-    ~ federal_agency (ForeignKey)
-    --
-}
-registrar.SeniorOfficial -- registrar.FederalAgency
-
-
-@enduml

From dd99f8f2d8b848e2f7e6d1c678b40d593c2b2a3a Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 09:39:56 -0700
Subject: [PATCH 020/118] Revert Pipfile.lock

---
 src/Pipfile.lock | 1367 +++++++++++++++++++++++++---------------------
 1 file changed, 730 insertions(+), 637 deletions(-)

diff --git a/src/Pipfile.lock b/src/Pipfile.lock
index 09ac4a934..a42563c63 100644
--- a/src/Pipfile.lock
+++ b/src/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "2799ab9e493352740c6946e604ccc075c5c16359c809753296091bbe2b9fd837"
+            "sha256": "9095c4f98f58a9502444584067a63f329d5a5fc4b49454c4e129bda09552d19d"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -16,11 +16,11 @@
     "default": {
         "annotated-types": {
             "hashes": [
-                "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53",
-                "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89"
+                "sha256:0641064de18ba7a25dee8f96403ebc39113d0cb953a01429249d5c7564666a43",
+                "sha256:563339e807e53ffd9c267e99fc6d9ea23eb8443c08f112651963e24e22f84a5d"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.7.0"
+            "version": "==0.6.0"
         },
         "asgiref": {
             "hashes": [
@@ -32,37 +32,37 @@
         },
         "boto3": {
             "hashes": [
-                "sha256:06eac4757de2a9c6020381205cb902f05964caad80b56e58c8931284a133b4cb",
-                "sha256:b9587131372a808bf6f99c5ed8b11be55cd113261cc3b437a917b4acc6c30bfe"
+                "sha256:decf52f8d5d8a1b10c9ff2a0e96ee207ed79e33d2e53fdf0880a5cbef70785e0",
+                "sha256:e836b71d79671270fccac0a4d4c8ec239a6b82ea47c399b64675aa597d0ee63b"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==1.35.8"
+            "version": "==1.34.95"
         },
         "botocore": {
             "hashes": [
-                "sha256:4b820cf680ab5d778bd2fe4feeef1ff8a2b96d5c535d4638ab30f703ade282f8",
-                "sha256:adf389eb8fd87775f193300e3431d1353f925807ad3a39958172cb644f0d60a1"
+                "sha256:6bd76a2eadb42b91fa3528392e981ad5b4dfdee3968fa5b904278acf6cbf15ff",
+                "sha256:ead5823e0dd6751ece5498cb979fd9abf190e691c8833bcac6876fd6ca261fa7"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==1.35.8"
+            "version": "==1.34.95"
         },
         "cachetools": {
             "hashes": [
-                "sha256:02134e8439cdc2ffb62023ce1debca2944c3f289d66bb17ead3ab3dede74b292",
-                "sha256:2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a"
+                "sha256:0abad1021d3f8325b2fc1d2e9c8b9c9d57b04c3932657a72465447332c24d945",
+                "sha256:ba29e2dfa0b8b556606f097407ed1aa62080ee108ab0dc5ec9d6a723a007d105"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==5.5.0"
+            "version": "==5.3.3"
         },
         "certifi": {
             "hashes": [
-                "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b",
-                "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"
+                "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f",
+                "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==2024.7.4"
+            "version": "==2024.2.2"
         },
         "cfenv": {
             "hashes": [
@@ -74,76 +74,61 @@
         },
         "cffi": {
             "hashes": [
-                "sha256:011aff3524d578a9412c8b3cfaa50f2c0bd78e03eb7af7aa5e0df59b158efb2f",
-                "sha256:0a048d4f6630113e54bb4b77e315e1ba32a5a31512c31a273807d0027a7e69ab",
-                "sha256:0bb15e7acf8ab35ca8b24b90af52c8b391690ef5c4aec3d31f38f0d37d2cc499",
-                "sha256:0d46ee4764b88b91f16661a8befc6bfb24806d885e27436fdc292ed7e6f6d058",
-                "sha256:0e60821d312f99d3e1569202518dddf10ae547e799d75aef3bca3a2d9e8ee693",
-                "sha256:0fdacad9e0d9fc23e519efd5ea24a70348305e8d7d85ecbb1a5fa66dc834e7fb",
-                "sha256:14b9cbc8f7ac98a739558eb86fabc283d4d564dafed50216e7f7ee62d0d25377",
-                "sha256:17c6d6d3260c7f2d94f657e6872591fe8733872a86ed1345bda872cfc8c74885",
-                "sha256:1a2ddbac59dc3716bc79f27906c010406155031a1c801410f1bafff17ea304d2",
-                "sha256:2404f3de742f47cb62d023f0ba7c5a916c9c653d5b368cc966382ae4e57da401",
-                "sha256:24658baf6224d8f280e827f0a50c46ad819ec8ba380a42448e24459daf809cf4",
-                "sha256:24aa705a5f5bd3a8bcfa4d123f03413de5d86e497435693b638cbffb7d5d8a1b",
-                "sha256:2770bb0d5e3cc0e31e7318db06efcbcdb7b31bcb1a70086d3177692a02256f59",
-                "sha256:331ad15c39c9fe9186ceaf87203a9ecf5ae0ba2538c9e898e3a6967e8ad3db6f",
-                "sha256:3aa9d43b02a0c681f0bfbc12d476d47b2b2b6a3f9287f11ee42989a268a1833c",
-                "sha256:41f4915e09218744d8bae14759f983e466ab69b178de38066f7579892ff2a555",
-                "sha256:4304d4416ff032ed50ad6bb87416d802e67139e31c0bde4628f36a47a3164bfa",
-                "sha256:435a22d00ec7d7ea533db494da8581b05977f9c37338c80bc86314bec2619424",
-                "sha256:45f7cd36186db767d803b1473b3c659d57a23b5fa491ad83c6d40f2af58e4dbb",
-                "sha256:48b389b1fd5144603d61d752afd7167dfd205973a43151ae5045b35793232aa2",
-                "sha256:4e67d26532bfd8b7f7c05d5a766d6f437b362c1bf203a3a5ce3593a645e870b8",
-                "sha256:516a405f174fd3b88829eabfe4bb296ac602d6a0f68e0d64d5ac9456194a5b7e",
-                "sha256:5ba5c243f4004c750836f81606a9fcb7841f8874ad8f3bf204ff5e56332b72b9",
-                "sha256:5bdc0f1f610d067c70aa3737ed06e2726fd9d6f7bfee4a351f4c40b6831f4e82",
-                "sha256:6107e445faf057c118d5050560695e46d272e5301feffda3c41849641222a828",
-                "sha256:6327b572f5770293fc062a7ec04160e89741e8552bf1c358d1a23eba68166759",
-                "sha256:669b29a9eca6146465cc574659058ed949748f0809a2582d1f1a324eb91054dc",
-                "sha256:6ce01337d23884b21c03869d2f68c5523d43174d4fc405490eb0091057943118",
-                "sha256:6d872186c1617d143969defeadac5a904e6e374183e07977eedef9c07c8953bf",
-                "sha256:6f76a90c345796c01d85e6332e81cab6d70de83b829cf1d9762d0a3da59c7932",
-                "sha256:70d2aa9fb00cf52034feac4b913181a6e10356019b18ef89bc7c12a283bf5f5a",
-                "sha256:7cbc78dc018596315d4e7841c8c3a7ae31cc4d638c9b627f87d52e8abaaf2d29",
-                "sha256:856bf0924d24e7f93b8aee12a3a1095c34085600aa805693fb7f5d1962393206",
-                "sha256:8a98748ed1a1df4ee1d6f927e151ed6c1a09d5ec21684de879c7ea6aa96f58f2",
-                "sha256:93a7350f6706b31f457c1457d3a3259ff9071a66f312ae64dc024f049055f72c",
-                "sha256:964823b2fc77b55355999ade496c54dde161c621cb1f6eac61dc30ed1b63cd4c",
-                "sha256:a003ac9edc22d99ae1286b0875c460351f4e101f8c9d9d2576e78d7e048f64e0",
-                "sha256:a0ce71725cacc9ebf839630772b07eeec220cbb5f03be1399e0457a1464f8e1a",
-                "sha256:a47eef975d2b8b721775a0fa286f50eab535b9d56c70a6e62842134cf7841195",
-                "sha256:a8b5b9712783415695663bd463990e2f00c6750562e6ad1d28e072a611c5f2a6",
-                "sha256:a9015f5b8af1bb6837a3fcb0cdf3b874fe3385ff6274e8b7925d81ccaec3c5c9",
-                "sha256:aec510255ce690d240f7cb23d7114f6b351c733a74c279a84def763660a2c3bc",
-                "sha256:b00e7bcd71caa0282cbe3c90966f738e2db91e64092a877c3ff7f19a1628fdcb",
-                "sha256:b50aaac7d05c2c26dfd50c3321199f019ba76bb650e346a6ef3616306eed67b0",
-                "sha256:b7b6ea9e36d32582cda3465f54c4b454f62f23cb083ebc7a94e2ca6ef011c3a7",
-                "sha256:bb9333f58fc3a2296fb1d54576138d4cf5d496a2cc118422bd77835e6ae0b9cb",
-                "sha256:c1c13185b90bbd3f8b5963cd8ce7ad4ff441924c31e23c975cb150e27c2bf67a",
-                "sha256:c3b8bd3133cd50f6b637bb4322822c94c5ce4bf0d724ed5ae70afce62187c492",
-                "sha256:c5d97162c196ce54af6700949ddf9409e9833ef1003b4741c2b39ef46f1d9720",
-                "sha256:c815270206f983309915a6844fe994b2fa47e5d05c4c4cef267c3b30e34dbe42",
-                "sha256:cab2eba3830bf4f6d91e2d6718e0e1c14a2f5ad1af68a89d24ace0c6b17cced7",
-                "sha256:d1df34588123fcc88c872f5acb6f74ae59e9d182a2707097f9e28275ec26a12d",
-                "sha256:d6bdcd415ba87846fd317bee0774e412e8792832e7805938987e4ede1d13046d",
-                "sha256:db9a30ec064129d605d0f1aedc93e00894b9334ec74ba9c6bdd08147434b33eb",
-                "sha256:dbc183e7bef690c9abe5ea67b7b60fdbca81aa8da43468287dae7b5c046107d4",
-                "sha256:dca802c8db0720ce1c49cce1149ff7b06e91ba15fa84b1d59144fef1a1bc7ac2",
-                "sha256:dec6b307ce928e8e112a6bb9921a1cb00a0e14979bf28b98e084a4b8a742bd9b",
-                "sha256:df8bb0010fdd0a743b7542589223a2816bdde4d94bb5ad67884348fa2c1c67e8",
-                "sha256:e4094c7b464cf0a858e75cd14b03509e84789abf7b79f8537e6a72152109c76e",
-                "sha256:e4760a68cab57bfaa628938e9c2971137e05ce48e762a9cb53b76c9b569f1204",
-                "sha256:eb09b82377233b902d4c3fbeeb7ad731cdab579c6c6fda1f763cd779139e47c3",
-                "sha256:eb862356ee9391dc5a0b3cbc00f416b48c1b9a52d252d898e5b7696a5f9fe150",
-                "sha256:ef9528915df81b8f4c7612b19b8628214c65c9b7f74db2e34a646a0a2a0da2d4",
-                "sha256:f3157624b7558b914cb039fd1af735e5e8049a87c817cc215109ad1c8779df76",
-                "sha256:f3e0992f23bbb0be00a921eae5363329253c3b86287db27092461c887b791e5e",
-                "sha256:f9338cc05451f1942d0d8203ec2c346c830f8e86469903d5126c1f0a13a2bcbb",
-                "sha256:ffef8fd58a36fb5f1196919638f73dd3ae0db1a878982b27a9a5a176ede4ba91"
+                "sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc",
+                "sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a",
+                "sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417",
+                "sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab",
+                "sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520",
+                "sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36",
+                "sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743",
+                "sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8",
+                "sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed",
+                "sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684",
+                "sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56",
+                "sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324",
+                "sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d",
+                "sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235",
+                "sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e",
+                "sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088",
+                "sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000",
+                "sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7",
+                "sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e",
+                "sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673",
+                "sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c",
+                "sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe",
+                "sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2",
+                "sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098",
+                "sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8",
+                "sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a",
+                "sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0",
+                "sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b",
+                "sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896",
+                "sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e",
+                "sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9",
+                "sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2",
+                "sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b",
+                "sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6",
+                "sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404",
+                "sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f",
+                "sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0",
+                "sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4",
+                "sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc",
+                "sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936",
+                "sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba",
+                "sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872",
+                "sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb",
+                "sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614",
+                "sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1",
+                "sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d",
+                "sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969",
+                "sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b",
+                "sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4",
+                "sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627",
+                "sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956",
+                "sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357"
             ],
             "markers": "platform_python_implementation != 'PyPy'",
-            "version": "==1.17.0"
+            "version": "==1.16.0"
         },
         "charset-normalizer": {
             "hashes": [
@@ -243,36 +228,41 @@
         },
         "cryptography": {
             "hashes": [
-                "sha256:0663585d02f76929792470451a5ba64424acc3cd5227b03921dab0e2f27b1709",
-                "sha256:08a24a7070b2b6804c1940ff0f910ff728932a9d0e80e7814234269f9d46d069",
-                "sha256:232ce02943a579095a339ac4b390fbbe97f5b5d5d107f8a08260ea2768be8cc2",
-                "sha256:2905ccf93a8a2a416f3ec01b1a7911c3fe4073ef35640e7ee5296754e30b762b",
-                "sha256:299d3da8e00b7e2b54bb02ef58d73cd5f55fb31f33ebbf33bd00d9aa6807df7e",
-                "sha256:2c6d112bf61c5ef44042c253e4859b3cbbb50df2f78fa8fae6747a7814484a70",
-                "sha256:31e44a986ceccec3d0498e16f3d27b2ee5fdf69ce2ab89b52eaad1d2f33d8778",
-                "sha256:3d9a1eca329405219b605fac09ecfc09ac09e595d6def650a437523fcd08dd22",
-                "sha256:3dcdedae5c7710b9f97ac6bba7e1052b95c7083c9d0e9df96e02a1932e777895",
-                "sha256:47ca71115e545954e6c1d207dd13461ab81f4eccfcb1345eac874828b5e3eaaf",
-                "sha256:4a997df8c1c2aae1e1e5ac49c2e4f610ad037fc5a3aadc7b64e39dea42249431",
-                "sha256:51956cf8730665e2bdf8ddb8da0056f699c1a5715648c1b0144670c1ba00b48f",
-                "sha256:5bcb8a5620008a8034d39bce21dc3e23735dfdb6a33a06974739bfa04f853947",
-                "sha256:64c3f16e2a4fc51c0d06af28441881f98c5d91009b8caaff40cf3548089e9c74",
-                "sha256:6e2b11c55d260d03a8cf29ac9b5e0608d35f08077d8c087be96287f43af3ccdc",
-                "sha256:7b3f5fe74a5ca32d4d0f302ffe6680fcc5c28f8ef0dc0ae8f40c0f3a1b4fca66",
-                "sha256:844b6d608374e7d08f4f6e6f9f7b951f9256db41421917dfb2d003dde4cd6b66",
-                "sha256:9a8d6802e0825767476f62aafed40532bd435e8a5f7d23bd8b4f5fd04cc80ecf",
-                "sha256:aae4d918f6b180a8ab8bf6511a419473d107df4dbb4225c7b48c5c9602c38c7f",
-                "sha256:ac1955ce000cb29ab40def14fd1bbfa7af2017cca696ee696925615cafd0dce5",
-                "sha256:b88075ada2d51aa9f18283532c9f60e72170041bba88d7f37e49cbb10275299e",
-                "sha256:cb013933d4c127349b3948aa8aaf2f12c0353ad0eccd715ca789c8a0f671646f",
-                "sha256:cc70b4b581f28d0a254d006f26949245e3657d40d8857066c2ae22a61222ef55",
-                "sha256:e9c5266c432a1e23738d178e51c2c7a5e2ddf790f248be939448c0ba2021f9d1",
-                "sha256:ea9e57f8ea880eeea38ab5abf9fbe39f923544d7884228ec67d666abd60f5a47",
-                "sha256:ee0c405832ade84d4de74b9029bedb7b31200600fa524d218fc29bfa371e97f5",
-                "sha256:fdcb265de28585de5b859ae13e3846a8e805268a823a12a4da2597f1f5afc9f0"
+                "sha256:0270572b8bd2c833c3981724b8ee9747b3ec96f699a9665470018594301439ee",
+                "sha256:111a0d8553afcf8eb02a4fea6ca4f59d48ddb34497aa8706a6cf536f1a5ec576",
+                "sha256:16a48c23a62a2f4a285699dba2e4ff2d1cff3115b9df052cdd976a18856d8e3d",
+                "sha256:1b95b98b0d2af784078fa69f637135e3c317091b615cd0905f8b8a087e86fa30",
+                "sha256:1f71c10d1e88467126f0efd484bd44bca5e14c664ec2ede64c32f20875c0d413",
+                "sha256:2424ff4c4ac7f6b8177b53c17ed5d8fa74ae5955656867f5a8affaca36a27abb",
+                "sha256:2bce03af1ce5a5567ab89bd90d11e7bbdff56b8af3acbbec1faded8f44cb06da",
+                "sha256:329906dcc7b20ff3cad13c069a78124ed8247adcac44b10bea1130e36caae0b4",
+                "sha256:37dd623507659e08be98eec89323469e8c7b4c1407c85112634ae3dbdb926fdd",
+                "sha256:3eaafe47ec0d0ffcc9349e1708be2aaea4c6dd4978d76bf6eb0cb2c13636c6fc",
+                "sha256:5e6275c09d2badf57aea3afa80d975444f4be8d3bc58f7f80d2a484c6f9485c8",
+                "sha256:6fe07eec95dfd477eb9530aef5bead34fec819b3aaf6c5bd6d20565da607bfe1",
+                "sha256:7367d7b2eca6513681127ebad53b2582911d1736dc2ffc19f2c3ae49997496bc",
+                "sha256:7cde5f38e614f55e28d831754e8a3bacf9ace5d1566235e39d91b35502d6936e",
+                "sha256:9481ffe3cf013b71b2428b905c4f7a9a4f76ec03065b05ff499bb5682a8d9ad8",
+                "sha256:98d8dc6d012b82287f2c3d26ce1d2dd130ec200c8679b6213b3c73c08b2b7940",
+                "sha256:a011a644f6d7d03736214d38832e030d8268bcff4a41f728e6030325fea3e400",
+                "sha256:a2913c5375154b6ef2e91c10b5720ea6e21007412f6437504ffea2109b5a33d7",
+                "sha256:a30596bae9403a342c978fb47d9b0ee277699fa53bbafad14706af51fe543d16",
+                "sha256:b03c2ae5d2f0fc05f9a2c0c997e1bc18c8229f392234e8a0194f202169ccd278",
+                "sha256:b6cd2203306b63e41acdf39aa93b86fb566049aeb6dc489b70e34bcd07adca74",
+                "sha256:b7ffe927ee6531c78f81aa17e684e2ff617daeba7f189f911065b2ea2d526dec",
+                "sha256:b8cac287fafc4ad485b8a9b67d0ee80c66bf3574f655d3b97ef2e1082360faf1",
+                "sha256:ba334e6e4b1d92442b75ddacc615c5476d4ad55cc29b15d590cc6b86efa487e2",
+                "sha256:ba3e4a42397c25b7ff88cdec6e2a16c2be18720f317506ee25210f6d31925f9c",
+                "sha256:c41fb5e6a5fe9ebcd58ca3abfeb51dffb5d83d6775405305bfa8715b76521922",
+                "sha256:cd2030f6650c089aeb304cf093f3244d34745ce0cfcc39f20c6fbfe030102e2a",
+                "sha256:cd65d75953847815962c84a4654a84850b2bb4aed3f26fadcc1c13892e1e29f6",
+                "sha256:e4985a790f921508f36f81831817cbc03b102d643b5fcb81cd33df3fa291a1a1",
+                "sha256:e807b3188f9eb0eaa7bbb579b462c5ace579f1cedb28107ce8b48a9f7ad3679e",
+                "sha256:f12764b8fffc7a123f641d7d049d382b73f96a34117e0b637b80643169cec8ac",
+                "sha256:f8837fe1d6ac4a8052a9a8ddab256bc006242696f03368a4009be7ee3075cdb7"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==43.0.0"
+            "version": "==42.0.5"
         },
         "defusedxml": {
             "hashes": [
@@ -292,10 +282,10 @@
         },
         "dj-database-url": {
             "hashes": [
-                "sha256:3e792567b0aa9a4884860af05fe2aa4968071ad351e033b6db632f97ac6db9de",
-                "sha256:9f9b05058ddf888f1e6f840048b8d705ff9395e3b52a07165daa3d8b9360551b"
+                "sha256:04bc34b248d4c21aaa13e4ab419ae6575ef5f10f3df735ce7da97722caa356e0",
+                "sha256:f2042cefe1086e539c9da39fad5ad7f61173bf79665e69bf7e4de55fa88b135f"
             ],
-            "version": "==2.2.0"
+            "version": "==2.1.0"
         },
         "dj-email-url": {
             "hashes": [
@@ -347,12 +337,12 @@
         },
         "django-cors-headers": {
             "hashes": [
-                "sha256:5c6e3b7fe870876a1efdfeb4f433782c3524078fa0dc9e0195f6706ce7a242f6",
-                "sha256:92cf4633e22af67a230a1456cb1b7a02bb213d6536d2dcb2a4a24092ea9cebc2"
+                "sha256:0b1fd19297e37417fc9f835d39e45c8c642938ddba1acce0c1753d3edef04f36",
+                "sha256:0bf65ef45e606aff1994d35503e6b677c0b26cafff6506f8fd7187f3be840207"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==4.4.0"
+            "version": "==4.3.1"
         },
         "django-csp": {
             "hashes": [
@@ -372,12 +362,12 @@
         },
         "django-import-export": {
             "hashes": [
-                "sha256:16ecc5a9f0df46bde6eb278a3e65ebda0ee1db55656f36440e9fb83f40ab85a3",
-                "sha256:730ae2443a02b1ba27d8dba078a27ae9123adfcabb78161b4f130843607b3df9"
+                "sha256:2eac09e8cec8670f36e24314760448011ad23c51e8fb930d55f50d0c3c926da0",
+                "sha256:4deabc557801d368093608c86fd0f4831bc9540e2ea41ca2f023e2efb3eb6f48"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==4.1.1"
+            "version": "==3.3.8"
         },
         "django-login-required-middleware": {
             "hashes": [
@@ -391,11 +381,11 @@
                 "phonenumberslite"
             ],
             "hashes": [
-                "sha256:196c917b70c01a98e327f482eb8a4a4a55a29891db551f99078585397370b3ba",
-                "sha256:8a560fe1b01b94c9de8cde22bc373b695f023cc6df4baba00264cb079da9f631"
+                "sha256:bc6eaa49d1f9d870944f5280258db511e3a1ba5e2fbbed255488dceacae45d06",
+                "sha256:f9cdb3de085f99c249328293a3b93d4e5fa440c0c8e3b99eb0d0f54748629797"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==8.0.0"
+            "version": "==7.3.0"
         },
         "django-waffle": {
             "hashes": [
@@ -426,14 +416,22 @@
             "markers": "python_version >= '3.8'",
             "version": "==11.0.0"
         },
+        "et-xmlfile": {
+            "hashes": [
+                "sha256:8eb9e2bc2f8c97e37a2dc85a09ecdcdec9d8a396530a6d5a33b30b9a92da0c5c",
+                "sha256:a2ba85d1d6a74ef63837eed693bcb89c3f752169b0e3e7ae5b16ca5e1b3deada"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==1.1.0"
+        },
         "faker": {
             "hashes": [
-                "sha256:0d3c0399204aaf8205cc1750db443474ca0436f177126b2c27b798e8336cc74f",
-                "sha256:6a3a08be54c37e05f7943d7ba5211d252c1de737687a46ad6f29209d8d5db11f"
+                "sha256:87ef41e24b39a5be66ecd874af86f77eebd26782a2681200e86c5326340a95d3",
+                "sha256:e23a2b74888885c3d23a9237bacb823041291c03d609a39acb9ebe6c123f3986"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==28.0.0"
+            "version": "==25.0.0"
         },
         "fred-epplib": {
             "git": "https://github.com/cisagov/epplib.git",
@@ -569,20 +567,20 @@
         },
         "gunicorn": {
             "hashes": [
-                "sha256:ec400d38950de4dfd418cff8328b2c8faed0edb0d517d3394e457c317908ca4d",
-                "sha256:f014447a0101dc57e294f6c18ca6b40227a4c90e9bdb586042628030cba004ec"
+                "sha256:350679f91b24062c86e386e198a15438d53a7a8207235a78ba1b53df4c4378d9",
+                "sha256:4a0b436239ff76fb33f11c07a16482c521a7e09c1ce3cc293c2330afe01bec63"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==23.0.0"
+            "version": "==22.0.0"
         },
         "idna": {
             "hashes": [
-                "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac",
-                "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"
+                "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc",
+                "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"
             ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.8"
+            "markers": "python_version >= '3.5'",
+            "version": "==3.7"
         },
         "jmespath": {
             "hashes": [
@@ -594,155 +592,177 @@
         },
         "lxml": {
             "hashes": [
-                "sha256:01220dca0d066d1349bd6a1726856a78f7929f3878f7e2ee83c296c69495309e",
-                "sha256:02ced472497b8362c8e902ade23e3300479f4f43e45f4105c85ef43b8db85229",
-                "sha256:052d99051e77a4f3e8482c65014cf6372e61b0a6f4fe9edb98503bb5364cfee3",
-                "sha256:07da23d7ee08577760f0a71d67a861019103e4812c87e2fab26b039054594cc5",
-                "sha256:094cb601ba9f55296774c2d57ad68730daa0b13dc260e1f941b4d13678239e70",
-                "sha256:0a7056921edbdd7560746f4221dca89bb7a3fe457d3d74267995253f46343f15",
-                "sha256:0c120f43553ec759f8de1fee2f4794452b0946773299d44c36bfe18e83caf002",
-                "sha256:0d7b36afa46c97875303a94e8f3ad932bf78bace9e18e603f2085b652422edcd",
-                "sha256:0fdf3a3059611f7585a78ee10399a15566356116a4288380921a4b598d807a22",
-                "sha256:109fa6fede314cc50eed29e6e56c540075e63d922455346f11e4d7a036d2b8cf",
-                "sha256:146173654d79eb1fc97498b4280c1d3e1e5d58c398fa530905c9ea50ea849b22",
-                "sha256:1473427aff3d66a3fa2199004c3e601e6c4500ab86696edffdbc84954c72d832",
-                "sha256:1483fd3358963cc5c1c9b122c80606a3a79ee0875bcac0204149fa09d6ff2727",
-                "sha256:168f2dfcfdedf611eb285efac1516c8454c8c99caf271dccda8943576b67552e",
-                "sha256:17e8d968d04a37c50ad9c456a286b525d78c4a1c15dd53aa46c1d8e06bf6fa30",
-                "sha256:18feb4b93302091b1541221196a2155aa296c363fd233814fa11e181adebc52f",
-                "sha256:1afe0a8c353746e610bd9031a630a95bcfb1a720684c3f2b36c4710a0a96528f",
-                "sha256:1d04f064bebdfef9240478f7a779e8c5dc32b8b7b0b2fc6a62e39b928d428e51",
-                "sha256:1fdc9fae8dd4c763e8a31e7630afef517eab9f5d5d31a278df087f307bf601f4",
-                "sha256:1ffc23010330c2ab67fac02781df60998ca8fe759e8efde6f8b756a20599c5de",
-                "sha256:20094fc3f21ea0a8669dc4c61ed7fa8263bd37d97d93b90f28fc613371e7a875",
-                "sha256:213261f168c5e1d9b7535a67e68b1f59f92398dd17a56d934550837143f79c42",
-                "sha256:218c1b2e17a710e363855594230f44060e2025b05c80d1f0661258142b2add2e",
-                "sha256:23e0553b8055600b3bf4a00b255ec5c92e1e4aebf8c2c09334f8368e8bd174d6",
-                "sha256:25f1b69d41656b05885aa185f5fdf822cb01a586d1b32739633679699f220391",
-                "sha256:2b3778cb38212f52fac9fe913017deea2fdf4eb1a4f8e4cfc6b009a13a6d3fcc",
-                "sha256:2bc9fd5ca4729af796f9f59cd8ff160fe06a474da40aca03fcc79655ddee1a8b",
-                "sha256:2c226a06ecb8cdef28845ae976da407917542c5e6e75dcac7cc33eb04aaeb237",
-                "sha256:2c3406b63232fc7e9b8783ab0b765d7c59e7c59ff96759d8ef9632fca27c7ee4",
-                "sha256:2c86bf781b12ba417f64f3422cfc302523ac9cd1d8ae8c0f92a1c66e56ef2e86",
-                "sha256:2d9b8d9177afaef80c53c0a9e30fa252ff3036fb1c6494d427c066a4ce6a282f",
-                "sha256:2dec2d1130a9cda5b904696cec33b2cfb451304ba9081eeda7f90f724097300a",
-                "sha256:2dfab5fa6a28a0b60a20638dc48e6343c02ea9933e3279ccb132f555a62323d8",
-                "sha256:2ecdd78ab768f844c7a1d4a03595038c166b609f6395e25af9b0f3f26ae1230f",
-                "sha256:315f9542011b2c4e1d280e4a20ddcca1761993dda3afc7a73b01235f8641e903",
-                "sha256:36aef61a1678cb778097b4a6eeae96a69875d51d1e8f4d4b491ab3cfb54b5a03",
-                "sha256:384aacddf2e5813a36495233b64cb96b1949da72bef933918ba5c84e06af8f0e",
-                "sha256:3879cc6ce938ff4eb4900d901ed63555c778731a96365e53fadb36437a131a99",
-                "sha256:3c174dc350d3ec52deb77f2faf05c439331d6ed5e702fc247ccb4e6b62d884b7",
-                "sha256:3eb44520c4724c2e1a57c0af33a379eee41792595023f367ba3952a2d96c2aab",
-                "sha256:406246b96d552e0503e17a1006fd27edac678b3fcc9f1be71a2f94b4ff61528d",
-                "sha256:41ce1f1e2c7755abfc7e759dc34d7d05fd221723ff822947132dc934d122fe22",
-                "sha256:423b121f7e6fa514ba0c7918e56955a1d4470ed35faa03e3d9f0e3baa4c7e492",
-                "sha256:44264ecae91b30e5633013fb66f6ddd05c006d3e0e884f75ce0b4755b3e3847b",
-                "sha256:482c2f67761868f0108b1743098640fbb2a28a8e15bf3f47ada9fa59d9fe08c3",
-                "sha256:4b0c7a688944891086ba192e21c5229dea54382f4836a209ff8d0a660fac06be",
-                "sha256:4c1fefd7e3d00921c44dc9ca80a775af49698bbfd92ea84498e56acffd4c5469",
-                "sha256:4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f",
-                "sha256:501d0d7e26b4d261fca8132854d845e4988097611ba2531408ec91cf3fd9d20a",
-                "sha256:516f491c834eb320d6c843156440fe7fc0d50b33e44387fcec5b02f0bc118a4c",
-                "sha256:51806cfe0279e06ed8500ce19479d757db42a30fd509940b1701be9c86a5ff9a",
-                "sha256:562e7494778a69086f0312ec9689f6b6ac1c6b65670ed7d0267e49f57ffa08c4",
-                "sha256:56b9861a71575f5795bde89256e7467ece3d339c9b43141dbdd54544566b3b94",
-                "sha256:5b8f5db71b28b8c404956ddf79575ea77aa8b1538e8b2ef9ec877945b3f46442",
-                "sha256:5c2fb570d7823c2bbaf8b419ba6e5662137f8166e364a8b2b91051a1fb40ab8b",
-                "sha256:5c54afdcbb0182d06836cc3d1be921e540be3ebdf8b8a51ee3ef987537455f84",
-                "sha256:5d6a6972b93c426ace71e0be9a6f4b2cfae9b1baed2eed2006076a746692288c",
-                "sha256:609251a0ca4770e5a8768ff902aa02bf636339c5a93f9349b48eb1f606f7f3e9",
-                "sha256:62d172f358f33a26d6b41b28c170c63886742f5b6772a42b59b4f0fa10526cb1",
-                "sha256:62f7fdb0d1ed2065451f086519865b4c90aa19aed51081979ecd05a21eb4d1be",
-                "sha256:658f2aa69d31e09699705949b5fc4719cbecbd4a97f9656a232e7d6c7be1a367",
-                "sha256:65ab5685d56914b9a2a34d67dd5488b83213d680b0c5d10b47f81da5a16b0b0e",
-                "sha256:68934b242c51eb02907c5b81d138cb977b2129a0a75a8f8b60b01cb8586c7b21",
-                "sha256:68b87753c784d6acb8a25b05cb526c3406913c9d988d51f80adecc2b0775d6aa",
-                "sha256:69959bd3167b993e6e710b99051265654133a98f20cec1d9b493b931942e9c16",
-                "sha256:6a7095eeec6f89111d03dabfe5883a1fd54da319c94e0fb104ee8f23616b572d",
-                "sha256:6b038cc86b285e4f9fea2ba5ee76e89f21ed1ea898e287dc277a25884f3a7dfe",
-                "sha256:6ba0d3dcac281aad8a0e5b14c7ed6f9fa89c8612b47939fc94f80b16e2e9bc83",
-                "sha256:6e91cf736959057f7aac7adfc83481e03615a8e8dd5758aa1d95ea69e8931dba",
-                "sha256:6ee8c39582d2652dcd516d1b879451500f8db3fe3607ce45d7c5957ab2596040",
-                "sha256:6f651ebd0b21ec65dfca93aa629610a0dbc13dbc13554f19b0113da2e61a4763",
-                "sha256:71a8dd38fbd2f2319136d4ae855a7078c69c9a38ae06e0c17c73fd70fc6caad8",
-                "sha256:74068c601baff6ff021c70f0935b0c7bc528baa8ea210c202e03757c68c5a4ff",
-                "sha256:7437237c6a66b7ca341e868cda48be24b8701862757426852c9b3186de1da8a2",
-                "sha256:747a3d3e98e24597981ca0be0fd922aebd471fa99d0043a3842d00cdcad7ad6a",
-                "sha256:74bcb423462233bc5d6066e4e98b0264e7c1bed7541fff2f4e34fe6b21563c8b",
-                "sha256:78d9b952e07aed35fe2e1a7ad26e929595412db48535921c5013edc8aa4a35ce",
-                "sha256:7b1cd427cb0d5f7393c31b7496419da594fe600e6fdc4b105a54f82405e6626c",
-                "sha256:7d3d1ca42870cdb6d0d29939630dbe48fa511c203724820fc0fd507b2fb46577",
-                "sha256:7e2f58095acc211eb9d8b5771bf04df9ff37d6b87618d1cbf85f92399c98dae8",
-                "sha256:7f41026c1d64043a36fda21d64c5026762d53a77043e73e94b71f0521939cc71",
-                "sha256:81b4e48da4c69313192d8c8d4311e5d818b8be1afe68ee20f6385d0e96fc9512",
-                "sha256:86a6b24b19eaebc448dc56b87c4865527855145d851f9fc3891673ff97950540",
-                "sha256:874a216bf6afaf97c263b56371434e47e2c652d215788396f60477540298218f",
-                "sha256:89e043f1d9d341c52bf2af6d02e6adde62e0a46e6755d5eb60dc6e4f0b8aeca2",
-                "sha256:8c72e9563347c7395910de6a3100a4840a75a6f60e05af5e58566868d5eb2d6a",
-                "sha256:8dc2c0395bea8254d8daebc76dcf8eb3a95ec2a46fa6fae5eaccee366bfe02ce",
-                "sha256:8f0de2d390af441fe8b2c12626d103540b5d850d585b18fcada58d972b74a74e",
-                "sha256:92e67a0be1639c251d21e35fe74df6bcc40cba445c2cda7c4a967656733249e2",
-                "sha256:94d6c3782907b5e40e21cadf94b13b0842ac421192f26b84c45f13f3c9d5dc27",
-                "sha256:97acf1e1fd66ab53dacd2c35b319d7e548380c2e9e8c54525c6e76d21b1ae3b1",
-                "sha256:9ada35dd21dc6c039259596b358caab6b13f4db4d4a7f8665764d616daf9cc1d",
-                "sha256:9c52100e2c2dbb0649b90467935c4b0de5528833c76a35ea1a2691ec9f1ee7a1",
-                "sha256:9e41506fec7a7f9405b14aa2d5c8abbb4dbbd09d88f9496958b6d00cb4d45330",
-                "sha256:9e4b47ac0f5e749cfc618efdf4726269441014ae1d5583e047b452a32e221920",
-                "sha256:9fb81d2824dff4f2e297a276297e9031f46d2682cafc484f49de182aa5e5df99",
-                "sha256:a0eabd0a81625049c5df745209dc7fcef6e2aea7793e5f003ba363610aa0a3ff",
-                "sha256:a3d819eb6f9b8677f57f9664265d0a10dd6551d227afb4af2b9cd7bdc2ccbf18",
-                "sha256:a87de7dd873bf9a792bf1e58b1c3887b9264036629a5bf2d2e6579fe8e73edff",
-                "sha256:aa617107a410245b8660028a7483b68e7914304a6d4882b5ff3d2d3eb5948d8c",
-                "sha256:aac0bbd3e8dd2d9c45ceb82249e8bdd3ac99131a32b4d35c8af3cc9db1657179",
-                "sha256:ab6dd83b970dc97c2d10bc71aa925b84788c7c05de30241b9e96f9b6d9ea3080",
-                "sha256:ace2c2326a319a0bb8a8b0e5b570c764962e95818de9f259ce814ee666603f19",
-                "sha256:ae5fe5c4b525aa82b8076c1a59d642c17b6e8739ecf852522c6321852178119d",
-                "sha256:b11a5d918a6216e521c715b02749240fb07ae5a1fefd4b7bf12f833bc8b4fe70",
-                "sha256:b1c8c20847b9f34e98080da785bb2336ea982e7f913eed5809e5a3c872900f32",
-                "sha256:b369d3db3c22ed14c75ccd5af429086f166a19627e84a8fdade3f8f31426e52a",
-                "sha256:b710bc2b8292966b23a6a0121f7a6c51d45d2347edcc75f016ac123b8054d3f2",
-                "sha256:bd96517ef76c8654446fc3db9242d019a1bb5fe8b751ba414765d59f99210b79",
-                "sha256:c00f323cc00576df6165cc9d21a4c21285fa6b9989c5c39830c3903dc4303ef3",
-                "sha256:c162b216070f280fa7da844531169be0baf9ccb17263cf5a8bf876fcd3117fa5",
-                "sha256:c1a69e58a6bb2de65902051d57fde951febad631a20a64572677a1052690482f",
-                "sha256:c1f794c02903c2824fccce5b20c339a1a14b114e83b306ff11b597c5f71a1c8d",
-                "sha256:c24037349665434f375645fa9d1f5304800cec574d0310f618490c871fd902b3",
-                "sha256:c300306673aa0f3ed5ed9372b21867690a17dba38c68c44b287437c362ce486b",
-                "sha256:c56a1d43b2f9ee4786e4658c7903f05da35b923fb53c11025712562d5cc02753",
-                "sha256:c6379f35350b655fd817cd0d6cbeef7f265f3ae5fedb1caae2eb442bbeae9ab9",
-                "sha256:c802e1c2ed9f0c06a65bc4ed0189d000ada8049312cfeab6ca635e39c9608957",
-                "sha256:cb83f8a875b3d9b458cada4f880fa498646874ba4011dc974e071a0a84a1b033",
-                "sha256:cf120cce539453ae086eacc0130a324e7026113510efa83ab42ef3fcfccac7fb",
-                "sha256:dd36439be765e2dde7660212b5275641edbc813e7b24668831a5c8ac91180656",
-                "sha256:dd5350b55f9fecddc51385463a4f67a5da829bc741e38cf689f38ec9023f54ab",
-                "sha256:df5c7333167b9674aa8ae1d4008fa4bc17a313cc490b2cca27838bbdcc6bb15b",
-                "sha256:e63601ad5cd8f860aa99d109889b5ac34de571c7ee902d6812d5d9ddcc77fa7d",
-                "sha256:e92ce66cd919d18d14b3856906a61d3f6b6a8500e0794142338da644260595cd",
-                "sha256:e99f5507401436fdcc85036a2e7dc2e28d962550afe1cbfc07c40e454256a859",
-                "sha256:ea2e2f6f801696ad7de8aec061044d6c8c0dd4037608c7cab38a9a4d316bfb11",
-                "sha256:eafa2c8658f4e560b098fe9fc54539f86528651f61849b22111a9b107d18910c",
-                "sha256:ecd4ad8453ac17bc7ba3868371bffb46f628161ad0eefbd0a855d2c8c32dd81a",
-                "sha256:ee70d08fd60c9565ba8190f41a46a54096afa0eeb8f76bd66f2c25d3b1b83005",
-                "sha256:eec1bb8cdbba2925bedc887bc0609a80e599c75b12d87ae42ac23fd199445654",
-                "sha256:ef0c1fe22171dd7c7c27147f2e9c3e86f8bdf473fed75f16b0c2e84a5030ce80",
-                "sha256:f2901429da1e645ce548bf9171784c0f74f0718c3f6150ce166be39e4dd66c3e",
-                "sha256:f422a209d2455c56849442ae42f25dbaaba1c6c3f501d58761c619c7836642ec",
-                "sha256:f65e5120863c2b266dbcc927b306c5b78e502c71edf3295dfcb9501ec96e5fc7",
-                "sha256:f7d4a670107d75dfe5ad080bed6c341d18c4442f9378c9f58e5851e86eb79965",
-                "sha256:f914c03e6a31deb632e2daa881fe198461f4d06e57ac3d0e05bbcab8eae01945",
-                "sha256:fb66442c2546446944437df74379e9cf9e9db353e61301d1a0e26482f43f0dd8"
+                "sha256:04ab5415bf6c86e0518d57240a96c4d1fcfc3cb370bb2ac2a732b67f579e5a04",
+                "sha256:057cdc6b86ab732cf361f8b4d8af87cf195a1f6dc5b0ff3de2dced242c2015e0",
+                "sha256:058a1308914f20784c9f4674036527e7c04f7be6fb60f5d61353545aa7fcb739",
+                "sha256:08802f0c56ed150cc6885ae0788a321b73505d2263ee56dad84d200cab11c07a",
+                "sha256:0a15438253b34e6362b2dc41475e7f80de76320f335e70c5528b7148cac253a1",
+                "sha256:0c3f67e2aeda739d1cc0b1102c9a9129f7dc83901226cc24dd72ba275ced4218",
+                "sha256:0e7259016bc4345a31af861fdce942b77c99049d6c2107ca07dc2bba2435c1d9",
+                "sha256:0ed777c1e8c99b63037b91f9d73a6aad20fd035d77ac84afcc205225f8f41188",
+                "sha256:0f5d65c39f16717a47c36c756af0fb36144069c4718824b7533f803ecdf91138",
+                "sha256:0f8c09ed18ecb4ebf23e02b8e7a22a05d6411911e6fabef3a36e4f371f4f2585",
+                "sha256:11a04306fcba10cd9637e669fd73aa274c1c09ca64af79c041aa820ea992b637",
+                "sha256:1ae67b4e737cddc96c99461d2f75d218bdf7a0c3d3ad5604d1f5e7464a2f9ffe",
+                "sha256:1c5bb205e9212d0ebddf946bc07e73fa245c864a5f90f341d11ce7b0b854475d",
+                "sha256:1f7785f4f789fdb522729ae465adcaa099e2a3441519df750ebdccc481d961a1",
+                "sha256:200e63525948e325d6a13a76ba2911f927ad399ef64f57898cf7c74e69b71095",
+                "sha256:21c2e6b09565ba5b45ae161b438e033a86ad1736b8c838c766146eff8ceffff9",
+                "sha256:2213afee476546a7f37c7a9b4ad4d74b1e112a6fafffc9185d6d21f043128c81",
+                "sha256:27aa20d45c2e0b8cd05da6d4759649170e8dfc4f4e5ef33a34d06f2d79075d57",
+                "sha256:2a66bf12fbd4666dd023b6f51223aed3d9f3b40fef06ce404cb75bafd3d89536",
+                "sha256:2c9d147f754b1b0e723e6afb7ba1566ecb162fe4ea657f53d2139bbf894d050a",
+                "sha256:2ddfe41ddc81f29a4c44c8ce239eda5ade4e7fc305fb7311759dd6229a080052",
+                "sha256:31e9a882013c2f6bd2f2c974241bf4ba68c85eba943648ce88936d23209a2e01",
+                "sha256:3249cc2989d9090eeac5467e50e9ec2d40704fea9ab72f36b034ea34ee65ca98",
+                "sha256:3545039fa4779be2df51d6395e91a810f57122290864918b172d5dc7ca5bb433",
+                "sha256:394ed3924d7a01b5bd9a0d9d946136e1c2f7b3dc337196d99e61740ed4bc6fe1",
+                "sha256:3a6b45da02336895da82b9d472cd274b22dc27a5cea1d4b793874eead23dd14f",
+                "sha256:3a74c4f27167cb95c1d4af1c0b59e88b7f3e0182138db2501c353555f7ec57f4",
+                "sha256:3d0c3dd24bb4605439bf91068598d00c6370684f8de4a67c2992683f6c309d6b",
+                "sha256:3dbe858ee582cbb2c6294dc85f55b5f19c918c2597855e950f34b660f1a5ede6",
+                "sha256:3dc773b2861b37b41a6136e0b72a1a44689a9c4c101e0cddb6b854016acc0aa8",
+                "sha256:3f7765e69bbce0906a7c74d5fe46d2c7a7596147318dbc08e4a2431f3060e306",
+                "sha256:417d14450f06d51f363e41cace6488519038f940676ce9664b34ebf5653433a5",
+                "sha256:44f6c7caff88d988db017b9b0e4ab04934f11e3e72d478031efc7edcac6c622f",
+                "sha256:491755202eb21a5e350dae00c6d9a17247769c64dcf62d8c788b5c135e179dc4",
+                "sha256:4951e4f7a5680a2db62f7f4ab2f84617674d36d2d76a729b9a8be4b59b3659be",
+                "sha256:52421b41ac99e9d91934e4d0d0fe7da9f02bfa7536bb4431b4c05c906c8c6919",
+                "sha256:530e7c04f72002d2f334d5257c8a51bf409db0316feee7c87e4385043be136af",
+                "sha256:533658f8fbf056b70e434dff7e7aa611bcacb33e01f75de7f821810e48d1bb66",
+                "sha256:5670fb70a828663cc37552a2a85bf2ac38475572b0e9b91283dc09efb52c41d1",
+                "sha256:56c22432809085b3f3ae04e6e7bdd36883d7258fcd90e53ba7b2e463efc7a6af",
+                "sha256:58278b29cb89f3e43ff3e0c756abbd1518f3ee6adad9e35b51fb101c1c1daaec",
+                "sha256:588008b8497667f1ddca7c99f2f85ce8511f8f7871b4a06ceede68ab62dff64b",
+                "sha256:59565f10607c244bc4c05c0c5fa0c190c990996e0c719d05deec7030c2aa8289",
+                "sha256:59689a75ba8d7ffca577aefd017d08d659d86ad4585ccc73e43edbfc7476781a",
+                "sha256:5aea8212fb823e006b995c4dda533edcf98a893d941f173f6c9506126188860d",
+                "sha256:5c670c0406bdc845b474b680b9a5456c561c65cf366f8db5a60154088c92d102",
+                "sha256:5ca1e8188b26a819387b29c3895c47a5e618708fe6f787f3b1a471de2c4a94d9",
+                "sha256:5d077bc40a1fe984e1a9931e801e42959a1e6598edc8a3223b061d30fbd26bbc",
+                "sha256:5d5792e9b3fb8d16a19f46aa8208987cfeafe082363ee2745ea8b643d9cc5b45",
+                "sha256:5dd1537e7cc06efd81371f5d1a992bd5ab156b2b4f88834ca852de4a8ea523fa",
+                "sha256:5ea7b6766ac2dfe4bcac8b8595107665a18ef01f8c8343f00710b85096d1b53a",
+                "sha256:622020d4521e22fb371e15f580d153134bfb68d6a429d1342a25f051ec72df1c",
+                "sha256:627402ad8dea044dde2eccde4370560a2b750ef894c9578e1d4f8ffd54000461",
+                "sha256:644df54d729ef810dcd0f7732e50e5ad1bd0a135278ed8d6bcb06f33b6b6f708",
+                "sha256:64641a6068a16201366476731301441ce93457eb8452056f570133a6ceb15fca",
+                "sha256:64c2baa7774bc22dd4474248ba16fe1a7f611c13ac6123408694d4cc93d66dbd",
+                "sha256:6588c459c5627fefa30139be4d2e28a2c2a1d0d1c265aad2ba1935a7863a4913",
+                "sha256:66bc5eb8a323ed9894f8fa0ee6cb3e3fb2403d99aee635078fd19a8bc7a5a5da",
+                "sha256:68a2610dbe138fa8c5826b3f6d98a7cfc29707b850ddcc3e21910a6fe51f6ca0",
+                "sha256:6935bbf153f9a965f1e07c2649c0849d29832487c52bb4a5c5066031d8b44fd5",
+                "sha256:6992030d43b916407c9aa52e9673612ff39a575523c5f4cf72cdef75365709a5",
+                "sha256:6a014510830df1475176466b6087fc0c08b47a36714823e58d8b8d7709132a96",
+                "sha256:6ab833e4735a7e5533711a6ea2df26459b96f9eec36d23f74cafe03631647c41",
+                "sha256:6cc6ee342fb7fa2471bd9b6d6fdfc78925a697bf5c2bcd0a302e98b0d35bfad3",
+                "sha256:6cf58416653c5901e12624e4013708b6e11142956e7f35e7a83f1ab02f3fe456",
+                "sha256:70a9768e1b9d79edca17890175ba915654ee1725975d69ab64813dd785a2bd5c",
+                "sha256:70ac664a48aa64e5e635ae5566f5227f2ab7f66a3990d67566d9907edcbbf867",
+                "sha256:71e97313406ccf55d32cc98a533ee05c61e15d11b99215b237346171c179c0b0",
+                "sha256:7221d49259aa1e5a8f00d3d28b1e0b76031655ca74bb287123ef56c3db92f213",
+                "sha256:74b28c6334cca4dd704e8004cba1955af0b778cf449142e581e404bd211fb619",
+                "sha256:764b521b75701f60683500d8621841bec41a65eb739b8466000c6fdbc256c240",
+                "sha256:78bfa756eab503673991bdcf464917ef7845a964903d3302c5f68417ecdc948c",
+                "sha256:794f04eec78f1d0e35d9e0c36cbbb22e42d370dda1609fb03bcd7aeb458c6377",
+                "sha256:79bd05260359170f78b181b59ce871673ed01ba048deef4bf49a36ab3e72e80b",
+                "sha256:7a7efd5b6d3e30d81ec68ab8a88252d7c7c6f13aaa875009fe3097eb4e30b84c",
+                "sha256:7c17b64b0a6ef4e5affae6a3724010a7a66bda48a62cfe0674dabd46642e8b54",
+                "sha256:804f74efe22b6a227306dd890eecc4f8c59ff25ca35f1f14e7482bbce96ef10b",
+                "sha256:853e074d4931dbcba7480d4dcab23d5c56bd9607f92825ab80ee2bd916edea53",
+                "sha256:857500f88b17a6479202ff5fe5f580fc3404922cd02ab3716197adf1ef628029",
+                "sha256:865bad62df277c04beed9478fe665b9ef63eb28fe026d5dedcb89b537d2e2ea6",
+                "sha256:88e22fc0a6684337d25c994381ed8a1580a6f5ebebd5ad41f89f663ff4ec2885",
+                "sha256:8b9c07e7a45bb64e21df4b6aa623cb8ba214dfb47d2027d90eac197329bb5e94",
+                "sha256:8de8f9d6caa7f25b204fc861718815d41cbcf27ee8f028c89c882a0cf4ae4134",
+                "sha256:8e77c69d5892cb5ba71703c4057091e31ccf534bd7f129307a4d084d90d014b8",
+                "sha256:9123716666e25b7b71c4e1789ec829ed18663152008b58544d95b008ed9e21e9",
+                "sha256:958244ad566c3ffc385f47dddde4145088a0ab893504b54b52c041987a8c1863",
+                "sha256:96323338e6c14e958d775700ec8a88346014a85e5de73ac7967db0367582049b",
+                "sha256:9676bfc686fa6a3fa10cd4ae6b76cae8be26eb5ec6811d2a325636c460da1806",
+                "sha256:9b0ff53900566bc6325ecde9181d89afadc59c5ffa39bddf084aaedfe3b06a11",
+                "sha256:9b9ec9c9978b708d488bec36b9e4c94d88fd12ccac3e62134a9d17ddba910ea9",
+                "sha256:9c6ad0fbf105f6bcc9300c00010a2ffa44ea6f555df1a2ad95c88f5656104817",
+                "sha256:9ca66b8e90daca431b7ca1408cae085d025326570e57749695d6a01454790e95",
+                "sha256:9e2addd2d1866fe112bc6f80117bcc6bc25191c5ed1bfbcf9f1386a884252ae8",
+                "sha256:a0af35bd8ebf84888373630f73f24e86bf016642fb8576fba49d3d6b560b7cbc",
+                "sha256:a2b44bec7adf3e9305ce6cbfa47a4395667e744097faed97abb4728748ba7d47",
+                "sha256:a2dfe7e2473f9b59496247aad6e23b405ddf2e12ef0765677b0081c02d6c2c0b",
+                "sha256:a55ee573116ba208932e2d1a037cc4b10d2c1cb264ced2184d00b18ce585b2c0",
+                "sha256:a7baf9ffc238e4bf401299f50e971a45bfcc10a785522541a6e3179c83eabf0a",
+                "sha256:a8d5c70e04aac1eda5c829a26d1f75c6e5286c74743133d9f742cda8e53b9c2f",
+                "sha256:a91481dbcddf1736c98a80b122afa0f7296eeb80b72344d7f45dc9f781551f56",
+                "sha256:ab31a88a651039a07a3ae327d68ebdd8bc589b16938c09ef3f32a4b809dc96ef",
+                "sha256:abc25c3cab9ec7fcd299b9bcb3b8d4a1231877e425c650fa1c7576c5107ab851",
+                "sha256:adfb84ca6b87e06bc6b146dc7da7623395db1e31621c4785ad0658c5028b37d7",
+                "sha256:afbbdb120d1e78d2ba8064a68058001b871154cc57787031b645c9142b937a62",
+                "sha256:afd5562927cdef7c4f5550374acbc117fd4ecc05b5007bdfa57cc5355864e0a4",
+                "sha256:b070bbe8d3f0f6147689bed981d19bbb33070225373338df755a46893528104a",
+                "sha256:b0b58fbfa1bf7367dde8a557994e3b1637294be6cf2169810375caf8571a085c",
+                "sha256:b560e3aa4b1d49e0e6c847d72665384db35b2f5d45f8e6a5c0072e0283430533",
+                "sha256:b6241d4eee5f89453307c2f2bfa03b50362052ca0af1efecf9fef9a41a22bb4f",
+                "sha256:b6787b643356111dfd4032b5bffe26d2f8331556ecb79e15dacb9275da02866e",
+                "sha256:bcbf4af004f98793a95355980764b3d80d47117678118a44a80b721c9913436a",
+                "sha256:beb72935a941965c52990f3a32d7f07ce869fe21c6af8b34bf6a277b33a345d3",
+                "sha256:bf2e2458345d9bffb0d9ec16557d8858c9c88d2d11fed53998512504cd9df49b",
+                "sha256:c2d35a1d047efd68027817b32ab1586c1169e60ca02c65d428ae815b593e65d4",
+                "sha256:c38d7b9a690b090de999835f0443d8aa93ce5f2064035dfc48f27f02b4afc3d0",
+                "sha256:c6f2c8372b98208ce609c9e1d707f6918cc118fea4e2c754c9f0812c04ca116d",
+                "sha256:c817d420c60a5183953c783b0547d9eb43b7b344a2c46f69513d5952a78cddf3",
+                "sha256:c8ba129e6d3b0136a0f50345b2cb3db53f6bda5dd8c7f5d83fbccba97fb5dcb5",
+                "sha256:c94e75445b00319c1fad60f3c98b09cd63fe1134a8a953dcd48989ef42318534",
+                "sha256:cc4691d60512798304acb9207987e7b2b7c44627ea88b9d77489bbe3e6cc3bd4",
+                "sha256:cc518cea79fd1e2f6c90baafa28906d4309d24f3a63e801d855e7424c5b34144",
+                "sha256:cd53553ddad4a9c2f1f022756ae64abe16da1feb497edf4d9f87f99ec7cf86bd",
+                "sha256:cf22b41fdae514ee2f1691b6c3cdeae666d8b7fa9434de445f12bbeee0cf48dd",
+                "sha256:d38c8f50ecf57f0463399569aa388b232cf1a2ffb8f0a9a5412d0db57e054860",
+                "sha256:d3be9b2076112e51b323bdf6d5a7f8a798de55fb8d95fcb64bd179460cdc0704",
+                "sha256:d4f2cc7060dc3646632d7f15fe68e2fa98f58e35dd5666cd525f3b35d3fed7f8",
+                "sha256:d7520db34088c96cc0e0a3ad51a4fd5b401f279ee112aa2b7f8f976d8582606d",
+                "sha256:d793bebb202a6000390a5390078e945bbb49855c29c7e4d56a85901326c3b5d9",
+                "sha256:da052e7962ea2d5e5ef5bc0355d55007407087392cf465b7ad84ce5f3e25fe0f",
+                "sha256:dae0ed02f6b075426accbf6b2863c3d0a7eacc1b41fb40f2251d931e50188dad",
+                "sha256:ddc678fb4c7e30cf830a2b5a8d869538bc55b28d6c68544d09c7d0d8f17694dc",
+                "sha256:df2e6f546c4df14bc81f9498bbc007fbb87669f1bb707c6138878c46b06f6510",
+                "sha256:e02c5175f63effbd7c5e590399c118d5db6183bbfe8e0d118bdb5c2d1b48d937",
+                "sha256:e196a4ff48310ba62e53a8e0f97ca2bca83cdd2fe2934d8b5cb0df0a841b193a",
+                "sha256:e233db59c8f76630c512ab4a4daf5a5986da5c3d5b44b8e9fc742f2a24dbd460",
+                "sha256:e32be23d538753a8adb6c85bd539f5fd3b15cb987404327c569dfc5fd8366e85",
+                "sha256:e3d30321949861404323c50aebeb1943461a67cd51d4200ab02babc58bd06a86",
+                "sha256:e89580a581bf478d8dcb97d9cd011d567768e8bc4095f8557b21c4d4c5fea7d0",
+                "sha256:e998e304036198b4f6914e6a1e2b6f925208a20e2042563d9734881150c6c246",
+                "sha256:ec42088248c596dbd61d4ae8a5b004f97a4d91a9fd286f632e42e60b706718d7",
+                "sha256:efa7b51824aa0ee957ccd5a741c73e6851de55f40d807f08069eb4c5a26b2baa",
+                "sha256:f0a1bc63a465b6d72569a9bba9f2ef0334c4e03958e043da1920299100bc7c08",
+                "sha256:f18a5a84e16886898e51ab4b1d43acb3083c39b14c8caeb3589aabff0ee0b270",
+                "sha256:f2a9efc53d5b714b8df2b4b3e992accf8ce5bbdfe544d74d5c6766c9e1146a3a",
+                "sha256:f3bbbc998d42f8e561f347e798b85513ba4da324c2b3f9b7969e9c45b10f6169",
+                "sha256:f42038016852ae51b4088b2862126535cc4fc85802bfe30dea3500fdfaf1864e",
+                "sha256:f443cdef978430887ed55112b491f670bba6462cea7a7742ff8f14b7abb98d75",
+                "sha256:f51969bac61441fd31f028d7b3b45962f3ecebf691a510495e5d2cd8c8092dbd",
+                "sha256:f8aca2e3a72f37bfc7b14ba96d4056244001ddcc18382bd0daa087fd2e68a354",
+                "sha256:f9737bf36262046213a28e789cc82d82c6ef19c85a0cf05e75c670a33342ac2c",
+                "sha256:fd6037392f2d57793ab98d9e26798f44b8b4da2f2464388588f48ac52c489ea1",
+                "sha256:feaa45c0eae424d3e90d78823f3828e7dc42a42f21ed420db98da2c4ecf0a2cb",
+                "sha256:ff097ae562e637409b429a7ac958a20aab237a0378c42dabaa1e3abf2f896e5f",
+                "sha256:ff46d772d5f6f73564979cd77a4fffe55c916a05f3cb70e7c9c0590059fb29ef"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==5.3.0"
+            "version": "==5.2.1"
         },
         "mako": {
             "hashes": [
-                "sha256:260f1dbc3a519453a9c856dedfe4beb4e50bd5a26d96386cb6c80856556bb91a",
-                "sha256:48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc"
+                "sha256:5324b88089a8978bf76d1629774fcc2f1c07b82acdf00f4c5dd8ceadfffc4b40",
+                "sha256:e16c01d9ab9c11f7290eef1cfefc093fb5a45ee4a3da09e2fec2e4d1bae54e73"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==1.3.5"
+            "version": "==1.3.3"
+        },
+        "markuppy": {
+            "hashes": [
+                "sha256:1adee2c0a542af378fe84548ff6f6b0168f3cb7f426b46961038a2bcfaad0d5f"
+            ],
+            "version": "==1.14"
         },
         "markupsafe": {
             "hashes": [
@@ -812,11 +832,18 @@
         },
         "marshmallow": {
             "hashes": [
-                "sha256:4972f529104a220bb8637d595aa4c9762afbe7f7a77d82dc58c1615d70c5823e",
-                "sha256:71a2dce49ef901c3f97ed296ae5051135fd3febd2bf43afe0ae9a82143a494d9"
+                "sha256:4e65e9e0d80fc9e609574b9983cf32579f305c718afb30d7233ab818571768c3",
+                "sha256:f085493f79efb0644f270a9bf2892843142d80d7174bbbd2f3713f2a589dc633"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==3.22.0"
+            "version": "==3.21.1"
+        },
+        "odfpy": {
+            "hashes": [
+                "sha256:db766a6e59c5103212f3cc92ec8dd50a0f3a02790233ed0b52148b70d3c438ec",
+                "sha256:fc3b8d1bc098eba4a0fda865a76d9d1e577c4ceec771426bcb169a82c5e9dfe0"
+            ],
+            "version": "==1.4.1"
         },
         "oic": {
             "hashes": [
@@ -827,6 +854,13 @@
             "markers": "python_version ~= '3.8'",
             "version": "==1.7.0"
         },
+        "openpyxl": {
+            "hashes": [
+                "sha256:a6f5977418eff3b2d5500d54d9db50c8277a368436f4e4f8ddb1be3422870184",
+                "sha256:f91456ead12ab3c6c2e9491cf33ba6d08357d802192379bb482f1033ade496f5"
+            ],
+            "version": "==3.1.2"
+        },
         "orderedmultidict": {
             "hashes": [
                 "sha256:04070bbb5e87291cc9bfa51df413677faf2141c73c61d2a5f7b26bea3cd882ad",
@@ -836,18 +870,18 @@
         },
         "packaging": {
             "hashes": [
-                "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002",
-                "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"
+                "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5",
+                "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"
             ],
-            "markers": "python_version >= '3.8'",
-            "version": "==24.1"
+            "markers": "python_version >= '3.7'",
+            "version": "==24.0"
         },
         "phonenumberslite": {
             "hashes": [
-                "sha256:63d650f2fe464602c8b01b7e0cda6b7057811a2410cbd1d21d90374642abdc51",
-                "sha256:ab6aa6e5fa115c89ea63e3c316c764ff449f8ecb826499cfc925f6a39f29e174"
+                "sha256:343b300d9c8ac4dca84e6b922ec51c3d838f2feabf9dd2418da64b639d220879",
+                "sha256:64b513134b785fbeeaf4cc020e18d384541c4118ed3ece2118437d996f435ca0"
             ],
-            "version": "==8.13.44"
+            "version": "==8.13.35"
         },
         "psycopg2-binary": {
             "hashes": [
@@ -977,114 +1011,104 @@
         },
         "pydantic": {
             "hashes": [
-                "sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a",
-                "sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8"
+                "sha256:e029badca45266732a9a79898a15ae2e8b14840b1eabbb25844be28f0b33f3d5",
+                "sha256:e9dbb5eada8abe4d9ae5f46b9939aead650cd2b68f249bb3a8139dbe125803cc"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.8.2"
+            "version": "==2.7.1"
         },
         "pydantic-core": {
             "hashes": [
-                "sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d",
-                "sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f",
-                "sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686",
-                "sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482",
-                "sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006",
-                "sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83",
-                "sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6",
-                "sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88",
-                "sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86",
-                "sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a",
-                "sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6",
-                "sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a",
-                "sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6",
-                "sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6",
-                "sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43",
-                "sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c",
-                "sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4",
-                "sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e",
-                "sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203",
-                "sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd",
-                "sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1",
-                "sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24",
-                "sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc",
-                "sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc",
-                "sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3",
-                "sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598",
-                "sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98",
-                "sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331",
-                "sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2",
-                "sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a",
-                "sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6",
-                "sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688",
-                "sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91",
-                "sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa",
-                "sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b",
-                "sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0",
-                "sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840",
-                "sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c",
-                "sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd",
-                "sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3",
-                "sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231",
-                "sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1",
-                "sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953",
-                "sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250",
-                "sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a",
-                "sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2",
-                "sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20",
-                "sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434",
-                "sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab",
-                "sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703",
-                "sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a",
-                "sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2",
-                "sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac",
-                "sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611",
-                "sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121",
-                "sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e",
-                "sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b",
-                "sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09",
-                "sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906",
-                "sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9",
-                "sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7",
-                "sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b",
-                "sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987",
-                "sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c",
-                "sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b",
-                "sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e",
-                "sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237",
-                "sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1",
-                "sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19",
-                "sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b",
-                "sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad",
-                "sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0",
-                "sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94",
-                "sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312",
-                "sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f",
-                "sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669",
-                "sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1",
-                "sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe",
-                "sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99",
-                "sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a",
-                "sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a",
-                "sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52",
-                "sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c",
-                "sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad",
-                "sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1",
-                "sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a",
-                "sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f",
-                "sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a",
-                "sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27"
+                "sha256:0098300eebb1c837271d3d1a2cd2911e7c11b396eac9661655ee524a7f10587b",
+                "sha256:042473b6280246b1dbf530559246f6842b56119c2926d1e52b631bdc46075f2a",
+                "sha256:05b7133a6e6aeb8df37d6f413f7705a37ab4031597f64ab56384c94d98fa0e90",
+                "sha256:0680b1f1f11fda801397de52c36ce38ef1c1dc841a0927a94f226dea29c3ae3d",
+                "sha256:0d69b4c2f6bb3e130dba60d34c0845ba31b69babdd3f78f7c0c8fae5021a253e",
+                "sha256:1404c69d6a676245199767ba4f633cce5f4ad4181f9d0ccb0577e1f66cf4c46d",
+                "sha256:182245ff6b0039e82b6bb585ed55a64d7c81c560715d1bad0cbad6dfa07b4027",
+                "sha256:1a388a77e629b9ec814c1b1e6b3b595fe521d2cdc625fcca26fbc2d44c816804",
+                "sha256:1d90c3265ae107f91a4f279f4d6f6f1d4907ac76c6868b27dc7fb33688cfb347",
+                "sha256:20aca1e2298c56ececfd8ed159ae4dde2df0781988c97ef77d5c16ff4bd5b400",
+                "sha256:219da3f096d50a157f33645a1cf31c0ad1fe829a92181dd1311022f986e5fbe3",
+                "sha256:22057013c8c1e272eb8d0eebc796701167d8377441ec894a8fed1af64a0bf399",
+                "sha256:223ee893d77a310a0391dca6df00f70bbc2f36a71a895cecd9a0e762dc37b349",
+                "sha256:224c421235f6102e8737032483f43c1a8cfb1d2f45740c44166219599358c2cd",
+                "sha256:2334ce8c673ee93a1d6a65bd90327588387ba073c17e61bf19b4fd97d688d63c",
+                "sha256:269322dcc3d8bdb69f054681edff86276b2ff972447863cf34c8b860f5188e2e",
+                "sha256:2728b01246a3bba6de144f9e3115b532ee44bd6cf39795194fb75491824a1413",
+                "sha256:2b8ed04b3582771764538f7ee7001b02e1170223cf9b75dff0bc698fadb00cf3",
+                "sha256:2e29d20810dfc3043ee13ac7d9e25105799817683348823f305ab3f349b9386e",
+                "sha256:36789b70d613fbac0a25bb07ab3d9dba4d2e38af609c020cf4d888d165ee0bf3",
+                "sha256:390193c770399861d8df9670fb0d1874f330c79caaca4642332df7c682bf6b91",
+                "sha256:3a6515ebc6e69d85502b4951d89131ca4e036078ea35533bb76327f8424531ce",
+                "sha256:3f9a801e7c8f1ef8718da265bba008fa121243dfe37c1cea17840b0944dfd72c",
+                "sha256:43f0f463cf89ace478de71a318b1b4f05ebc456a9b9300d027b4b57c1a2064fb",
+                "sha256:4456f2dca97c425231d7315737d45239b2b51a50dc2b6f0c2bb181fce6207664",
+                "sha256:470b94480bb5ee929f5acba6995251ada5e059a5ef3e0dfc63cca287283ebfa6",
+                "sha256:4774f3184d2ef3e14e8693194f661dea5a4d6ca4e3dc8e39786d33a94865cefd",
+                "sha256:4b4356d3538c3649337df4074e81b85f0616b79731fe22dd11b99499b2ebbdf3",
+                "sha256:553ef617b6836fc7e4df130bb851e32fe357ce36336d897fd6646d6058d980af",
+                "sha256:6132dd3bd52838acddca05a72aafb6eab6536aa145e923bb50f45e78b7251043",
+                "sha256:6a46e22a707e7ad4484ac9ee9f290f9d501df45954184e23fc29408dfad61350",
+                "sha256:6e5c584d357c4e2baf0ff7baf44f4994be121e16a2c88918a5817331fc7599d7",
+                "sha256:75250dbc5290e3f1a0f4618db35e51a165186f9034eff158f3d490b3fed9f8a0",
+                "sha256:75f7e9488238e920ab6204399ded280dc4c307d034f3924cd7f90a38b1829563",
+                "sha256:78363590ef93d5d226ba21a90a03ea89a20738ee5b7da83d771d283fd8a56761",
+                "sha256:7ca4ae5a27ad7a4ee5170aebce1574b375de390bc01284f87b18d43a3984df72",
+                "sha256:800d60565aec896f25bc3cfa56d2277d52d5182af08162f7954f938c06dc4ee3",
+                "sha256:82d5d4d78e4448683cb467897fe24e2b74bb7b973a541ea1dcfec1d3cbce39fb",
+                "sha256:852e966fbd035a6468fc0a3496589b45e2208ec7ca95c26470a54daed82a0788",
+                "sha256:868649da93e5a3d5eacc2b5b3b9235c98ccdbfd443832f31e075f54419e1b96b",
+                "sha256:886eec03591b7cf058467a70a87733b35f44707bd86cf64a615584fd72488b7c",
+                "sha256:8b172601454f2d7701121bbec3425dd71efcb787a027edf49724c9cefc14c038",
+                "sha256:95b9d5e72481d3780ba3442eac863eae92ae43a5f3adb5b4d0a1de89d42bb250",
+                "sha256:98758d627ff397e752bc339272c14c98199c613f922d4a384ddc07526c86a2ec",
+                "sha256:997abc4df705d1295a42f95b4eec4950a37ad8ae46d913caeee117b6b198811c",
+                "sha256:9b5155ff768083cb1d62f3e143b49a8a3432e6789a3abee8acd005c3c7af1c74",
+                "sha256:9e08e867b306f525802df7cd16c44ff5ebbe747ff0ca6cf3fde7f36c05a59a81",
+                "sha256:9fdad8e35f278b2c3eb77cbdc5c0a49dada440657bf738d6905ce106dc1de439",
+                "sha256:a1874c6dd4113308bd0eb568418e6114b252afe44319ead2b4081e9b9521fe75",
+                "sha256:a8309f67285bdfe65c372ea3722b7a5642680f3dba538566340a9d36e920b5f0",
+                "sha256:ae0a8a797a5e56c053610fa7be147993fe50960fa43609ff2a9552b0e07013e8",
+                "sha256:b14d82cdb934e99dda6d9d60dc84a24379820176cc4a0d123f88df319ae9c150",
+                "sha256:b1bd7e47b1558ea872bd16c8502c414f9e90dcf12f1395129d7bb42a09a95438",
+                "sha256:b3ef08e20ec49e02d5c6717a91bb5af9b20f1805583cb0adfe9ba2c6b505b5ae",
+                "sha256:b89ed9eb7d616ef5714e5590e6cf7f23b02d0d539767d33561e3675d6f9e3857",
+                "sha256:c4fcf5cd9c4b655ad666ca332b9a081112cd7a58a8b5a6ca7a3104bc950f2038",
+                "sha256:c6fdc8627910eed0c01aed6a390a252fe3ea6d472ee70fdde56273f198938374",
+                "sha256:c9bd70772c720142be1020eac55f8143a34ec9f82d75a8e7a07852023e46617f",
+                "sha256:ca7b0c1f1c983e064caa85f3792dd2fe3526b3505378874afa84baf662e12241",
+                "sha256:cbca948f2d14b09d20268cda7b0367723d79063f26c4ffc523af9042cad95592",
+                "sha256:cc1cfd88a64e012b74e94cd00bbe0f9c6df57049c97f02bb07d39e9c852e19a4",
+                "sha256:ccdd111c03bfd3666bd2472b674c6899550e09e9f298954cfc896ab92b5b0e6d",
+                "sha256:cfeecd1ac6cc1fb2692c3d5110781c965aabd4ec5d32799773ca7b1456ac636b",
+                "sha256:d4d938ec0adf5167cb335acb25a4ee69a8107e4984f8fbd2e897021d9e4ca21b",
+                "sha256:d7d904828195733c183d20a54230c0df0eb46ec746ea1a666730787353e87182",
+                "sha256:d91cb5ea8b11607cc757675051f61b3d93f15eca3cefb3e6c704a5d6e8440f4e",
+                "sha256:d9319e499827271b09b4e411905b24a426b8fb69464dfa1696258f53a3334641",
+                "sha256:e0e8b1be28239fc64a88a8189d1df7fad8be8c1ae47fcc33e43d4be15f99cc70",
+                "sha256:e18609ceaa6eed63753037fc06ebb16041d17d28199ae5aba0052c51449650a9",
+                "sha256:e1b395e58b10b73b07b7cf740d728dd4ff9365ac46c18751bf8b3d8cca8f625a",
+                "sha256:e23ec367a948b6d812301afc1b13f8094ab7b2c280af66ef450efc357d2ae543",
+                "sha256:e25add29b8f3b233ae90ccef2d902d0ae0432eb0d45370fe315d1a5cf231004b",
+                "sha256:e6dac87ddb34aaec85f873d737e9d06a3555a1cc1a8e0c44b7f8d5daeb89d86f",
+                "sha256:ef26c9e94a8c04a1b2924149a9cb081836913818e55681722d7f29af88fe7b38",
+                "sha256:eff2de745698eb46eeb51193a9f41d67d834d50e424aef27df2fcdee1b153845",
+                "sha256:f0a21cbaa69900cbe1a2e7cad2aa74ac3cf21b10c3efb0fa0b80305274c0e8a2",
+                "sha256:f459a5ce8434614dfd39bbebf1041952ae01da6bed9855008cb33b875cb024c0",
+                "sha256:f93a8a2e3938ff656a7c1bc57193b1319960ac015b6e87d76c76bf14fe0244b4",
+                "sha256:fb2bd7be70c0fe4dfd32c951bc813d9fe6ebcbfdd15a07527796c8204bd36242"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.20.1"
+            "version": "==2.18.2"
         },
         "pydantic-settings": {
             "hashes": [
-                "sha256:bb6849dc067f1687574c12a639e231f3a6feeed0a12d710c1382045c5db1c315",
-                "sha256:ed81c3a0f46392b4d7c0a565c05884e6e54b3456e6f0fe4d8814981172dc9a88"
+                "sha256:00b9f6a5e95553590434c0fa01ead0b216c3e10bc54ae02e37f359948643c5ed",
+                "sha256:0235391d26db4d2190cb9b31051c4b46882d28a51533f97440867f012d4da091"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.4.0"
+            "version": "==2.2.1"
         },
         "pyjwkest": {
             "hashes": [
@@ -1109,6 +1133,62 @@
             "markers": "python_version >= '3.8'",
             "version": "==1.0.1"
         },
+        "pyyaml": {
+            "hashes": [
+                "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5",
+                "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc",
+                "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df",
+                "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741",
+                "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206",
+                "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27",
+                "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595",
+                "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62",
+                "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98",
+                "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696",
+                "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290",
+                "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9",
+                "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d",
+                "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6",
+                "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867",
+                "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47",
+                "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486",
+                "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6",
+                "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3",
+                "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007",
+                "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938",
+                "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0",
+                "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c",
+                "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735",
+                "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d",
+                "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28",
+                "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4",
+                "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba",
+                "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8",
+                "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef",
+                "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5",
+                "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd",
+                "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3",
+                "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0",
+                "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515",
+                "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c",
+                "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c",
+                "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924",
+                "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34",
+                "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43",
+                "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859",
+                "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673",
+                "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54",
+                "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a",
+                "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b",
+                "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab",
+                "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa",
+                "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c",
+                "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585",
+                "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d",
+                "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"
+            ],
+            "version": "==6.0.1"
+        },
         "pyzipper": {
             "hashes": [
                 "sha256:0adca90a00c36a93fbe49bfa8c5add452bfe4ef85a1b8e3638739dd1c7b26bfc",
@@ -1120,28 +1200,28 @@
         },
         "requests": {
             "hashes": [
-                "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760",
-                "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"
+                "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f",
+                "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==2.32.3"
+            "markers": "python_version >= '3.7'",
+            "version": "==2.31.0"
         },
         "s3transfer": {
             "hashes": [
-                "sha256:0711534e9356d3cc692fdde846b4a1e4b0cb6519971860796e6bc4c7aea00ef6",
-                "sha256:eca1c20de70a39daee580aef4986996620f365c4e0fda6a86100231d62f1bf69"
+                "sha256:5683916b4c724f799e600f41dd9e10a9ff19871bf87623cc8f491cb4f5fa0a19",
+                "sha256:ceb252b11bcf87080fb7850a224fb6e05c8a776bab8f2b64b7f25b969464839d"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.10.2"
+            "version": "==0.10.1"
         },
         "setuptools": {
             "hashes": [
-                "sha256:0274581a0037b638b9fc1c6883cc71c0210865aaa76073f7882376b641b84e8f",
-                "sha256:a85e96b8be2b906f3e3e789adec6a9323abf79758ecfa3065bd740d81158b11e"
+                "sha256:6c1fccdac05a97e598fb0ae3bbed5904ccb317337a51139dcd51453611bbb987",
+                "sha256:c636ac361bc47580504644275c9ad802c50415c7522212252c033bd15f301f32"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==74.0.0"
+            "version": "==69.5.1"
         },
         "six": {
             "hashes": [
@@ -1153,11 +1233,11 @@
         },
         "sqlparse": {
             "hashes": [
-                "sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4",
-                "sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e"
+                "sha256:714d0a4932c059d16189f58ef5411ec2287a4360f17cdd0edd2d09d4c5087c93",
+                "sha256:c204494cd97479d0e39f28c93d46c0b2d5959c7b9ab904762ea6c7af211c8663"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.5.1"
+            "version": "==0.5.0"
         },
         "tablib": {
             "extras": [
@@ -1185,29 +1265,43 @@
         },
         "typing-extensions": {
             "hashes": [
-                "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
-                "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"
+                "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0",
+                "sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==4.12.2"
+            "version": "==4.11.0"
         },
         "urllib3": {
             "hashes": [
-                "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
-                "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
+                "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d",
+                "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.2.2"
+            "version": "==2.2.1"
         },
         "whitenoise": {
             "hashes": [
-                "sha256:58c7a6cd811e275a6c91af22e96e87da0b1109e9a53bb7464116ef4c963bf636",
-                "sha256:a1ae85e01fdc9815d12fa33f17765bc132ed2c54fa76daf9e39e879dd93566f6"
+                "sha256:8998f7370973447fac1e8ef6e8ded2c5209a7b1f67c1012866dbcd09681c3251",
+                "sha256:b1f9db9bf67dc183484d760b99f4080185633136a273a03f6436034a41064146"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==6.7.0"
+            "version": "==6.6.0"
+        },
+        "xlrd": {
+            "hashes": [
+                "sha256:6a33ee89877bd9abc1158129f6e94be74e2679636b8a205b43b85206c3f0bbdd",
+                "sha256:f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88"
+            ],
+            "version": "==2.0.1"
+        },
+        "xlwt": {
+            "hashes": [
+                "sha256:a082260524678ba48a297d922cc385f58278b8aa68741596a87de01a9c628b2e",
+                "sha256:c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88"
+            ],
+            "version": "==1.3.0"
         },
         "zope.event": {
             "hashes": [
@@ -1219,43 +1313,45 @@
         },
         "zope.interface": {
             "hashes": [
-                "sha256:01e6e58078ad2799130c14a1d34ec89044ada0e1495329d72ee0407b9ae5100d",
-                "sha256:064ade95cb54c840647205987c7b557f75d2b2f7d1a84bfab4cf81822ef6e7d1",
-                "sha256:11fa1382c3efb34abf16becff8cb214b0b2e3144057c90611621f2d186b7e1b7",
-                "sha256:1bee1b722077d08721005e8da493ef3adf0b7908e0cd85cc7dc836ac117d6f32",
-                "sha256:1eeeb92cb7d95c45e726e3c1afe7707919370addae7ed14f614e22217a536958",
-                "sha256:21a207c6b2c58def5011768140861a73f5240f4f39800625072ba84e76c9da0b",
-                "sha256:2545d6d7aac425d528cd9bf0d9e55fcd47ab7fd15f41a64b1c4bf4c6b24946dc",
-                "sha256:2c4316a30e216f51acbd9fb318aa5af2e362b716596d82cbb92f9101c8f8d2e7",
-                "sha256:35062d93bc49bd9b191331c897a96155ffdad10744ab812485b6bad5b588d7e4",
-                "sha256:382d31d1e68877061daaa6499468e9eb38eb7625d4369b1615ac08d3860fe896",
-                "sha256:3aa8fcbb0d3c2be1bfd013a0f0acd636f6ed570c287743ae2bbd467ee967154d",
-                "sha256:3d4b91821305c8d8f6e6207639abcbdaf186db682e521af7855d0bea3047c8ca",
-                "sha256:3de1d553ce72868b77a7e9d598c9bff6d3816ad2b4cc81c04f9d8914603814f3",
-                "sha256:3fcdc76d0cde1c09c37b7c6b0f8beba2d857d8417b055d4f47df9c34ec518bdd",
-                "sha256:5112c530fa8aa2108a3196b9c2f078f5738c1c37cfc716970edc0df0414acda8",
-                "sha256:53d678bb1c3b784edbfb0adeebfeea6bf479f54da082854406a8f295d36f8386",
-                "sha256:6195c3c03fef9f87c0dbee0b3b6451df6e056322463cf35bca9a088e564a3c58",
-                "sha256:6d04b11ea47c9c369d66340dbe51e9031df2a0de97d68f442305ed7625ad6493",
-                "sha256:6dd647fcd765030638577fe6984284e0ebba1a1008244c8a38824be096e37fe3",
-                "sha256:799ef7a444aebbad5a145c3b34bff012b54453cddbde3332d47ca07225792ea4",
-                "sha256:7d92920416f31786bc1b2f34cc4fc4263a35a407425319572cbf96b51e835cd3",
-                "sha256:7e0c151a6c204f3830237c59ee4770cc346868a7a1af6925e5e38650141a7f05",
-                "sha256:84f8794bd59ca7d09d8fce43ae1b571be22f52748169d01a13d3ece8394d8b5b",
-                "sha256:95e5913ec718010dc0e7c215d79a9683b4990e7026828eedfda5268e74e73e11",
-                "sha256:9b9369671a20b8d039b8e5a1a33abd12e089e319a3383b4cc0bf5c67bd05fe7b",
-                "sha256:ab985c566a99cc5f73bc2741d93f1ed24a2cc9da3890144d37b9582965aff996",
-                "sha256:af94e429f9d57b36e71ef4e6865182090648aada0cb2d397ae2b3f7fc478493a",
-                "sha256:c96b3e6b0d4f6ddfec4e947130ec30bd2c7b19db6aa633777e46c8eecf1d6afd",
-                "sha256:cd2690d4b08ec9eaf47a85914fe513062b20da78d10d6d789a792c0b20307fb1",
-                "sha256:d3b7ce6d46fb0e60897d62d1ff370790ce50a57d40a651db91a3dde74f73b738",
-                "sha256:d976fa7b5faf5396eb18ce6c132c98e05504b52b60784e3401f4ef0b2e66709b",
-                "sha256:db6237e8fa91ea4f34d7e2d16d74741187e9105a63bbb5686c61fea04cdbacca",
-                "sha256:ecd32f30f40bfd8511b17666895831a51b532e93fc106bfa97f366589d3e4e0e",
-                "sha256:f418c88f09c3ba159b95a9d1cfcdbe58f208443abb1f3109f4b9b12fd60b187c"
+                "sha256:014bb94fe6bf1786da1aa044eadf65bc6437bcb81c451592987e5be91e70a91e",
+                "sha256:01a0b3dd012f584afcf03ed814bce0fc40ed10e47396578621509ac031be98bf",
+                "sha256:10cde8dc6b2fd6a1d0b5ca4be820063e46ddba417ab82bcf55afe2227337b130",
+                "sha256:187f7900b63845dcdef1be320a523dbbdba94d89cae570edc2781eb55f8c2f86",
+                "sha256:1b0c4c90e5eefca2c3e045d9f9ed9f1e2cdbe70eb906bff6b247e17119ad89a1",
+                "sha256:22e8a218e8e2d87d4d9342aa973b7915297a08efbebea5b25900c73e78ed468e",
+                "sha256:26c9a37fb395a703e39b11b00b9e921c48f82b6e32cc5851ad5d0618cd8876b5",
+                "sha256:2bb78c12c1ad3a20c0d981a043d133299117b6854f2e14893b156979ed4e1d2c",
+                "sha256:2c3cfb272bcb83650e6695d49ae0d14dd06dc694789a3d929f23758557a23d92",
+                "sha256:2f32010ffb87759c6a3ad1c65ed4d2e38e51f6b430a1ca11cee901ec2b42e021",
+                "sha256:3c8731596198198746f7ce2a4487a0edcbc9ea5e5918f0ab23c4859bce56055c",
+                "sha256:40aa8c8e964d47d713b226c5baf5f13cdf3a3169c7a2653163b17ff2e2334d10",
+                "sha256:4137025731e824eee8d263b20682b28a0bdc0508de9c11d6c6be54163e5b7c83",
+                "sha256:46034be614d1f75f06e7dcfefba21d609b16b38c21fc912b01a99cb29e58febb",
+                "sha256:483e118b1e075f1819b3c6ace082b9d7d3a6a5eb14b2b375f1b80a0868117920",
+                "sha256:4d6b229f5e1a6375f206455cc0a63a8e502ed190fe7eb15e94a312dc69d40299",
+                "sha256:567d54c06306f9c5b6826190628d66753b9f2b0422f4c02d7c6d2b97ebf0a24e",
+                "sha256:5683aa8f2639016fd2b421df44301f10820e28a9b96382a6e438e5c6427253af",
+                "sha256:600101f43a7582d5b9504a7c629a1185a849ce65e60fca0f6968dfc4b76b6d39",
+                "sha256:62e32f02b3f26204d9c02c3539c802afc3eefb19d601a0987836ed126efb1f21",
+                "sha256:69dedb790530c7ca5345899a1b4cb837cc53ba669051ea51e8c18f82f9389061",
+                "sha256:72d5efecad16c619a97744a4f0b67ce1bcc88115aa82fcf1dc5be9bb403bcc0b",
+                "sha256:8d407e0fd8015f6d5dfad481309638e1968d70e6644e0753f229154667dd6cd5",
+                "sha256:a058e6cf8d68a5a19cb5449f42a404f0d6c2778b897e6ce8fadda9cea308b1b0",
+                "sha256:a1adc14a2a9d5e95f76df625a9b39f4709267a483962a572e3f3001ef90ea6e6",
+                "sha256:a56fe1261230093bfeedc1c1a6cd6f3ec568f9b07f031c9a09f46b201f793a85",
+                "sha256:ad4524289d8dbd6fb5aa17aedb18f5643e7d48358f42c007a5ee51a2afc2a7c5",
+                "sha256:afa0491a9f154cf8519a02026dc85a416192f4cb1efbbf32db4a173ba28b289a",
+                "sha256:bf34840e102d1d0b2d39b1465918d90b312b1119552cebb61a242c42079817b9",
+                "sha256:c40df4aea777be321b7e68facb901bc67317e94b65d9ab20fb96e0eb3c0b60a1",
+                "sha256:d0e7321557c702bd92dac3c66a2f22b963155fdb4600133b6b29597f62b71b12",
+                "sha256:d165d7774d558ea971cb867739fb334faf68fc4756a784e689e11efa3becd59e",
+                "sha256:e78a183a3c2f555c2ad6aaa1ab572d1c435ba42f1dc3a7e8c82982306a19b785",
+                "sha256:e8fa0fb05083a1a4216b4b881fdefa71c5d9a106e9b094cd4399af6b52873e91",
+                "sha256:f83d6b4b22262d9a826c3bd4b2fbfafe1d0000f085ef8e44cd1328eea274ae6a",
+                "sha256:f95bebd0afe86b2adc074df29edb6848fc4d474ff24075e2c263d698774e108d"
             ],
-            "markers": "python_version >= '3.8'",
-            "version": "==7.0.3"
+            "markers": "python_version >= '3.7'",
+            "version": "==6.3"
         }
     },
     "develop": {
@@ -1269,12 +1365,12 @@
         },
         "bandit": {
             "hashes": [
-                "sha256:52077cb339000f337fb25f7e045995c4ad01511e716e5daac37014b9752de8ec",
-                "sha256:7c395a436743018f7be0a4cbb0a4ea9b902b6d87264ddecf8cfdc73b4f78ff61"
+                "sha256:36de50f720856ab24a24dbaa5fee2c66050ed97c1477e0a1159deab1775eab6b",
+                "sha256:509f7af645bc0cd8fd4587abc1a038fc795636671ee8204d502b933aee44f381"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==1.7.9"
+            "version": "==1.7.8"
         },
         "beautifulsoup4": {
             "hashes": [
@@ -1286,49 +1382,49 @@
         },
         "black": {
             "hashes": [
-                "sha256:09cdeb74d494ec023ded657f7092ba518e8cf78fa8386155e4a03fdcc44679e6",
-                "sha256:1f13f7f386f86f8121d76599114bb8c17b69d962137fc70efe56137727c7047e",
-                "sha256:2500945420b6784c38b9ee885af039f5e7471ef284ab03fa35ecdde4688cd83f",
-                "sha256:2b59b250fdba5f9a9cd9d0ece6e6d993d91ce877d121d161e4698af3eb9c1018",
-                "sha256:3c4285573d4897a7610054af5a890bde7c65cb466040c5f0c8b732812d7f0e5e",
-                "sha256:505289f17ceda596658ae81b61ebbe2d9b25aa78067035184ed0a9d855d18afd",
-                "sha256:62e8730977f0b77998029da7971fa896ceefa2c4c4933fcd593fa599ecbf97a4",
-                "sha256:649f6d84ccbae73ab767e206772cc2d7a393a001070a4c814a546afd0d423aed",
-                "sha256:6e55d30d44bed36593c3163b9bc63bf58b3b30e4611e4d88a0c3c239930ed5b2",
-                "sha256:707a1ca89221bc8a1a64fb5e15ef39cd755633daa672a9db7498d1c19de66a42",
-                "sha256:72901b4913cbac8972ad911dc4098d5753704d1f3c56e44ae8dce99eecb0e3af",
-                "sha256:73bbf84ed136e45d451a260c6b73ed674652f90a2b3211d6a35e78054563a9bb",
-                "sha256:7c046c1d1eeb7aea9335da62472481d3bbf3fd986e093cffd35f4385c94ae368",
-                "sha256:81c6742da39f33b08e791da38410f32e27d632260e599df7245cccee2064afeb",
-                "sha256:837fd281f1908d0076844bc2b801ad2d369c78c45cf800cad7b61686051041af",
-                "sha256:972085c618ee94f402da1af548a4f218c754ea7e5dc70acb168bfaca4c2542ed",
-                "sha256:9e84e33b37be070ba135176c123ae52a51f82306def9f7d063ee302ecab2cf47",
-                "sha256:b19c9ad992c7883ad84c9b22aaa73562a16b819c1d8db7a1a1a49fb7ec13c7d2",
-                "sha256:d6417535d99c37cee4091a2f24eb2b6d5ec42b144d50f1f2e436d9fe1916fe1a",
-                "sha256:eab4dd44ce80dea27dc69db40dab62d4ca96112f87996bca68cd75639aeb2e4c",
-                "sha256:f490dbd59680d809ca31efdae20e634f3fae27fba3ce0ba3208333b713bc3920",
-                "sha256:fb6e2c0b86bbd43dee042e48059c9ad7830abd5c94b0bc518c0eeec57c3eddc1"
+                "sha256:257d724c2c9b1660f353b36c802ccece186a30accc7742c176d29c146df6e474",
+                "sha256:37aae07b029fa0174d39daf02748b379399b909652a806e5708199bd93899da1",
+                "sha256:415e686e87dbbe6f4cd5ef0fbf764af7b89f9057b97c908742b6008cc554b9c0",
+                "sha256:48a85f2cb5e6799a9ef05347b476cce6c182d6c71ee36925a6c194d074336ef8",
+                "sha256:7768a0dbf16a39aa5e9a3ded568bb545c8c2727396d063bbaf847df05b08cd96",
+                "sha256:7e122b1c4fb252fd85df3ca93578732b4749d9be076593076ef4d07a0233c3e1",
+                "sha256:88c57dc656038f1ab9f92b3eb5335ee9b021412feaa46330d5eba4e51fe49b04",
+                "sha256:8e537d281831ad0e71007dcdcbe50a71470b978c453fa41ce77186bbe0ed6021",
+                "sha256:98e123f1d5cfd42f886624d84464f7756f60ff6eab89ae845210631714f6db94",
+                "sha256:accf49e151c8ed2c0cdc528691838afd217c50412534e876a19270fea1e28e2d",
+                "sha256:b1530ae42e9d6d5b670a34db49a94115a64596bc77710b1d05e9801e62ca0a7c",
+                "sha256:b9176b9832e84308818a99a561e90aa479e73c523b3f77afd07913380ae2eab7",
+                "sha256:bdde6f877a18f24844e381d45e9947a49e97933573ac9d4345399be37621e26c",
+                "sha256:be8bef99eb46d5021bf053114442914baeb3649a89dc5f3a555c88737e5e98fc",
+                "sha256:bf10f7310db693bb62692609b397e8d67257c55f949abde4c67f9cc574492cc7",
+                "sha256:c872b53057f000085da66a19c55d68f6f8ddcac2642392ad3a355878406fbd4d",
+                "sha256:d36ed1124bb81b32f8614555b34cc4259c3fbc7eec17870e8ff8ded335b58d8c",
+                "sha256:da33a1a5e49c4122ccdfd56cd021ff1ebc4a1ec4e2d01594fef9b6f267a9e741",
+                "sha256:dd1b5a14e417189db4c7b64a6540f31730713d173f0b63e55fabd52d61d8fdce",
+                "sha256:e151054aa00bad1f4e1f04919542885f89f5f7d086b8a59e5000e6c616896ffb",
+                "sha256:eaea3008c281f1038edb473c1aa8ed8143a5535ff18f978a318f10302b254063",
+                "sha256:ef703f83fc32e131e9bcc0a5094cfe85599e7109f896fe8bc96cc402f3eb4b6e"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==24.8.0"
+            "version": "==24.4.2"
         },
         "blinker": {
             "hashes": [
-                "sha256:1779309f71bf239144b9399d06ae925637cf6634cf6bd131104184531bf67c01",
-                "sha256:8f77b09d3bf7c795e969e9486f39c2c5e9c39d4ee07424be2bc594ece9642d83"
+                "sha256:5f1cdeff423b77c31b89de0565cd03e5275a03028f44b2b15f912632a58cced6",
+                "sha256:da44ec748222dcd0105ef975eed946da197d5bdf8bafb6aa92f5bc89da63fa25"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==1.8.2"
+            "version": "==1.8.1"
         },
         "boto3": {
             "hashes": [
-                "sha256:06eac4757de2a9c6020381205cb902f05964caad80b56e58c8931284a133b4cb",
-                "sha256:b9587131372a808bf6f99c5ed8b11be55cd113261cc3b437a917b4acc6c30bfe"
+                "sha256:decf52f8d5d8a1b10c9ff2a0e96ee207ed79e33d2e53fdf0880a5cbef70785e0",
+                "sha256:e836b71d79671270fccac0a4d4c8ec239a6b82ea47c399b64675aa597d0ee63b"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==1.35.8"
+            "version": "==1.34.95"
         },
         "boto3-mocking": {
             "hashes": [
@@ -1341,28 +1437,28 @@
         },
         "boto3-stubs": {
             "hashes": [
-                "sha256:cfe2c813d8a43b91cccd7d1d4230b781fe3572e2d13e42d5ba60d78b42638bc8",
-                "sha256:e5767b1aabdbc5e84915e533f852605bbb07cfe1b86fe172ab27654a2f24b48d"
+                "sha256:412006b27ee707e9b51a084b02ac92b143af8a3b56727582afec2a76ce93c3b6",
+                "sha256:4fb5830626de42446c238ca72ca1a53e461281396007fb900edf50ceeb044a10"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==1.35.8"
+            "version": "==1.34.95"
         },
         "botocore": {
             "hashes": [
-                "sha256:4b820cf680ab5d778bd2fe4feeef1ff8a2b96d5c535d4638ab30f703ade282f8",
-                "sha256:adf389eb8fd87775f193300e3431d1353f925807ad3a39958172cb644f0d60a1"
+                "sha256:6bd76a2eadb42b91fa3528392e981ad5b4dfdee3968fa5b904278acf6cbf15ff",
+                "sha256:ead5823e0dd6751ece5498cb979fd9abf190e691c8833bcac6876fd6ca261fa7"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==1.35.8"
+            "version": "==1.34.95"
         },
         "botocore-stubs": {
             "hashes": [
-                "sha256:a49f9db19259dc280fee73d74f3a171310f3916a12e679b6c4bf8f719cb37461",
-                "sha256:dac2ebedcd8b0c98be89d6e708fa9ce6d5d12e1bc6b629e77ae8c0d289088c49"
+                "sha256:64d80a3467e3b19939e9c2750af33328b3087f8f524998dbdf7ed168227f507d",
+                "sha256:b0345f55babd8b901c53804fc5c326a4a0bd2e23e3b71f9ea5d9f7663466e6ba"
             ],
-            "markers": "python_version >= '3.8'",
-            "version": "==1.35.8"
+            "markers": "python_version >= '3.8' and python_version < '4.0'",
+            "version": "==1.34.94"
         },
         "click": {
             "hashes": [
@@ -1383,36 +1479,36 @@
         },
         "django-debug-toolbar": {
             "hashes": [
-                "sha256:36e421cb908c2f0675e07f9f41e3d1d8618dc386392ec82d23bcfcd5d29c7044",
-                "sha256:3beb671c9ec44ffb817fad2780667f172bd1c067dbcabad6268ce39a81335f45"
+                "sha256:0b0dddee5ea29b9cb678593bc0d7a6d76b21d7799cb68e091a2148341a80f3c4",
+                "sha256:e09b7dcb8417b743234dfc57c95a7c1d1d87a88844abd13b4c5387f807b31bf6"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==4.4.6"
+            "version": "==4.3.0"
         },
         "django-model2puml": {
             "hashes": [
-                "sha256:f7ef57efbf261e8e0f90043c2be379e9457b30603ccc01fe7a01c233d0dfa27c"
+                "sha256:6e773d742e556020a04d3216ce5dee5d3551da162e2d42a997f85b4ed1854771"
             ],
             "index": "pypi",
-            "version": "==0.5.1"
+            "version": "==0.4.1"
         },
         "django-stubs": {
             "hashes": [
-                "sha256:78e3764488fdfd2695f12502136548ec22f8d4b1780541a835042b8238d11514",
-                "sha256:c2502f5ecbae50c68f9a86d52b5b2447d8648fd205036dad0ccb41e19a445927"
+                "sha256:084484cbe16a6d388e80ec687e46f529d67a232f3befaf55c936b3b476be289d",
+                "sha256:b8a792bee526d6cab31e197cb414ee7fa218abd931a50948c66a80b3a2548621"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==5.0.4"
+            "version": "==5.0.0"
         },
         "django-stubs-ext": {
             "hashes": [
-                "sha256:85da065224204774208be29c7d02b4482d5a69218a728465c2fbe41725fdc819",
-                "sha256:910cbaff3d1e8e806a5c27d5ddd4088535aae8371ea921b7fd680fdfa5f14e30"
+                "sha256:5bacfbb498a206d5938454222b843d81da79ea8b6fcd1a59003f529e775bc115",
+                "sha256:8e1334fdf0c8bff87e25d593b33d4247487338aaed943037826244ff788b56a8"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==5.0.4"
+            "version": "==5.0.0"
         },
         "django-webtest": {
             "hashes": [
@@ -1424,12 +1520,12 @@
         },
         "flake8": {
             "hashes": [
-                "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38",
-                "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213"
+                "sha256:33f96621059e65eec474169085dc92bf26e7b2d47366b70be2f67ab80dc25132",
+                "sha256:a6dfbb75e03252917f2473ea9653f7cd799c3064e54d4c8140044c5c065f53c3"
             ],
             "index": "pypi",
             "markers": "python_full_version >= '3.8.1'",
-            "version": "==7.1.1"
+            "version": "==7.0.0"
         },
         "jmespath": {
             "hashes": [
@@ -1465,37 +1561,37 @@
         },
         "mypy": {
             "hashes": [
-                "sha256:06d26c277962f3fb50e13044674aa10553981ae514288cb7d0a738f495550b36",
-                "sha256:2ff93107f01968ed834f4256bc1fc4475e2fecf6c661260066a985b52741ddce",
-                "sha256:36383a4fcbad95f2657642a07ba22ff797de26277158f1cc7bd234821468b1b6",
-                "sha256:37c7fa6121c1cdfcaac97ce3d3b5588e847aa79b580c1e922bb5d5d2902df19b",
-                "sha256:3a66169b92452f72117e2da3a576087025449018afc2d8e9bfe5ffab865709ca",
-                "sha256:3f14cd3d386ac4d05c5a39a51b84387403dadbd936e17cb35882134d4f8f0d24",
-                "sha256:41ea707d036a5307ac674ea172875f40c9d55c5394f888b168033177fce47383",
-                "sha256:478db5f5036817fe45adb7332d927daa62417159d49783041338921dcf646fc7",
-                "sha256:4a8a53bc3ffbd161b5b2a4fff2f0f1e23a33b0168f1c0778ec70e1a3d66deb86",
-                "sha256:539c570477a96a4e6fb718b8d5c3e0c0eba1f485df13f86d2970c91f0673148d",
-                "sha256:57555a7715c0a34421013144a33d280e73c08df70f3a18a552938587ce9274f4",
-                "sha256:6e658bd2d20565ea86da7d91331b0eed6d2eee22dc031579e6297f3e12c758c8",
-                "sha256:6e7184632d89d677973a14d00ae4d03214c8bc301ceefcdaf5c474866814c987",
-                "sha256:75746e06d5fa1e91bfd5432448d00d34593b52e7e91a187d981d08d1f33d4385",
-                "sha256:7f9993ad3e0ffdc95c2a14b66dee63729f021968bff8ad911867579c65d13a79",
-                "sha256:801780c56d1cdb896eacd5619a83e427ce436d86a3bdf9112527f24a66618fef",
-                "sha256:801ca29f43d5acce85f8e999b1e431fb479cb02d0e11deb7d2abb56bdaf24fd6",
-                "sha256:969ea3ef09617aff826885a22ece0ddef69d95852cdad2f60c8bb06bf1f71f70",
-                "sha256:a976775ab2256aadc6add633d44f100a2517d2388906ec4f13231fafbb0eccca",
-                "sha256:af8d155170fcf87a2afb55b35dc1a0ac21df4431e7d96717621962e4b9192e70",
-                "sha256:b499bc07dbdcd3de92b0a8b29fdf592c111276f6a12fe29c30f6c417dd546d12",
-                "sha256:cd953f221ac1379050a8a646585a29574488974f79d8082cedef62744f0a0104",
-                "sha256:d42a6dd818ffce7be66cce644f1dff482f1d97c53ca70908dff0b9ddc120b77a",
-                "sha256:e8960dbbbf36906c5c0b7f4fbf2f0c7ffb20f4898e6a879fcf56a41a08b0d318",
-                "sha256:edb91dded4df17eae4537668b23f0ff6baf3707683734b6a818d5b9d0c0c31a1",
-                "sha256:ee23de8530d99b6db0573c4ef4bd8f39a2a6f9b60655bf7a1357e585a3486f2b",
-                "sha256:f7821776e5c4286b6a13138cc935e2e9b6fde05e081bdebf5cdb2bb97c9df81d"
+                "sha256:075cbf81f3e134eadaf247de187bd604748171d6b79736fa9b6c9685b4083061",
+                "sha256:12b6bfc1b1a66095ab413160a6e520e1dc076a28f3e22f7fb25ba3b000b4ef99",
+                "sha256:1ec404a7cbe9fc0e92cb0e67f55ce0c025014e26d33e54d9e506a0f2d07fe5de",
+                "sha256:28d0e038361b45f099cc086d9dd99c15ff14d0188f44ac883010e172ce86c38a",
+                "sha256:2b0695d605ddcd3eb2f736cd8b4e388288c21e7de85001e9f85df9187f2b50f9",
+                "sha256:3236a4c8f535a0631f85f5fcdffba71c7feeef76a6002fcba7c1a8e57c8be1ec",
+                "sha256:3be66771aa5c97602f382230165b856c231d1277c511c9a8dd058be4784472e1",
+                "sha256:3d087fcbec056c4ee34974da493a826ce316947485cef3901f511848e687c131",
+                "sha256:3f298531bca95ff615b6e9f2fc0333aae27fa48052903a0ac90215021cdcfa4f",
+                "sha256:4a2b5cdbb5dd35aa08ea9114436e0d79aceb2f38e32c21684dcf8e24e1e92821",
+                "sha256:4cf18f9d0efa1b16478c4c129eabec36148032575391095f73cae2e722fcf9d5",
+                "sha256:8b2cbaca148d0754a54d44121b5825ae71868c7592a53b7292eeb0f3fdae95ee",
+                "sha256:8f55583b12156c399dce2df7d16f8a5095291354f1e839c252ec6c0611e86e2e",
+                "sha256:92f93b21c0fe73dc00abf91022234c79d793318b8a96faac147cd579c1671746",
+                "sha256:9e36fb078cce9904c7989b9693e41cb9711e0600139ce3970c6ef814b6ebc2b2",
+                "sha256:9fd50226364cd2737351c79807775136b0abe084433b55b2e29181a4c3c878c0",
+                "sha256:a781f6ad4bab20eef8b65174a57e5203f4be627b46291f4589879bf4e257b97b",
+                "sha256:a87dbfa85971e8d59c9cc1fcf534efe664d8949e4c0b6b44e8ca548e746a8d53",
+                "sha256:b808e12113505b97d9023b0b5e0c0705a90571c6feefc6f215c1df9381256e30",
+                "sha256:bc6ac273b23c6b82da3bb25f4136c4fd42665f17f2cd850771cb600bdd2ebeda",
+                "sha256:cd777b780312ddb135bceb9bc8722a73ec95e042f911cc279e2ec3c667076051",
+                "sha256:da1cbf08fb3b851ab3b9523a884c232774008267b1f83371ace57f412fe308c2",
+                "sha256:e22e1527dc3d4aa94311d246b59e47f6455b8729f4968765ac1eacf9a4760bc7",
+                "sha256:f8c083976eb530019175aabadb60921e73b4f45736760826aa1689dda8208aee",
+                "sha256:f90cff89eea89273727d8783fef5d4a934be2fdca11b47def50cf5d311aff727",
+                "sha256:fa7ef5244615a2523b56c034becde4e9e3f9b034854c93639adb667ec9ec2976",
+                "sha256:fcfc70599efde5c67862a07a1aaf50e55bce629ace26bb19dc17cece5dd31ca4"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==1.11.2"
+            "version": "==1.10.0"
         },
         "mypy-extensions": {
             "hashes": [
@@ -1515,11 +1611,11 @@
         },
         "packaging": {
             "hashes": [
-                "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002",
-                "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"
+                "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5",
+                "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"
             ],
-            "markers": "python_version >= '3.8'",
-            "version": "==24.1"
+            "markers": "python_version >= '3.7'",
+            "version": "==24.0"
         },
         "pathspec": {
             "hashes": [
@@ -1531,27 +1627,27 @@
         },
         "pbr": {
             "hashes": [
-                "sha256:788183e382e3d1d7707db08978239965e8b9e4e5ed42669bf4758186734d5f24",
-                "sha256:a776ae228892d8013649c0aeccbb3d5f99ee15e005a4cbb7e61d55a067b28a2a"
+                "sha256:4a7317d5e3b17a3dccb6a8cfe67dab65b20551404c52c8ed41279fa4f0cb4cda",
+                "sha256:d1377122a5a00e2f940ee482999518efe16d745d423a670c27773dfbc3c9a7d9"
             ],
             "markers": "python_version >= '2.6'",
-            "version": "==6.1.0"
+            "version": "==6.0.0"
         },
         "platformdirs": {
             "hashes": [
-                "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee",
-                "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3"
+                "sha256:031cd18d4ec63ec53e82dceaac0417d218a6863f7745dfcc9efe7793b7039bdf",
+                "sha256:17d5a1161b3fd67b390023cb2d3b026bbd40abde6fdb052dfbd3a29c3ba22ee1"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==4.2.2"
+            "version": "==4.2.1"
         },
         "pycodestyle": {
             "hashes": [
-                "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3",
-                "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521"
+                "sha256:41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f",
+                "sha256:44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.12.1"
+            "version": "==2.11.1"
         },
         "pyflakes": {
             "hashes": [
@@ -1563,11 +1659,11 @@
         },
         "pygments": {
             "hashes": [
-                "sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199",
-                "sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a"
+                "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c",
+                "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"
             ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.18.0"
+            "markers": "python_version >= '3.7'",
+            "version": "==2.17.2"
         },
         "python-dateutil": {
             "hashes": [
@@ -1579,78 +1675,75 @@
         },
         "pyyaml": {
             "hashes": [
-                "sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff",
-                "sha256:0833f8694549e586547b576dcfaba4a6b55b9e96098b36cdc7ebefe667dfed48",
-                "sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086",
-                "sha256:0b69e4ce7a131fe56b7e4d770c67429700908fc0752af059838b1cfb41960e4e",
-                "sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133",
-                "sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5",
-                "sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484",
-                "sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee",
-                "sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5",
-                "sha256:23502f431948090f597378482b4812b0caae32c22213aecf3b55325e049a6c68",
-                "sha256:24471b829b3bf607e04e88d79542a9d48bb037c2267d7927a874e6c205ca7e9a",
-                "sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf",
-                "sha256:2e99c6826ffa974fe6e27cdb5ed0021786b03fc98e5ee3c5bfe1fd5015f42b99",
-                "sha256:39693e1f8320ae4f43943590b49779ffb98acb81f788220ea932a6b6c51004d8",
-                "sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85",
-                "sha256:3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19",
-                "sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc",
-                "sha256:43fa96a3ca0d6b1812e01ced1044a003533c47f6ee8aca31724f78e93ccc089a",
-                "sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1",
-                "sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317",
-                "sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c",
-                "sha256:6395c297d42274772abc367baaa79683958044e5d3835486c16da75d2a694631",
-                "sha256:688ba32a1cffef67fd2e9398a2efebaea461578b0923624778664cc1c914db5d",
-                "sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652",
-                "sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5",
-                "sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e",
-                "sha256:7c36280e6fb8385e520936c3cb3b8042851904eba0e58d277dca80a5cfed590b",
-                "sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8",
-                "sha256:80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476",
-                "sha256:82d09873e40955485746739bcb8b4586983670466c23382c19cffecbf1fd8706",
-                "sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563",
-                "sha256:8824b5a04a04a047e72eea5cec3bc266db09e35de6bdfe34c9436ac5ee27d237",
-                "sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b",
-                "sha256:9056c1ecd25795207ad294bcf39f2db3d845767be0ea6e6a34d856f006006083",
-                "sha256:936d68689298c36b53b29f23c6dbb74de12b4ac12ca6cfe0e047bedceea56180",
-                "sha256:9b22676e8097e9e22e36d6b7bda33190d0d400f345f23d4065d48f4ca7ae0425",
-                "sha256:a4d3091415f010369ae4ed1fc6b79def9416358877534caf6a0fdd2146c87a3e",
-                "sha256:a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f",
-                "sha256:a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725",
-                "sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183",
-                "sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab",
-                "sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774",
-                "sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725",
-                "sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e",
-                "sha256:d7fded462629cfa4b685c5416b949ebad6cec74af5e2d42905d41e257e0869f5",
-                "sha256:d84a1718ee396f54f3a086ea0a66d8e552b2ab2017ef8b420e92edbc841c352d",
-                "sha256:d8e03406cac8513435335dbab54c0d385e4a49e4945d2909a581c83647ca0290",
-                "sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44",
-                "sha256:ec031d5d2feb36d1d1a24380e4db6d43695f3748343d99434e6f5f9156aaa2ed",
-                "sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4",
-                "sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba",
-                "sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12",
-                "sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4"
+                "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5",
+                "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc",
+                "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df",
+                "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741",
+                "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206",
+                "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27",
+                "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595",
+                "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62",
+                "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98",
+                "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696",
+                "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290",
+                "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9",
+                "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d",
+                "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6",
+                "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867",
+                "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47",
+                "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486",
+                "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6",
+                "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3",
+                "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007",
+                "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938",
+                "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0",
+                "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c",
+                "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735",
+                "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d",
+                "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28",
+                "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4",
+                "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba",
+                "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8",
+                "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef",
+                "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5",
+                "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd",
+                "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3",
+                "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0",
+                "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515",
+                "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c",
+                "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c",
+                "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924",
+                "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34",
+                "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43",
+                "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859",
+                "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673",
+                "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54",
+                "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a",
+                "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b",
+                "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab",
+                "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa",
+                "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c",
+                "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585",
+                "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d",
+                "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"
             ],
-            "markers": "python_version >= '3.8'",
-            "version": "==6.0.2"
+            "version": "==6.0.1"
         },
         "rich": {
             "hashes": [
-                "sha256:2e85306a063b9492dffc86278197a60cbece75bcb766022f3436f567cae11bdc",
-                "sha256:a5ac1f1cd448ade0d59cc3356f7db7a7ccda2c8cbae9c7a90c28ff463d3e91f4"
+                "sha256:4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222",
+                "sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432"
             ],
             "markers": "python_full_version >= '3.7.0'",
-            "version": "==13.8.0"
+            "version": "==13.7.1"
         },
         "s3transfer": {
             "hashes": [
-                "sha256:0711534e9356d3cc692fdde846b4a1e4b0cb6519971860796e6bc4c7aea00ef6",
-                "sha256:eca1c20de70a39daee580aef4986996620f365c4e0fda6a86100231d62f1bf69"
+                "sha256:5683916b4c724f799e600f41dd9e10a9ff19871bf87623cc8f491cb4f5fa0a19",
+                "sha256:ceb252b11bcf87080fb7850a224fb6e05c8a776bab8f2b64b7f25b969464839d"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.10.2"
+            "version": "==0.10.1"
         },
         "six": {
             "hashes": [
@@ -1662,27 +1755,27 @@
         },
         "soupsieve": {
             "hashes": [
-                "sha256:e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb",
-                "sha256:e72c4ff06e4fb6e4b5a9f0f55fe6e81514581fca1515028625d0f299c602ccc9"
+                "sha256:5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690",
+                "sha256:eaa337ff55a1579b6549dc679565eac1e3d000563bcb1c8ab0d0fefbc0c2cdc7"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.6"
+            "version": "==2.5"
         },
         "sqlparse": {
             "hashes": [
-                "sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4",
-                "sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e"
+                "sha256:714d0a4932c059d16189f58ef5411ec2287a4360f17cdd0edd2d09d4c5087c93",
+                "sha256:c204494cd97479d0e39f28c93d46c0b2d5959c7b9ab904762ea6c7af211c8663"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.5.1"
+            "version": "==0.5.0"
         },
         "stevedore": {
             "hashes": [
-                "sha256:1efd34ca08f474dad08d9b19e934a22c68bb6fe416926479ba29e5013bcc8f78",
-                "sha256:9a64265f4060312828151c204efbe9b7a9852a0d9228756344dbc7e4023e375a"
+                "sha256:1c15d95766ca0569cad14cb6272d4d31dae66b011a929d7c18219c176ea1b5c9",
+                "sha256:46b93ca40e1114cea93d738a6c1e365396981bb6bb78c27045b7587c9473544d"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==5.3.0"
+            "version": "==5.2.0"
         },
         "tomli": {
             "hashes": [
@@ -1694,62 +1787,62 @@
         },
         "types-awscrt": {
             "hashes": [
-                "sha256:0839fe12f0f914d8f7d63ed777c728cb4eccc2d5d79a26e377d12b0604e7bf0e",
-                "sha256:84a9f4f422ec525c314fdf54c23a1e73edfbcec968560943ca2d41cfae623b38"
+                "sha256:3ae374b553e7228ba41a528cf42bd0b2ad7303d806c73eff4aaaac1515e3ea4e",
+                "sha256:64898a2f4a2468f66233cb8c29c5f66de907cf80ba1ef5bb1359aef2f81bb521"
             ],
             "markers": "python_version >= '3.7' and python_version < '4.0'",
-            "version": "==0.21.2"
+            "version": "==0.20.9"
         },
         "types-cachetools": {
             "hashes": [
-                "sha256:b888ab5c1a48116f7799cd5004b18474cd82b5463acb5ffb2db2fc9c7b053bc0",
-                "sha256:efb2ed8bf27a4b9d3ed70d33849f536362603a90b8090a328acf0cd42fda82e2"
+                "sha256:27c982cdb9cf3fead8b0089ee6b895715ecc99dac90ec29e2cab56eb1aaf4199",
+                "sha256:98c069dc7fc087b1b061703369c80751b0a0fc561f6fb072b554e5eee23773a0"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==5.5.0.20240820"
+            "markers": "python_version >= '3.7'",
+            "version": "==5.3.0.7"
         },
         "types-pyyaml": {
             "hashes": [
-                "sha256:b8f76ddbd7f65440a8bda5526a9607e4c7a322dc2f8e1a8c405644f9a6f4b9af",
-                "sha256:deda34c5c655265fc517b546c902aa6eed2ef8d3e921e4765fe606fe2afe8d35"
+                "sha256:a9e0f0f88dc835739b0c1ca51ee90d04ca2a897a71af79de9aec5f38cb0a5342",
+                "sha256:b845b06a1c7e54b8e5b4c683043de0d9caf205e7434b3edc678ff2411979b8f6"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==6.0.12.20240808"
+            "version": "==6.0.12.20240311"
         },
         "types-requests": {
             "hashes": [
-                "sha256:90c079ff05e549f6bf50e02e910210b98b8ff1ebdd18e19c873cd237737c1358",
-                "sha256:f754283e152c752e46e70942fa2a146b5bc70393522257bb85bd1ef7e019dcc3"
+                "sha256:4428df33c5503945c74b3f42e82b181e86ec7b724620419a2966e2de604ce1a1",
+                "sha256:6216cdac377c6b9a040ac1c0404f7284bd13199c0e1bb235f4324627e8898cf5"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==2.32.0.20240712"
+            "version": "==2.31.0.20240406"
         },
         "types-s3transfer": {
             "hashes": [
-                "sha256:60167a3bfb5c536ec6cdb5818f7f9a28edca9dc3e0b5ff85ae374526fc5e576e",
-                "sha256:7a3fec8cd632e2b5efb665a355ef93c2a87fdd5a45b74a949f95a9e628a86356"
+                "sha256:02154cce46528287ad76ad1a0153840e0492239a0887e8833466eccf84b98da0",
+                "sha256:49a7c81fa609ac1532f8de3756e64b58afcecad8767933310228002ec7adff74"
             ],
-            "markers": "python_version >= '3.8'",
-            "version": "==0.10.2"
+            "markers": "python_version >= '3.8' and python_version < '4.0'",
+            "version": "==0.10.1"
         },
         "typing-extensions": {
             "hashes": [
-                "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
-                "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"
+                "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0",
+                "sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==4.12.2"
+            "version": "==4.11.0"
         },
         "urllib3": {
             "hashes": [
-                "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
-                "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
+                "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d",
+                "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.2.2"
+            "version": "==2.2.1"
         },
         "waitress": {
             "hashes": [
@@ -1761,11 +1854,11 @@
         },
         "webob": {
             "hashes": [
-                "sha256:2abc1555e118fc251e705fc6dc66c7f5353bb9fbfab6d20e22f1c02b4b71bcee",
-                "sha256:b60ba63f05c0cf61e086a10c3781a41fcfe30027753a8ae6d819c77592ce83ea"
+                "sha256:73aae30359291c14fa3b956f8b5ca31960e420c28c1bec002547fb04928cf89b",
+                "sha256:b64ef5141be559cfade448f044fa45c2260351edcb6a8ef6b7e00c7dcef0c323"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==1.8.8"
+            "version": "==1.8.7"
         },
         "webtest": {
             "hashes": [

From f46cc141b0ec54c9de694b87d25809c7e9b2a74c Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 09:57:48 -0700
Subject: [PATCH 021/118] Correct migrations

---
 ...e.py => 0120_remove_domaininformation_submitter_and_more.py} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/registrar/migrations/{0119_remove_domaininformation_submitter_and_more.py => 0120_remove_domaininformation_submitter_and_more.py} (91%)

diff --git a/src/registrar/migrations/0119_remove_domaininformation_submitter_and_more.py b/src/registrar/migrations/0120_remove_domaininformation_submitter_and_more.py
similarity index 91%
rename from src/registrar/migrations/0119_remove_domaininformation_submitter_and_more.py
rename to src/registrar/migrations/0120_remove_domaininformation_submitter_and_more.py
index d438d6744..d8992845f 100644
--- a/src/registrar/migrations/0119_remove_domaininformation_submitter_and_more.py
+++ b/src/registrar/migrations/0120_remove_domaininformation_submitter_and_more.py
@@ -8,7 +8,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0118_alter_portfolio_options_alter_portfolio_creator_and_more"),
+        ("registrar", "0119_remove_user_portfolio_and_more"),
     ]
 
     operations = [

From ce0befc06377d99cfa02299f24652431d49adbc4 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Thu, 29 Aug 2024 10:19:08 -0700
Subject: [PATCH 022/118] Update diagrams

---
 docs/architecture/diagrams/models_diagram.md  | 20 +++++++++++++++----
 docs/architecture/diagrams/models_diagram.svg |  2 +-
 src/registrar/tests/test_views_request.py     |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/docs/architecture/diagrams/models_diagram.md b/docs/architecture/diagrams/models_diagram.md
index 4bbec31cc..1856407aa 100644
--- a/docs/architecture/diagrams/models_diagram.md
+++ b/docs/architecture/diagrams/models_diagram.md
@@ -285,6 +285,22 @@ class "registrar.DomainInvitation <Registrar>" as registrar.DomainInvitation #d6
 registrar.DomainInvitation -- registrar.Domain
 
 
+class "registrar.UserPortfolioPermission <Registrar>" as registrar.UserPortfolioPermission #d6f4e9 {
+    user portfolio permission
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    ~ user (ForeignKey)
+    ~ portfolio (ForeignKey)
+    + roles (ArrayField)
+    + additional_permissions (ArrayField)
+    --
+}
+registrar.UserPortfolioPermission -- registrar.User
+registrar.UserPortfolioPermission -- registrar.Portfolio
+
+
 class "registrar.PortfolioInvitation <Registrar>" as registrar.PortfolioInvitation #d6f4e9 {
     portfolio invitation
     --
@@ -361,9 +377,6 @@ class "registrar.User <Registrar>" as registrar.User #d6f4e9 {
     + is_active (BooleanField)
     + date_joined (DateTimeField)
     + status (CharField)
-    ~ portfolio (ForeignKey)
-    + portfolio_roles (ArrayField)
-    + portfolio_additional_permissions (ArrayField)
     + phone (PhoneNumberField)
     + middle_name (CharField)
     + title (CharField)
@@ -373,7 +386,6 @@ class "registrar.User <Registrar>" as registrar.User #d6f4e9 {
     # domains (ManyToManyField)
     --
 }
-registrar.User -- registrar.Portfolio
 registrar.User *--* registrar.Domain
 
 
diff --git a/docs/architecture/diagrams/models_diagram.svg b/docs/architecture/diagrams/models_diagram.svg
index f8cf3a46d..85c0e7620 100644
--- a/docs/architecture/diagrams/models_diagram.svg
+++ b/docs/architecture/diagrams/models_diagram.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="3209px" preserveAspectRatio="none" style="width:2583px;height:3209px;background:#FFFFFF;" version="1.1" viewBox="0 0 2583 3209" width="2583px" zoomAndPan="magnify"><defs/><g><!--cluster registrar--><g id="cluster_registrar"><path d="M100,6 L170,6 A3.75,3.75 0 0 1 172.5,8.5 L179.5,28.2969 L2510,28.2969 A2.5,2.5 0 0 1 2512.5,30.7969 L2512.5,3199.5 A2.5,2.5 0 0 1 2510,3202 L100,3202 A2.5,2.5 0 0 1 97.5,3199.5 L97.5,8.5 A2.5,2.5 0 0 1 100,6 " fill="none" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="97.5" x2="179.5" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="69" x="101.5" y="20.9951">registrar</text></g><!--class Contact--><g id="elem_Contact"><rect codeLine="34" fill="#D6F4E9" height="235.2656" id="Contact" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="217" x="1644" y="2173"/><ellipse cx="1661.7" cy="2189" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1664.6688,2194.6406 Q1664.0906,2194.9375 1663.45,2195.0781 Q1662.8094,2195.2344 1662.1063,2195.2344 Q1659.6063,2195.2344 1658.2781,2193.5938 Q1656.9656,2191.9375 1656.9656,2188.8125 Q1656.9656,2185.6875 1658.2781,2184.0313 Q1659.6063,2182.375 1662.1063,2182.375 Q1662.8094,2182.375 1663.45,2182.5313 Q1664.1063,2182.6875 1664.6688,2182.9844 L1664.6688,2185.7031 Q1664.0438,2185.125 1663.45,2184.8594 Q1662.8563,2184.5781 1662.2313,2184.5781 Q1660.8875,2184.5781 1660.2,2185.6563 Q1659.5125,2186.7188 1659.5125,2188.8125 Q1659.5125,2190.9063 1660.2,2191.9844 Q1660.8875,2193.0469 1662.2313,2193.0469 Q1662.8563,2193.0469 1663.45,2192.7813 Q1664.0438,2192.5 1664.6688,2191.9219 L1664.6688,2194.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="115" x="1676.3" y="2193.8467">registrar.Contact</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="1806" y="2170"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="1807" y="2182.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1645" x2="1860" y1="2205" y2="2205"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1650" y="2221.9951">contact</text><line style="stroke:#181818;stroke-width:1.0;" x1="1645" x2="1860" y1="2229.2969" y2="2229.2969"/><ellipse cx="1655" cy="2242.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="1664" y="2246.292">id (BigAutoField)</text><ellipse cx="1655" cy="2259.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="1664" y="2262.5889">created_at (DateTimeField)</text><ellipse cx="1655" cy="2275.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="1664" y="2278.8857">updated_at (DateTimeField)</text><polygon fill="#4177AF" points="1655,2287.8359,1651,2293.8359,1659,2293.8359" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="1664" y="2295.1826">user (OneToOneField)</text><ellipse cx="1655" cy="2308.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="1664" y="2311.4795">first_name (CharField)</text><ellipse cx="1655" cy="2324.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="1664" y="2327.7764">middle_name (CharField)</text><ellipse cx="1655" cy="2340.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="1664" y="2344.0732">last_name (CharField)</text><ellipse cx="1655" cy="2357.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="103" x="1664" y="2360.3701">title (CharField)</text><ellipse cx="1655" cy="2373.3203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118" x="1664" y="2376.667">email (EmailField)</text><ellipse cx="1655" cy="2389.6172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="1664" y="2392.9639">phone (PhoneNumberField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1645" x2="1860" y1="2400.2656" y2="2400.2656"/></g><!--class User--><g id="elem_User"><rect codeLine="332" fill="#D6F4E9" height="381.9375" id="User" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="284" x="1291.5" y="2509"/><ellipse cx="1350.75" cy="2525" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1353.7188,2530.6406 Q1353.1406,2530.9375 1352.5,2531.0781 Q1351.8594,2531.2344 1351.1563,2531.2344 Q1348.6563,2531.2344 1347.3281,2529.5938 Q1346.0156,2527.9375 1346.0156,2524.8125 Q1346.0156,2521.6875 1347.3281,2520.0313 Q1348.6563,2518.375 1351.1563,2518.375 Q1351.8594,2518.375 1352.5,2518.5313 Q1353.1563,2518.6875 1353.7188,2518.9844 L1353.7188,2521.7031 Q1353.0938,2521.125 1352.5,2520.8594 Q1351.9063,2520.5781 1351.2813,2520.5781 Q1349.9375,2520.5781 1349.25,2521.6563 Q1348.5625,2522.7188 1348.5625,2524.8125 Q1348.5625,2526.9063 1349.25,2527.9844 Q1349.9375,2529.0469 1351.2813,2529.0469 Q1351.9063,2529.0469 1352.5,2528.7813 Q1353.0938,2528.5 1353.7188,2527.9219 L1353.7188,2530.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="1371.25" y="2529.8467">registrar.User</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="1520.5" y="2506"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="1521.5" y="2518.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1292.5" x2="1574.5" y1="2541" y2="2541"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="31" x="1297.5" y="2557.9951">user</text><line style="stroke:#181818;stroke-width:1.0;" x1="1292.5" x2="1574.5" y1="2565.2969" y2="2565.2969"/><ellipse cx="1302.5" cy="2578.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="1311.5" y="2582.292">id (BigAutoField)</text><ellipse cx="1302.5" cy="2595.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="145" x="1311.5" y="2598.5889">password (CharField)</text><ellipse cx="1302.5" cy="2611.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="177" x="1311.5" y="2614.8857">last_login (DateTimeField)</text><ellipse cx="1302.5" cy="2627.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="192" x="1311.5" y="2631.1826">is_superuser (BooleanField)</text><ellipse cx="1302.5" cy="2644.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="1311.5" y="2647.4795">username (CharField)</text><ellipse cx="1302.5" cy="2660.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="1311.5" y="2663.7764">first_name (CharField)</text><ellipse cx="1302.5" cy="2676.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="1311.5" y="2680.0732">last_name (CharField)</text><ellipse cx="1302.5" cy="2693.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118" x="1311.5" y="2696.3701">email (EmailField)</text><ellipse cx="1302.5" cy="2709.3203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150" x="1311.5" y="2712.667">is_staff (BooleanField)</text><ellipse cx="1302.5" cy="2725.6172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="161" x="1311.5" y="2728.9639">is_active (BooleanField)</text><ellipse cx="1302.5" cy="2741.9141" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="193" x="1311.5" y="2745.2607">date_joined (DateTimeField)</text><ellipse cx="1302.5" cy="2758.2109" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="1311.5" y="2761.5576">status (CharField)</text><ellipse cx="1302.5" cy="2774.5078" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="1311.5" y="2777.8545">phone (PhoneNumberField)</text><ellipse cx="1302.5" cy="2790.8047" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="1311.5" y="2794.1514">middle_name (CharField)</text><ellipse cx="1302.5" cy="2807.1016" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="103" x="1311.5" y="2810.4482">title (CharField)</text><ellipse cx="1302.5" cy="2823.3984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="188" x="1311.5" y="2826.7451">verification_type (CharField)</text><polygon fill="#FFFF44" points="1302.5,2834.6953,1306.5,2838.6953,1302.5,2842.6953,1298.5,2838.6953" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="185" x="1311.5" y="2843.042">groups (ManyToManyField)</text><polygon fill="#FFFF44" points="1302.5,2850.9922,1306.5,2854.9922,1302.5,2858.9922,1298.5,2854.9922" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="258" x="1311.5" y="2859.3389">user_permissions (ManyToManyField)</text><polygon fill="#FFFF44" points="1302.5,2867.2891,1306.5,2871.2891,1302.5,2875.2891,1298.5,2871.2891" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="195" x="1311.5" y="2875.6357">domains (ManyToManyField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1292.5" x2="1574.5" y1="2882.9375" y2="2882.9375"/></g><!--class Host--><g id="elem_Host"><rect codeLine="52" fill="#D6F4E9" height="153.7813" id="Host" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="217" x="2242" y="2623"/><ellipse cx="2269.6" cy="2639" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M2272.5688,2644.6406 Q2271.9906,2644.9375 2271.35,2645.0781 Q2270.7094,2645.2344 2270.0063,2645.2344 Q2267.5063,2645.2344 2266.1781,2643.5938 Q2264.8656,2641.9375 2264.8656,2638.8125 Q2264.8656,2635.6875 2266.1781,2634.0313 Q2267.5063,2632.375 2270.0063,2632.375 Q2270.7094,2632.375 2271.35,2632.5313 Q2272.0063,2632.6875 2272.5688,2632.9844 L2272.5688,2635.7031 Q2271.9438,2635.125 2271.35,2634.8594 Q2270.7563,2634.5781 2270.1313,2634.5781 Q2268.7875,2634.5781 2268.1,2635.6563 Q2267.4125,2636.7188 2267.4125,2638.8125 Q2267.4125,2640.9063 2268.1,2641.9844 Q2268.7875,2643.0469 2270.1313,2643.0469 Q2270.7563,2643.0469 2271.35,2642.7813 Q2271.9438,2642.5 2272.5688,2641.9219 L2272.5688,2644.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="2286.4" y="2643.8467">registrar.Host</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="2404" y="2620"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="2405" y="2632.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="2243" x2="2458" y1="2655" y2="2655"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="31" x="2248" y="2671.9951">host</text><line style="stroke:#181818;stroke-width:1.0;" x1="2243" x2="2458" y1="2679.2969" y2="2679.2969"/><ellipse cx="2253" cy="2692.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="2262" y="2696.292">id (BigAutoField)</text><ellipse cx="2253" cy="2709.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="2262" y="2712.5889">created_at (DateTimeField)</text><ellipse cx="2253" cy="2725.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="2262" y="2728.8857">updated_at (DateTimeField)</text><ellipse cx="2253" cy="2741.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="2262" y="2745.1826">name (CharField)</text><polygon fill="#4177AF" points="2253,2754.1328,2249,2760.1328,2257,2760.1328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="142" x="2262" y="2761.4795">domain (ForeignKey)</text><line style="stroke:#181818;stroke-width:1.0;" x1="2243" x2="2458" y1="2768.7813" y2="2768.7813"/></g><!--class Domain--><g id="elem_Domain"><rect codeLine="120" fill="#D6F4E9" height="235.2656" id="Domain" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="292" x="1772.5" y="2951"/><ellipse cx="1825.25" cy="2967" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1828.2188,2972.6406 Q1827.6406,2972.9375 1827,2973.0781 Q1826.3594,2973.2344 1825.6563,2973.2344 Q1823.1563,2973.2344 1821.8281,2971.5938 Q1820.5156,2969.9375 1820.5156,2966.8125 Q1820.5156,2963.6875 1821.8281,2962.0313 Q1823.1563,2960.375 1825.6563,2960.375 Q1826.3594,2960.375 1827,2960.5313 Q1827.6563,2960.6875 1828.2188,2960.9844 L1828.2188,2963.7031 Q1827.5938,2963.125 1827,2962.8594 Q1826.4063,2962.5781 1825.7813,2962.5781 Q1824.4375,2962.5781 1823.75,2963.6563 Q1823.0625,2964.7188 1823.0625,2966.8125 Q1823.0625,2968.9063 1823.75,2969.9844 Q1824.4375,2971.0469 1825.7813,2971.0469 Q1826.4063,2971.0469 1827,2970.7813 Q1827.5938,2970.5 1828.2188,2969.9219 L1828.2188,2972.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="114" x="1845.75" y="2971.8467">registrar.Domain</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="2009.5" y="2948"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="2010.5" y="2960.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1773.5" x2="2063.5" y1="2983" y2="2983"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="51" x="1778.5" y="2999.9951">domain</text><line style="stroke:#181818;stroke-width:1.0;" x1="1773.5" x2="2063.5" y1="3007.2969" y2="3007.2969"/><ellipse cx="1783.5" cy="3020.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="1792.5" y="3024.292">id (BigAutoField)</text><ellipse cx="1783.5" cy="3037.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="1792.5" y="3040.5889">created_at (DateTimeField)</text><ellipse cx="1783.5" cy="3053.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="1792.5" y="3056.8857">updated_at (DateTimeField)</text><ellipse cx="1783.5" cy="3069.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="138" x="1792.5" y="3073.1826">name (DomainField)</text><ellipse cx="1783.5" cy="3086.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="1792.5" y="3089.4795">state (FSMField)</text><ellipse cx="1783.5" cy="3102.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="184" x="1792.5" y="3105.7764">expiration_date (DateField)</text><ellipse cx="1783.5" cy="3118.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="266" x="1792.5" y="3122.0732">security_contact_registry_id (TextField)</text><ellipse cx="1783.5" cy="3135.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="1792.5" y="3138.3701">deleted (DateField)</text><ellipse cx="1783.5" cy="3151.3203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="1792.5" y="3154.667">first_ready (DateField)</text><ellipse cx="1783.5" cy="3167.6172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="213" x="1792.5" y="3170.9639">dsdata_last_change (TextField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1773.5" x2="2063.5" y1="3178.2656" y2="3178.2656"/></g><!--class HostIP--><g id="elem_HostIP"><rect codeLine="65" fill="#D6F4E9" height="153.7813" id="HostIP" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="217" x="2242" y="2213.5"/><ellipse cx="2264.2" cy="2229.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M2267.1688,2235.1406 Q2266.5906,2235.4375 2265.95,2235.5781 Q2265.3094,2235.7344 2264.6063,2235.7344 Q2262.1063,2235.7344 2260.7781,2234.0938 Q2259.4656,2232.4375 2259.4656,2229.3125 Q2259.4656,2226.1875 2260.7781,2224.5313 Q2262.1063,2222.875 2264.6063,2222.875 Q2265.3094,2222.875 2265.95,2223.0313 Q2266.6063,2223.1875 2267.1688,2223.4844 L2267.1688,2226.2031 Q2266.5438,2225.625 2265.95,2225.3594 Q2265.3563,2225.0781 2264.7313,2225.0781 Q2263.3875,2225.0781 2262.7,2226.1563 Q2262.0125,2227.2188 2262.0125,2229.3125 Q2262.0125,2231.4063 2262.7,2232.4844 Q2263.3875,2233.5469 2264.7313,2233.5469 Q2265.3563,2233.5469 2265.95,2233.2813 Q2266.5438,2233 2267.1688,2232.4219 L2267.1688,2235.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="105" x="2279.8" y="2234.3467">registrar.HostIP</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="2404" y="2210.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="2405" y="2222.6387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="2243" x2="2458" y1="2245.5" y2="2245.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="2248" y="2262.4951">host ip</text><line style="stroke:#181818;stroke-width:1.0;" x1="2243" x2="2458" y1="2269.7969" y2="2269.7969"/><ellipse cx="2253" cy="2283.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="2262" y="2286.792">id (BigAutoField)</text><ellipse cx="2253" cy="2299.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="2262" y="2303.0889">created_at (DateTimeField)</text><ellipse cx="2253" cy="2316.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="2262" y="2319.3857">updated_at (DateTimeField)</text><ellipse cx="2253" cy="2332.3359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="2262" y="2335.6826">address (CharField)</text><polygon fill="#4177AF" points="2253,2344.6328,2249,2350.6328,2257,2350.6328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="2262" y="2351.9795">host (ForeignKey)</text><line style="stroke:#181818;stroke-width:1.0;" x1="2243" x2="2458" y1="2359.2813" y2="2359.2813"/></g><!--class PublicContact--><g id="elem_PublicContact"><rect codeLine="78" fill="#D6F4E9" height="381.9375" id="PublicContact" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="252" x="1954.5" y="2509"/><ellipse cx="1969.5" cy="2525" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1972.4688,2530.6406 Q1971.8906,2530.9375 1971.25,2531.0781 Q1970.6094,2531.2344 1969.9063,2531.2344 Q1967.4063,2531.2344 1966.0781,2529.5938 Q1964.7656,2527.9375 1964.7656,2524.8125 Q1964.7656,2521.6875 1966.0781,2520.0313 Q1967.4063,2518.375 1969.9063,2518.375 Q1970.6094,2518.375 1971.25,2518.5313 Q1971.9063,2518.6875 1972.4688,2518.9844 L1972.4688,2521.7031 Q1971.8438,2521.125 1971.25,2520.8594 Q1970.6563,2520.5781 1970.0313,2520.5781 Q1968.6875,2520.5781 1968,2521.6563 Q1967.3125,2522.7188 1967.3125,2524.8125 Q1967.3125,2526.9063 1968,2527.9844 Q1968.6875,2529.0469 1970.0313,2529.0469 Q1970.6563,2529.0469 1971.25,2528.7813 Q1971.8438,2528.5 1972.4688,2527.9219 L1972.4688,2530.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="156" x="1983.5" y="2529.8467">registrar.PublicContact</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="2151.5" y="2506"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="2152.5" y="2518.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1955.5" x2="2205.5" y1="2541" y2="2541"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="1960.5" y="2557.9951">public contact</text><line style="stroke:#181818;stroke-width:1.0;" x1="1955.5" x2="2205.5" y1="2565.2969" y2="2565.2969"/><ellipse cx="1965.5" cy="2578.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="1974.5" y="2582.292">id (BigAutoField)</text><ellipse cx="1965.5" cy="2595.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="1974.5" y="2598.5889">created_at (DateTimeField)</text><ellipse cx="1965.5" cy="2611.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="1974.5" y="2614.8857">updated_at (DateTimeField)</text><ellipse cx="1965.5" cy="2627.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="167" x="1974.5" y="2631.1826">contact_type (CharField)</text><ellipse cx="1965.5" cy="2644.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="1974.5" y="2647.4795">registry_id (CharField)</text><polygon fill="#4177AF" points="1965.5,2656.4297,1961.5,2662.4297,1969.5,2662.4297" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="142" x="1974.5" y="2663.7764">domain (ForeignKey)</text><ellipse cx="1965.5" cy="2676.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="1974.5" y="2680.0732">name (CharField)</text><ellipse cx="1965.5" cy="2693.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="101" x="1974.5" y="2696.3701">org (CharField)</text><ellipse cx="1965.5" cy="2709.3203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="1974.5" y="2712.667">street1 (CharField)</text><ellipse cx="1965.5" cy="2725.6172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="1974.5" y="2728.9639">street2 (CharField)</text><ellipse cx="1965.5" cy="2741.9141" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="1974.5" y="2745.2607">street3 (CharField)</text><ellipse cx="1965.5" cy="2758.2109" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="101" x="1974.5" y="2761.5576">city (CharField)</text><ellipse cx="1965.5" cy="2774.5078" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="95" x="1974.5" y="2777.8545">sp (CharField)</text><ellipse cx="1965.5" cy="2790.8047" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="95" x="1974.5" y="2794.1514">pc (CharField)</text><ellipse cx="1965.5" cy="2807.1016" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="94" x="1974.5" y="2810.4482">cc (CharField)</text><ellipse cx="1965.5" cy="2823.3984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118" x="1974.5" y="2826.7451">email (EmailField)</text><ellipse cx="1965.5" cy="2839.6953" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="114" x="1974.5" y="2843.042">voice (CharField)</text><ellipse cx="1965.5" cy="2855.9922" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="1974.5" y="2859.3389">fax (CharField)</text><ellipse cx="1965.5" cy="2872.2891" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="98" x="1974.5" y="2875.6357">pw (CharField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1955.5" x2="2205.5" y1="2882.9375" y2="2882.9375"/></g><!--class UserDomainRole--><g id="elem_UserDomainRole"><rect codeLine="105" fill="#D6F4E9" height="170.0781" id="UserDomainRole" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="273" x="1934" y="2205.5"/><ellipse cx="1949" cy="2221.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1951.9688,2227.1406 Q1951.3906,2227.4375 1950.75,2227.5781 Q1950.1094,2227.7344 1949.4063,2227.7344 Q1946.9063,2227.7344 1945.5781,2226.0938 Q1944.2656,2224.4375 1944.2656,2221.3125 Q1944.2656,2218.1875 1945.5781,2216.5313 Q1946.9063,2214.875 1949.4063,2214.875 Q1950.1094,2214.875 1950.75,2215.0313 Q1951.4063,2215.1875 1951.9688,2215.4844 L1951.9688,2218.2031 Q1951.3438,2217.625 1950.75,2217.3594 Q1950.1563,2217.0781 1949.5313,2217.0781 Q1948.1875,2217.0781 1947.5,2218.1563 Q1946.8125,2219.2188 1946.8125,2221.3125 Q1946.8125,2223.4063 1947.5,2224.4844 Q1948.1875,2225.5469 1949.5313,2225.5469 Q1950.1563,2225.5469 1950.75,2225.2813 Q1951.3438,2225 1951.9688,2224.4219 L1951.9688,2227.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="177" x="1963" y="2226.3467">registrar.UserDomainRole</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="2152" y="2202.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="2153" y="2214.6387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1935" x2="2206" y1="2237.5" y2="2237.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="1940" y="2254.4951">user domain role</text><line style="stroke:#181818;stroke-width:1.0;" x1="1935" x2="2206" y1="2261.7969" y2="2261.7969"/><ellipse cx="1945" cy="2275.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="1954" y="2278.792">id (BigAutoField)</text><ellipse cx="1945" cy="2291.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="1954" y="2295.0889">created_at (DateTimeField)</text><ellipse cx="1945" cy="2308.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="1954" y="2311.3857">updated_at (DateTimeField)</text><polygon fill="#4177AF" points="1945,2320.3359,1941,2326.3359,1949,2326.3359" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="1954" y="2327.6826">user (ForeignKey)</text><polygon fill="#4177AF" points="1945,2336.6328,1941,2342.6328,1949,2342.6328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="142" x="1954" y="2343.9795">domain (ForeignKey)</text><ellipse cx="1945" cy="2356.9297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="102" x="1954" y="2360.2764">role (TextField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1935" x2="2206" y1="2367.5781" y2="2367.5781"/></g><!--class FederalAgency--><g id="elem_FederalAgency"><rect codeLine="137" fill="#D6F4E9" height="153.7813" id="FederalAgency" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="259" x="153" y="2623"/><ellipse cx="168" cy="2639" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M170.9688,2644.6406 Q170.3906,2644.9375 169.75,2645.0781 Q169.1094,2645.2344 168.4063,2645.2344 Q165.9063,2645.2344 164.5781,2643.5938 Q163.2656,2641.9375 163.2656,2638.8125 Q163.2656,2635.6875 164.5781,2634.0313 Q165.9063,2632.375 168.4063,2632.375 Q169.1094,2632.375 169.75,2632.5313 Q170.4063,2632.6875 170.9688,2632.9844 L170.9688,2635.7031 Q170.3438,2635.125 169.75,2634.8594 Q169.1563,2634.5781 168.5313,2634.5781 Q167.1875,2634.5781 166.5,2635.6563 Q165.8125,2636.7188 165.8125,2638.8125 Q165.8125,2640.9063 166.5,2641.9844 Q167.1875,2643.0469 168.5313,2643.0469 Q169.1563,2643.0469 169.75,2642.7813 Q170.3438,2642.5 170.9688,2641.9219 L170.9688,2644.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="163" x="182" y="2643.8467">registrar.FederalAgency</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="357" y="2620"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="358" y="2632.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="154" x2="411" y1="2655" y2="2655"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="105" x="159" y="2671.9951">Federal agency</text><line style="stroke:#181818;stroke-width:1.0;" x1="154" x2="411" y1="2679.2969" y2="2679.2969"/><ellipse cx="164" cy="2692.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="173" y="2696.292">id (BigAutoField)</text><ellipse cx="164" cy="2709.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="173" y="2712.5889">created_at (DateTimeField)</text><ellipse cx="164" cy="2725.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="173" y="2728.8857">updated_at (DateTimeField)</text><ellipse cx="164" cy="2741.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="173" y="2745.1826">agency (CharField)</text><ellipse cx="164" cy="2758.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="173" y="2761.4795">federal_type (CharField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="154" x2="411" y1="2768.7813" y2="2768.7813"/></g><!--class DomainRequest--><g id="elem_DomainRequest"><rect codeLine="149" fill="#D6F4E9" height="789.3594" id="DomainRequest" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="316" x="1182.5" y="1283"/><ellipse cx="1218.65" cy="1299" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1221.6188,1304.6406 Q1221.0406,1304.9375 1220.4,1305.0781 Q1219.7594,1305.2344 1219.0563,1305.2344 Q1216.5563,1305.2344 1215.2281,1303.5938 Q1213.9156,1301.9375 1213.9156,1298.8125 Q1213.9156,1295.6875 1215.2281,1294.0313 Q1216.5563,1292.375 1219.0563,1292.375 Q1219.7594,1292.375 1220.4,1292.5313 Q1221.0563,1292.6875 1221.6188,1292.9844 L1221.6188,1295.7031 Q1220.9938,1295.125 1220.4,1294.8594 Q1219.8063,1294.5781 1219.1813,1294.5781 Q1217.8375,1294.5781 1217.15,1295.6563 Q1216.4625,1296.7188 1216.4625,1298.8125 Q1216.4625,1300.9063 1217.15,1301.9844 Q1217.8375,1303.0469 1219.1813,1303.0469 Q1219.8063,1303.0469 1220.4,1302.7813 Q1220.9938,1302.5 1221.6188,1301.9219 L1221.6188,1304.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="1237.35" y="1303.8467">registrar.DomainRequest</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="1443.5" y="1280"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="1444.5" y="1292.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1183.5" x2="1497.5" y1="1315" y2="1315"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="109" x="1188.5" y="1331.9951">domain request</text><line style="stroke:#181818;stroke-width:1.0;" x1="1183.5" x2="1497.5" y1="1339.2969" y2="1339.2969"/><ellipse cx="1193.5" cy="1352.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="1202.5" y="1356.292">id (BigAutoField)</text><ellipse cx="1193.5" cy="1369.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="1202.5" y="1372.5889">created_at (DateTimeField)</text><ellipse cx="1193.5" cy="1385.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="1202.5" y="1388.8857">updated_at (DateTimeField)</text><ellipse cx="1193.5" cy="1401.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118" x="1202.5" y="1405.1826">status (FSMField)</text><ellipse cx="1193.5" cy="1418.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="1202.5" y="1421.4795">rejection_reason (TextField)</text><ellipse cx="1193.5" cy="1434.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="234" x="1202.5" y="1437.7764">action_needed_reason (TextField)</text><ellipse cx="1193.5" cy="1450.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277" x="1202.5" y="1454.0732">action_needed_reason_email (TextField)</text><polygon fill="#4177AF" points="1193.5,1463.0234,1189.5,1469.0234,1197.5,1469.0234" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="195" x="1202.5" y="1470.3701">federal_agency (ForeignKey)</text><polygon fill="#4177AF" points="1193.5,1479.3203,1189.5,1485.3203,1197.5,1485.3203" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="1202.5" y="1486.667">portfolio (ForeignKey)</text><polygon fill="#4177AF" points="1193.5,1495.6172,1189.5,1501.6172,1197.5,1501.6172" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="140" x="1202.5" y="1502.9639">creator (ForeignKey)</text><polygon fill="#4177AF" points="1193.5,1511.9141,1189.5,1517.9141,1197.5,1517.9141" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171" x="1202.5" y="1519.2607">investigator (ForeignKey)</text><ellipse cx="1193.5" cy="1532.2109" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="1202.5" y="1535.5576">generic_org_type (CharField)</text><ellipse cx="1193.5" cy="1548.5078" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="223" x="1202.5" y="1551.8545">is_election_board (BooleanField)</text><ellipse cx="1193.5" cy="1564.8047" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="1202.5" y="1568.1514">organization_type (CharField)</text><ellipse cx="1193.5" cy="1581.1016" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="283" x="1202.5" y="1584.4482">federally_recognized_tribe (BooleanField)</text><ellipse cx="1193.5" cy="1597.3984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="261" x="1202.5" y="1600.7451">state_recognized_tribe (BooleanField)</text><ellipse cx="1193.5" cy="1613.6953" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155" x="1202.5" y="1617.042">tribe_name (CharField)</text><ellipse cx="1193.5" cy="1629.9922" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="1202.5" y="1633.3389">federal_type (CharField)</text><ellipse cx="1193.5" cy="1646.2891" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="209" x="1202.5" y="1649.6357">organization_name (CharField)</text><ellipse cx="1193.5" cy="1662.5859" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="174" x="1202.5" y="1665.9326">address_line1 (CharField)</text><ellipse cx="1193.5" cy="1678.8828" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="174" x="1202.5" y="1682.2295">address_line2 (CharField)</text><ellipse cx="1193.5" cy="1695.1797" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="101" x="1202.5" y="1698.5264">city (CharField)</text><ellipse cx="1193.5" cy="1711.4766" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="1202.5" y="1714.8232">state_territory (CharField)</text><ellipse cx="1193.5" cy="1727.7734" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="133" x="1202.5" y="1731.1201">zipcode (CharField)</text><ellipse cx="1193.5" cy="1744.0703" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="163" x="1202.5" y="1747.417">urbanization (CharField)</text><ellipse cx="1193.5" cy="1760.3672" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="245" x="1202.5" y="1763.7139">about_your_organization (TextField)</text><polygon fill="#4177AF" points="1193.5,1772.6641,1189.5,1778.6641,1197.5,1778.6641" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="183" x="1202.5" y="1780.0107">senior_official (ForeignKey)</text><polygon fill="#4177AF" points="1193.5,1788.9609,1189.5,1794.9609,1197.5,1794.9609" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="245" x="1202.5" y="1796.3076">approved_domain (OneToOneField)</text><polygon fill="#4177AF" points="1193.5,1805.2578,1189.5,1811.2578,1197.5,1811.2578" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="252" x="1202.5" y="1812.6045">requested_domain (OneToOneField)</text><polygon fill="#4177AF" points="1193.5,1821.5547,1189.5,1827.5547,1197.5,1827.5547" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="1202.5" y="1828.9014">submitter (ForeignKey)</text><ellipse cx="1193.5" cy="1841.8516" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="1202.5" y="1845.1982">purpose (TextField)</text><ellipse cx="1193.5" cy="1858.1484" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="271" x="1202.5" y="1861.4951">no_other_contacts_rationale (TextField)</text><ellipse cx="1193.5" cy="1874.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171" x="1202.5" y="1877.792">anything_else (TextField)</text><ellipse cx="1193.5" cy="1890.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="263" x="1202.5" y="1894.0889">has_anything_else_text (BooleanField)</text><ellipse cx="1193.5" cy="1907.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="259" x="1202.5" y="1910.3857">cisa_representative_email (EmailField)</text><ellipse cx="1193.5" cy="1923.3359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="1202.5" y="1926.6826">cisa_representative_first_name (CharField)</text><ellipse cx="1193.5" cy="1939.6328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="1202.5" y="1942.9795">cisa_representative_last_name (CharField)</text><ellipse cx="1193.5" cy="1955.9297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="269" x="1202.5" y="1959.2764">has_cisa_representative (BooleanField)</text><ellipse cx="1193.5" cy="1972.2266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="268" x="1202.5" y="1975.5732">is_policy_acknowledged (BooleanField)</text><ellipse cx="1193.5" cy="1988.5234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196" x="1202.5" y="1991.8701">submission_date (DateField)</text><ellipse cx="1193.5" cy="2004.8203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="1202.5" y="2008.167">notes (TextField)</text><polygon fill="#FFFF44" points="1193.5,2016.1172,1197.5,2020.1172,1193.5,2024.1172,1189.5,2020.1172" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="255" x="1202.5" y="2024.4639">current_websites (ManyToManyField)</text><polygon fill="#FFFF44" points="1193.5,2032.4141,1197.5,2036.4141,1193.5,2040.4141,1189.5,2036.4141" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="273" x="1202.5" y="2040.7607">alternative_domains (ManyToManyField)</text><polygon fill="#FFFF44" points="1193.5,2048.7109,1197.5,2052.7109,1193.5,2056.7109,1189.5,2052.7109" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="240" x="1202.5" y="2057.0576">other_contacts (ManyToManyField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1183.5" x2="1497.5" y1="2064.3594" y2="2064.3594"/></g><!--class Portfolio--><g id="elem_Portfolio"><rect codeLine="404" fill="#D6F4E9" height="316.75" id="Portfolio" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="264" x="150.5" y="2132"/><ellipse cx="188.45" cy="2148" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M191.4188,2153.6406 Q190.8406,2153.9375 190.2,2154.0781 Q189.5594,2154.2344 188.8563,2154.2344 Q186.3563,2154.2344 185.0281,2152.5938 Q183.7156,2150.9375 183.7156,2147.8125 Q183.7156,2144.6875 185.0281,2143.0313 Q186.3563,2141.375 188.8563,2141.375 Q189.5594,2141.375 190.2,2141.5313 Q190.8563,2141.6875 191.4188,2141.9844 L191.4188,2144.7031 Q190.7938,2144.125 190.2,2143.8594 Q189.6063,2143.5781 188.9813,2143.5781 Q187.6375,2143.5781 186.95,2144.6563 Q186.2625,2145.7188 186.2625,2147.8125 Q186.2625,2149.9063 186.95,2150.9844 Q187.6375,2152.0469 188.9813,2152.0469 Q189.6063,2152.0469 190.2,2151.7813 Q190.7938,2151.5 191.4188,2150.9219 L191.4188,2153.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="207.55" y="2152.8467">registrar.Portfolio</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="359.5" y="2129"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="360.5" y="2141.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="151.5" x2="413.5" y1="2164" y2="2164"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="156.5" y="2180.9951">portfolio</text><line style="stroke:#181818;stroke-width:1.0;" x1="151.5" x2="413.5" y1="2188.2969" y2="2188.2969"/><ellipse cx="161.5" cy="2201.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="170.5" y="2205.292">id (BigAutoField)</text><ellipse cx="161.5" cy="2218.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="170.5" y="2221.5889">created_at (DateTimeField)</text><ellipse cx="161.5" cy="2234.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="170.5" y="2237.8857">updated_at (DateTimeField)</text><polygon fill="#4177AF" points="161.5,2246.8359,157.5,2252.8359,165.5,2252.8359" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="140" x="170.5" y="2254.1826">creator (ForeignKey)</text><ellipse cx="161.5" cy="2267.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="170.5" y="2270.4795">notes (TextField)</text><polygon fill="#4177AF" points="161.5,2279.4297,157.5,2285.4297,165.5,2285.4297" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="195" x="170.5" y="2286.7764">federal_agency (ForeignKey)</text><ellipse cx="161.5" cy="2299.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="170.5" y="2303.0732">organization_type (CharField)</text><ellipse cx="161.5" cy="2316.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="209" x="170.5" y="2319.3701">organization_name (CharField)</text><ellipse cx="161.5" cy="2332.3203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="174" x="170.5" y="2335.667">address_line1 (CharField)</text><ellipse cx="161.5" cy="2348.6172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="174" x="170.5" y="2351.9639">address_line2 (CharField)</text><ellipse cx="161.5" cy="2364.9141" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="101" x="170.5" y="2368.2607">city (CharField)</text><ellipse cx="161.5" cy="2381.2109" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="170.5" y="2384.5576">state_territory (CharField)</text><ellipse cx="161.5" cy="2397.5078" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="133" x="170.5" y="2400.8545">zipcode (CharField)</text><ellipse cx="161.5" cy="2413.8047" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="163" x="170.5" y="2417.1514">urbanization (CharField)</text><ellipse cx="161.5" cy="2430.1016" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="238" x="170.5" y="2433.4482">security_contact_email (EmailField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="151.5" x2="413.5" y1="2440.75" y2="2440.75"/></g><!--class DraftDomain--><g id="elem_DraftDomain"><rect codeLine="262" fill="#D6F4E9" height="137.4844" id="DraftDomain" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="243" x="450" y="2222"/><ellipse cx="465" cy="2238" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M467.9688,2243.6406 Q467.3906,2243.9375 466.75,2244.0781 Q466.1094,2244.2344 465.4063,2244.2344 Q462.9063,2244.2344 461.5781,2242.5938 Q460.2656,2240.9375 460.2656,2237.8125 Q460.2656,2234.6875 461.5781,2233.0313 Q462.9063,2231.375 465.4063,2231.375 Q466.1094,2231.375 466.75,2231.5313 Q467.4063,2231.6875 467.9688,2231.9844 L467.9688,2234.7031 Q467.3438,2234.125 466.75,2233.8594 Q466.1563,2233.5781 465.5313,2233.5781 Q464.1875,2233.5781 463.5,2234.6563 Q462.8125,2235.7188 462.8125,2237.8125 Q462.8125,2239.9063 463.5,2240.9844 Q464.1875,2242.0469 465.5313,2242.0469 Q466.1563,2242.0469 466.75,2241.7813 Q467.3438,2241.5 467.9688,2240.9219 L467.9688,2243.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="479" y="2242.8467">registrar.DraftDomain</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="638" y="2219"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="639" y="2231.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="451" x2="692" y1="2254" y2="2254"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="86" x="456" y="2270.9951">draft domain</text><line style="stroke:#181818;stroke-width:1.0;" x1="451" x2="692" y1="2278.2969" y2="2278.2969"/><ellipse cx="461" cy="2291.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="470" y="2295.292">id (BigAutoField)</text><ellipse cx="461" cy="2308.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="470" y="2311.5889">created_at (DateTimeField)</text><ellipse cx="461" cy="2324.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="470" y="2327.8857">updated_at (DateTimeField)</text><ellipse cx="461" cy="2340.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="470" y="2344.1826">name (CharField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="451" x2="692" y1="2351.4844" y2="2351.4844"/></g><!--class Website--><g id="elem_Website"><rect codeLine="370" fill="#D6F4E9" height="137.4844" id="Website" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="217" x="728" y="2222"/><ellipse cx="744.8" cy="2238" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M747.7688,2243.6406 Q747.1906,2243.9375 746.55,2244.0781 Q745.9094,2244.2344 745.2063,2244.2344 Q742.7063,2244.2344 741.3781,2242.5938 Q740.0656,2240.9375 740.0656,2237.8125 Q740.0656,2234.6875 741.3781,2233.0313 Q742.7063,2231.375 745.2063,2231.375 Q745.9094,2231.375 746.55,2231.5313 Q747.2063,2231.6875 747.7688,2231.9844 L747.7688,2234.7031 Q747.1438,2234.125 746.55,2233.8594 Q745.9563,2233.5781 745.3313,2233.5781 Q743.9875,2233.5781 743.3,2234.6563 Q742.6125,2235.7188 742.6125,2237.8125 Q742.6125,2239.9063 743.3,2240.9844 Q743.9875,2242.0469 745.3313,2242.0469 Q745.9563,2242.0469 746.55,2241.7813 Q747.1438,2241.5 747.7688,2240.9219 L747.7688,2243.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="759.2" y="2242.8467">registrar.Website</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="890" y="2219"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="891" y="2231.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="729" x2="944" y1="2254" y2="2254"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="734" y="2270.9951">website</text><line style="stroke:#181818;stroke-width:1.0;" x1="729" x2="944" y1="2278.2969" y2="2278.2969"/><ellipse cx="739" cy="2291.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="748" y="2295.292">id (BigAutoField)</text><ellipse cx="739" cy="2308.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="748" y="2311.5889">created_at (DateTimeField)</text><ellipse cx="739" cy="2324.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="748" y="2327.8857">updated_at (DateTimeField)</text><ellipse cx="739" cy="2340.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="748" y="2344.1826">website (CharField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="729" x2="944" y1="2351.4844" y2="2351.4844"/></g><!--class DomainInformation--><g id="elem_DomainInformation"><rect codeLine="211" fill="#D6F4E9" height="658.9844" id="DomainInformation" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="316" x="1594.5" y="564"/><ellipse cx="1622.55" cy="580" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1625.5188,585.6406 Q1624.9406,585.9375 1624.3,586.0781 Q1623.6594,586.2344 1622.9563,586.2344 Q1620.4563,586.2344 1619.1281,584.5938 Q1617.8156,582.9375 1617.8156,579.8125 Q1617.8156,576.6875 1619.1281,575.0313 Q1620.4563,573.375 1622.9563,573.375 Q1623.6594,573.375 1624.3,573.5313 Q1624.9563,573.6875 1625.5188,573.9844 L1625.5188,576.7031 Q1624.8938,576.125 1624.3,575.8594 Q1623.7063,575.5781 1623.0813,575.5781 Q1621.7375,575.5781 1621.05,576.6563 Q1620.3625,577.7188 1620.3625,579.8125 Q1620.3625,581.9063 1621.05,582.9844 Q1621.7375,584.0469 1623.0813,584.0469 Q1623.7063,584.0469 1624.3,583.7813 Q1624.8938,583.5 1625.5188,582.9219 L1625.5188,585.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="1639.45" y="584.8467">registrar.DomainInformation</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="1855.5" y="561"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="1856.5" y="573.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1595.5" x2="1909.5" y1="596" y2="596"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="1600.5" y="612.9951">domain information</text><line style="stroke:#181818;stroke-width:1.0;" x1="1595.5" x2="1909.5" y1="620.2969" y2="620.2969"/><ellipse cx="1605.5" cy="633.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="1614.5" y="637.292">id (BigAutoField)</text><ellipse cx="1605.5" cy="650.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="1614.5" y="653.5889">created_at (DateTimeField)</text><ellipse cx="1605.5" cy="666.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="1614.5" y="669.8857">updated_at (DateTimeField)</text><polygon fill="#4177AF" points="1605.5,678.8359,1601.5,684.8359,1609.5,684.8359" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="195" x="1614.5" y="686.1826">federal_agency (ForeignKey)</text><polygon fill="#4177AF" points="1605.5,695.1328,1601.5,701.1328,1609.5,701.1328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="140" x="1614.5" y="702.4795">creator (ForeignKey)</text><polygon fill="#4177AF" points="1605.5,711.4297,1601.5,717.4297,1609.5,717.4297" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="1614.5" y="718.7764">portfolio (ForeignKey)</text><polygon fill="#4177AF" points="1605.5,727.7266,1601.5,733.7266,1609.5,733.7266" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="234" x="1614.5" y="735.0732">domain_request (OneToOneField)</text><ellipse cx="1605.5" cy="748.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="1614.5" y="751.3701">generic_org_type (CharField)</text><ellipse cx="1605.5" cy="764.3203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="1614.5" y="767.667">organization_type (CharField)</text><ellipse cx="1605.5" cy="780.6172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="283" x="1614.5" y="783.9639">federally_recognized_tribe (BooleanField)</text><ellipse cx="1605.5" cy="796.9141" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="261" x="1614.5" y="800.2607">state_recognized_tribe (BooleanField)</text><ellipse cx="1605.5" cy="813.2109" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155" x="1614.5" y="816.5576">tribe_name (CharField)</text><ellipse cx="1605.5" cy="829.5078" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="1614.5" y="832.8545">federal_type (CharField)</text><ellipse cx="1605.5" cy="845.8047" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="223" x="1614.5" y="849.1514">is_election_board (BooleanField)</text><ellipse cx="1605.5" cy="862.1016" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="209" x="1614.5" y="865.4482">organization_name (CharField)</text><ellipse cx="1605.5" cy="878.3984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="174" x="1614.5" y="881.7451">address_line1 (CharField)</text><ellipse cx="1605.5" cy="894.6953" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="174" x="1614.5" y="898.042">address_line2 (CharField)</text><ellipse cx="1605.5" cy="910.9922" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="101" x="1614.5" y="914.3389">city (CharField)</text><ellipse cx="1605.5" cy="927.2891" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="1614.5" y="930.6357">state_territory (CharField)</text><ellipse cx="1605.5" cy="943.5859" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="133" x="1614.5" y="946.9326">zipcode (CharField)</text><ellipse cx="1605.5" cy="959.8828" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="163" x="1614.5" y="963.2295">urbanization (CharField)</text><ellipse cx="1605.5" cy="976.1797" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="245" x="1614.5" y="979.5264">about_your_organization (TextField)</text><polygon fill="#4177AF" points="1605.5,988.4766,1601.5,994.4766,1609.5,994.4766" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="183" x="1614.5" y="995.8232">senior_official (ForeignKey)</text><polygon fill="#4177AF" points="1605.5,1004.7734,1601.5,1010.7734,1609.5,1010.7734" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="1614.5" y="1012.1201">domain (OneToOneField)</text><polygon fill="#4177AF" points="1605.5,1021.0703,1601.5,1027.0703,1609.5,1027.0703" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="1614.5" y="1028.417">submitter (ForeignKey)</text><ellipse cx="1605.5" cy="1041.3672" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="1614.5" y="1044.7139">purpose (TextField)</text><ellipse cx="1605.5" cy="1057.6641" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="271" x="1614.5" y="1061.0107">no_other_contacts_rationale (TextField)</text><ellipse cx="1605.5" cy="1073.9609" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171" x="1614.5" y="1077.3076">anything_else (TextField)</text><ellipse cx="1605.5" cy="1090.2578" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="263" x="1614.5" y="1093.6045">has_anything_else_text (BooleanField)</text><ellipse cx="1605.5" cy="1106.5547" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="259" x="1614.5" y="1109.9014">cisa_representative_email (EmailField)</text><ellipse cx="1605.5" cy="1122.8516" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="1614.5" y="1126.1982">cisa_representative_first_name (CharField)</text><ellipse cx="1605.5" cy="1139.1484" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="289" x="1614.5" y="1142.4951">cisa_representative_last_name (CharField)</text><ellipse cx="1605.5" cy="1155.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="269" x="1614.5" y="1158.792">has_cisa_representative (BooleanField)</text><ellipse cx="1605.5" cy="1171.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="268" x="1614.5" y="1175.0889">is_policy_acknowledged (BooleanField)</text><ellipse cx="1605.5" cy="1188.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="1614.5" y="1191.3857">notes (TextField)</text><polygon fill="#FFFF44" points="1605.5,1199.3359,1609.5,1203.3359,1605.5,1207.3359,1601.5,1203.3359" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="240" x="1614.5" y="1207.6826">other_contacts (ManyToManyField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1595.5" x2="1909.5" y1="1214.9844" y2="1214.9844"/></g><!--class DomainInvitation--><g id="elem_DomainInvitation"><rect codeLine="273" fill="#D6F4E9" height="170.0781" id="DomainInvitation" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="271" x="1611" y="2615"/><ellipse cx="1626" cy="2631" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1628.9688,2636.6406 Q1628.3906,2636.9375 1627.75,2637.0781 Q1627.1094,2637.2344 1626.4063,2637.2344 Q1623.9063,2637.2344 1622.5781,2635.5938 Q1621.2656,2633.9375 1621.2656,2630.8125 Q1621.2656,2627.6875 1622.5781,2626.0313 Q1623.9063,2624.375 1626.4063,2624.375 Q1627.1094,2624.375 1627.75,2624.5313 Q1628.4063,2624.6875 1628.9688,2624.9844 L1628.9688,2627.7031 Q1628.3438,2627.125 1627.75,2626.8594 Q1627.1563,2626.5781 1626.5313,2626.5781 Q1625.1875,2626.5781 1624.5,2627.6563 Q1623.8125,2628.7188 1623.8125,2630.8125 Q1623.8125,2632.9063 1624.5,2633.9844 Q1625.1875,2635.0469 1626.5313,2635.0469 Q1627.1563,2635.0469 1627.75,2634.7813 Q1628.3438,2634.5 1628.9688,2633.9219 L1628.9688,2636.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="1640" y="2635.8467">registrar.DomainInvitation</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="1827" y="2612"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="1828" y="2624.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1612" x2="1881" y1="2647" y2="2647"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="1617" y="2663.9951">domain invitation</text><line style="stroke:#181818;stroke-width:1.0;" x1="1612" x2="1881" y1="2671.2969" y2="2671.2969"/><ellipse cx="1622" cy="2684.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="1631" y="2688.292">id (BigAutoField)</text><ellipse cx="1622" cy="2701.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="1631" y="2704.5889">created_at (DateTimeField)</text><ellipse cx="1622" cy="2717.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="1631" y="2720.8857">updated_at (DateTimeField)</text><ellipse cx="1622" cy="2733.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118" x="1631" y="2737.1826">email (EmailField)</text><polygon fill="#4177AF" points="1622,2746.1328,1618,2752.1328,1626,2752.1328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="142" x="1631" y="2753.4795">domain (ForeignKey)</text><ellipse cx="1622" cy="2766.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118" x="1631" y="2769.7764">status (FSMField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1612" x2="1881" y1="2777.0781" y2="2777.0781"/></g><!--class TransitionDomain--><g id="elem_TransitionDomain"><rect codeLine="287" fill="#D6F4E9" height="463.4219" id="TransitionDomain" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="278" x="2023.5" y="41"/><ellipse cx="2038.5" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M2041.4688,62.6406 Q2040.8906,62.9375 2040.25,63.0781 Q2039.6094,63.2344 2038.9063,63.2344 Q2036.4063,63.2344 2035.0781,61.5938 Q2033.7656,59.9375 2033.7656,56.8125 Q2033.7656,53.6875 2035.0781,52.0313 Q2036.4063,50.375 2038.9063,50.375 Q2039.6094,50.375 2040.25,50.5313 Q2040.9063,50.6875 2041.4688,50.9844 L2041.4688,53.7031 Q2040.8438,53.125 2040.25,52.8594 Q2039.6563,52.5781 2039.0313,52.5781 Q2037.6875,52.5781 2037,53.6563 Q2036.3125,54.7188 2036.3125,56.8125 Q2036.3125,58.9063 2037,59.9844 Q2037.6875,61.0469 2039.0313,61.0469 Q2039.6563,61.0469 2040.25,60.7813 Q2040.8438,60.5 2041.4688,59.9219 L2041.4688,62.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="182" x="2052.5" y="61.8467">registrar.TransitionDomain</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="2246.5" y="38"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="2247.5" y="50.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="2024.5" x2="2300.5" y1="73" y2="73"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="119" x="2029.5" y="89.9951">transition domain</text><line style="stroke:#181818;stroke-width:1.0;" x1="2024.5" x2="2300.5" y1="97.2969" y2="97.2969"/><ellipse cx="2034.5" cy="110.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="2043.5" y="114.292">id (BigAutoField)</text><ellipse cx="2034.5" cy="127.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="2043.5" y="130.5889">created_at (DateTimeField)</text><ellipse cx="2034.5" cy="143.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="2043.5" y="146.8857">updated_at (DateTimeField)</text><ellipse cx="2034.5" cy="159.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="2043.5" y="163.1826">username (CharField)</text><ellipse cx="2034.5" cy="176.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="2043.5" y="179.4795">domain_name (CharField)</text><ellipse cx="2034.5" cy="192.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="2043.5" y="195.7764">status (CharField)</text><ellipse cx="2034.5" cy="208.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="177" x="2043.5" y="212.0732">email_sent (BooleanField)</text><ellipse cx="2034.5" cy="225.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="177" x="2043.5" y="228.3701">processed (BooleanField)</text><ellipse cx="2034.5" cy="241.3203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="197" x="2043.5" y="244.667">generic_org_type (CharField)</text><ellipse cx="2034.5" cy="257.6172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="209" x="2043.5" y="260.9639">organization_name (CharField)</text><ellipse cx="2034.5" cy="273.9141" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="2043.5" y="277.2607">federal_type (CharField)</text><ellipse cx="2034.5" cy="290.2109" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="182" x="2043.5" y="293.5576">federal_agency (CharField)</text><ellipse cx="2034.5" cy="306.5078" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="207" x="2043.5" y="309.8545">epp_creation_date (DateField)</text><ellipse cx="2034.5" cy="322.8047" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="218" x="2043.5" y="326.1514">epp_expiration_date (DateField)</text><ellipse cx="2034.5" cy="339.1016" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="2043.5" y="342.4482">first_name (CharField)</text><ellipse cx="2034.5" cy="355.3984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="2043.5" y="358.7451">middle_name (CharField)</text><ellipse cx="2034.5" cy="371.6953" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="2043.5" y="375.042">last_name (CharField)</text><ellipse cx="2034.5" cy="387.9922" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="103" x="2043.5" y="391.3389">title (CharField)</text><ellipse cx="2034.5" cy="404.2891" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118" x="2043.5" y="407.6357">email (EmailField)</text><ellipse cx="2034.5" cy="420.5859" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="123" x="2043.5" y="423.9326">phone (CharField)</text><ellipse cx="2034.5" cy="436.8828" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="165" x="2043.5" y="440.2295">address_line (CharField)</text><ellipse cx="2034.5" cy="453.1797" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="101" x="2043.5" y="456.5264">city (CharField)</text><ellipse cx="2034.5" cy="469.4766" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="2043.5" y="472.8232">state_territory (CharField)</text><ellipse cx="2034.5" cy="485.7734" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="133" x="2043.5" y="489.1201">zipcode (CharField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="2024.5" x2="2300.5" y1="496.4219" y2="496.4219"/></g><!--class VerifiedByStaff--><g id="elem_VerifiedByStaff"><rect codeLine="318" fill="#D6F4E9" height="170.0781" id="VerifiedByStaff" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="255" x="1316" y="2205.5"/><ellipse cx="1331" cy="2221.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1333.9688,2227.1406 Q1333.3906,2227.4375 1332.75,2227.5781 Q1332.1094,2227.7344 1331.4063,2227.7344 Q1328.9063,2227.7344 1327.5781,2226.0938 Q1326.2656,2224.4375 1326.2656,2221.3125 Q1326.2656,2218.1875 1327.5781,2216.5313 Q1328.9063,2214.875 1331.4063,2214.875 Q1332.1094,2214.875 1332.75,2215.0313 Q1333.4063,2215.1875 1333.9688,2215.4844 L1333.9688,2218.2031 Q1333.3438,2217.625 1332.75,2217.3594 Q1332.1563,2217.0781 1331.5313,2217.0781 Q1330.1875,2217.0781 1329.5,2218.1563 Q1328.8125,2219.2188 1328.8125,2221.3125 Q1328.8125,2223.4063 1329.5,2224.4844 Q1330.1875,2225.5469 1331.5313,2225.5469 Q1332.1563,2225.5469 1332.75,2225.2813 Q1333.3438,2225 1333.9688,2224.4219 L1333.9688,2227.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="159" x="1345" y="2226.3467">registrar.VerifiedByStaff</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="1516" y="2202.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="1517" y="2214.6387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1317" x2="1570" y1="2237.5" y2="2237.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="102" x="1322" y="2254.4951">verified by staff</text><line style="stroke:#181818;stroke-width:1.0;" x1="1317" x2="1570" y1="2261.7969" y2="2261.7969"/><ellipse cx="1327" cy="2275.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="1336" y="2278.792">id (BigAutoField)</text><ellipse cx="1327" cy="2291.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="1336" y="2295.0889">created_at (DateTimeField)</text><ellipse cx="1327" cy="2308.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="1336" y="2311.3857">updated_at (DateTimeField)</text><ellipse cx="1327" cy="2324.3359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118" x="1336" y="2327.6826">email (EmailField)</text><polygon fill="#4177AF" points="1327,2336.6328,1323,2342.6328,1331,2342.6328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="159" x="1336" y="2343.9795">requestor (ForeignKey)</text><ellipse cx="1327" cy="2356.9297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="1336" y="2360.2764">notes (TextField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1317" x2="1570" y1="2367.5781" y2="2367.5781"/></g><!--class UserGroup--><g id="elem_UserGroup"><rect codeLine="359" fill="#D6F4E9" height="137.4844" id="UserGroup" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="246" x="1547.5" y="204"/><ellipse cx="1568.8" cy="220" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1571.7688,225.6406 Q1571.1906,225.9375 1570.55,226.0781 Q1569.9094,226.2344 1569.2063,226.2344 Q1566.7063,226.2344 1565.3781,224.5938 Q1564.0656,222.9375 1564.0656,219.8125 Q1564.0656,216.6875 1565.3781,215.0313 Q1566.7063,213.375 1569.2063,213.375 Q1569.9094,213.375 1570.55,213.5313 Q1571.2063,213.6875 1571.7688,213.9844 L1571.7688,216.7031 Q1571.1438,216.125 1570.55,215.8594 Q1569.9563,215.5781 1569.3313,215.5781 Q1567.9875,215.5781 1567.3,216.6563 Q1566.6125,217.7188 1566.6125,219.8125 Q1566.6125,221.9063 1567.3,222.9844 Q1567.9875,224.0469 1569.3313,224.0469 Q1569.9563,224.0469 1570.55,223.7813 Q1571.1438,223.5 1571.7688,222.9219 L1571.7688,225.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="136" x="1584.2" y="224.8467">registrar.UserGroup</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="1738.5" y="201"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="1739.5" y="213.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1548.5" x2="1792.5" y1="236" y2="236"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="77" x="1553.5" y="252.9951">User group</text><line style="stroke:#181818;stroke-width:1.0;" x1="1548.5" x2="1792.5" y1="260.2969" y2="260.2969"/><rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="1555.5" y="270.9453"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="90" x="1567.5" y="277.292">id (AutoField)</text><ellipse cx="1558.5" cy="290.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="1567.5" y="293.5889">name (CharField)</text><polygon fill="#4177AF" points="1558.5,302.5391,1554.5,308.5391,1562.5,308.5391" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="1567.5" y="309.8857">group_ptr (OneToOneField)</text><polygon fill="#FFFF44" points="1558.5,317.8359,1562.5,321.8359,1558.5,325.8359,1554.5,321.8359" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="220" x="1567.5" y="326.1826">permissions (ManyToManyField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1548.5" x2="1792.5" y1="333.4844" y2="333.4844"/></g><!--class WaffleFlag--><g id="elem_WaffleFlag"><rect codeLine="381" fill="#D6F4E9" height="316.75" id="WaffleFlag" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="226" x="1054.5" y="2132"/><ellipse cx="1069.5" cy="2148" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1072.4688,2153.6406 Q1071.8906,2153.9375 1071.25,2154.0781 Q1070.6094,2154.2344 1069.9063,2154.2344 Q1067.4063,2154.2344 1066.0781,2152.5938 Q1064.7656,2150.9375 1064.7656,2147.8125 Q1064.7656,2144.6875 1066.0781,2143.0313 Q1067.4063,2141.375 1069.9063,2141.375 Q1070.6094,2141.375 1071.25,2141.5313 Q1071.9063,2141.6875 1072.4688,2141.9844 L1072.4688,2144.7031 Q1071.8438,2144.125 1071.25,2143.8594 Q1070.6563,2143.5781 1070.0313,2143.5781 Q1068.6875,2143.5781 1068,2144.6563 Q1067.3125,2145.7188 1067.3125,2147.8125 Q1067.3125,2149.9063 1068,2150.9844 Q1068.6875,2152.0469 1070.0313,2152.0469 Q1070.6563,2152.0469 1071.25,2151.7813 Q1071.8438,2151.5 1072.4688,2150.9219 L1072.4688,2153.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="130" x="1083.5" y="2152.8467">registrar.WaffleFlag</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="1225.5" y="2129"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="1226.5" y="2141.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1055.5" x2="1279.5" y1="2164" y2="2164"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="67" x="1060.5" y="2180.9951">waffle flag</text><line style="stroke:#181818;stroke-width:1.0;" x1="1055.5" x2="1279.5" y1="2188.2969" y2="2188.2969"/><ellipse cx="1065.5" cy="2201.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="1074.5" y="2205.292">id (BigAutoField)</text><ellipse cx="1065.5" cy="2218.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="1074.5" y="2221.5889">name (CharField)</text><ellipse cx="1065.5" cy="2234.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="167" x="1074.5" y="2237.8857">everyone (BooleanField)</text><ellipse cx="1065.5" cy="2250.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155" x="1074.5" y="2254.1826">percent (DecimalField)</text><ellipse cx="1065.5" cy="2267.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="151" x="1074.5" y="2270.4795">testing (BooleanField)</text><ellipse cx="1065.5" cy="2283.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="182" x="1074.5" y="2286.7764">superusers (BooleanField)</text><ellipse cx="1065.5" cy="2299.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="1074.5" y="2303.0732">staff (BooleanField)</text><ellipse cx="1065.5" cy="2316.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="199" x="1074.5" y="2319.3701">authenticated (BooleanField)</text><ellipse cx="1065.5" cy="2332.3203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="1074.5" y="2335.667">languages (TextField)</text><ellipse cx="1065.5" cy="2348.6172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="146" x="1074.5" y="2351.9639">rollout (BooleanField)</text><ellipse cx="1065.5" cy="2364.9141" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="108" x="1074.5" y="2368.2607">note (TextField)</text><ellipse cx="1065.5" cy="2381.2109" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="166" x="1074.5" y="2384.5576">created (DateTimeField)</text><ellipse cx="1065.5" cy="2397.5078" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="172" x="1074.5" y="2400.8545">modified (DateTimeField)</text><polygon fill="#FFFF44" points="1065.5,2408.8047,1069.5,2412.8047,1065.5,2416.8047,1061.5,2412.8047" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="185" x="1074.5" y="2417.1514">groups (ManyToManyField)</text><polygon fill="#FFFF44" points="1065.5,2425.1016,1069.5,2429.1016,1065.5,2433.1016,1061.5,2429.1016" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="1074.5" y="2433.4482">users (ManyToManyField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1055.5" x2="1279.5" y1="2440.75" y2="2440.75"/></g><!--class DomainGroup--><g id="elem_DomainGroup"><rect codeLine="428" fill="#D6F4E9" height="170.0781" id="DomainGroup" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="253" x="870" y="187.5"/><ellipse cx="885" cy="203.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M887.9688,209.1406 Q887.3906,209.4375 886.75,209.5781 Q886.1094,209.7344 885.4063,209.7344 Q882.9063,209.7344 881.5781,208.0938 Q880.2656,206.4375 880.2656,203.3125 Q880.2656,200.1875 881.5781,198.5313 Q882.9063,196.875 885.4063,196.875 Q886.1094,196.875 886.75,197.0313 Q887.4063,197.1875 887.9688,197.4844 L887.9688,200.2031 Q887.3438,199.625 886.75,199.3594 Q886.1563,199.0781 885.5313,199.0781 Q884.1875,199.0781 883.5,200.1563 Q882.8125,201.2188 882.8125,203.3125 Q882.8125,205.4063 883.5,206.4844 Q884.1875,207.5469 885.5313,207.5469 Q886.1563,207.5469 886.75,207.2813 Q887.3438,207 887.9688,206.4219 L887.9688,209.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="899" y="208.3467">registrar.DomainGroup</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="1068" y="184.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="1069" y="196.6387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="871" x2="1122" y1="219.5" y2="219.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="96" x="876" y="236.4951">domain group</text><line style="stroke:#181818;stroke-width:1.0;" x1="871" x2="1122" y1="243.7969" y2="243.7969"/><ellipse cx="881" cy="257.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="890" y="260.792">id (BigAutoField)</text><ellipse cx="881" cy="273.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="890" y="277.0889">created_at (DateTimeField)</text><ellipse cx="881" cy="290.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="890" y="293.3857">updated_at (DateTimeField)</text><ellipse cx="881" cy="306.3359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="890" y="309.6826">name (CharField)</text><polygon fill="#4177AF" points="881,318.6328,877,324.6328,885,324.6328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="890" y="325.9795">portfolio (ForeignKey)</text><polygon fill="#FFFF44" points="881,333.9297,885,337.9297,881,341.9297,877,337.9297" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="195" x="890" y="342.2764">domains (ManyToManyField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="871" x2="1122" y1="349.5781" y2="349.5781"/></g><!--class Suborganization--><g id="elem_Suborganization"><rect codeLine="443" fill="#D6F4E9" height="153.7813" id="Suborganization" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="269" x="188" y="1600.5"/><ellipse cx="203" cy="1616.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M205.9688,1622.1406 Q205.3906,1622.4375 204.75,1622.5781 Q204.1094,1622.7344 203.4063,1622.7344 Q200.9063,1622.7344 199.5781,1621.0938 Q198.2656,1619.4375 198.2656,1616.3125 Q198.2656,1613.1875 199.5781,1611.5313 Q200.9063,1609.875 203.4063,1609.875 Q204.1094,1609.875 204.75,1610.0313 Q205.4063,1610.1875 205.9688,1610.4844 L205.9688,1613.2031 Q205.3438,1612.625 204.75,1612.3594 Q204.1563,1612.0781 203.5313,1612.0781 Q202.1875,1612.0781 201.5,1613.1563 Q200.8125,1614.2188 200.8125,1616.3125 Q200.8125,1618.4063 201.5,1619.4844 Q202.1875,1620.5469 203.5313,1620.5469 Q204.1563,1620.5469 204.75,1620.2813 Q205.3438,1620 205.9688,1619.4219 L205.9688,1622.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="217" y="1621.3467">registrar.Suborganization</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="58" x="402" y="1597.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="56" x="403" y="1609.6387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="189" x2="456" y1="1632.5" y2="1632.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="194" y="1649.4951">suborganization</text><line style="stroke:#181818;stroke-width:1.0;" x1="189" x2="456" y1="1656.7969" y2="1656.7969"/><ellipse cx="199" cy="1670.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="208" y="1673.792">id (BigAutoField)</text><ellipse cx="199" cy="1686.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="208" y="1690.0889">created_at (DateTimeField)</text><ellipse cx="199" cy="1703.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="208" y="1706.3857">updated_at (DateTimeField)</text><ellipse cx="199" cy="1719.3359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="208" y="1722.6826">name (CharField)</text><polygon fill="#4177AF" points="199,1731.6328,195,1737.6328,203,1737.6328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="208" y="1738.9795">portfolio (ForeignKey)</text><line style="stroke:#181818;stroke-width:1.0;" x1="189" x2="456" y1="1746.2813" y2="1746.2813"/></g><!--link Contact to User--><g id="link_Contact_User"><path codeLine="49" d="M1661.3,2408 C1634.6,2442.11 1604.75,2480.23 1575.68,2517.37 " fill="none" id="Contact-User" style="stroke:#181818;stroke-width:1.0;"/></g><!--link Host to Domain--><g id="link_Host_Domain"><path codeLine="62" d="M2310.91,2777.36 C2288.96,2814.7 2259.11,2858.48 2224.5,2891 C2178.01,2934.67 2118.79,2971.99 2064.86,3000.91 " fill="none" id="Host-Domain" style="stroke:#181818;stroke-width:1.0;"/></g><!--link HostIP to Host--><g id="link_HostIP_Host"><path codeLine="75" d="M2350.5,2367.67 C2350.5,2440.58 2350.5,2549.96 2350.5,2622.86 " fill="none" id="HostIP-Host" style="stroke:#181818;stroke-width:1.0;"/></g><!--link PublicContact to Domain--><g id="link_PublicContact_Domain"><path codeLine="102" d="M1996.41,2891.23 C1987.48,2911.45 1978.59,2931.55 1970.19,2950.56 " fill="none" id="PublicContact-Domain" style="stroke:#181818;stroke-width:1.0;"/></g><!--link UserDomainRole to User--><g id="link_UserDomainRole_User"><path codeLine="116" d="M2000.68,2375.89 C1973.93,2403.15 1941.39,2430.96 1906.5,2449 C1780.68,2514.07 1715.7,2437.38 1593.5,2509 C1587.45,2512.54 1581.53,2516.4 1575.74,2520.52 " fill="none" id="UserDomainRole-User" style="stroke:#181818;stroke-width:1.0;"/></g><!--link UserDomainRole to Domain--><g id="link_UserDomainRole_Domain"><path codeLine="117" d="M2004.94,2375.72 C1978.86,2414.16 1951.71,2461.62 1937.5,2509 C1893.25,2656.52 1896.57,2835.85 1905.48,2950.81 " fill="none" id="UserDomainRole-Domain" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to FederalAgency--><g id="link_DomainRequest_FederalAgency"><path codeLine="198" d="M1182.34,1852.99 C1118.65,1932.66 1050.65,2031.54 1009.5,2132 C955.5,2263.8 1052.37,2338.51 962.5,2449 C826.58,2616.1 568.21,2671.51 412.04,2689.89 " fill="none" id="DomainRequest-FederalAgency" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to Portfolio--><g id="link_DomainRequest_Portfolio"><path codeLine="199" d="M1182.22,1801.68 C1061.87,1889.51 888.84,2003.69 720.5,2072 C599.34,2121.16 546.76,2068.45 432.5,2132 C426.56,2135.3 420.71,2138.92 414.97,2142.79 " fill="none" id="DomainRequest-Portfolio" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to User--><g id="link_DomainRequest_User"><path codeLine="200" d="M1498.65,1946.33 C1528.51,2005.26 1555.39,2068.97 1571.5,2132 C1606.38,2268.5 1610.09,2313.5 1571.5,2449 C1565.76,2469.14 1557.89,2489.24 1548.78,2508.79 " fill="none" id="DomainRequest-User" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to User--><g id="link_DomainRequest_User"><path codeLine="201" d="M1498.56,1884.72 C1542.75,1959.27 1584.58,2046.25 1606.5,2132 C1641.38,2268.5 1645.09,2313.5 1606.5,2449 C1599.15,2474.78 1588.3,2500.51 1575.54,2525.11 " fill="none" id="DomainRequest-User-1" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to Contact--><g id="link_DomainRequest_Contact"><path codeLine="202" d="M1498.69,1951.83 C1550.44,2029.52 1606.38,2110.01 1652.73,2172.91 " fill="none" id="DomainRequest-Contact" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to Contact--><g id="link_DomainRequest_Contact"><path codeLine="205" d="M1498.61,1912.98 C1558.52,2001.83 1624.15,2099.15 1673.67,2172.6 " fill="none" id="DomainRequest-Contact-1" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to Contact--><g id="link_DomainRequest_Contact"><path codeLine="208" d="M1505.6241,1886.265 C1574.5241,1984.215 1637.5985,2079.0131 1688.7885,2162.7031 " fill="none" id="DomainRequest-Contact-2" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1498.72,1876.45,1498.9004,1883.6588,1505.6241,1886.265,1505.4437,1879.0561,1498.72,1876.45" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1695.05,2172.94,1695.3315,2165.7344,1688.7885,2162.7031,1688.507,2169.9087,1695.05,2172.94" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to Domain--><g id="link_DomainRequest_Domain"><path codeLine="203" d="M1182.34,1861.47 C1124.93,1939.47 1066.98,2034.82 1037.5,2132 C996.6,2266.82 1003.17,2312.36 1037.5,2449 C1091.8,2665.19 1100.2,2752.05 1274.5,2891 C1418.29,3005.63 1631.14,3045.97 1772.26,3060.07 " fill="none" id="DomainRequest-Domain" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to DraftDomain--><g id="link_DomainRequest_DraftDomain"><path codeLine="204" d="M1182.32,1778.01 C1050.25,1864.38 860.1,1996.55 710.5,2132 C680.35,2159.29 650.1,2192.69 625.55,2221.69 " fill="none" id="DomainRequest-DraftDomain" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to Website--><g id="link_DomainRequest_Website"><path codeLine="206" d="M1174.6094,1865.2281 C1071.4794,1987.6681 959.0715,2124.9055 891.2115,2212.4555 " fill="none" id="DomainRequest-Website" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1182.34,1856.05,1175.4153,1858.0622,1174.6094,1865.2281,1181.5341,1863.2159,1182.34,1856.05" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="883.86,2221.94,890.6972,2219.6482,891.2115,2212.4555,884.3742,2214.7473,883.86,2221.94" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to Website--><g id="link_DomainRequest_Website"><path codeLine="207" d="M1174.8094,1895.0987 C1079.8994,2012.0787 979.8145,2132.21 909.0845,2212.82 " fill="none" id="DomainRequest-Website-1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1182.37,1885.78,1175.4835,1887.9191,1174.8094,1895.0987,1181.6959,1892.9595,1182.37,1885.78" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="901.17,2221.84,908.1339,2219.9681,909.0845,2212.82,902.1206,2214.6918,901.17,2221.84" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to FederalAgency--><g id="link_DomainInformation_FederalAgency"><path codeLine="252" d="M1594.2,909.7 C1230.31,948.18 351.57,1062.43 170.5,1283 C6,1483.38 63.29,2199.16 132.5,2449 C150.03,2512.29 188.32,2575.65 221.83,2622.74 " fill="none" id="DomainInformation-FederalAgency" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to User--><g id="link_DomainInformation_User"><path codeLine="253" d="M1803.05,1223.38 C1865.23,1651.46 1953.83,2356.16 1878.5,2449 C1796.94,2549.52 1704.57,2442.54 1593.5,2509 C1587.39,2512.65 1581.41,2516.63 1575.56,2520.86 " fill="none" id="DomainInformation-User" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to Portfolio--><g id="link_DomainInformation_Portfolio"><path codeLine="254" d="M1594.29,983.4 C1471.3,1056.13 1299.63,1165.81 1165.5,1283 C814.46,1589.69 782.3,1721.94 474.5,2072 C455.12,2094.03 434.63,2117.3 414.52,2140.1 " fill="none" id="DomainInformation-Portfolio" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to DomainRequest--><g id="link_DomainInformation_DomainRequest"><path codeLine="255" d="M1594.39,1194.61 C1562.96,1254.26 1529.95,1316.9 1498.53,1376.55 " fill="none" id="DomainInformation-DomainRequest" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to Contact--><g id="link_DomainInformation_Contact"><path codeLine="256" d="M1729.82,1223.33 C1723.28,1528.62 1725.72,1966.14 1737.15,2172.85 " fill="none" id="DomainInformation-Contact" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to Contact--><g id="link_DomainInformation_Contact"><path codeLine="258" d="M1752.5,1223.33 C1752.5,1528.62 1752.5,1966.14 1752.5,2172.85 " fill="none" id="DomainInformation-Contact-1" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to Contact--><g id="link_DomainInformation_Contact"><path codeLine="259" d="M1775.4274,1235.3272 C1781.9774,1540.6172 1779.9425,1954.1583 1768.5125,2160.8683 " fill="none" id="DomainInformation-Contact-2" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1775.17,1223.33,1771.2996,1229.4144,1775.4274,1235.3272,1779.2978,1229.2428,1775.17,1223.33" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1767.85,2172.85,1772.1752,2167.08,1768.5125,2160.8683,1764.1874,2166.6383,1767.85,2172.85" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to Domain--><g id="link_DomainInformation_Domain"><path codeLine="257" d="M1910.56,1088.28 C2088.46,1320.06 2366.9,1727.64 2476.5,2132 C2520.62,2294.79 2576.17,2754.93 2476.5,2891 C2427.34,2958.11 2212.76,3011.58 2064.5,3041.4 " fill="none" id="DomainInformation-Domain" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInvitation to Domain--><g id="link_DomainInvitation_Domain"><path codeLine="284" d="M1785.96,2785.08 C1809.02,2834.22 1838.46,2896.97 1863.74,2950.83 " fill="none" id="DomainInvitation-Domain" style="stroke:#181818;stroke-width:1.0;"/></g><!--link VerifiedByStaff to User--><g id="link_VerifiedByStaff_User"><path codeLine="329" d="M1441.42,2375.93 C1440.48,2414.63 1439.31,2462.2 1438.16,2508.81 " fill="none" id="VerifiedByStaff-User" style="stroke:#181818;stroke-width:1.0;"/></g><!--link User to Domain--><g id="link_User_Domain"><path codeLine="356" d="M1584.5159,2883.6658 C1590.3959,2889.0158 1587.48,2886.09 1593.5,2891 C1647.23,2934.83 1702.757,2967.6833 1761.387,2997.2733 " fill="none" id="User-Domain" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1575.64,2875.59,1577.386,2882.5865,1584.5159,2883.6658,1582.7699,2876.6693,1575.64,2875.59" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1772.1,3002.68,1768.5458,2996.4057,1761.387,2997.2733,1764.9413,3003.5476,1772.1,3002.68" style="stroke:#181818;stroke-width:1.0;"/></g><!--link WaffleFlag to User--><g id="link_WaffleFlag_User"><path codeLine="401" d="M1276.8979,2459.0996 C1289.6879,2478.6996 1289.76,2478.8018 1302.83,2498.8218 " fill="none" id="WaffleFlag-User" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1270.34,2449.05,1270.2691,2456.2608,1276.8979,2459.0996,1276.9688,2451.8888,1270.34,2449.05" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1309.39,2508.87,1309.4594,2501.6592,1302.83,2498.8218,1302.7606,2506.0325,1309.39,2508.87" style="stroke:#181818;stroke-width:1.0;"/></g><!--link Portfolio to User--><g id="link_Portfolio_User"><path codeLine="424" d="M414.67,2437.58 C420.51,2441.66 426.46,2445.49 432.5,2449 C709.39,2610.22 1088.05,2668.2 1291.07,2688.5 " fill="none" id="Portfolio-User" style="stroke:#181818;stroke-width:1.0;"/></g><!--link Portfolio to FederalAgency--><g id="link_Portfolio_FederalAgency"><path codeLine="425" d="M282.5,2449.05 C282.5,2508.74 282.5,2574.01 282.5,2622.88 " fill="none" id="Portfolio-FederalAgency" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainGroup to Portfolio--><g id="link_DomainGroup_Portfolio"><path codeLine="439" d="M891.17,357.53 C703.12,515.15 315.72,876.19 170.5,1283 C52.6,1613.25 87.9,1731.2 170.5,2072 C175.35,2092.02 182.38,2112.26 190.6,2131.92 " fill="none" id="DomainGroup-Portfolio" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainGroup to DomainInformation--><g id="link_DomainGroup_DomainInformation"><path codeLine="440" d="M1108.5251,365.2318 C1236.0051,469.6018 1436.1255,633.4575 1585.0455,755.3975 " fill="none" id="DomainGroup-DomainInformation" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1099.24,357.63,1101.3486,364.5259,1108.5251,365.2318,1106.4165,358.3359,1099.24,357.63" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1594.33,763,1592.2219,756.1039,1585.0455,755.3975,1587.1536,762.2936,1594.33,763" style="stroke:#181818;stroke-width:1.0;"/></g><!--link Suborganization to Portfolio--><g id="link_Suborganization_Portfolio"><path codeLine="453" d="M317.51,1754.65 C311.37,1848.54 300.76,2010.54 292.83,2131.71 " fill="none" id="Suborganization-Portfolio" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[xLfVRzis47_Ffo2Q5w-11xGR1WmO1hJDiWL3jw39raU1bYYPdKng59L4BPRFlXCbEwPqHyb1fxH3yv04l1_5-t_7a-ASboLxOaGcIsku-VgLLfR7bltmPhlqunF6IpP472VVfT-Axzc78mO_SRlg_byktPyJ9XEsU2cp5vNLPrBaoLVTUcm4joA9k6MBK_ZlIcw41wYA90IuOrKf35lyhiILXb_UtbIQqaQARmHRl5fpun4tCaboGL516UHEAssEhOiDbpbR_DJyyGZ5MYlOSD7y-QtQhCJ-Fb3HFqT3dIwNUuh-0sGyEZgA-oRwHPSX-pYoRvmrBCrZcHE6gk-E9HeKfDZYJ1iXC_Mhg555EEOzBPowZPGUpYz6D060eIwOBEPI1qyI8u3leKOS8rFq0I9u6cdMC7rSLAjSnkC1xEDyxHIEDcyqdsoFYsnTO27MiLv73GUJFOjmnHEcJOQimW52s6SavJb9-GQXnDBMs8O2MInYx07n8RdcMiiO4pNbjzY1DuF5djlvBZ8n7fjyrLBVQ4YLj0FsWBu7kipUsTG0UTwAqdUYa7irtB75bRYrj29xeWxp-pGehVIM4b1s1_2Lt0erRqbe6Ud53y11jPUlVJU_BQJXLceL9GxGFDNVAEBAG8X5sypXfOYUIKvO8d81728FQfi5a32f4MfImlayScr1lEOg8-oDsELC9CBm_4KcL5m7pEFZV2jrDCOTSRQArRA299EM7JnBKtheF5hyNObWr-BZC6y5i2FEfOV6EQjow9r6l1EnSquuejGAyJVUqfK0ZIM7mQ8kn_V0TpljRyqpp5I5DZRLkTGOqUb3enbEgcjGgynm-Wc30uMHSGHrawhGiemWn5fnLfgRnYWQiXXN_ShBbNpVXZRng4xEl0Q5n3e3EEZ66haI-3DT3fc8TIIgmG-wTuztuX5TinVbKebd8_Jd1tGDJaGh3AGyRJ34Urd4Ei5OgingnpR6qKfNDgfrPQ9z0H7_AuMI6b1fAcC9IGbn95uKHb-32ROr4xcVtMt3U0nMLgkDj5QWBbbKfj2bG69AwKZRjJ3Rob16RINXEORcghPhgJBmNlHfQrv67WQiS6jnvufboS4F2x2mWAEjl1OHsR1XuE355TiGkgusd2DxSDOXV0j8774TyVWlfMzoaMI2Y65dbx8C56UbhIW7oZncKB8Dy17TY5Kf7UGrwFPADxyz8C_1xAgLiVKH6kiRcu3rcZA_rdYDbbUEfssvsARTQV1Ur_THa5sZFWtSzPBJi8Qdzf0DOvmyNIwVxi7Vjgxm7y6tp91joRbAjTcq6M-iDTd7eks9l0VCTMSPxma2PJ_OBhGoHLsk9YPj4ng3pxdYFwIf-T8OXExGNmhzPrJegJB-y8gxdq8FgBhaDhH0acYwJfDRlEeoVHjL14VE-RW7750Bxujyg0hkeNhrhw4yoaZfe1d4kRgMTcgjtq69Kh-bpoKlaLz2uqbyVa44vaxUYMF7AyCLj6AmOzHn1b1VfNP7djc5ce4laLExxeUWRXMBZ-UZ9WNZ6HLknp5KUIhX7jfEFQohwVUCGocA8dBQ3Lpn6ipubFOJUnCRxBhcQBge_FGdc3sL8dbPNrgUfe5OwYFzKBhkg6nLDrocwQDdf-x-WCyLyGQZbw3w4azwGzwiZxn_GjuwJTDM0MVTQ9DGJflhhCd7g9wW_IghGfZsNHEM0m99AHXDeNWXuw9XnocLwXMR0JNLIZOk4RtJ43h9o01z-Funz6N4M6QWehzr_ZXmqpnccT5LGS-I6kL7O9vklaK3mqCfv1LWlniBlqJzkM5pn7zRZE_4xYGduxuhBvqh3_oO-4x3ROyAYtzTSyp6rKDbkMvu4v1hY_2bwiQ5S-MoxhZ9oVij150kpdAUXIIx1_M4SmIM0cMQW5ICW_lNBghGnaEOs7KbfoAM6-vd0Tky_54PDUtjqbL9pcAe_C4hk2WgsuGarV7aN6KLD28bSYCtEizrPUcxARAdipvXsOrEslA8aISbXuaHlsVjNjnJ1MjtDmrzjhF3z3xPsTrhPvewaZD5ggIF3ogd3Gh_dvEsmRSCHBtkVwApSuVGJ8H0-GCNyieyLeZsKUX5UL2C7k7Bmy2S-y1AlY_knD5I2qQh_zwm1hF0PRNo1g-q5Vf8tnAbJ_rqZT5JTbygGk57_m80]--></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="3504px" preserveAspectRatio="none" style="width:3106px;height:3504px;background:#FFFFFF;" version="1.1" viewBox="0 0 3106 3504" width="3106px" zoomAndPan="magnify"><defs/><g><!--cluster registrar--><g id="cluster_registrar"><path d="M88.06,6 L158.561,6 A3.75,3.75 0 0 1 161.061,8.5 L168.061,28.2969 L3097.06,28.2969 A2.5,2.5 0 0 1 3099.56,30.7969 L3099.56,3494.5 A2.5,2.5 0 0 1 3097.06,3497 L88.06,3497 A2.5,2.5 0 0 1 85.56,3494.5 L85.56,8.5 A2.5,2.5 0 0 1 88.06,6 " fill="none" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="85.56" x2="168.061" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="69.501" x="89.56" y="20.9951">registrar</text></g><!--class Contact--><g id="elem_Contact"><rect codeLine="34" fill="#D6F4E9" height="218.9688" id="Contact" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="222.1436" x="1961.56" y="2238"/><ellipse cx="1980.1174" cy="2254" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1983.0861,2259.6406 Q1982.508,2259.9375 1981.8674,2260.0781 Q1981.2267,2260.2344 1980.5236,2260.2344 Q1978.0236,2260.2344 1976.6955,2258.5938 Q1975.383,2256.9375 1975.383,2253.8125 Q1975.383,2250.6875 1976.6955,2249.0313 Q1978.0236,2247.375 1980.5236,2247.375 Q1981.2267,2247.375 1981.8674,2247.5313 Q1982.5236,2247.6875 1983.0861,2247.9844 L1983.0861,2250.7031 Q1982.4611,2250.125 1981.8674,2249.8594 Q1981.2736,2249.5781 1980.6486,2249.5781 Q1979.3049,2249.5781 1978.6174,2250.6563 Q1977.9299,2251.7188 1977.9299,2253.8125 Q1977.9299,2255.9063 1978.6174,2256.9844 Q1979.3049,2258.0469 1980.6486,2258.0469 Q1981.2736,2258.0469 1981.8674,2257.7813 Q1982.4611,2257.5 1983.0861,2256.9219 L1983.0861,2259.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118.9385" x="1994.9079" y="2258.8467">registrar.Contact</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="2129.8539" y="2235"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="2130.8539" y="2247.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1962.56" x2="2182.7036" y1="2270" y2="2270"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52.3906" x="1967.56" y="2286.9951">contact</text><line style="stroke:#181818;stroke-width:1.0;" x1="1962.56" x2="2182.7036" y1="2294.2969" y2="2294.2969"/><ellipse cx="1972.56" cy="2307.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="1981.56" y="2311.292">id (BigAutoField)</text><ellipse cx="1972.56" cy="2324.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="1981.56" y="2327.5889">created_at (DateTimeField)</text><ellipse cx="1972.56" cy="2340.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="1981.56" y="2343.8857">updated_at (DateTimeField)</text><ellipse cx="1972.56" cy="2356.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155.75" x="1981.56" y="2360.1826">first_name (CharField)</text><ellipse cx="1972.56" cy="2373.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176.1963" x="1981.56" y="2376.4795">middle_name (CharField)</text><ellipse cx="1972.56" cy="2389.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153.6445" x="1981.56" y="2392.7764">last_name (CharField)</text><ellipse cx="1972.56" cy="2405.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="109.0605" x="1981.56" y="2409.0732">title (CharField)</text><ellipse cx="1972.56" cy="2422.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126.1572" x="1981.56" y="2425.3701">email (EmailField)</text><ellipse cx="1972.56" cy="2438.3203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="192.124" x="1981.56" y="2441.667">phone (PhoneNumberField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1962.56" x2="2182.7036" y1="2448.9688" y2="2448.9688"/></g><!--class Host--><g id="elem_Host"><rect codeLine="50" fill="#D6F4E9" height="153.7813" id="Host" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="222.1436" x="2218.56" y="2270.5"/><ellipse cx="2247.2841" cy="2286.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M2250.2529,2292.1406 Q2249.6747,2292.4375 2249.0341,2292.5781 Q2248.3935,2292.7344 2247.6904,2292.7344 Q2245.1904,2292.7344 2243.8622,2291.0938 Q2242.5497,2289.4375 2242.5497,2286.3125 Q2242.5497,2283.1875 2243.8622,2281.5313 Q2245.1904,2279.875 2247.6904,2279.875 Q2248.3935,2279.875 2249.0341,2280.0313 Q2249.6904,2280.1875 2250.2529,2280.4844 L2250.2529,2283.2031 Q2249.6279,2282.625 2249.0341,2282.3594 Q2248.4404,2282.0781 2247.8154,2282.0781 Q2246.4716,2282.0781 2245.7841,2283.1563 Q2245.0966,2284.2188 2245.0966,2286.3125 Q2245.0966,2288.4063 2245.7841,2289.4844 Q2246.4716,2290.5469 2247.8154,2290.5469 Q2248.4404,2290.5469 2249.0341,2290.2813 Q2249.6279,2290 2250.2529,2289.4219 L2250.2529,2292.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="96.3457" x="2264.3339" y="2291.3467">registrar.Host</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="2386.8539" y="2267.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="2387.8539" y="2279.6387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="2219.56" x2="2439.7036" y1="2302.5" y2="2302.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30.2217" x="2224.56" y="2319.4951">host</text><line style="stroke:#181818;stroke-width:1.0;" x1="2219.56" x2="2439.7036" y1="2326.7969" y2="2326.7969"/><ellipse cx="2229.56" cy="2340.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="2238.56" y="2343.792">id (BigAutoField)</text><ellipse cx="2229.56" cy="2356.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="2238.56" y="2360.0889">created_at (DateTimeField)</text><ellipse cx="2229.56" cy="2373.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="2238.56" y="2376.3857">updated_at (DateTimeField)</text><ellipse cx="2229.56" cy="2389.3359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121.3926" x="2238.56" y="2392.6826">name (CharField)</text><polygon fill="#4177AF" points="2229.56,2401.6328,2225.56,2407.6328,2233.56,2407.6328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="146.5215" x="2238.56" y="2408.9795">domain (ForeignKey)</text><line style="stroke:#181818;stroke-width:1.0;" x1="2219.56" x2="2439.7036" y1="2416.2813" y2="2416.2813"/></g><!--class Domain--><g id="elem_Domain"><rect codeLine="118" fill="#D6F4E9" height="235.2656" id="Domain" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="301.6797" x="2178.56" y="2672"/><ellipse cx="2234.1025" cy="2688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M2237.0712,2693.6406 Q2236.4931,2693.9375 2235.8525,2694.0781 Q2235.2119,2694.2344 2234.5087,2694.2344 Q2232.0087,2694.2344 2230.6806,2692.5938 Q2229.3681,2690.9375 2229.3681,2687.8125 Q2229.3681,2684.6875 2230.6806,2683.0313 Q2232.0087,2681.375 2234.5087,2681.375 Q2235.2119,2681.375 2235.8525,2681.5313 Q2236.5087,2681.6875 2237.0712,2681.9844 L2237.0712,2684.7031 Q2236.4462,2684.125 2235.8525,2683.8594 Q2235.2587,2683.5781 2234.6337,2683.5781 Q2233.29,2683.5781 2232.6025,2684.6563 Q2231.915,2685.7188 2231.915,2687.8125 Q2231.915,2689.9063 2232.6025,2690.9844 Q2233.29,2692.0469 2234.6337,2692.0469 Q2235.2587,2692.0469 2235.8525,2691.7813 Q2236.4462,2691.5 2237.0712,2690.9219 L2237.0712,2693.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118.7949" x="2254.6025" y="2692.8467">registrar.Domain</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="2426.3901" y="2669"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="2427.3901" y="2681.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="2179.56" x2="2479.2397" y1="2704" y2="2704"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52.4316" x="2184.56" y="2720.9951">domain</text><line style="stroke:#181818;stroke-width:1.0;" x1="2179.56" x2="2479.2397" y1="2728.2969" y2="2728.2969"/><ellipse cx="2189.56" cy="2741.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="2198.56" y="2745.292">id (BigAutoField)</text><ellipse cx="2189.56" cy="2758.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="2198.56" y="2761.5889">created_at (DateTimeField)</text><ellipse cx="2189.56" cy="2774.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="2198.56" y="2777.8857">updated_at (DateTimeField)</text><ellipse cx="2189.56" cy="2790.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="142.7344" x="2198.56" y="2794.1826">name (DomainField)</text><ellipse cx="2189.56" cy="2807.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="113.1895" x="2198.56" y="2810.4795">state (FSMField)</text><ellipse cx="2189.56" cy="2823.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="2198.56" y="2826.7764">expiration_date (DateField)</text><ellipse cx="2189.56" cy="2839.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="275.6797" x="2198.56" y="2843.0732">security_contact_registry_id (TextField)</text><ellipse cx="2189.56" cy="2856.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="135.1602" x="2198.56" y="2859.3701">deleted (DateField)</text><ellipse cx="2189.56" cy="2872.3203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="156.6455" x="2198.56" y="2875.667">first_ready (DateField)</text><ellipse cx="2189.56" cy="2888.6172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="218.1348" x="2198.56" y="2891.9639">dsdata_last_change (TextField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="2179.56" x2="2479.2397" y1="2899.2656" y2="2899.2656"/></g><!--class HostIP--><g id="elem_HostIP"><rect codeLine="63" fill="#D6F4E9" height="153.7813" id="HostIP" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="222.1436" x="2218.56" y="1600.5"/><ellipse cx="2241.627" cy="1616.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M2244.5958,1622.1406 Q2244.0177,1622.4375 2243.377,1622.5781 Q2242.7364,1622.7344 2242.0333,1622.7344 Q2239.5333,1622.7344 2238.2052,1621.0938 Q2236.8927,1619.4375 2236.8927,1616.3125 Q2236.8927,1613.1875 2238.2052,1611.5313 Q2239.5333,1609.875 2242.0333,1609.875 Q2242.7364,1609.875 2243.377,1610.0313 Q2244.0333,1610.1875 2244.5958,1610.4844 L2244.5958,1613.2031 Q2243.9708,1612.625 2243.377,1612.3594 Q2242.7833,1612.0781 2242.1583,1612.0781 Q2240.8145,1612.0781 2240.127,1613.1563 Q2239.4395,1614.2188 2239.4395,1616.3125 Q2239.4395,1618.4063 2240.127,1619.4844 Q2240.8145,1620.5469 2242.1583,1620.5469 Q2242.7833,1620.5469 2243.377,1620.2813 Q2243.9708,1620 2244.5958,1619.4219 L2244.5958,1622.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="108.917" x="2257.4197" y="1621.3467">registrar.HostIP</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="2386.8539" y="1597.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="2387.8539" y="1609.6387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="2219.56" x2="2439.7036" y1="1632.5" y2="1632.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47.4482" x="2224.56" y="1649.4951">host ip</text><line style="stroke:#181818;stroke-width:1.0;" x1="2219.56" x2="2439.7036" y1="1656.7969" y2="1656.7969"/><ellipse cx="2229.56" cy="1670.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="2238.56" y="1673.792">id (BigAutoField)</text><ellipse cx="2229.56" cy="1686.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="2238.56" y="1690.0889">created_at (DateTimeField)</text><ellipse cx="2229.56" cy="1703.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="2238.56" y="1706.3857">updated_at (DateTimeField)</text><ellipse cx="2229.56" cy="1719.3359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="136.999" x="2238.56" y="1722.6826">address (CharField)</text><polygon fill="#4177AF" points="2229.56,1731.6328,2225.56,1737.6328,2233.56,1737.6328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="124.3115" x="2238.56" y="1738.9795">host (ForeignKey)</text><line style="stroke:#181818;stroke-width:1.0;" x1="2219.56" x2="2439.7036" y1="1746.2813" y2="1746.2813"/></g><!--class PublicContact--><g id="elem_PublicContact"><rect codeLine="76" fill="#D6F4E9" height="381.9375" id="PublicContact" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="255.917" x="2475.56" y="2156.5"/><ellipse cx="2490.56" cy="2172.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M2493.5288,2178.1406 Q2492.9506,2178.4375 2492.31,2178.5781 Q2491.6694,2178.7344 2490.9663,2178.7344 Q2488.4663,2178.7344 2487.1381,2177.0938 Q2485.8256,2175.4375 2485.8256,2172.3125 Q2485.8256,2169.1875 2487.1381,2167.5313 Q2488.4663,2165.875 2490.9663,2165.875 Q2491.6694,2165.875 2492.31,2166.0313 Q2492.9663,2166.1875 2493.5288,2166.4844 L2493.5288,2169.2031 Q2492.9038,2168.625 2492.31,2168.3594 Q2491.7163,2168.0781 2491.0913,2168.0781 Q2489.7475,2168.0781 2489.06,2169.1563 Q2488.3725,2170.2188 2488.3725,2172.3125 Q2488.3725,2174.4063 2489.06,2175.4844 Q2489.7475,2176.5469 2491.0913,2176.5469 Q2491.7163,2176.5469 2492.31,2176.2813 Q2492.9038,2176 2493.5288,2175.4219 L2493.5288,2178.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160.6172" x="2504.56" y="2177.3467">registrar.PublicContact</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="2677.6274" y="2153.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="2678.6274" y="2165.6387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="2476.56" x2="2730.477" y1="2188.5" y2="2188.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="98.9639" x="2481.56" y="2205.4951">public contact</text><line style="stroke:#181818;stroke-width:1.0;" x1="2476.56" x2="2730.477" y1="2212.7969" y2="2212.7969"/><ellipse cx="2486.56" cy="2226.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="2495.56" y="2229.792">id (BigAutoField)</text><ellipse cx="2486.56" cy="2242.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="2495.56" y="2246.0889">created_at (DateTimeField)</text><ellipse cx="2486.56" cy="2259.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="2495.56" y="2262.3857">updated_at (DateTimeField)</text><ellipse cx="2486.56" cy="2275.3359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="172.3545" x="2495.56" y="2278.6826">contact_type (CharField)</text><ellipse cx="2486.56" cy="2291.6328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155.4355" x="2495.56" y="2294.9795">registry_id (CharField)</text><polygon fill="#4177AF" points="2486.56,2303.9297,2482.56,2309.9297,2490.56,2309.9297" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="146.5215" x="2495.56" y="2311.2764">domain (ForeignKey)</text><ellipse cx="2486.56" cy="2324.2266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121.3926" x="2495.56" y="2327.5732">name (CharField)</text><ellipse cx="2486.56" cy="2340.5234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104.8975" x="2495.56" y="2343.8701">org (CharField)</text><ellipse cx="2486.56" cy="2356.8203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131.8516" x="2495.56" y="2360.167">street1 (CharField)</text><ellipse cx="2486.56" cy="2373.1172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131.8516" x="2495.56" y="2376.4639">street2 (CharField)</text><ellipse cx="2486.56" cy="2389.4141" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131.8516" x="2495.56" y="2392.7607">street3 (CharField)</text><ellipse cx="2486.56" cy="2405.7109" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107.0508" x="2495.56" y="2409.0576">city (CharField)</text><ellipse cx="2486.56" cy="2422.0078" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97.8701" x="2495.56" y="2425.3545">sp (CharField)</text><ellipse cx="2486.56" cy="2438.3047" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="98.2734" x="2495.56" y="2441.6514">pc (CharField)</text><ellipse cx="2486.56" cy="2454.6016" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97.084" x="2495.56" y="2457.9482">cc (CharField)</text><ellipse cx="2486.56" cy="2470.8984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126.1572" x="2495.56" y="2474.2451">email (EmailField)</text><ellipse cx="2486.56" cy="2487.1953" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118.7402" x="2495.56" y="2490.542">voice (CharField)</text><ellipse cx="2486.56" cy="2503.4922" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="103.4824" x="2495.56" y="2506.8389">fax (CharField)</text><ellipse cx="2486.56" cy="2519.7891" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="102.0264" x="2495.56" y="2523.1357">pw (CharField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="2476.56" x2="2730.477" y1="2530.4375" y2="2530.4375"/></g><!--class UserDomainRole--><g id="elem_UserDomainRole"><rect codeLine="103" fill="#D6F4E9" height="170.0781" id="UserDomainRole" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="276.8008" x="1232.06" y="1592.5"/><ellipse cx="1247.06" cy="1608.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1250.0288,1614.1406 Q1249.4506,1614.4375 1248.81,1614.5781 Q1248.1694,1614.7344 1247.4663,1614.7344 Q1244.9663,1614.7344 1243.6381,1613.0938 Q1242.3256,1611.4375 1242.3256,1608.3125 Q1242.3256,1605.1875 1243.6381,1603.5313 Q1244.9663,1601.875 1247.4663,1601.875 Q1248.1694,1601.875 1248.81,1602.0313 Q1249.4663,1602.1875 1250.0288,1602.4844 L1250.0288,1605.2031 Q1249.4038,1604.625 1248.81,1604.3594 Q1248.2163,1604.0781 1247.5913,1604.0781 Q1246.2475,1604.0781 1245.56,1605.1563 Q1244.8725,1606.2188 1244.8725,1608.3125 Q1244.8725,1610.4063 1245.56,1611.4844 Q1246.2475,1612.5469 1247.5913,1612.5469 Q1248.2163,1612.5469 1248.81,1612.2813 Q1249.4038,1612 1250.0288,1611.4219 L1250.0288,1614.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="181.501" x="1261.06" y="1613.3467">registrar.UserDomainRole</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="1455.0112" y="1589.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="1456.0112" y="1601.6387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1233.06" x2="1507.8608" y1="1624.5" y2="1624.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118.6924" x="1238.06" y="1641.4951">user domain role</text><line style="stroke:#181818;stroke-width:1.0;" x1="1233.06" x2="1507.8608" y1="1648.7969" y2="1648.7969"/><ellipse cx="1243.06" cy="1662.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="1252.06" y="1665.792">id (BigAutoField)</text><ellipse cx="1243.06" cy="1678.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="1252.06" y="1682.0889">created_at (DateTimeField)</text><ellipse cx="1243.06" cy="1695.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="1252.06" y="1698.3857">updated_at (DateTimeField)</text><polygon fill="#4177AF" points="1243.06,1707.3359,1239.06,1713.3359,1247.06,1713.3359" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="124.626" x="1252.06" y="1714.6826">user (ForeignKey)</text><polygon fill="#4177AF" points="1243.06,1723.6328,1239.06,1729.6328,1247.06,1729.6328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="146.5215" x="1252.06" y="1730.9795">domain (ForeignKey)</text><ellipse cx="1243.06" cy="1743.9297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106.4697" x="1252.06" y="1747.2764">role (TextField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1233.06" x2="1507.8608" y1="1754.5781" y2="1754.5781"/></g><!--class User--><g id="elem_User"><rect codeLine="348" fill="#D6F4E9" height="430.8281" id="User" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="338.7168" x="897.06" y="2132"/><ellipse cx="982.3286" cy="2148" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M985.2973,2153.6406 Q984.7192,2153.9375 984.0786,2154.0781 Q983.4379,2154.2344 982.7348,2154.2344 Q980.2348,2154.2344 978.9067,2152.5938 Q977.5942,2150.9375 977.5942,2147.8125 Q977.5942,2144.6875 978.9067,2143.0313 Q980.2348,2141.375 982.7348,2141.375 Q983.4379,2141.375 984.0786,2141.5313 Q984.7348,2141.6875 985.2973,2141.9844 L985.2973,2144.7031 Q984.6723,2144.125 984.0786,2143.8594 Q983.4848,2143.5781 982.8598,2143.5781 Q981.5161,2143.5781 980.8286,2144.6563 Q980.1411,2145.7188 980.1411,2147.8125 Q980.1411,2149.9063 980.8286,2150.9844 Q981.5161,2152.0469 982.8598,2152.0469 Q983.4848,2152.0469 984.0786,2151.7813 Q984.6723,2151.5 985.2973,2150.9219 L985.2973,2153.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="96.3799" x="1002.8286" y="2152.8467">registrar.User</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="1181.9272" y="2129"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="1182.9272" y="2141.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="898.06" x2="1234.7768" y1="2164" y2="2164"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30.5361" x="903.06" y="2180.9951">user</text><line style="stroke:#181818;stroke-width:1.0;" x1="898.06" x2="1234.7768" y1="2188.2969" y2="2188.2969"/><ellipse cx="908.06" cy="2201.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="917.06" y="2205.292">id (BigAutoField)</text><ellipse cx="908.06" cy="2218.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148.4014" x="917.06" y="2221.5889">password (CharField)</text><ellipse cx="908.06" cy="2234.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="183.2168" x="917.06" y="2237.8857">last_login (DateTimeField)</text><ellipse cx="908.06" cy="2250.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="193.5391" x="917.06" y="2254.1826">is_superuser (BooleanField)</text><ellipse cx="908.06" cy="2267.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="151.9287" x="917.06" y="2270.4795">username (CharField)</text><ellipse cx="908.06" cy="2283.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155.75" x="917.06" y="2286.7764">first_name (CharField)</text><ellipse cx="908.06" cy="2299.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153.6445" x="917.06" y="2303.0732">last_name (CharField)</text><ellipse cx="908.06" cy="2316.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126.1572" x="917.06" y="2319.3701">email (EmailField)</text><ellipse cx="908.06" cy="2332.3203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="154.7998" x="917.06" y="2335.667">is_staff (BooleanField)</text><ellipse cx="908.06" cy="2348.6172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="166.1338" x="917.06" y="2351.9639">is_active (BooleanField)</text><ellipse cx="908.06" cy="2364.9141" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198.1465" x="917.06" y="2368.2607">date_joined (DateTimeField)</text><ellipse cx="908.06" cy="2381.2109" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="124.708" x="917.06" y="2384.5576">status (CharField)</text><polygon fill="#4177AF" points="908.06,2393.5078,904.06,2399.5078,912.06,2399.5078" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="152.626" x="917.06" y="2400.8545">portfolio (ForeignKey)</text><ellipse cx="908.06" cy="2413.8047" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186.3135" x="917.06" y="2417.1514">portfolio_roles (ArrayField)</text><ellipse cx="908.06" cy="2430.1016" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="312.7168" x="917.06" y="2433.4482">portfolio_additional_permissions (ArrayField)</text><ellipse cx="908.06" cy="2446.3984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="192.124" x="917.06" y="2449.7451">phone (PhoneNumberField)</text><ellipse cx="908.06" cy="2462.6953" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176.1963" x="917.06" y="2466.042">middle_name (CharField)</text><ellipse cx="908.06" cy="2478.9922" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="109.0605" x="917.06" y="2482.3389">title (CharField)</text><ellipse cx="908.06" cy="2495.2891" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="198.4199" x="917.06" y="2498.6357">verification_type (CharField)</text><polygon fill="#FFFF44" points="908.06,2506.5859,912.06,2510.5859,908.06,2514.5859,904.06,2510.5859" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189.7178" x="917.06" y="2514.9326">groups (ManyToManyField)</text><polygon fill="#FFFF44" points="908.06,2522.8828,912.06,2526.8828,908.06,2530.8828,904.06,2526.8828" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="262.9854" x="917.06" y="2531.2295">user_permissions (ManyToManyField)</text><polygon fill="#FFFF44" points="908.06,2539.1797,912.06,2543.1797,908.06,2547.1797,904.06,2543.1797" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201.1816" x="917.06" y="2547.5264">domains (ManyToManyField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="898.06" x2="1234.7768" y1="2554.8281" y2="2554.8281"/></g><!--class FederalAgency--><g id="elem_FederalAgency"><rect codeLine="135" fill="#D6F4E9" height="186.375" id="FederalAgency" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="264.0928" x="591.56" y="3295"/><ellipse cx="606.56" cy="3311" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M609.5288,3316.6406 Q608.9506,3316.9375 608.31,3317.0781 Q607.6694,3317.2344 606.9663,3317.2344 Q604.4663,3317.2344 603.1381,3315.5938 Q601.8256,3313.9375 601.8256,3310.8125 Q601.8256,3307.6875 603.1381,3306.0313 Q604.4663,3304.375 606.9663,3304.375 Q607.6694,3304.375 608.31,3304.5313 Q608.9663,3304.6875 609.5288,3304.9844 L609.5288,3307.7031 Q608.9038,3307.125 608.31,3306.8594 Q607.7163,3306.5781 607.0913,3306.5781 Q605.7475,3306.5781 605.06,3307.6563 Q604.3725,3308.7188 604.3725,3310.8125 Q604.3725,3312.9063 605.06,3313.9844 Q605.7475,3315.0469 607.0913,3315.0469 Q607.7163,3315.0469 608.31,3314.7813 Q608.9038,3314.5 609.5288,3313.9219 L609.5288,3316.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="168.793" x="620.56" y="3315.8467">registrar.FederalAgency</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="801.8032" y="3292"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="802.8032" y="3304.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="592.56" x2="854.6528" y1="3327" y2="3327"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107.7754" x="597.56" y="3343.9951">Federal agency</text><line style="stroke:#181818;stroke-width:1.0;" x1="592.56" x2="854.6528" y1="3351.2969" y2="3351.2969"/><ellipse cx="602.56" cy="3364.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="611.56" y="3368.292">id (BigAutoField)</text><ellipse cx="602.56" cy="3381.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="611.56" y="3384.5889">created_at (DateTimeField)</text><ellipse cx="602.56" cy="3397.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="611.56" y="3400.8857">updated_at (DateTimeField)</text><ellipse cx="602.56" cy="3413.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132.624" x="611.56" y="3417.1826">agency (CharField)</text><ellipse cx="602.56" cy="3430.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169.2305" x="611.56" y="3433.4795">federal_type (CharField)</text><ellipse cx="602.56" cy="3446.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="127.4834" x="611.56" y="3449.7764">initials (CharField)</text><ellipse cx="602.56" cy="3462.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153.7061" x="611.56" y="3466.0732">is_fceb (BooleanField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="592.56" x2="854.6528" y1="3473.375" y2="3473.375"/></g><!--class DomainRequest--><g id="elem_DomainRequest"><rect codeLine="149" fill="#D6F4E9" height="789.3594" id="DomainRequest" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="325.9609" x="1544.56" y="1283"/><ellipse cx="1584.0261" cy="1299" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1586.9949,1304.6406 Q1586.4167,1304.9375 1585.7761,1305.0781 Q1585.1355,1305.2344 1584.4324,1305.2344 Q1581.9324,1305.2344 1580.6042,1303.5938 Q1579.2917,1301.9375 1579.2917,1298.8125 Q1579.2917,1295.6875 1580.6042,1294.0313 Q1581.9324,1292.375 1584.4324,1292.375 Q1585.1355,1292.375 1585.7761,1292.5313 Q1586.4324,1292.6875 1586.9949,1292.9844 L1586.9949,1295.7031 Q1586.3699,1295.125 1585.7761,1294.8594 Q1585.1824,1294.5781 1584.5574,1294.5781 Q1583.2136,1294.5781 1582.5261,1295.6563 Q1581.8386,1296.7188 1581.8386,1298.8125 Q1581.8386,1300.9063 1582.5261,1301.9844 Q1583.2136,1303.0469 1584.5574,1303.0469 Q1585.1824,1303.0469 1585.7761,1302.7813 Q1586.3699,1302.5 1586.9949,1301.9219 L1586.9949,1304.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176.292" x="1603.463" y="1303.8467">registrar.DomainRequest</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="1816.6713" y="1280"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="1817.6713" y="1292.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1545.56" x2="1869.5209" y1="1315" y2="1315"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110.4072" x="1550.56" y="1331.9951">domain request</text><line style="stroke:#181818;stroke-width:1.0;" x1="1545.56" x2="1869.5209" y1="1339.2969" y2="1339.2969"/><ellipse cx="1555.56" cy="1352.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="1564.56" y="1356.292">id (BigAutoField)</text><ellipse cx="1555.56" cy="1369.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="1564.56" y="1372.5889">created_at (DateTimeField)</text><ellipse cx="1555.56" cy="1385.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="1564.56" y="1388.8857">updated_at (DateTimeField)</text><ellipse cx="1555.56" cy="1401.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120.7432" x="1564.56" y="1405.1826">status (FSMField)</text><ellipse cx="1555.56" cy="1418.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="195.7129" x="1564.56" y="1421.4795">rejection_reason (TextField)</text><ellipse cx="1555.56" cy="1434.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="236.9063" x="1564.56" y="1437.7764">action_needed_reason (TextField)</text><ellipse cx="1555.56" cy="1450.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="282.5156" x="1564.56" y="1454.0732">action_needed_reason_email (TextField)</text><polygon fill="#4177AF" points="1555.56,1463.0234,1551.56,1469.0234,1559.56,1469.0234" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201.291" x="1564.56" y="1470.3701">federal_agency (ForeignKey)</text><polygon fill="#4177AF" points="1555.56,1479.3203,1551.56,1485.3203,1559.56,1485.3203" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="152.626" x="1564.56" y="1486.667">portfolio (ForeignKey)</text><polygon fill="#4177AF" points="1555.56,1495.6172,1551.56,1501.6172,1559.56,1501.6172" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="213.4385" x="1564.56" y="1502.9639">sub_organization (ForeignKey)</text><polygon fill="#4177AF" points="1555.56,1511.9141,1551.56,1517.9141,1559.56,1517.9141" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="144.5459" x="1564.56" y="1519.2607">creator (ForeignKey)</text><polygon fill="#4177AF" points="1555.56,1528.2109,1551.56,1534.2109,1559.56,1534.2109" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="177.7002" x="1564.56" y="1535.5576">investigator (ForeignKey)</text><ellipse cx="1555.56" cy="1548.5078" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="202.501" x="1564.56" y="1551.8545">generic_org_type (CharField)</text><ellipse cx="1555.56" cy="1564.8047" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="226.8848" x="1564.56" y="1568.1514">is_election_board (BooleanField)</text><ellipse cx="1555.56" cy="1581.1016" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="207.2588" x="1564.56" y="1584.4482">organization_type (CharField)</text><ellipse cx="1555.56" cy="1597.3984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290.6025" x="1564.56" y="1600.7451">federally_recognized_tribe (BooleanField)</text><ellipse cx="1555.56" cy="1613.6953" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="264.626" x="1564.56" y="1617.042">state_recognized_tribe (BooleanField)</text><ellipse cx="1555.56" cy="1629.9922" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="161.0273" x="1564.56" y="1633.3389">tribe_name (CharField)</text><ellipse cx="1555.56" cy="1646.2891" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169.2305" x="1564.56" y="1649.6357">federal_type (CharField)</text><ellipse cx="1555.56" cy="1662.5859" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="215.6875" x="1564.56" y="1665.9326">organization_name (CharField)</text><ellipse cx="1555.56" cy="1678.8828" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="178.1719" x="1564.56" y="1682.2295">address_line1 (CharField)</text><ellipse cx="1555.56" cy="1695.1797" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="178.1719" x="1564.56" y="1698.5264">address_line2 (CharField)</text><ellipse cx="1555.56" cy="1711.4766" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107.0508" x="1564.56" y="1714.8232">city (CharField)</text><ellipse cx="1555.56" cy="1727.7734" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="181.7539" x="1564.56" y="1731.1201">state_territory (CharField)</text><ellipse cx="1555.56" cy="1744.0703" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="135.5771" x="1564.56" y="1747.417">zipcode (CharField)</text><ellipse cx="1555.56" cy="1760.3672" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169.292" x="1564.56" y="1763.7139">urbanization (CharField)</text><ellipse cx="1555.56" cy="1776.6641" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="252.8135" x="1564.56" y="1780.0107">about_your_organization (TextField)</text><polygon fill="#4177AF" points="1555.56,1788.9609,1551.56,1794.9609,1559.56,1794.9609" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="190.4492" x="1564.56" y="1796.3076">senior_official (ForeignKey)</text><polygon fill="#4177AF" points="1555.56,1805.2578,1551.56,1811.2578,1559.56,1811.2578" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="248.7256" x="1564.56" y="1812.6045">approved_domain (OneToOneField)</text><polygon fill="#4177AF" points="1555.56,1821.5547,1551.56,1827.5547,1559.56,1827.5547" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="253.292" x="1564.56" y="1828.9014">requested_domain (OneToOneField)</text><ellipse cx="1555.56" cy="1841.8516" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="136.5205" x="1564.56" y="1845.1982">purpose (TextField)</text><ellipse cx="1555.56" cy="1858.1484" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277.2998" x="1564.56" y="1861.4951">no_other_contacts_rationale (TextField)</text><ellipse cx="1555.56" cy="1874.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176.8047" x="1564.56" y="1877.792">anything_else (TextField)</text><ellipse cx="1555.56" cy="1890.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="269.1787" x="1564.56" y="1894.0889">has_anything_else_text (BooleanField)</text><ellipse cx="1555.56" cy="1907.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="270.3682" x="1564.56" y="1910.3857">cisa_representative_email (EmailField)</text><ellipse cx="1555.56" cy="1923.3359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299.9609" x="1564.56" y="1926.6826">cisa_representative_first_name (CharField)</text><ellipse cx="1555.56" cy="1939.6328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="297.8555" x="1564.56" y="1942.9795">cisa_representative_last_name (CharField)</text><ellipse cx="1555.56" cy="1955.9297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="274.3535" x="1564.56" y="1959.2764">has_cisa_representative (BooleanField)</text><ellipse cx="1555.56" cy="1972.2266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="272.8428" x="1564.56" y="1975.5732">is_policy_acknowledged (BooleanField)</text><ellipse cx="1555.56" cy="1988.5234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="199.2334" x="1564.56" y="1991.8701">submission_date (DateField)</text><ellipse cx="1555.56" cy="2004.8203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118.4805" x="1564.56" y="2008.167">notes (TextField)</text><polygon fill="#FFFF44" points="1555.56,2016.1172,1559.56,2020.1172,1555.56,2024.1172,1551.56,2020.1172" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="261.0439" x="1564.56" y="2024.4639">current_websites (ManyToManyField)</text><polygon fill="#FFFF44" points="1555.56,2032.4141,1559.56,2036.4141,1555.56,2040.4141,1551.56,2036.4141" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="284.2383" x="1564.56" y="2040.7607">alternative_domains (ManyToManyField)</text><polygon fill="#FFFF44" points="1555.56,2048.7109,1559.56,2052.7109,1555.56,2056.7109,1551.56,2052.7109" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="245.4375" x="1564.56" y="2057.0576">other_contacts (ManyToManyField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1545.56" x2="1869.5209" y1="2064.3594" y2="2064.3594"/></g><!--class Portfolio--><g id="elem_Portfolio"><rect codeLine="424" fill="#D6F4E9" height="333.0469" id="Portfolio" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="274.4453" x="587.56" y="2623"/><ellipse cx="628.0228" cy="2639" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M630.9915,2644.6406 Q630.4134,2644.9375 629.7728,2645.0781 Q629.1322,2645.2344 628.429,2645.2344 Q625.929,2645.2344 624.6009,2643.5938 Q623.2884,2641.9375 623.2884,2638.8125 Q623.2884,2635.6875 624.6009,2634.0313 Q625.929,2632.375 628.429,2632.375 Q629.1322,2632.375 629.7728,2632.5313 Q630.429,2632.6875 630.9915,2632.9844 L630.9915,2635.7031 Q630.3665,2635.125 629.7728,2634.8594 Q629.179,2634.5781 628.554,2634.5781 Q627.2103,2634.5781 626.5228,2635.6563 Q625.8353,2636.7188 625.8353,2638.8125 Q625.8353,2640.9063 626.5228,2641.9844 Q627.2103,2643.0469 628.554,2643.0469 Q629.179,2643.0469 629.7728,2642.7813 Q630.3665,2642.5 630.9915,2641.9219 L630.9915,2644.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122.5615" x="647.6812" y="2643.8467">registrar.Portfolio</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="808.1557" y="2620"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="809.1557" y="2632.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="588.56" x2="861.0053" y1="2655" y2="2655"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58.5361" x="593.56" y="2671.9951">portfolio</text><line style="stroke:#181818;stroke-width:1.0;" x1="588.56" x2="861.0053" y1="2679.2969" y2="2679.2969"/><ellipse cx="598.56" cy="2692.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="607.56" y="2696.292">id (BigAutoField)</text><ellipse cx="598.56" cy="2709.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="607.56" y="2712.5889">created_at (DateTimeField)</text><ellipse cx="598.56" cy="2725.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="607.56" y="2728.8857">updated_at (DateTimeField)</text><polygon fill="#4177AF" points="598.56,2737.8359,594.56,2743.8359,602.56,2743.8359" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="144.5459" x="607.56" y="2745.1826">creator (ForeignKey)</text><ellipse cx="598.56" cy="2758.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="215.6875" x="607.56" y="2761.4795">organization_name (CharField)</text><ellipse cx="598.56" cy="2774.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="207.2588" x="607.56" y="2777.7764">organization_type (CharField)</text><ellipse cx="598.56" cy="2790.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118.4805" x="607.56" y="2794.0732">notes (TextField)</text><polygon fill="#4177AF" points="598.56,2803.0234,594.56,2809.0234,602.56,2809.0234" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201.291" x="607.56" y="2810.3701">federal_agency (ForeignKey)</text><polygon fill="#4177AF" points="598.56,2819.3203,594.56,2825.3203,602.56,2825.3203" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="190.4492" x="607.56" y="2826.667">senior_official (ForeignKey)</text><ellipse cx="598.56" cy="2839.6172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="178.1719" x="607.56" y="2842.9639">address_line1 (CharField)</text><ellipse cx="598.56" cy="2855.9141" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="178.1719" x="607.56" y="2859.2607">address_line2 (CharField)</text><ellipse cx="598.56" cy="2872.2109" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107.0508" x="607.56" y="2875.5576">city (CharField)</text><ellipse cx="598.56" cy="2888.5078" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="181.7539" x="607.56" y="2891.8545">state_territory (CharField)</text><ellipse cx="598.56" cy="2904.8047" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="135.5771" x="607.56" y="2908.1514">zipcode (CharField)</text><ellipse cx="598.56" cy="2921.1016" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169.292" x="607.56" y="2924.4482">urbanization (CharField)</text><ellipse cx="598.56" cy="2937.3984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="248.4453" x="607.56" y="2940.7451">security_contact_email (EmailField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="588.56" x2="861.0053" y1="2948.0469" y2="2948.0469"/></g><!--class Suborganization--><g id="elem_Suborganization"><rect codeLine="465" fill="#D6F4E9" height="153.7813" id="Suborganization" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="273.7109" x="587.56" y="2270.5"/><ellipse cx="602.56" cy="2286.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M605.5288,2292.1406 Q604.9506,2292.4375 604.31,2292.5781 Q603.6694,2292.7344 602.9663,2292.7344 Q600.4663,2292.7344 599.1381,2291.0938 Q597.8256,2289.4375 597.8256,2286.3125 Q597.8256,2283.1875 599.1381,2281.5313 Q600.4663,2279.875 602.9663,2279.875 Q603.6694,2279.875 604.31,2280.0313 Q604.9663,2280.1875 605.5288,2280.4844 L605.5288,2283.2031 Q604.9038,2282.625 604.31,2282.3594 Q603.7163,2282.0781 603.0913,2282.0781 Q601.7475,2282.0781 601.06,2283.1563 Q600.3725,2284.2188 600.3725,2286.3125 Q600.3725,2288.4063 601.06,2289.4844 Q601.7475,2290.5469 603.0913,2290.5469 Q603.7163,2290.5469 604.31,2290.2813 Q604.9038,2290 605.5288,2289.4219 L605.5288,2292.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="178.4111" x="616.56" y="2291.3467">registrar.Suborganization</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="807.4213" y="2267.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="808.4213" y="2279.6387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="588.56" x2="860.2709" y1="2302.5" y2="2302.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112.3486" x="593.56" y="2319.4951">suborganization</text><line style="stroke:#181818;stroke-width:1.0;" x1="588.56" x2="860.2709" y1="2326.7969" y2="2326.7969"/><ellipse cx="598.56" cy="2340.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="607.56" y="2343.792">id (BigAutoField)</text><ellipse cx="598.56" cy="2356.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="607.56" y="2360.0889">created_at (DateTimeField)</text><ellipse cx="598.56" cy="2373.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="607.56" y="2376.3857">updated_at (DateTimeField)</text><ellipse cx="598.56" cy="2389.3359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121.3926" x="607.56" y="2392.6826">name (CharField)</text><polygon fill="#4177AF" points="598.56,2401.6328,594.56,2407.6328,602.56,2407.6328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="152.626" x="607.56" y="2408.9795">portfolio (ForeignKey)</text><line style="stroke:#181818;stroke-width:1.0;" x1="588.56" x2="860.2709" y1="2416.2813" y2="2416.2813"/></g><!--class DraftDomain--><g id="elem_DraftDomain"><rect codeLine="262" fill="#D6F4E9" height="137.4844" id="DraftDomain" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="249.6279" x="1345.56" y="2279"/><ellipse cx="1360.56" cy="2295" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1363.5288,2300.6406 Q1362.9506,2300.9375 1362.31,2301.0781 Q1361.6694,2301.2344 1360.9663,2301.2344 Q1358.4663,2301.2344 1357.1381,2299.5938 Q1355.8256,2297.9375 1355.8256,2294.8125 Q1355.8256,2291.6875 1357.1381,2290.0313 Q1358.4663,2288.375 1360.9663,2288.375 Q1361.6694,2288.375 1362.31,2288.5313 Q1362.9663,2288.6875 1363.5288,2288.9844 L1363.5288,2291.7031 Q1362.9038,2291.125 1362.31,2290.8594 Q1361.7163,2290.5781 1361.0913,2290.5781 Q1359.7475,2290.5781 1359.06,2291.6563 Q1358.3725,2292.7188 1358.3725,2294.8125 Q1358.3725,2296.9063 1359.06,2297.9844 Q1359.7475,2299.0469 1361.0913,2299.0469 Q1361.7163,2299.0469 1362.31,2298.7813 Q1362.9038,2298.5 1363.5288,2297.9219 L1363.5288,2300.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="154.3281" x="1374.56" y="2299.8467">registrar.DraftDomain</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="1541.3383" y="2276"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="1542.3383" y="2288.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1346.56" x2="1594.1879" y1="2311" y2="2311"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="90.5215" x="1351.56" y="2327.9951">draft domain</text><line style="stroke:#181818;stroke-width:1.0;" x1="1346.56" x2="1594.1879" y1="2335.2969" y2="2335.2969"/><ellipse cx="1356.56" cy="2348.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="1365.56" y="2352.292">id (BigAutoField)</text><ellipse cx="1356.56" cy="2365.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="1365.56" y="2368.5889">created_at (DateTimeField)</text><ellipse cx="1356.56" cy="2381.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="1365.56" y="2384.8857">updated_at (DateTimeField)</text><ellipse cx="1356.56" cy="2397.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121.3926" x="1365.56" y="2401.1826">name (CharField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1346.56" x2="1594.1879" y1="2408.4844" y2="2408.4844"/></g><!--class Website--><g id="elem_Website"><rect codeLine="390" fill="#D6F4E9" height="137.4844" id="Website" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="222.1436" x="1667.56" y="2279"/><ellipse cx="1685.1453" cy="2295" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1688.1141,2300.6406 Q1687.5359,2300.9375 1686.8953,2301.0781 Q1686.2547,2301.2344 1685.5516,2301.2344 Q1683.0516,2301.2344 1681.7234,2299.5938 Q1680.4109,2297.9375 1680.4109,2294.8125 Q1680.4109,2291.6875 1681.7234,2290.0313 Q1683.0516,2288.375 1685.5516,2288.375 Q1686.2547,2288.375 1686.8953,2288.5313 Q1687.5516,2288.6875 1688.1141,2288.9844 L1688.1141,2291.7031 Q1687.4891,2291.125 1686.8953,2290.8594 Q1686.3016,2290.5781 1685.6766,2290.5781 Q1684.3328,2290.5781 1683.6453,2291.6563 Q1682.9578,2292.7188 1682.9578,2294.8125 Q1682.9578,2296.9063 1683.6453,2297.9844 Q1684.3328,2299.0469 1685.6766,2299.0469 Q1686.3016,2299.0469 1686.8953,2298.7813 Q1687.4891,2298.5 1688.1141,2297.9219 L1688.1141,2300.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121.0986" x="1699.7198" y="2299.8467">registrar.Website</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="1835.8539" y="2276"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="1836.8539" y="2288.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1668.56" x2="1888.7036" y1="2311" y2="2311"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54.2363" x="1673.56" y="2327.9951">website</text><line style="stroke:#181818;stroke-width:1.0;" x1="1668.56" x2="1888.7036" y1="2335.2969" y2="2335.2969"/><ellipse cx="1678.56" cy="2348.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="1687.56" y="2352.292">id (BigAutoField)</text><ellipse cx="1678.56" cy="2365.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="1687.56" y="2368.5889">created_at (DateTimeField)</text><ellipse cx="1678.56" cy="2381.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="1687.56" y="2384.8857">updated_at (DateTimeField)</text><ellipse cx="1678.56" cy="2397.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="135.9258" x="1687.56" y="2401.1826">website (CharField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1668.56" x2="1888.7036" y1="2408.4844" y2="2408.4844"/></g><!--class DomainInformation--><g id="elem_DomainInformation"><rect codeLine="211" fill="#D6F4E9" height="658.9844" id="DomainInformation" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="325.9609" x="1032.56" y="564"/><ellipse cx="1061.321" cy="580" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1064.2898,585.6406 Q1063.7117,585.9375 1063.071,586.0781 Q1062.4304,586.2344 1061.7273,586.2344 Q1059.2273,586.2344 1057.8992,584.5938 Q1056.5867,582.9375 1056.5867,579.8125 Q1056.5867,576.6875 1057.8992,575.0313 Q1059.2273,573.375 1061.7273,573.375 Q1062.4304,573.375 1063.071,573.5313 Q1063.7273,573.6875 1064.2898,573.9844 L1064.2898,576.7031 Q1063.6648,576.125 1063.071,575.8594 Q1062.4773,575.5781 1061.8523,575.5781 Q1060.5085,575.5781 1059.821,576.6563 Q1059.1335,577.7188 1059.1335,579.8125 Q1059.1335,581.9063 1059.821,582.9844 Q1060.5085,584.0469 1061.8523,584.0469 Q1062.4773,584.0469 1063.071,583.7813 Q1063.6648,583.5 1064.2898,582.9219 L1064.2898,585.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200.0811" x="1078.379" y="584.8467">registrar.DomainInformation</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="1304.6713" y="561"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="1305.6713" y="573.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1033.56" x2="1357.5209" y1="596" y2="596"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137.9287" x="1038.56" y="612.9951">domain information</text><line style="stroke:#181818;stroke-width:1.0;" x1="1033.56" x2="1357.5209" y1="620.2969" y2="620.2969"/><ellipse cx="1043.56" cy="633.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="1052.56" y="637.292">id (BigAutoField)</text><ellipse cx="1043.56" cy="650.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="1052.56" y="653.5889">created_at (DateTimeField)</text><ellipse cx="1043.56" cy="666.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="1052.56" y="669.8857">updated_at (DateTimeField)</text><polygon fill="#4177AF" points="1043.56,678.8359,1039.56,684.8359,1047.56,684.8359" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201.291" x="1052.56" y="686.1826">federal_agency (ForeignKey)</text><polygon fill="#4177AF" points="1043.56,695.1328,1039.56,701.1328,1047.56,701.1328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="144.5459" x="1052.56" y="702.4795">creator (ForeignKey)</text><polygon fill="#4177AF" points="1043.56,711.4297,1039.56,717.4297,1047.56,717.4297" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="152.626" x="1052.56" y="718.7764">portfolio (ForeignKey)</text><polygon fill="#4177AF" points="1043.56,727.7266,1039.56,733.7266,1047.56,733.7266" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="213.4385" x="1052.56" y="735.0732">sub_organization (ForeignKey)</text><polygon fill="#4177AF" points="1043.56,744.0234,1039.56,750.0234,1047.56,750.0234" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="235.792" x="1052.56" y="751.3701">domain_request (OneToOneField)</text><ellipse cx="1043.56" cy="764.3203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="202.501" x="1052.56" y="767.667">generic_org_type (CharField)</text><ellipse cx="1043.56" cy="780.6172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="207.2588" x="1052.56" y="783.9639">organization_type (CharField)</text><ellipse cx="1043.56" cy="796.9141" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290.6025" x="1052.56" y="800.2607">federally_recognized_tribe (BooleanField)</text><ellipse cx="1043.56" cy="813.2109" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="264.626" x="1052.56" y="816.5576">state_recognized_tribe (BooleanField)</text><ellipse cx="1043.56" cy="829.5078" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="161.0273" x="1052.56" y="832.8545">tribe_name (CharField)</text><ellipse cx="1043.56" cy="845.8047" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169.2305" x="1052.56" y="849.1514">federal_type (CharField)</text><ellipse cx="1043.56" cy="862.1016" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="226.8848" x="1052.56" y="865.4482">is_election_board (BooleanField)</text><ellipse cx="1043.56" cy="878.3984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="215.6875" x="1052.56" y="881.7451">organization_name (CharField)</text><ellipse cx="1043.56" cy="894.6953" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="178.1719" x="1052.56" y="898.042">address_line1 (CharField)</text><ellipse cx="1043.56" cy="910.9922" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="178.1719" x="1052.56" y="914.3389">address_line2 (CharField)</text><ellipse cx="1043.56" cy="927.2891" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107.0508" x="1052.56" y="930.6357">city (CharField)</text><ellipse cx="1043.56" cy="943.5859" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="181.7539" x="1052.56" y="946.9326">state_territory (CharField)</text><ellipse cx="1043.56" cy="959.8828" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="135.5771" x="1052.56" y="963.2295">zipcode (CharField)</text><ellipse cx="1043.56" cy="976.1797" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169.292" x="1052.56" y="979.5264">urbanization (CharField)</text><ellipse cx="1043.56" cy="992.4766" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="252.8135" x="1052.56" y="995.8232">about_your_organization (TextField)</text><polygon fill="#4177AF" points="1043.56,1004.7734,1039.56,1010.7734,1047.56,1010.7734" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="190.4492" x="1052.56" y="1012.1201">senior_official (ForeignKey)</text><polygon fill="#4177AF" points="1043.56,1021.0703,1039.56,1027.0703,1047.56,1027.0703" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175.2666" x="1052.56" y="1028.417">domain (OneToOneField)</text><ellipse cx="1043.56" cy="1041.3672" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="136.5205" x="1052.56" y="1044.7139">purpose (TextField)</text><ellipse cx="1043.56" cy="1057.6641" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="277.2998" x="1052.56" y="1061.0107">no_other_contacts_rationale (TextField)</text><ellipse cx="1043.56" cy="1073.9609" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176.8047" x="1052.56" y="1077.3076">anything_else (TextField)</text><ellipse cx="1043.56" cy="1090.2578" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="269.1787" x="1052.56" y="1093.6045">has_anything_else_text (BooleanField)</text><ellipse cx="1043.56" cy="1106.5547" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="270.3682" x="1052.56" y="1109.9014">cisa_representative_email (EmailField)</text><ellipse cx="1043.56" cy="1122.8516" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="299.9609" x="1052.56" y="1126.1982">cisa_representative_first_name (CharField)</text><ellipse cx="1043.56" cy="1139.1484" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="297.8555" x="1052.56" y="1142.4951">cisa_representative_last_name (CharField)</text><ellipse cx="1043.56" cy="1155.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="274.3535" x="1052.56" y="1158.792">has_cisa_representative (BooleanField)</text><ellipse cx="1043.56" cy="1171.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="272.8428" x="1052.56" y="1175.0889">is_policy_acknowledged (BooleanField)</text><ellipse cx="1043.56" cy="1188.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118.4805" x="1052.56" y="1191.3857">notes (TextField)</text><polygon fill="#FFFF44" points="1043.56,1199.3359,1047.56,1203.3359,1043.56,1207.3359,1039.56,1203.3359" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="245.4375" x="1052.56" y="1207.6826">other_contacts (ManyToManyField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1033.56" x2="1357.5209" y1="1214.9844" y2="1214.9844"/></g><!--class DomainInvitation--><g id="elem_DomainInvitation"><rect codeLine="273" fill="#D6F4E9" height="170.0781" id="DomainInvitation" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="280.1572" x="2803.56" y="2262.5"/><ellipse cx="2818.56" cy="2278.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M2821.5288,2284.1406 Q2820.9506,2284.4375 2820.31,2284.5781 Q2819.6694,2284.7344 2818.9663,2284.7344 Q2816.4663,2284.7344 2815.1381,2283.0938 Q2813.8256,2281.4375 2813.8256,2278.3125 Q2813.8256,2275.1875 2815.1381,2273.5313 Q2816.4663,2271.875 2818.9663,2271.875 Q2819.6694,2271.875 2820.31,2272.0313 Q2820.9663,2272.1875 2821.5288,2272.4844 L2821.5288,2275.2031 Q2820.9038,2274.625 2820.31,2274.3594 Q2819.7163,2274.0781 2819.0913,2274.0781 Q2817.7475,2274.0781 2817.06,2275.1563 Q2816.3725,2276.2188 2816.3725,2278.3125 Q2816.3725,2280.4063 2817.06,2281.4844 Q2817.7475,2282.5469 2819.0913,2282.5469 Q2819.7163,2282.5469 2820.31,2282.2813 Q2820.9038,2282 2821.5288,2281.4219 L2821.5288,2284.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="184.8574" x="2832.56" y="2283.3467">registrar.DomainInvitation</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="3029.8676" y="2259.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="3030.8676" y="2271.6387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="2804.56" x2="3082.7172" y1="2294.5" y2="2294.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122.7051" x="2809.56" y="2311.4951">domain invitation</text><line style="stroke:#181818;stroke-width:1.0;" x1="2804.56" x2="3082.7172" y1="2318.7969" y2="2318.7969"/><ellipse cx="2814.56" cy="2332.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="2823.56" y="2335.792">id (BigAutoField)</text><ellipse cx="2814.56" cy="2348.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="2823.56" y="2352.0889">created_at (DateTimeField)</text><ellipse cx="2814.56" cy="2365.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="2823.56" y="2368.3857">updated_at (DateTimeField)</text><ellipse cx="2814.56" cy="2381.3359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126.1572" x="2823.56" y="2384.6826">email (EmailField)</text><polygon fill="#4177AF" points="2814.56,2393.6328,2810.56,2399.6328,2818.56,2399.6328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="146.5215" x="2823.56" y="2400.9795">domain (ForeignKey)</text><ellipse cx="2814.56" cy="2413.9297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120.7432" x="2823.56" y="2417.2764">status (FSMField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="2804.56" x2="3082.7172" y1="2424.5781" y2="2424.5781"/></g><!--class PortfolioInvitation--><g id="elem_PortfolioInvitation"><rect codeLine="287" fill="#D6F4E9" height="202.6719" id="PortfolioInvitation" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="338.7168" x="139.06" y="2246"/><ellipse cx="178.7168" cy="2262" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M181.6856,2267.6406 Q181.1075,2267.9375 180.4668,2268.0781 Q179.8262,2268.2344 179.1231,2268.2344 Q176.6231,2268.2344 175.295,2266.5938 Q173.9825,2264.9375 173.9825,2261.8125 Q173.9825,2258.6875 175.295,2257.0313 Q176.6231,2255.375 179.1231,2255.375 Q179.8262,2255.375 180.4668,2255.5313 Q181.1231,2255.6875 181.6856,2255.9844 L181.6856,2258.7031 Q181.0606,2258.125 180.4668,2257.8594 Q179.8731,2257.5781 179.2481,2257.5781 Q177.9043,2257.5781 177.2168,2258.6563 Q176.5293,2259.7188 176.5293,2261.8125 Q176.5293,2263.9063 177.2168,2264.9844 Q177.9043,2266.0469 179.2481,2266.0469 Q179.8731,2266.0469 180.4668,2265.7813 Q181.0606,2265.5 181.6856,2264.9219 L181.6856,2267.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="188.624" x="198.1961" y="2266.8467">registrar.PortfolioInvitation</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="423.9272" y="2243"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="424.9272" y="2255.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="140.06" x2="476.7768" y1="2278" y2="2278"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128.8096" x="145.06" y="2294.9951">portfolio invitation</text><line style="stroke:#181818;stroke-width:1.0;" x1="140.06" x2="476.7768" y1="2302.2969" y2="2302.2969"/><ellipse cx="150.06" cy="2315.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="159.06" y="2319.292">id (BigAutoField)</text><ellipse cx="150.06" cy="2332.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="159.06" y="2335.5889">created_at (DateTimeField)</text><ellipse cx="150.06" cy="2348.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="159.06" y="2351.8857">updated_at (DateTimeField)</text><ellipse cx="150.06" cy="2364.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126.1572" x="159.06" y="2368.1826">email (EmailField)</text><polygon fill="#4177AF" points="150.06,2377.1328,146.06,2383.1328,154.06,2383.1328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="152.626" x="159.06" y="2384.4795">portfolio (ForeignKey)</text><ellipse cx="150.06" cy="2397.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186.3135" x="159.06" y="2400.7764">portfolio_roles (ArrayField)</text><ellipse cx="150.06" cy="2413.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="312.7168" x="159.06" y="2417.0732">portfolio_additional_permissions (ArrayField)</text><ellipse cx="150.06" cy="2430.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120.7432" x="159.06" y="2433.3701">status (FSMField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="140.06" x2="476.7768" y1="2440.6719" y2="2440.6719"/></g><!--class TransitionDomain--><g id="elem_TransitionDomain"><rect codeLine="303" fill="#D6F4E9" height="463.4219" id="TransitionDomain" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="283.8555" x="2565.56" y="41"/><ellipse cx="2580.56" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M2583.5288,62.6406 Q2582.9506,62.9375 2582.31,63.0781 Q2581.6694,63.2344 2580.9663,63.2344 Q2578.4663,63.2344 2577.1381,61.5938 Q2575.8256,59.9375 2575.8256,56.8125 Q2575.8256,53.6875 2577.1381,52.0313 Q2578.4663,50.375 2580.9663,50.375 Q2581.6694,50.375 2582.31,50.5313 Q2582.9663,50.6875 2583.5288,50.9844 L2583.5288,53.7031 Q2582.9038,53.125 2582.31,52.8594 Q2581.7163,52.5781 2581.0913,52.5781 Q2579.7475,52.5781 2579.06,53.6563 Q2578.3725,54.7188 2578.3725,56.8125 Q2578.3725,58.9063 2579.06,59.9844 Q2579.7475,61.0469 2581.0913,61.0469 Q2581.7163,61.0469 2582.31,60.7813 Q2582.9038,60.5 2583.5288,59.9219 L2583.5288,62.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="188.5557" x="2594.56" y="61.8467">registrar.TransitionDomain</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="2795.5659" y="38"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="2796.5659" y="50.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="2566.56" x2="2848.4155" y1="73" y2="73"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="123.5801" x="2571.56" y="89.9951">transition domain</text><line style="stroke:#181818;stroke-width:1.0;" x1="2566.56" x2="2848.4155" y1="97.2969" y2="97.2969"/><ellipse cx="2576.56" cy="110.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="2585.56" y="114.292">id (BigAutoField)</text><ellipse cx="2576.56" cy="127.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="2585.56" y="130.5889">created_at (DateTimeField)</text><ellipse cx="2576.56" cy="143.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="2585.56" y="146.8857">updated_at (DateTimeField)</text><ellipse cx="2576.56" cy="159.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="151.9287" x="2585.56" y="163.1826">username (CharField)</text><ellipse cx="2576.56" cy="176.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="180.8242" x="2585.56" y="179.4795">domain_name (CharField)</text><ellipse cx="2576.56" cy="192.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="124.708" x="2585.56" y="195.7764">status (CharField)</text><ellipse cx="2576.56" cy="208.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="181.2754" x="2585.56" y="212.0732">email_sent (BooleanField)</text><ellipse cx="2576.56" cy="225.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="177.0029" x="2585.56" y="228.3701">processed (BooleanField)</text><ellipse cx="2576.56" cy="241.3203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="202.501" x="2585.56" y="244.667">generic_org_type (CharField)</text><ellipse cx="2576.56" cy="257.6172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="215.6875" x="2585.56" y="260.9639">organization_name (CharField)</text><ellipse cx="2576.56" cy="273.9141" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169.2305" x="2585.56" y="277.2607">federal_type (CharField)</text><ellipse cx="2576.56" cy="290.2109" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="188.8906" x="2585.56" y="293.5576">federal_agency (CharField)</text><ellipse cx="2576.56" cy="306.5078" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="211.5859" x="2585.56" y="309.8545">epp_creation_date (DateField)</text><ellipse cx="2576.56" cy="322.8047" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="224.9502" x="2585.56" y="326.1514">epp_expiration_date (DateField)</text><ellipse cx="2576.56" cy="339.1016" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155.75" x="2585.56" y="342.4482">first_name (CharField)</text><ellipse cx="2576.56" cy="355.3984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176.1963" x="2585.56" y="358.7451">middle_name (CharField)</text><ellipse cx="2576.56" cy="371.6953" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153.6445" x="2585.56" y="375.042">last_name (CharField)</text><ellipse cx="2576.56" cy="387.9922" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="109.0605" x="2585.56" y="391.3389">title (CharField)</text><ellipse cx="2576.56" cy="404.2891" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126.1572" x="2585.56" y="407.6357">email (EmailField)</text><ellipse cx="2576.56" cy="420.5859" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125.501" x="2585.56" y="423.9326">phone (CharField)</text><ellipse cx="2576.56" cy="436.8828" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169.2646" x="2585.56" y="440.2295">address_line (CharField)</text><ellipse cx="2576.56" cy="453.1797" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107.0508" x="2585.56" y="456.5264">city (CharField)</text><ellipse cx="2576.56" cy="469.4766" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="181.7539" x="2585.56" y="472.8232">state_territory (CharField)</text><ellipse cx="2576.56" cy="485.7734" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="135.5771" x="2585.56" y="489.1201">zipcode (CharField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="2566.56" x2="2848.4155" y1="496.4219" y2="496.4219"/></g><!--class VerifiedByStaff--><g id="elem_VerifiedByStaff"><rect codeLine="334" fill="#D6F4E9" height="170.0781" id="VerifiedByStaff" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="264.626" x="894.06" y="1592.5"/><ellipse cx="909.06" cy="1608.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M912.0288,1614.1406 Q911.4506,1614.4375 910.81,1614.5781 Q910.1694,1614.7344 909.4663,1614.7344 Q906.9663,1614.7344 905.6381,1613.0938 Q904.3256,1611.4375 904.3256,1608.3125 Q904.3256,1605.1875 905.6381,1603.5313 Q906.9663,1601.875 909.4663,1601.875 Q910.1694,1601.875 910.81,1602.0313 Q911.4663,1602.1875 912.0288,1602.4844 L912.0288,1605.2031 Q911.4038,1604.625 910.81,1604.3594 Q910.2163,1604.0781 909.5913,1604.0781 Q908.2475,1604.0781 907.56,1605.1563 Q906.8725,1606.2188 906.8725,1608.3125 Q906.8725,1610.4063 907.56,1611.4844 Q908.2475,1612.5469 909.5913,1612.5469 Q910.2163,1612.5469 910.81,1612.2813 Q911.4038,1612 912.0288,1611.4219 L912.0288,1614.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169.3262" x="923.06" y="1613.3467">registrar.VerifiedByStaff</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="1104.8364" y="1589.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="1105.8364" y="1601.6387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="895.06" x2="1157.686" y1="1624.5" y2="1624.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110.1543" x="900.06" y="1641.4951">verified by staff</text><line style="stroke:#181818;stroke-width:1.0;" x1="895.06" x2="1157.686" y1="1648.7969" y2="1648.7969"/><ellipse cx="905.06" cy="1662.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="914.06" y="1665.792">id (BigAutoField)</text><ellipse cx="905.06" cy="1678.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="914.06" y="1682.0889">created_at (DateTimeField)</text><ellipse cx="905.06" cy="1695.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="914.06" y="1698.3857">updated_at (DateTimeField)</text><ellipse cx="905.06" cy="1711.3359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126.1572" x="914.06" y="1714.6826">email (EmailField)</text><polygon fill="#4177AF" points="905.06,1723.6328,901.06,1729.6328,909.06,1729.6328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="161.9365" x="914.06" y="1730.9795">requestor (ForeignKey)</text><ellipse cx="905.06" cy="1743.9297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118.4805" x="914.06" y="1747.2764">notes (TextField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="895.06" x2="1157.686" y1="1754.5781" y2="1754.5781"/></g><!--class UserGroup--><g id="elem_UserGroup"><rect codeLine="379" fill="#D6F4E9" height="137.4844" id="UserGroup" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="251.4492" x="1811.06" y="204"/><ellipse cx="1833.6379" cy="220" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M1836.6067,225.6406 Q1836.0286,225.9375 1835.3879,226.0781 Q1834.7473,226.2344 1834.0442,226.2344 Q1831.5442,226.2344 1830.2161,224.5938 Q1828.9036,222.9375 1828.9036,219.8125 Q1828.9036,216.6875 1830.2161,215.0313 Q1831.5442,213.375 1834.0442,213.375 Q1834.7473,213.375 1835.3879,213.5313 Q1836.0442,213.6875 1836.6067,213.9844 L1836.6067,216.7031 Q1835.9817,216.125 1835.3879,215.8594 Q1834.7942,215.5781 1834.1692,215.5781 Q1832.8254,215.5781 1832.1379,216.6563 Q1831.4504,217.7188 1831.4504,219.8125 Q1831.4504,221.9063 1832.1379,222.9844 Q1832.8254,224.0469 1834.1692,224.0469 Q1834.7942,224.0469 1835.3879,223.7813 Q1835.9817,223.5 1836.6067,222.9219 L1836.6067,225.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="139.3096" x="1849.3219" y="224.8467">registrar.UserGroup</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="2008.6596" y="201"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="2009.6596" y="213.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="1812.06" x2="2061.5092" y1="236" y2="236"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="77.3281" x="1817.06" y="252.9951">User group</text><line style="stroke:#181818;stroke-width:1.0;" x1="1812.06" x2="2061.5092" y1="260.2969" y2="260.2969"/><rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="1819.06" y="270.9453"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93.9873" x="1831.06" y="277.292">id (AutoField)</text><ellipse cx="1822.06" cy="290.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121.3926" x="1831.06" y="293.5889">name (CharField)</text><polygon fill="#4177AF" points="1822.06,302.5391,1818.06,308.5391,1826.06,308.5391" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="190.9346" x="1831.06" y="309.8857">group_ptr (OneToOneField)</text><polygon fill="#FFFF44" points="1822.06,317.8359,1826.06,321.8359,1822.06,325.8359,1818.06,321.8359" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="225.4492" x="1831.06" y="326.1826">permissions (ManyToManyField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="1812.06" x2="2061.5092" y1="333.4844" y2="333.4844"/></g><!--class WaffleFlag--><g id="elem_WaffleFlag"><rect codeLine="401" fill="#D6F4E9" height="316.75" id="WaffleFlag" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="233.96" x="624.56" y="1519"/><ellipse cx="639.56" cy="1535" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M642.5288,1540.6406 Q641.9506,1540.9375 641.31,1541.0781 Q640.6694,1541.2344 639.9663,1541.2344 Q637.4663,1541.2344 636.1381,1539.5938 Q634.8256,1537.9375 634.8256,1534.8125 Q634.8256,1531.6875 636.1381,1530.0313 Q637.4663,1528.375 639.9663,1528.375 Q640.6694,1528.375 641.31,1528.5313 Q641.9663,1528.6875 642.5288,1528.9844 L642.5288,1531.7031 Q641.9038,1531.125 641.31,1530.8594 Q640.7163,1530.5781 640.0913,1530.5781 Q638.7475,1530.5781 638.06,1531.6563 Q637.3725,1532.7188 637.3725,1534.8125 Q637.3725,1536.9063 638.06,1537.9844 Q638.7475,1539.0469 640.0913,1539.0469 Q640.7163,1539.0469 641.31,1538.7813 Q641.9038,1538.5 642.5288,1537.9219 L642.5288,1540.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="138.6602" x="653.56" y="1539.8467">registrar.WaffleFlag</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="804.6704" y="1516"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="805.6704" y="1528.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="625.56" x2="857.52" y1="1551" y2="1551"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="73.124" x="630.56" y="1567.9951">waffle flag</text><line style="stroke:#181818;stroke-width:1.0;" x1="625.56" x2="857.52" y1="1575.2969" y2="1575.2969"/><ellipse cx="635.56" cy="1588.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="644.56" y="1592.292">id (BigAutoField)</text><ellipse cx="635.56" cy="1605.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121.3926" x="644.56" y="1608.5889">name (CharField)</text><ellipse cx="635.56" cy="1621.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171.001" x="644.56" y="1624.8857">everyone (BooleanField)</text><ellipse cx="635.56" cy="1637.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="159.7217" x="644.56" y="1641.1826">percent (DecimalField)</text><ellipse cx="635.56" cy="1654.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153.9316" x="644.56" y="1657.4795">testing (BooleanField)</text><ellipse cx="635.56" cy="1670.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="182.6494" x="644.56" y="1673.7764">superusers (BooleanField)</text><ellipse cx="635.56" cy="1686.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="136.6162" x="644.56" y="1690.0732">staff (BooleanField)</text><ellipse cx="635.56" cy="1703.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="203.3418" x="644.56" y="1706.3701">authenticated (BooleanField)</text><ellipse cx="635.56" cy="1719.3203" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="152.1201" x="644.56" y="1722.667">languages (TextField)</text><ellipse cx="635.56" cy="1735.6172" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150.4248" x="644.56" y="1738.9639">rollout (BooleanField)</text><ellipse cx="635.56" cy="1751.9141" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111.1865" x="644.56" y="1755.2607">note (TextField)</text><ellipse cx="635.56" cy="1768.2109" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170.4951" x="644.56" y="1771.5576">created (DateTimeField)</text><ellipse cx="635.56" cy="1784.5078" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="178.1582" x="644.56" y="1787.8545">modified (DateTimeField)</text><polygon fill="#FFFF44" points="635.56,1795.8047,639.56,1799.8047,635.56,1803.8047,631.56,1799.8047" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189.7178" x="644.56" y="1804.1514">groups (ManyToManyField)</text><polygon fill="#FFFF44" points="635.56,1812.1016,639.56,1816.1016,635.56,1820.1016,631.56,1816.1016" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="179.2861" x="644.56" y="1820.4482">users (ManyToManyField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="625.56" x2="857.52" y1="1827.75" y2="1827.75"/></g><!--class SeniorOfficial--><g id="elem_SeniorOfficial"><rect codeLine="478" fill="#D6F4E9" height="218.9688" id="SeniorOfficial" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="253.1758" x="516.06" y="3016"/><ellipse cx="531.06" cy="3032" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M534.0288,3037.6406 Q533.4506,3037.9375 532.81,3038.0781 Q532.1694,3038.2344 531.4663,3038.2344 Q528.9663,3038.2344 527.6381,3036.5938 Q526.3256,3034.9375 526.3256,3031.8125 Q526.3256,3028.6875 527.6381,3027.0313 Q528.9663,3025.375 531.4663,3025.375 Q532.1694,3025.375 532.81,3025.5313 Q533.4663,3025.6875 534.0288,3025.9844 L534.0288,3028.7031 Q533.4038,3028.125 532.81,3027.8594 Q532.2163,3027.5781 531.5913,3027.5781 Q530.2475,3027.5781 529.56,3028.6563 Q528.8725,3029.7188 528.8725,3031.8125 Q528.8725,3033.9063 529.56,3034.9844 Q530.2475,3036.0469 531.5913,3036.0469 Q532.2163,3036.0469 532.81,3035.7813 Q533.4038,3035.5 534.0288,3034.9219 L534.0288,3037.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157.876" x="545.06" y="3036.8467">registrar.SeniorOfficial</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="715.3862" y="3013"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="716.3862" y="3025.1387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="517.06" x2="768.2358" y1="3048" y2="3048"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93.8096" x="522.06" y="3064.9951">senior official</text><line style="stroke:#181818;stroke-width:1.0;" x1="517.06" x2="768.2358" y1="3072.2969" y2="3072.2969"/><ellipse cx="527.06" cy="3085.9453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="536.06" y="3089.292">id (BigAutoField)</text><ellipse cx="527.06" cy="3102.2422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="536.06" y="3105.5889">created_at (DateTimeField)</text><ellipse cx="527.06" cy="3118.5391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="536.06" y="3121.8857">updated_at (DateTimeField)</text><ellipse cx="527.06" cy="3134.8359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155.75" x="536.06" y="3138.1826">first_name (CharField)</text><ellipse cx="527.06" cy="3151.1328" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153.6445" x="536.06" y="3154.4795">last_name (CharField)</text><ellipse cx="527.06" cy="3167.4297" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="109.0605" x="536.06" y="3170.7764">title (CharField)</text><ellipse cx="527.06" cy="3183.7266" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="192.124" x="536.06" y="3187.0732">phone (PhoneNumberField)</text><ellipse cx="527.06" cy="3200.0234" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126.1572" x="536.06" y="3203.3701">email (EmailField)</text><polygon fill="#4177AF" points="527.06,3212.3203,523.06,3218.3203,531.06,3218.3203" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201.291" x="536.06" y="3219.667">federal_agency (ForeignKey)</text><line style="stroke:#181818;stroke-width:1.0;" x1="517.06" x2="768.2358" y1="3226.9688" y2="3226.9688"/></g><!--class DomainGroup--><g id="elem_DomainGroup"><rect codeLine="450" fill="#D6F4E9" height="170.0781" id="DomainGroup" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="257.0244" x="583.06" y="187.5"/><ellipse cx="598.06" cy="203.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M601.0288,209.1406 Q600.4506,209.4375 599.81,209.5781 Q599.1694,209.7344 598.4663,209.7344 Q595.9663,209.7344 594.6381,208.0938 Q593.3256,206.4375 593.3256,203.3125 Q593.3256,200.1875 594.6381,198.5313 Q595.9663,196.875 598.4663,196.875 Q599.1694,196.875 599.81,197.0313 Q600.4663,197.1875 601.0288,197.4844 L601.0288,200.2031 Q600.4038,199.625 599.81,199.3594 Q599.2163,199.0781 598.5913,199.0781 Q597.2475,199.0781 596.56,200.1563 Q595.8725,201.2188 595.8725,203.3125 Q595.8725,205.4063 596.56,206.4844 Q597.2475,207.5469 598.5913,207.5469 Q599.2163,207.5469 599.81,207.2813 Q600.4038,207 601.0288,206.4219 L601.0288,209.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="161.7246" x="612.06" y="208.3467">registrar.DomainGroup</text><rect fill="#FFFFFF" height="15.9688" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56.8496" x="786.2348" y="184.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54.8496" x="787.2348" y="196.6387">Registrar</text><line style="stroke:#181818;stroke-width:0.5;" x1="584.06" x2="839.0844" y1="219.5" y2="219.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97.8496" x="589.06" y="236.4951">domain group</text><line style="stroke:#181818;stroke-width:1.0;" x1="584.06" x2="839.0844" y1="243.7969" y2="243.7969"/><ellipse cx="594.06" cy="257.4453" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116.3682" x="603.06" y="260.792">id (BigAutoField)</text><ellipse cx="594.06" cy="273.7422" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191.5635" x="603.06" y="277.0889">created_at (DateTimeField)</text><ellipse cx="594.06" cy="290.0391" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="196.1436" x="603.06" y="293.3857">updated_at (DateTimeField)</text><ellipse cx="594.06" cy="306.3359" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121.3926" x="603.06" y="309.6826">name (CharField)</text><polygon fill="#4177AF" points="594.06,318.6328,590.06,324.6328,598.06,324.6328" style="stroke:#1963A0;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="152.626" x="603.06" y="325.9795">portfolio (ForeignKey)</text><polygon fill="#FFFF44" points="594.06,333.9297,598.06,337.9297,594.06,341.9297,590.06,337.9297" style="stroke:#B38D22;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201.1816" x="603.06" y="342.2764">domains (ManyToManyField)</text><line style="stroke:#181818;stroke-width:1.0;" x1="584.06" x2="839.0844" y1="349.5781" y2="349.5781"/></g><!--link Host to Domain--><g id="link_Host_Domain"><path codeLine="60" d="M2329.56,2424.64 C2329.56,2492.77 2329.56,2593.68 2329.56,2671.97 " fill="none" id="Host-Domain" style="stroke:#181818;stroke-width:1.0;"/></g><!--link HostIP to Host--><g id="link_HostIP_Host"><path codeLine="73" d="M2329.56,1754.8 C2329.56,1883.43 2329.56,2141.95 2329.56,2270.42 " fill="none" id="HostIP-Host" style="stroke:#181818;stroke-width:1.0;"/></g><!--link PublicContact to Domain--><g id="link_PublicContact_Domain"><path codeLine="100" d="M2485.17,2538.61 C2456.95,2583.93 2427.65,2630.98 2402.19,2671.86 " fill="none" id="PublicContact-Domain" style="stroke:#181818;stroke-width:1.0;"/></g><!--link UserDomainRole to User--><g id="link_UserDomainRole_User"><path codeLine="114" d="M1336.87,1762.88 C1304.41,1843.04 1253.2,1966.65 1204.56,2072 C1195.56,2091.49 1185.98,2111.64 1176.22,2131.76 " fill="none" id="UserDomainRole-User" style="stroke:#181818;stroke-width:1.0;"/></g><!--link UserDomainRole to Domain--><g id="link_UserDomainRole_Domain"><path codeLine="115" d="M1353.01,1762.68 C1314.1,1959.35 1231.4,2441.52 1328.56,2563 C1433.29,2693.95 1925.27,2754.25 2178.35,2776.99 " fill="none" id="UserDomainRole-Domain" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to FederalAgency--><g id="link_DomainRequest_FederalAgency"><path codeLine="198" d="M1657.11,2072.29 C1654.82,2092.48 1652.62,2112.47 1650.56,2132 C1640.45,2227.6 1655.78,2476.64 1613.56,2563 C1443.61,2910.6 1059.1,3183.73 855.6,3310.21 " fill="none" id="DomainRequest-FederalAgency" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to Portfolio--><g id="link_DomainRequest_Portfolio"><path codeLine="199" d="M1544.27,2055.35 C1538.55,2061.13 1532.65,2066.69 1526.56,2072 C1457.25,2132.42 1389.5,2063.14 1328.56,2132 C1199.71,2277.61 1374.31,2410.61 1253.56,2563 C1157.46,2684.29 983.8,2741.37 861.73,2767.53 " fill="none" id="DomainRequest-Portfolio" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to Suborganization--><g id="link_DomainRequest_Suborganization"><path codeLine="200" d="M1544.37,2058.21 C1538.63,2063.05 1532.7,2067.65 1526.56,2072 C1290.86,2238.87 1130.35,1988.82 879.56,2132 C825.1,2163.09 784.65,2222.01 758.75,2270.24 " fill="none" id="DomainRequest-Suborganization" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to User--><g id="link_DomainRequest_User"><path codeLine="201" d="M1544.4,2038.91 C1533.56,2050.82 1521.97,2061.93 1509.56,2072 C1416.49,2147.57 1350.24,2071.79 1246.56,2132 C1243.06,2134.03 1239.59,2136.14 1236.15,2138.33 " fill="none" id="DomainRequest-User" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to User--><g id="link_DomainRequest_User"><path codeLine="202" d="M1545,2071.64 C1544.85,2071.76 1544.71,2071.88 1544.56,2072 C1451.49,2147.57 1385.24,2071.79 1281.56,2132 C1265.93,2141.08 1250.82,2151.8 1236.35,2163.54 " fill="none" id="DomainRequest-User-1" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to Contact--><g id="link_DomainRequest_Contact"><path codeLine="203" d="M1870.64,2000.27 C1917.33,2085.93 1965.73,2172.65 2003.51,2237.88 " fill="none" id="DomainRequest-Contact" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to Contact--><g id="link_DomainRequest_Contact"><path codeLine="208" d="M1876.4476,1963.1111 C1931.8076,2063.2111 1978.2732,2149.5476 2017.8732,2226.9276 " fill="none" id="DomainRequest-Contact-1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1870.64,1952.61,1870.0434,1959.7964,1876.4476,1963.1111,1877.0441,1955.9247,1870.64,1952.61" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="2023.34,2237.61,2024.1674,2230.4465,2017.8732,2226.9276,2017.0458,2234.0911,2023.34,2237.61" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to Domain--><g id="link_DomainRequest_Domain"><path codeLine="204" d="M1870.58,2015.61 C1884.94,2054.23 1897.72,2093.55 1907.56,2132 C1931.39,2225.13 1893.23,2481.72 1944.56,2563 C1997.81,2647.32 2094.88,2703.87 2178.23,2739.24 " fill="none" id="DomainRequest-Domain" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to DraftDomain--><g id="link_DomainRequest_DraftDomain"><path codeLine="205" d="M1567.81,2072.39 C1539.46,2152.3 1512.79,2227.47 1494.57,2278.81 " fill="none" id="DomainRequest-DraftDomain" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to Website--><g id="link_DomainRequest_Website"><path codeLine="206" d="M1738.2016,2084.3148 C1747.1916,2164.2248 1753.5037,2215.6113 1761.4537,2266.9513 " fill="none" id="DomainRequest-Website" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1736.86,2072.39,1733.5559,2078.7996,1738.2016,2084.3148,1741.5057,2077.9052,1736.86,2072.39" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1763.29,2278.81,1766.3247,2272.2686,1761.4537,2266.9513,1758.419,2273.4928,1763.29,2278.81" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainRequest to Website--><g id="link_DomainRequest_Website"><path codeLine="207" d="M1763.9209,2084.3308 C1771.8909,2164.2408 1776.4442,2215.4879 1779.2542,2266.8279 " fill="none" id="DomainRequest-Website-1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1762.73,2072.39,1759.3452,2078.7574,1763.9209,2084.3308,1767.3057,2077.9634,1762.73,2072.39" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1779.91,2278.81,1783.5761,2272.6004,1779.2542,2266.8279,1775.5881,2273.0376,1779.91,2278.81" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to FederalAgency--><g id="link_DomainInformation_FederalAgency"><path codeLine="252" d="M1032.28,957.33 C885.46,1020.75 671.9,1131.04 531.56,1283 C247.27,1590.84 215.03,1723.53 121.56,2132 C6,2637.01 147.72,2853.81 498.56,3235 C525.3,3264.05 558.62,3290.36 591.36,3312.61 " fill="none" id="DomainInformation-FederalAgency" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to User--><g id="link_DomainInformation_User"><path codeLine="253" d="M1203.56,1223.33 C1208.2,1514.22 1207.97,1915.98 1176.56,2072 C1172.58,2091.75 1167.24,2111.9 1161.04,2131.86 " fill="none" id="DomainInformation-User" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to Portfolio--><g id="link_DomainInformation_Portfolio"><path codeLine="254" d="M1032.35,942.45 C878.69,997.28 657.5,1103.49 556.56,1283 C521.7,1344.99 548.61,2495.36 570.56,2563 C577.15,2583.29 586.17,2603.42 596.58,2622.81 " fill="none" id="DomainInformation-Portfolio" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to Suborganization--><g id="link_DomainInformation_Suborganization"><path codeLine="255" d="M1032.41,951.35 C891.47,1010.17 696.81,1117.06 607.56,1283 C524.51,1437.42 572.48,1900.21 607.56,2072 C621.89,2142.17 654.87,2216.61 682.17,2270.24 " fill="none" id="DomainInformation-Suborganization" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to DomainRequest--><g id="link_DomainInformation_DomainRequest"><path codeLine="256" d="M1358.82,1065.39 C1416.09,1130.44 1478.15,1207.2 1526.56,1283 C1532.63,1292.51 1538.61,1302.25 1544.49,1312.17 " fill="none" id="DomainInformation-DomainRequest" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to Contact--><g id="link_DomainInformation_Contact"><path codeLine="257" d="M1358.64,945.08 C1515.68,1000.81 1746.92,1106.77 1871.56,1283 C2080.11,1577.87 2078.92,2031.61 2072.86,2237.82 " fill="none" id="DomainInformation-Contact" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to Contact--><g id="link_DomainInformation_Contact"><path codeLine="259" d="M1370.0507,939.8424 C1535.9207,992.8424 1774.95,1096.91 1906.56,1283 C2115.11,1577.87 2115.1358,2019.6717 2094.1358,2225.8817 " fill="none" id="DomainInformation-Contact-1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1358.62,936.19,1363.1179,941.8264,1370.0507,939.8424,1365.5528,934.206,1358.62,936.19" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="2092.92,2237.82,2097.5073,2232.2561,2094.1358,2225.8817,2089.5485,2231.4456,2092.92,2237.82" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInformation to Domain--><g id="link_DomainInformation_Domain"><path codeLine="258" d="M1358.74,899.18 C1624.58,915.6 2152.18,986.21 2458.56,1283 C2745.06,1560.53 2684,1738.54 2749.56,2132 C2765.3,2226.48 2798.72,2480.8 2749.56,2563 C2691.57,2659.95 2576.01,2717.62 2480.77,2750.34 " fill="none" id="DomainInformation-Domain" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainInvitation to Domain--><g id="link_DomainInvitation_Domain"><path codeLine="284" d="M2891.11,2432.7 C2861.37,2475.58 2821.21,2526.28 2776.56,2563 C2688.11,2635.74 2572.31,2693.33 2480.73,2732.11 " fill="none" id="DomainInvitation-Domain" style="stroke:#181818;stroke-width:1.0;"/></g><!--link PortfolioInvitation to Portfolio--><g id="link_PortfolioInvitation_Portfolio"><path codeLine="300" d="M399.94,2449.16 C433,2485.27 470.76,2526.15 505.56,2563 C531.88,2590.87 560.25,2620.43 587.56,2648.64 " fill="none" id="PortfolioInvitation-Portfolio" style="stroke:#181818;stroke-width:1.0;"/></g><!--link VerifiedByStaff to User--><g id="link_VerifiedByStaff_User"><path codeLine="345" d="M1031.61,1762.76 C1037.12,1854.92 1046.18,2006.22 1053.7,2131.69 " fill="none" id="VerifiedByStaff-User" style="stroke:#181818;stroke-width:1.0;"/></g><!--link User to Portfolio--><g id="link_User_Portfolio"><path codeLine="375" d="M896.86,2550.47 C877.97,2574.64 859.06,2599.11 841.04,2622.69 " fill="none" id="User-Portfolio" style="stroke:#181818;stroke-width:1.0;"/></g><!--link Portfolio to User--><g id="link_Portfolio_User"><path codeLine="445" d="M861.7,2628.83 C878.68,2607.42 896.12,2585.18 913.31,2563.02 " fill="none" id="Portfolio-User" style="stroke:#181818;stroke-width:1.0;"/></g><!--link User to Domain--><g id="link_User_Domain"><path codeLine="376" d="M1245.8033,2529.1089 C1266.4033,2544.5889 1278.43,2551.51 1300.56,2563 C1587.86,2712.15 1957.8202,2761.869 2166.1802,2778.959 " fill="none" id="User-Domain" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1236.21,2521.9,1238.6037,2528.7022,1245.8033,2529.1089,1243.4096,2522.3067,1236.21,2521.9" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="2178.14,2779.94,2172.4871,2775.4629,2166.1802,2778.959,2171.8331,2783.4361,2178.14,2779.94" style="stroke:#181818;stroke-width:1.0;"/></g><!--link WaffleFlag to User--><g id="link_WaffleFlag_User"><path codeLine="421" d="M788.3322,1847.6891 C811.2022,1921.2591 838.85,1997.39 876.56,2072 C886.63,2091.91 891.7473,2101.7835 903.7473,2121.6135 " fill="none" id="WaffleFlag-User" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="784.77,1836.23,782.7314,1843.1469,788.3322,1847.6891,790.3708,1840.7722,784.77,1836.23" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="909.96,2131.88,910.2758,2124.6758,903.7473,2121.6135,903.4315,2128.8176,909.96,2131.88" style="stroke:#181818;stroke-width:1.0;"/></g><!--link Portfolio to FederalAgency--><g id="link_Portfolio_FederalAgency"><path codeLine="446" d="M775.47,2956.01 C780.03,2976.06 783.91,2996.38 786.56,3016 C799.58,3112.46 805.56,3139.54 786.56,3235 C782.6,3254.89 775.99,3275.44 768.51,3294.75 " fill="none" id="Portfolio-FederalAgency" style="stroke:#181818;stroke-width:1.0;"/></g><!--link Portfolio to SeniorOfficial--><g id="link_Portfolio_SeniorOfficial"><path codeLine="447" d="M683.92,2956.03 C678.93,2976.37 673.93,2996.74 669.21,3015.93 " fill="none" id="Portfolio-SeniorOfficial" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainGroup to Portfolio--><g id="link_DomainGroup_Portfolio"><path codeLine="461" d="M691.37,357.58 C651.14,529.88 562.25,936.09 531.56,1283 C500.66,1632.3 529.06,1721.34 531.56,2072 C533.12,2290.24 463.32,2358.14 538.56,2563 C549.93,2593.96 567.52,2623.74 587.44,2650.94 " fill="none" id="DomainGroup-Portfolio" style="stroke:#181818;stroke-width:1.0;"/></g><!--link DomainGroup to DomainInformation--><g id="link_DomainGroup_DomainInformation"><path codeLine="462" d="M784.7317,367.0832 C849.9917,450.5432 937.8182,562.8669 1025.0682,674.4469 " fill="none" id="DomainGroup-DomainInformation" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="777.34,357.63,777.8848,364.8205,784.7317,367.0832,784.1869,359.8927,777.34,357.63" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="1032.46,683.9,1031.9151,676.7095,1025.0682,674.4469,1025.6131,681.6374,1032.46,683.9" style="stroke:#181818;stroke-width:1.0;"/></g><!--link Suborganization to Portfolio--><g id="link_Suborganization_Portfolio"><path codeLine="475" d="M724.56,2424.64 C724.56,2479.12 724.56,2554.56 724.56,2622.63 " fill="none" id="Suborganization-Portfolio" style="stroke:#181818;stroke-width:1.0;"/></g><!--link SeniorOfficial to FederalAgency--><g id="link_SeniorOfficial_FederalAgency"><path codeLine="492" d="M676.32,3235.09 C682.49,3254.91 688.87,3275.43 694.87,3294.72 " fill="none" id="SeniorOfficial-FederalAgency" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[xLhRRjms47ttLmZnYnjZ2oGj2XGe2kHIjq6HneZTvb7WIfIMgLPKISgs4ZJVtX6bNOlI3CLrMza1uWVlGdCeSWxdnk4c1TCwUgHuBhHHJ7tzGfQ69IRwuUtkqO-F8gQZAU8u_IxxbdyVVJoAu2_fdjhlgvNzE8r46fqy5_cpsiWpmOlqg_vveZWpF8sPYKvUmhTBiUKEeAvIFo0JIfkuP5iUdRpOCEK8jo9D2qv9GMDof16cm9xpBHD5TF9J- -48geqiOS1v-_5RlLtpuJZWuU-ZewDapF4lKli8jcANtGqyMefQb9fFKIf1-J8wEPEAYxpybJS39KUBNwq6whoq0oaUNftFC060AHUHg9QYWwMfuh3kAIDs8I5yW0eE8-qpZ8_pUbs8PDu3NPpBJcLbIxjZFrricWfpdtxfJTok8DYo25CyZQJAaQSm0UVc2IbvIag-GII9C0qse48ULWdsWkIGE78bHOAfch4RRCBhoSEHsRac4kYFlskkEkbR2M6GDi0HqBN06eIxFLKWNiO6FtNpJep8PrxjwgAJItvZQ297gZfCjh90A4rw9_6GtGDSaZkbbaq9tK96_WDmeFRYjMlcDvLGp0XPnga5j6zr1_AaLk1YyIvoE25Yj2MdKSeB3Yj4NjGL0g1XsY3ILCFyBBOfFzcmCYVs6zcNCvvonOfdEI-JnhCzBixTfLuMCIjSB6DrIq62IRSSAagBKXZ12es9T9mbV0qhbc3Qh0pWh_S4_bVDlTMEYyEi7C1Mk1H_hL7NUchLYh_dYJLgc4BB4h5JribB3aodXy7YFZUCm9_skxRRrcc4gwGocIo4n8IwNiUGC5afFbYFn32MCub6Jr5U0VKYn-Md4IoAAv6qKv1sfMDmtqxbjMGgnSp8PlNz8gbNzLmK3P2Mo1pWm9zHOitnTzhu58Yr8kfWCECwpjg9L_I5P5o8aZ-PaJyze2AnAXgk89nAXI4-Y2gHARQaMgq7TZ5TqLhM9cvahKOMDB5HpKiX0PLb8e4GWXaIgoebhs0BTlduJSal9VnpNjIxkXy61L2jAgavubgbZANPSBLBB3hk4X4hC3Gh6xCHPGu6YhvjmtJiO83e6uFRJo8q0rEhO1CvJ6t45O_9UWy3Uy-qs03VIRPTEJ86NpfuQ0Nn8sbYblnPokk2fpadt1JYoLPexSdjfJHSJyWyZY3ZArX7VCtNMbZ8Q-3sKhR_7I0hm9pBJiVE36Yikza4R5JJkId7gTESR1usv7mNVSFW5_Lww4nXWqQLvd-2x0y7OU2-VWt3AfQPcG6FLwl7Wo7lEfFud-0xJSagvLMPIRNjWjjSfJB4ejMAk0KiTVIPBn4y6VvVLm-Ttd4Vkec87L0dVCu5m5rgd2zrWk-u_YNlFwoyJsNrkoVWOIGz80cJmz3KHwBfj4qEcKlTv40dEuKFepBqp3nU_06fyJQD-vBY03LAXwtaNXfLM6lKa_klX0bD_NieaVbtygNq9UACh-c9TpS81zth6zZCt3jL4AiOUdIRiQzD7X2tdeBfz5OOjzrbuFcPKgnnazWU0gbST4aghhZgZrNecA1Tm_WaOXwoTvUAbTekPzRf9r1trynUlB3xjrS0H5xiYrH2kgCNlx29spIAPyLAoGIACIff7bhrtgtu79V_KosgAhRiUaxjBMQ-R__0xjsznV4IjJ6LM_w0RSy4Jvyt5uPbcSUNnaZNbQvwQRHksbLcsRr7l_wOXtU3yI9n5AR66a-BEE9kSkP64hc736EhWhckfKefeoratkPIb2SeeNKDmRkxVSHYW2SeURt9vo-aNxJBiQHIzNvxzK0T1rgJYDzBS9rqvcfaSeT_7pdH-zkRkMX4HPpEuH9F4-8uofMiAxebsMwuktO2wEzj8XVHyoSOYnhL-FuB_vzRPMOygyEuxcLdiamCdMnbdMpYOSHlYkpmk38AFUuVH_CaKl6txn1wzDeXNAtwtlHIKRQVBZYjl0FNBlXPmNAVPhUWaN9M46KW2LEGYZxW98trFRGauYgnzT9BdeWjS-EJQIyJovowMkW3gIQRULHaOxNPmAIjurArMC7Al8OIIIFz7eXBXQmDtVb0nlIxJ-piLgPTuiR4GI4aC2uCTdlazrGgtSUDaACPTI1RghLDDgx3AkUGdZ9Uj8HqrMVRcPzZDtVoqnoYsA0Edzwc786YEdu4_CBo_gQddUxjpEMs8Ghjw4posptyyDPJMXrOGWpL3Uo5Tc2qe1Xq5R4T63LBFRimHhexeKTDrmUx6IEonrg5Ds9Sw_OHvm97l5bXj8jD3-A7-NTf0SnK-UGvTIvwZxVBvT8JdOx-0G00]--></g></svg>
\ No newline at end of file
diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 8718abda7..07ce4f8f8 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -2212,7 +2212,7 @@ class DomainRequestTests(TestWithUser, WebTest):
             2. then submit,
         the domain request also updates its creator data to reflect user profile changes."""
 
-        # Populate the database with a domain request 
+        # Populate the database with a domain request
         domain_request, _ = DomainRequest.objects.get_or_create(
             generic_org_type="federal",
             federal_type="executive",

From bf00f204b0122b73a728c83e1a454d34772c5fd7 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 11:30:49 -0700
Subject: [PATCH 023/118] remove unused INVESTIGATOR_NOT_SUBMITTER error code

---
 src/registrar/utility/errors.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/registrar/utility/errors.py b/src/registrar/utility/errors.py
index 47d3feff5..8cb83c0ee 100644
--- a/src/registrar/utility/errors.py
+++ b/src/registrar/utility/errors.py
@@ -77,17 +77,15 @@ class FSMErrorCodes(IntEnum):
         - 1 APPROVE_DOMAIN_IN_USE The domain is already in use
         - 2 NO_INVESTIGATOR No investigator is assigned
         - 3 INVESTIGATOR_NOT_STAFF Investigator is a non-staff user
-        - 4 INVESTIGATOR_NOT_SUBMITTER The form submitter is not the investigator
-        - 5 NO_REJECTION_REASON No rejection reason is specified
-        - 6 NO_ACTION_NEEDED_REASON No action needed reason is specified
+        - 4 NO_REJECTION_REASON No rejection reason is specified
+        - 5 NO_ACTION_NEEDED_REASON No action needed reason is specified
     """
 
     APPROVE_DOMAIN_IN_USE = 1
     NO_INVESTIGATOR = 2
     INVESTIGATOR_NOT_STAFF = 3
-    INVESTIGATOR_NOT_SUBMITTER = 4
-    NO_REJECTION_REASON = 5
-    NO_ACTION_NEEDED_REASON = 6
+    NO_REJECTION_REASON = 4
+    NO_ACTION_NEEDED_REASON = 5
 
 
 class FSMDomainRequestError(Exception):
@@ -100,7 +98,6 @@ class FSMDomainRequestError(Exception):
         FSMErrorCodes.APPROVE_DOMAIN_IN_USE: ("Cannot approve. Requested domain is already in use."),
         FSMErrorCodes.NO_INVESTIGATOR: ("Investigator is required for this status."),
         FSMErrorCodes.INVESTIGATOR_NOT_STAFF: ("Investigator is not a staff user."),
-        FSMErrorCodes.INVESTIGATOR_NOT_SUBMITTER: ("Only the assigned investigator can make this change."),
         FSMErrorCodes.NO_REJECTION_REASON: ("A reason is required for this status."),
         FSMErrorCodes.NO_ACTION_NEEDED_REASON: ("A reason is required for this status."),
     }

From fde87230b49a516700b73cf176a0f1ae8e5a71eb Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 11:32:10 -0700
Subject: [PATCH 024/118] Revert requirements.txt

---
 src/requirements.txt | 67 ++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/requirements.txt b/src/requirements.txt
index 4a6cec691..3f7158449 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -1,68 +1,75 @@
 -i https://pypi.python.org/simple
-annotated-types==0.7.0; python_version >= '3.8'
+annotated-types==0.6.0; python_version >= '3.8'
 asgiref==3.8.1; python_version >= '3.8'
-boto3==1.35.8; python_version >= '3.8'
-botocore==1.35.8; python_version >= '3.8'
-cachetools==5.5.0; python_version >= '3.7'
-certifi==2024.7.4; python_version >= '3.6'
+boto3==1.34.95; python_version >= '3.8'
+botocore==1.34.95; python_version >= '3.8'
+cachetools==5.3.3; python_version >= '3.7'
+certifi==2024.2.2; python_version >= '3.6'
 cfenv==0.5.3
-cffi==1.17.0; platform_python_implementation != 'PyPy'
+cffi==1.16.0; platform_python_implementation != 'PyPy'
 charset-normalizer==3.3.2; python_full_version >= '3.7.0'
-cryptography==43.0.0; python_version >= '3.7'
+cryptography==42.0.5; 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'
 diff-match-patch==20230430; python_version >= '3.7'
-dj-database-url==2.2.0
+dj-database-url==2.1.0
 dj-email-url==1.0.6
 django==4.2.10; python_version >= '3.8'
 django-admin-multiple-choice-list-filter==0.1.1
 django-allow-cidr==0.7.1
 django-auditlog==3.0.0; python_version >= '3.8'
 django-cache-url==3.4.5
-django-cors-headers==4.4.0; python_version >= '3.8'
+django-cors-headers==4.3.1; python_version >= '3.8'
 django-csp==3.8
 django-fsm==2.8.1
-django-import-export==4.1.1; python_version >= '3.8'
+django-import-export==3.3.8; python_version >= '3.8'
 django-login-required-middleware==0.9.0
-django-phonenumber-field[phonenumberslite]==8.0.0; python_version >= '3.8'
+django-phonenumber-field[phonenumberslite]==7.3.0; python_version >= '3.8'
 django-waffle==4.1.0; python_version >= '3.8'
 django-widget-tweaks==1.5.0; python_version >= '3.8'
 environs[django]==11.0.0; python_version >= '3.8'
-faker==28.0.0; python_version >= '3.8'
+et-xmlfile==1.1.0; python_version >= '3.6'
+faker==25.0.0; python_version >= '3.8'
 fred-epplib@ git+https://github.com/cisagov/epplib.git@d56d183f1664f34c40ca9716a3a9a345f0ef561c
 furl==2.1.3
 future==1.0.0; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
 gevent==24.2.1; python_version >= '3.8'
 greenlet==3.0.3; python_version >= '3.7'
-gunicorn==23.0.0; python_version >= '3.7'
-idna==3.8; python_version >= '3.6'
+gunicorn==22.0.0; python_version >= '3.7'
+idna==3.7; python_version >= '3.5'
 jmespath==1.0.1; python_version >= '3.7'
-lxml==5.3.0; python_version >= '3.6'
-mako==1.3.5; python_version >= '3.8'
+lxml==5.2.1; python_version >= '3.6'
+mako==1.3.3; python_version >= '3.8'
+markuppy==1.14
 markupsafe==2.1.5; python_version >= '3.7'
-marshmallow==3.22.0; python_version >= '3.8'
+marshmallow==3.21.1; python_version >= '3.8'
+odfpy==1.4.1
 oic==1.7.0; python_version ~= '3.8'
+openpyxl==3.1.2
 orderedmultidict==1.0.1
-packaging==24.1; python_version >= '3.8'
-phonenumberslite==8.13.44
+packaging==24.0; python_version >= '3.7'
+phonenumberslite==8.13.35
 psycopg2-binary==2.9.9; python_version >= '3.7'
 pycparser==2.22; python_version >= '3.8'
 pycryptodomex==3.20.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-pydantic==2.8.2; python_version >= '3.8'
-pydantic-core==2.20.1; python_version >= '3.8'
-pydantic-settings==2.4.0; python_version >= '3.8'
+pydantic==2.7.1; python_version >= '3.8'
+pydantic-core==2.18.2; python_version >= '3.8'
+pydantic-settings==2.2.1; python_version >= '3.8'
 pyjwkest==1.4.2
 python-dateutil==2.9.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 python-dotenv==1.0.1; python_version >= '3.8'
+pyyaml==6.0.1
 pyzipper==0.3.6; python_version >= '3.4'
-requests==2.32.3; python_version >= '3.8'
-s3transfer==0.10.2; python_version >= '3.8'
-setuptools==74.0.0; python_version >= '3.8'
+requests==2.31.0; python_version >= '3.7'
+s3transfer==0.10.1; python_version >= '3.8'
+setuptools==69.5.1; python_version >= '3.8'
 six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-sqlparse==0.5.1; python_version >= '3.8'
+sqlparse==0.5.0; python_version >= '3.8'
 tablib[html,ods,xls,xlsx,yaml]==3.5.0; python_version >= '3.8'
 tblib==3.0.0; python_version >= '3.8'
-typing-extensions==4.12.2; python_version >= '3.8'
-urllib3==2.2.2; python_version >= '3.8'
-whitenoise==6.7.0; python_version >= '3.8'
+typing-extensions==4.11.0; python_version >= '3.8'
+urllib3==2.2.1; python_version >= '3.8'
+whitenoise==6.6.0; python_version >= '3.8'
+xlrd==2.0.1
+xlwt==1.3.0
 zope.event==5.0; python_version >= '3.7'
-zope.interface==7.0.3; python_version >= '3.8'
+zope.interface==6.3; python_version >= '3.7'

From f41c6b3fa145b31b01543f5da47114d3b9eed131 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 11:56:46 -0700
Subject: [PATCH 025/118] Revert settings.py

---
 src/registrar/config/settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py
index 72bffdbb4..73aecad7a 100644
--- a/src/registrar/config/settings.py
+++ b/src/registrar/config/settings.py
@@ -357,7 +357,7 @@ CSP_FORM_ACTION = allowed_sources
 # and inline with a nonce, as well as allowing connections back to their domain.
 # Note: If needed, we can embed chart.js instead of using the CDN
 CSP_DEFAULT_SRC = ("'self'",)
-CSP_STYLE_SRC = ["'self'", "https://www.ssa.gov"]
+CSP_STYLE_SRC = ["'self'", "https://www.ssa.gov/accessibility/andi/andi.css"]
 CSP_SCRIPT_SRC_ELEM = [
     "'self'",
     "https://www.googletagmanager.com/",
@@ -367,7 +367,7 @@ CSP_SCRIPT_SRC_ELEM = [
 ]
 CSP_CONNECT_SRC = ["'self'", "https://www.google-analytics.com/", "https://www.ssa.gov/accessibility/andi/andi.js"]
 CSP_INCLUDE_NONCE_IN = ["script-src-elem", "style-src"]
-CSP_IMG_SRC = ["'self'", "https://www.ssa.gov"]
+CSP_IMG_SRC = ["'self'", "https://www.ssa.gov/accessibility/andi/icons/"]
 
 # Cross-Origin Resource Sharing (CORS) configuration
 # Sets clients that allow access control to manage.get.gov

From d8790448ab4cfb900d8a0cfda06a46e383fcd637 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 15:45:46 -0700
Subject: [PATCH 026/118] Delete submitter contacts

---
 .../0121_delete_cascade_submitter_contacts.py | 22 +++++++++++++
 ...ve_domaininformation_submitter_and_more.py | 33 -------------------
 2 files changed, 22 insertions(+), 33 deletions(-)
 create mode 100644 src/registrar/migrations/0121_delete_cascade_submitter_contacts.py
 delete mode 100644 src/registrar/migrations/0121_remove_domaininformation_submitter_and_more.py

diff --git a/src/registrar/migrations/0121_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0121_delete_cascade_submitter_contacts.py
new file mode 100644
index 000000000..434accd44
--- /dev/null
+++ b/src/registrar/migrations/0121_delete_cascade_submitter_contacts.py
@@ -0,0 +1,22 @@
+from django.db import migrations
+from typing import Any
+
+# Deletes Contact objects associated with a submitter which we are deprecating
+def cascade_delete_submitter_contacts(apps, schema_editor) -> Any:
+    contacts_model = apps.get_model("registrar", "Contact")
+    submitter_contacts = contacts_model.objects.filter(submitted_domain_requests__isnull=False)
+    submitter_contacts.delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registrar", "0120_add_domainrequest_submission_dates"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            cascade_delete_submitter_contacts,
+            reverse_code=migrations.RunPython.noop,
+            atomic=True
+        ),
+    ]
\ No newline at end of file
diff --git a/src/registrar/migrations/0121_remove_domaininformation_submitter_and_more.py b/src/registrar/migrations/0121_remove_domaininformation_submitter_and_more.py
deleted file mode 100644
index 91c392290..000000000
--- a/src/registrar/migrations/0121_remove_domaininformation_submitter_and_more.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Generated by Django 4.2.10 on 2024-08-26 18:45
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("registrar", "0120_add_domainrequest_submission_dates"),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name="domaininformation",
-            name="submitter",
-        ),
-        migrations.RemoveField(
-            model_name="domainrequest",
-            name="submitter",
-        ),
-        migrations.AlterField(
-            model_name="domainrequest",
-            name="creator",
-            field=models.ForeignKey(
-                help_text="Person who submitted the domain request. Will receive email updates.",
-                on_delete=django.db.models.deletion.PROTECT,
-                related_name="domain_requests_created",
-                to=settings.AUTH_USER_MODEL,
-            ),
-        ),
-    ]

From be54f8c4059ef0e19b4d890a1bf0b5320f4841de Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 15:46:48 -0700
Subject: [PATCH 027/118] Add delete domain info migration

---
 ...ve_domaininformation_submitter_and_more.py | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 src/registrar/migrations/0122_remove_domaininformation_submitter_and_more.py

diff --git a/src/registrar/migrations/0122_remove_domaininformation_submitter_and_more.py b/src/registrar/migrations/0122_remove_domaininformation_submitter_and_more.py
new file mode 100644
index 000000000..d8d6b7e32
--- /dev/null
+++ b/src/registrar/migrations/0122_remove_domaininformation_submitter_and_more.py
@@ -0,0 +1,33 @@
+# Generated by Django 4.2.10 on 2024-08-29 22:44
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0121_delete_cascade_submitter_contacts"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="domaininformation",
+            name="submitter",
+        ),
+        migrations.RemoveField(
+            model_name="domainrequest",
+            name="submitter",
+        ),
+        migrations.AlterField(
+            model_name="domainrequest",
+            name="creator",
+            field=models.ForeignKey(
+                help_text="Person who submitted the domain request. Will receive email updates.",
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="domain_requests_created",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

From 76e35db66352e300a5e101d648b1733227543a00 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 15:50:28 -0700
Subject: [PATCH 028/118] Fix linting

---
 .../migrations/0121_delete_cascade_submitter_contacts.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/registrar/migrations/0121_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0121_delete_cascade_submitter_contacts.py
index 434accd44..d6ed2dfa5 100644
--- a/src/registrar/migrations/0121_delete_cascade_submitter_contacts.py
+++ b/src/registrar/migrations/0121_delete_cascade_submitter_contacts.py
@@ -1,6 +1,7 @@
 from django.db import migrations
 from typing import Any
 
+
 # Deletes Contact objects associated with a submitter which we are deprecating
 def cascade_delete_submitter_contacts(apps, schema_editor) -> Any:
     contacts_model = apps.get_model("registrar", "Contact")
@@ -14,9 +15,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(
-            cascade_delete_submitter_contacts,
-            reverse_code=migrations.RunPython.noop,
-            atomic=True
-        ),
-    ]
\ No newline at end of file
+        migrations.RunPython(cascade_delete_submitter_contacts, reverse_code=migrations.RunPython.noop, atomic=True),
+    ]

From d66c75a75dc214eac2fad8f5ec18339b39af701a Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 16:18:39 -0700
Subject: [PATCH 029/118] Add migration changing submitted to cascade on delete

---
 ...er_domaininformation_submitter_and_more.py | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/registrar/migrations/0121_alter_domaininformation_submitter_and_more.py

diff --git a/src/registrar/migrations/0121_alter_domaininformation_submitter_and_more.py b/src/registrar/migrations/0121_alter_domaininformation_submitter_and_more.py
new file mode 100644
index 000000000..178c6e666
--- /dev/null
+++ b/src/registrar/migrations/0121_alter_domaininformation_submitter_and_more.py
@@ -0,0 +1,38 @@
+# Generated by Django 4.2.10 on 2024-08-29 23:17
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0120_add_domainrequest_submission_dates"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="domaininformation",
+            name="submitter",
+            field=models.ForeignKey(
+                blank=True,
+                help_text='Person listed under "your contact information" in the request form',
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="submitted_domain_requests_information",
+                to="registrar.contact",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="domainrequest",
+            name="submitter",
+            field=models.ForeignKey(
+                blank=True,
+                help_text='Person listed under "your contact information" in the request form; will receive email updates',
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="submitted_domain_requests",
+                to="registrar.contact",
+            ),
+        ),
+    ]

From 8db9ccda5d4d88b18aa5ef7b55fd1cf5567f6716 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 16:25:35 -0700
Subject: [PATCH 030/118] Rename migrations

---
 ...tter_contacts.py => 0122_delete_cascade_submitter_contacts.py} | 0
 ...ore.py => 0123_remove_domaininformation_submitter_and_more.py} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/registrar/migrations/{0121_delete_cascade_submitter_contacts.py => 0122_delete_cascade_submitter_contacts.py} (100%)
 rename src/registrar/migrations/{0122_remove_domaininformation_submitter_and_more.py => 0123_remove_domaininformation_submitter_and_more.py} (100%)

diff --git a/src/registrar/migrations/0121_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
similarity index 100%
rename from src/registrar/migrations/0121_delete_cascade_submitter_contacts.py
rename to src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
diff --git a/src/registrar/migrations/0122_remove_domaininformation_submitter_and_more.py b/src/registrar/migrations/0123_remove_domaininformation_submitter_and_more.py
similarity index 100%
rename from src/registrar/migrations/0122_remove_domaininformation_submitter_and_more.py
rename to src/registrar/migrations/0123_remove_domaininformation_submitter_and_more.py

From 5d1f86f2332f3430e93e4e47110977dad1ad6bbd Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 16:32:21 -0700
Subject: [PATCH 031/118] Correct migration dependency

---
 .../0123_remove_domaininformation_submitter_and_more.py         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/migrations/0123_remove_domaininformation_submitter_and_more.py b/src/registrar/migrations/0123_remove_domaininformation_submitter_and_more.py
index d8d6b7e32..aeaed494d 100644
--- a/src/registrar/migrations/0123_remove_domaininformation_submitter_and_more.py
+++ b/src/registrar/migrations/0123_remove_domaininformation_submitter_and_more.py
@@ -8,7 +8,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0121_delete_cascade_submitter_contacts"),
+        ("registrar", "0122_delete_cascade_submitter_contacts"),
     ]
 
     operations = [

From 017130143b06317287268b170f3ad66e4a66ec48 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 16:38:32 -0700
Subject: [PATCH 032/118] Correct migration dependencies

---
 .../migrations/0122_delete_cascade_submitter_contacts.py        | 2 +-
 .../0123_remove_domaininformation_submitter_and_more.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
index d6ed2dfa5..5002be293 100644
--- a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
+++ b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
@@ -11,7 +11,7 @@ def cascade_delete_submitter_contacts(apps, schema_editor) -> Any:
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("registrar", "0120_add_domainrequest_submission_dates"),
+        ("registrar", "0121_alter_domaininformation_submitter_and_more"),
     ]
 
     operations = [
diff --git a/src/registrar/migrations/0123_remove_domaininformation_submitter_and_more.py b/src/registrar/migrations/0123_remove_domaininformation_submitter_and_more.py
index aeaed494d..dcad2885e 100644
--- a/src/registrar/migrations/0123_remove_domaininformation_submitter_and_more.py
+++ b/src/registrar/migrations/0123_remove_domaininformation_submitter_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-08-29 22:44
+# Generated by Django 4.2.10 on 2024-08-29 24:13
 
 from django.conf import settings
 from django.db import migrations, models

From d0c598f3538f0f5218d537e0cc16314202883608 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 16:47:04 -0700
Subject: [PATCH 033/118] Correct cascade delete migration

---
 .../migrations/0122_delete_cascade_submitter_contacts.py        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
index 5002be293..8f2a453bd 100644
--- a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
+++ b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
@@ -5,7 +5,7 @@ from typing import Any
 # Deletes Contact objects associated with a submitter which we are deprecating
 def cascade_delete_submitter_contacts(apps, schema_editor) -> Any:
     contacts_model = apps.get_model("registrar", "Contact")
-    submitter_contacts = contacts_model.objects.filter(submitted_domain_requests__isnull=False)
+    submitter_contacts = contacts_model.objects.filter(submitted_domain_requests__isnull=False) | contacts_model.objects.filter(submitted_domain_requests_information__isnull=False)
     submitter_contacts.delete()
 
 

From bf83a15fc496f2b4b3a487c4861307cef6de66d1 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 16:48:06 -0700
Subject: [PATCH 034/118] Fix linting

---
 .../migrations/0122_delete_cascade_submitter_contacts.py      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
index 8f2a453bd..6bbe1e456 100644
--- a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
+++ b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
@@ -5,7 +5,9 @@ from typing import Any
 # Deletes Contact objects associated with a submitter which we are deprecating
 def cascade_delete_submitter_contacts(apps, schema_editor) -> Any:
     contacts_model = apps.get_model("registrar", "Contact")
-    submitter_contacts = contacts_model.objects.filter(submitted_domain_requests__isnull=False) | contacts_model.objects.filter(submitted_domain_requests_information__isnull=False)
+    submitter_contacts = contacts_model.objects.filter(
+        submitted_domain_requests__isnull=False
+    ) | contacts_model.objects.filter(submitted_domain_requests_information__isnull=False)
     submitter_contacts.delete()
 
 

From 6272dab45514b1cf3d9b79b20d248338353e2ffd Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 16:54:45 -0700
Subject: [PATCH 035/118] Fix cascade migration

---
 .../migrations/0122_delete_cascade_submitter_contacts.py    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
index 6bbe1e456..9d65c661b 100644
--- a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
+++ b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
@@ -1,13 +1,13 @@
 from django.db import migrations
+from django.db.models import Q
 from typing import Any
 
 
 # Deletes Contact objects associated with a submitter which we are deprecating
 def cascade_delete_submitter_contacts(apps, schema_editor) -> Any:
     contacts_model = apps.get_model("registrar", "Contact")
-    submitter_contacts = contacts_model.objects.filter(
-        submitted_domain_requests__isnull=False
-    ) | contacts_model.objects.filter(submitted_domain_requests_information__isnull=False)
+    submitter_contacts = contacts_model.objects.filter(Q(submitted_domain_requests__isnull=False)
+     | Q(submitted_domain_requests_information__isnull=False))
     submitter_contacts.delete()
 
 

From c4c5ae87f9c9c7e3f8dd16c3fc88723f360ee8d4 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 16:55:46 -0700
Subject: [PATCH 036/118] Fix linting

---
 .../migrations/0122_delete_cascade_submitter_contacts.py     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
index 9d65c661b..e7ba24eb4 100644
--- a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
+++ b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
@@ -6,8 +6,9 @@ from typing import Any
 # Deletes Contact objects associated with a submitter which we are deprecating
 def cascade_delete_submitter_contacts(apps, schema_editor) -> Any:
     contacts_model = apps.get_model("registrar", "Contact")
-    submitter_contacts = contacts_model.objects.filter(Q(submitted_domain_requests__isnull=False)
-     | Q(submitted_domain_requests_information__isnull=False))
+    submitter_contacts = contacts_model.objects.filter(
+        Q(submitted_domain_requests__isnull=False) | Q(submitted_domain_requests_information__isnull=False)
+    )
     submitter_contacts.delete()
 
 

From cf86579467705ad2aa7688457b2c0ad1a9634250 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 17:23:32 -0700
Subject: [PATCH 037/118] Add more conditions to cascade delete

---
 .../migrations/0122_delete_cascade_submitter_contacts.py   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
index e7ba24eb4..b43639187 100644
--- a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
+++ b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
@@ -7,7 +7,12 @@ from typing import Any
 def cascade_delete_submitter_contacts(apps, schema_editor) -> Any:
     contacts_model = apps.get_model("registrar", "Contact")
     submitter_contacts = contacts_model.objects.filter(
-        Q(submitted_domain_requests__isnull=False) | Q(submitted_domain_requests_information__isnull=False)
+        Q(submitted_domain_requests__isnull=False)
+        | Q(submitted_domain_requests_information__isnull=False)
+        | Q(information_senior_official__isnull=True)
+        | Q(senior_official__isnull=True)
+        | Q(contact_domain_requests_information__isnull=True)
+        | Q(contact_domain_requests__isnull=True)
     )
     submitter_contacts.delete()
 

From 17dd4dd2717f7d60adfc05efe68cad00e3d4964b Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 17:35:22 -0700
Subject: [PATCH 038/118] Add filter

---
 .../migrations/0122_delete_cascade_submitter_contacts.py     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
index b43639187..e37ddce7b 100644
--- a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
+++ b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
@@ -9,10 +9,7 @@ def cascade_delete_submitter_contacts(apps, schema_editor) -> Any:
     submitter_contacts = contacts_model.objects.filter(
         Q(submitted_domain_requests__isnull=False)
         | Q(submitted_domain_requests_information__isnull=False)
-        | Q(information_senior_official__isnull=True)
-        | Q(senior_official__isnull=True)
-        | Q(contact_domain_requests_information__isnull=True)
-        | Q(contact_domain_requests__isnull=True)
+    ).filter(information_senior_official__isnull=True, senior_official__isnull=True, contact_domain_requests_information__isnull=True, contact_domain_requests__isnull=True
     )
     submitter_contacts.delete()
 

From 79f020b40217109f251690e9c531b2309ead7127 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 29 Aug 2024 17:36:08 -0700
Subject: [PATCH 039/118] Fix linting

---
 .../migrations/0122_delete_cascade_submitter_contacts.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
index e37ddce7b..0d3988421 100644
--- a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
+++ b/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
@@ -7,9 +7,12 @@ from typing import Any
 def cascade_delete_submitter_contacts(apps, schema_editor) -> Any:
     contacts_model = apps.get_model("registrar", "Contact")
     submitter_contacts = contacts_model.objects.filter(
-        Q(submitted_domain_requests__isnull=False)
-        | Q(submitted_domain_requests_information__isnull=False)
-    ).filter(information_senior_official__isnull=True, senior_official__isnull=True, contact_domain_requests_information__isnull=True, contact_domain_requests__isnull=True
+        Q(submitted_domain_requests__isnull=False) | Q(submitted_domain_requests_information__isnull=False)
+    ).filter(
+        information_senior_official__isnull=True,
+        senior_official__isnull=True,
+        contact_domain_requests_information__isnull=True,
+        contact_domain_requests__isnull=True,
     )
     submitter_contacts.delete()
 

From 2acef3f3d9bcedb1ab8f2a192be35c33c2eff25d Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 5 Sep 2024 14:37:39 -0700
Subject: [PATCH 040/118] Convert submitter to null on delete

---
 .../0121_alter_domaininformation_submitter_and_more.py        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/migrations/0121_alter_domaininformation_submitter_and_more.py b/src/registrar/migrations/0121_alter_domaininformation_submitter_and_more.py
index 178c6e666..7162624a0 100644
--- a/src/registrar/migrations/0121_alter_domaininformation_submitter_and_more.py
+++ b/src/registrar/migrations/0121_alter_domaininformation_submitter_and_more.py
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
                 blank=True,
                 help_text='Person listed under "your contact information" in the request form',
                 null=True,
-                on_delete=django.db.models.deletion.CASCADE,
+                on_delete=django.db.models.deletion.SET_NULL,
                 related_name="submitted_domain_requests_information",
                 to="registrar.contact",
             ),
@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
                 blank=True,
                 help_text='Person listed under "your contact information" in the request form; will receive email updates',
                 null=True,
-                on_delete=django.db.models.deletion.CASCADE,
+                on_delete=django.db.models.deletion.SET_NULL,
                 related_name="submitted_domain_requests",
                 to="registrar.contact",
             ),

From f7fed00e8a4107eac0366cd3995cdbf3df7a0d20 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 5 Sep 2024 14:48:01 -0700
Subject: [PATCH 041/118] Correct migration order

---
 ...re.py => 0123_alter_domaininformation_submitter_and_more.py} | 2 +-
 ...er_contacts.py => 0124_delete_cascade_submitter_contacts.py} | 2 +-
 ...e.py => 0125_remove_domaininformation_submitter_and_more.py} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename src/registrar/migrations/{0121_alter_domaininformation_submitter_and_more.py => 0123_alter_domaininformation_submitter_and_more.py} (94%)
 rename src/registrar/migrations/{0122_delete_cascade_submitter_contacts.py => 0124_delete_cascade_submitter_contacts.py} (93%)
 rename src/registrar/migrations/{0123_remove_domaininformation_submitter_and_more.py => 0125_remove_domaininformation_submitter_and_more.py} (93%)

diff --git a/src/registrar/migrations/0121_alter_domaininformation_submitter_and_more.py b/src/registrar/migrations/0123_alter_domaininformation_submitter_and_more.py
similarity index 94%
rename from src/registrar/migrations/0121_alter_domaininformation_submitter_and_more.py
rename to src/registrar/migrations/0123_alter_domaininformation_submitter_and_more.py
index 7162624a0..bdb6c0540 100644
--- a/src/registrar/migrations/0121_alter_domaininformation_submitter_and_more.py
+++ b/src/registrar/migrations/0123_alter_domaininformation_submitter_and_more.py
@@ -7,7 +7,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0120_add_domainrequest_submission_dates"),
+        ("registrar", "0122_create_groups_v16"),
     ]
 
     operations = [
diff --git a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0124_delete_cascade_submitter_contacts.py
similarity index 93%
rename from src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
rename to src/registrar/migrations/0124_delete_cascade_submitter_contacts.py
index 0d3988421..8c5da0508 100644
--- a/src/registrar/migrations/0122_delete_cascade_submitter_contacts.py
+++ b/src/registrar/migrations/0124_delete_cascade_submitter_contacts.py
@@ -19,7 +19,7 @@ def cascade_delete_submitter_contacts(apps, schema_editor) -> Any:
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("registrar", "0121_alter_domaininformation_submitter_and_more"),
+        ("registrar", "0123_alter_domaininformation_submitter_and_more"),
     ]
 
     operations = [
diff --git a/src/registrar/migrations/0123_remove_domaininformation_submitter_and_more.py b/src/registrar/migrations/0125_remove_domaininformation_submitter_and_more.py
similarity index 93%
rename from src/registrar/migrations/0123_remove_domaininformation_submitter_and_more.py
rename to src/registrar/migrations/0125_remove_domaininformation_submitter_and_more.py
index dcad2885e..30575d776 100644
--- a/src/registrar/migrations/0123_remove_domaininformation_submitter_and_more.py
+++ b/src/registrar/migrations/0125_remove_domaininformation_submitter_and_more.py
@@ -8,7 +8,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0122_delete_cascade_submitter_contacts"),
+        ("registrar", "0124_delete_cascade_submitter_contacts"),
     ]
 
     operations = [

From 78476a98c1dd1ddf1bfbc4bd298faca71ba2aac8 Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 5 Sep 2024 15:51:30 -0700
Subject: [PATCH 042/118] Whitelist emails sent in test save models

---
 src/registrar/tests/test_admin_request.py | 33 +++++++++++++++--------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index cb4b2bef5..400862168 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -829,8 +829,9 @@ class TestDomainRequestAdmin(MockEppLib):
             title="Treat inspector",
         )
 
-        # Create a sample domain request
+        # Create a sample domain request and whitelist user email
         domain_request = completed_domain_request(user=_creator)
+        AllowedEmail.objects.get_or_create(email=_creator.email)
 
         # Test Submitted Status from started
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.SUBMITTED)
@@ -911,8 +912,9 @@ class TestDomainRequestAdmin(MockEppLib):
 
         BCC_EMAIL = settings.DEFAULT_FROM_EMAIL
 
-        # Create a sample domain request
+        # Create a sample domain request and whitelist user email
         domain_request = completed_domain_request(user=_creator)
+        AllowedEmail.objects.get_or_create(email=_creator.email)
 
         # Test Submitted Status from started
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.SUBMITTED)
@@ -969,8 +971,9 @@ class TestDomainRequestAdmin(MockEppLib):
             title="Treat inspector",
         )
 
-        # Create a sample domain request
+        # Create a sample domain request and whitelist user email
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
+        AllowedEmail.objects.get_or_create(email=_creator.email)
 
         # Test Submitted Status
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.APPROVED)
@@ -1005,8 +1008,9 @@ class TestDomainRequestAdmin(MockEppLib):
             title="Treat inspector",
         )
 
-        # Create a sample domain request
+        # Create a sample domain request and whitelist user email
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
+        AllowedEmail.objects.get_or_create(email=_creator.email)
 
         # Reject for reason DOMAIN_PURPOSE and test email
         self.transition_state_and_send_email(
@@ -1041,8 +1045,9 @@ class TestDomainRequestAdmin(MockEppLib):
             title="Treat inspector",
         )
 
-        # Create a sample domain request
+        # Create a sample domain request and whitelist user email
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
+        AllowedEmail.objects.get_or_create(email=_creator.email)
 
         # Reject for reason REQUESTOR and test email including dynamic organization name
         self.transition_state_and_send_email(
@@ -1076,8 +1081,9 @@ class TestDomainRequestAdmin(MockEppLib):
             title="Treat inspector",
         )
 
-        # Create a sample domain request
+        # Create a sample domain request and whitelist user email
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
+        AllowedEmail.objects.get_or_create(email=_creator.email)
 
         # Reject for reason SECOND_DOMAIN_REASONING and test email including dynamic organization name
         self.transition_state_and_send_email(
@@ -1109,8 +1115,9 @@ class TestDomainRequestAdmin(MockEppLib):
             title="Treat inspector",
         )
 
-        # Create a sample domain request
+        # Create a sample domain request and whitelist user email
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
+        AllowedEmail.objects.get_or_create(email=_creator.email)
 
         # Reject for reason CONTACTS_OR_ORGANIZATION_LEGITIMACY and test email including dynamic organization name
         self.transition_state_and_send_email(
@@ -1146,8 +1153,9 @@ class TestDomainRequestAdmin(MockEppLib):
             title="Treat inspector",
         )
 
-        # Create a sample domain request
+        # Create a sample domain request and whitelist user email
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
+        AllowedEmail.objects.get_or_create(email=_creator.email)
 
         # Reject for reason ORGANIZATION_ELIGIBILITY and test email including dynamic organization name
         self.transition_state_and_send_email(
@@ -1182,8 +1190,9 @@ class TestDomainRequestAdmin(MockEppLib):
             title="Treat inspector",
         )
 
-        # Create a sample domain request
+        # Create a sample domain request and whitelist user email
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
+        AllowedEmail.objects.get_or_create(email=_creator.email)
 
         # Reject for reason NAMING_REQUIREMENTS and test email including dynamic organization name
         self.transition_state_and_send_email(
@@ -1216,8 +1225,9 @@ class TestDomainRequestAdmin(MockEppLib):
             title="Treat inspector",
         )
 
-        # Create a sample domain request
+        # Create a sample domain request and whitelist user email
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
+        AllowedEmail.objects.get_or_create(email=_creator.email)
 
         # Reject for reason NAMING_REQUIREMENTS and test email including dynamic organization name
         self.transition_state_and_send_email(
@@ -1304,8 +1314,9 @@ class TestDomainRequestAdmin(MockEppLib):
             title="Treat inspector",
         )
 
-        # Create a sample domain request
+        # Create a sample domain request and whitelists user email
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=_creator)
+        AllowedEmail.objects.get_or_create(email=_creator.email)
 
         # Test Submitted Status
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.WITHDRAWN)

From 72c955fa058b1ed9adebeba451daef63626374cf Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Fri, 6 Sep 2024 14:23:21 -0700
Subject: [PATCH 043/118] Fix spelling

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

diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py
index 338a93237..ac8865a34 100644
--- a/src/registrar/views/utility/mixins.py
+++ b/src/registrar/views/utility/mixins.py
@@ -84,7 +84,7 @@ class OrderableFieldsMixin:
         def get_sortable_creator(self, obj):
             return obj.creator
         # Allows column order sorting
-        get_sortable_creator.admin_order_field = ["creator__first_name", "creaotr__last_name"]
+        get_sortable_creator.admin_order_field = ["creator__first_name", "creator__last_name"]
         # Sets column's header
         get_sortable_creator.short_description = "creator"
         ```

From 44c911e320bb54f3763555432957dcf996c412cf Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 9 Sep 2024 11:32:34 -0400
Subject: [PATCH 044/118] removed method to add has_profile_feature_flag to
 context, and reference

---
 src/registrar/config/settings.py    | 1 -
 src/registrar/context_processors.py | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py
index 7965424bc..b567d01ff 100644
--- a/src/registrar/config/settings.py
+++ b/src/registrar/config/settings.py
@@ -242,7 +242,6 @@ TEMPLATES = [
                 "registrar.context_processors.is_production",
                 "registrar.context_processors.org_user_status",
                 "registrar.context_processors.add_path_to_context",
-                "registrar.context_processors.add_has_profile_feature_flag_to_context",
                 "registrar.context_processors.portfolio_permissions",
             ],
         },
diff --git a/src/registrar/context_processors.py b/src/registrar/context_processors.py
index 2ac22b2e0..7f09df310 100644
--- a/src/registrar/context_processors.py
+++ b/src/registrar/context_processors.py
@@ -54,10 +54,6 @@ def add_path_to_context(request):
     return {"path": getattr(request, "path", None)}
 
 
-def add_has_profile_feature_flag_to_context(request):
-    return {"has_profile_feature_flag": flag_is_active(request, "profile_feature")}
-
-
 def portfolio_permissions(request):
     """Make portfolio permissions for the request user available in global context"""
     context = {

From 2e3f4bdf0cb780a4c656da2f83d234cef5e16bc1 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 9 Sep 2024 11:36:01 -0400
Subject: [PATCH 045/118] removed profile feature flag reference from process
 view method

---
 src/registrar/registrar_middleware.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/registrar/registrar_middleware.py b/src/registrar/registrar_middleware.py
index 4b590db1e..0d0f55024 100644
--- a/src/registrar/registrar_middleware.py
+++ b/src/registrar/registrar_middleware.py
@@ -72,12 +72,7 @@ class CheckUserProfileMiddleware:
         """Runs pre-processing logic for each view. Checks for the
         finished_setup flag on the current user. If they haven't done so,
         then we redirect them to the finish setup page."""
-        # Check that the user is "opted-in" to the profile feature flag
-        has_profile_feature_flag = flag_is_active(request, "profile_feature")
 
-        # If they aren't, skip this check entirely
-        if not has_profile_feature_flag:
-            return None
 
         if request.user.is_authenticated:
             profile_page = self.profile_page

From a35d39e711ecfd620074031496971c390ecf3069 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Mon, 9 Sep 2024 09:12:18 -0700
Subject: [PATCH 046/118] Update migrations

---
 ...lioinvitation_portfolio_additional_permissions_and_more.py | 2 +-
 ....py => 0124_alter_domaininformation_submitter_and_more.py} | 2 +-
 ..._contacts.py => 0125_delete_cascade_submitter_contacts.py} | 4 ++--
 ...py => 0126_remove_domaininformation_submitter_and_more.py} | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename src/registrar/migrations/{0123_alter_domaininformation_submitter_and_more.py => 0124_alter_domaininformation_submitter_and_more.py} (92%)
 rename src/registrar/migrations/{0124_delete_cascade_submitter_contacts.py => 0125_delete_cascade_submitter_contacts.py} (92%)
 rename src/registrar/migrations/{0125_remove_domaininformation_submitter_and_more.py => 0126_remove_domaininformation_submitter_and_more.py} (93%)

diff --git a/src/registrar/migrations/0123_alter_portfolioinvitation_portfolio_additional_permissions_and_more.py b/src/registrar/migrations/0123_alter_portfolioinvitation_portfolio_additional_permissions_and_more.py
index c14a70ab0..65608e63d 100644
--- a/src/registrar/migrations/0123_alter_portfolioinvitation_portfolio_additional_permissions_and_more.py
+++ b/src/registrar/migrations/0123_alter_portfolioinvitation_portfolio_additional_permissions_and_more.py
@@ -63,4 +63,4 @@ class Migration(migrations.Migration):
                 size=None,
             ),
         ),
-    ]
+    ]
\ No newline at end of file
diff --git a/src/registrar/migrations/0123_alter_domaininformation_submitter_and_more.py b/src/registrar/migrations/0124_alter_domaininformation_submitter_and_more.py
similarity index 92%
rename from src/registrar/migrations/0123_alter_domaininformation_submitter_and_more.py
rename to src/registrar/migrations/0124_alter_domaininformation_submitter_and_more.py
index bdb6c0540..f72fc2d86 100644
--- a/src/registrar/migrations/0123_alter_domaininformation_submitter_and_more.py
+++ b/src/registrar/migrations/0124_alter_domaininformation_submitter_and_more.py
@@ -7,7 +7,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0122_create_groups_v16"),
+        ("registrar", "0123_alter_portfolioinvitation_portfolio_additional_permissions_and_more"),
     ]
 
     operations = [
diff --git a/src/registrar/migrations/0124_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0125_delete_cascade_submitter_contacts.py
similarity index 92%
rename from src/registrar/migrations/0124_delete_cascade_submitter_contacts.py
rename to src/registrar/migrations/0125_delete_cascade_submitter_contacts.py
index 8c5da0508..74dcb9331 100644
--- a/src/registrar/migrations/0124_delete_cascade_submitter_contacts.py
+++ b/src/registrar/migrations/0125_delete_cascade_submitter_contacts.py
@@ -19,9 +19,9 @@ def cascade_delete_submitter_contacts(apps, schema_editor) -> Any:
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("registrar", "0123_alter_domaininformation_submitter_and_more"),
+        ("registrar", "0124_alter_domaininformation_submitter_and_more"),
     ]
 
     operations = [
         migrations.RunPython(cascade_delete_submitter_contacts, reverse_code=migrations.RunPython.noop, atomic=True),
-    ]
+    ]
\ No newline at end of file
diff --git a/src/registrar/migrations/0125_remove_domaininformation_submitter_and_more.py b/src/registrar/migrations/0126_remove_domaininformation_submitter_and_more.py
similarity index 93%
rename from src/registrar/migrations/0125_remove_domaininformation_submitter_and_more.py
rename to src/registrar/migrations/0126_remove_domaininformation_submitter_and_more.py
index 30575d776..8f04497df 100644
--- a/src/registrar/migrations/0125_remove_domaininformation_submitter_and_more.py
+++ b/src/registrar/migrations/0126_remove_domaininformation_submitter_and_more.py
@@ -8,7 +8,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0124_delete_cascade_submitter_contacts"),
+        ("registrar", "0125_delete_cascade_submitter_contacts"),
     ]
 
     operations = [

From 96811baa3441fdb0c33f3fb89270f1acd4e6fc49 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Mon, 9 Sep 2024 09:19:00 -0700
Subject: [PATCH 047/118] Fix linter

---
 ...folioinvitation_portfolio_additional_permissions_and_more.py | 2 +-
 .../migrations/0125_delete_cascade_submitter_contacts.py        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/migrations/0123_alter_portfolioinvitation_portfolio_additional_permissions_and_more.py b/src/registrar/migrations/0123_alter_portfolioinvitation_portfolio_additional_permissions_and_more.py
index 65608e63d..c14a70ab0 100644
--- a/src/registrar/migrations/0123_alter_portfolioinvitation_portfolio_additional_permissions_and_more.py
+++ b/src/registrar/migrations/0123_alter_portfolioinvitation_portfolio_additional_permissions_and_more.py
@@ -63,4 +63,4 @@ class Migration(migrations.Migration):
                 size=None,
             ),
         ),
-    ]
\ No newline at end of file
+    ]
diff --git a/src/registrar/migrations/0125_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0125_delete_cascade_submitter_contacts.py
index 74dcb9331..44bd6c1fa 100644
--- a/src/registrar/migrations/0125_delete_cascade_submitter_contacts.py
+++ b/src/registrar/migrations/0125_delete_cascade_submitter_contacts.py
@@ -24,4 +24,4 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunPython(cascade_delete_submitter_contacts, reverse_code=migrations.RunPython.noop, atomic=True),
-    ]
\ No newline at end of file
+    ]

From 32e3d2f9c678577d53b9625f329399b66a857961 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 9 Sep 2024 12:26:59 -0400
Subject: [PATCH 048/118] removed the profile_feature_flag from
 send_status_update_emailmethod

---
 src/registrar/models/domain_request.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index b80e063cd..9f1c3ad5d 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -741,9 +741,6 @@ class DomainRequest(TimeStampedModel):
         contact information. If there is not creator information, then do
         nothing.
 
-        If the waffle flag "profile_feature" is active, then this email will be sent to the
-        domain request creator rather than the submitter
-
         Optional args:
         bcc_address: str -> the address to bcc to
 
@@ -758,7 +755,7 @@ class DomainRequest(TimeStampedModel):
         custom_email_content: str -> Renders an email with the content of this string as its body text.
         """
 
-        recipient = self.creator if flag_is_active(None, "profile_feature") else self.submitter
+        recipient = self.creator
         if recipient is None or recipient.email is None:
             logger.warning(
                 f"Cannot send {new_status} email, no creator email address for domain request with pk: {self.pk}."

From b824ebfa0584f78188575c969cdd572195876ae0 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Mon, 9 Sep 2024 12:27:18 -0400
Subject: [PATCH 049/118] manin nav active state when senior-official

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

diff --git a/src/registrar/templates/includes/header_extended.html b/src/registrar/templates/includes/header_extended.html
index 5084b1a3d..34f72db48 100644
--- a/src/registrar/templates/includes/header_extended.html
+++ b/src/registrar/templates/includes/header_extended.html
@@ -70,7 +70,7 @@
             <li class="usa-nav__primary-item">
                 {% url 'organization' as url %}
                 <!-- Move the padding from the a to the span so that the descenders do not get cut off -->
-                <a href="{{ url }}" class="usa-nav-link padding-y-0 {% if request.path == '/organization/' %} usa-current{% endif %}">
+                <a href="{{ url }}" class="usa-nav-link padding-y-0 {% if request.path == '/organization/' or request.path == '/senior-official/' %} usa-current{% endif %}">
                     <span class="ellipsis ellipsis--23 ellipsis--desktop-50 padding-y-1 desktop:padding-y-2">
                         {{ portfolio.organization_name }}
                     </span>

From a08e51813de67ea46666e5b7235f2c769653666d Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Mon, 9 Sep 2024 15:25:10 -0400
Subject: [PATCH 050/118] margin tweak, message positionning change

---
 src/registrar/templates/no_portfolio_domains.html      | 6 ++++++
 src/registrar/templates/portfolio_base.html            | 3 ---
 src/registrar/templates/portfolio_domains.html         | 4 ++++
 src/registrar/templates/portfolio_organization.html    | 6 +++++-
 src/registrar/templates/portfolio_requests.html        | 4 ++++
 src/registrar/templates/portfolio_senior_official.html | 4 ++++
 6 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/registrar/templates/no_portfolio_domains.html b/src/registrar/templates/no_portfolio_domains.html
index e9b0da306..75ff3a91f 100644
--- a/src/registrar/templates/no_portfolio_domains.html
+++ b/src/registrar/templates/no_portfolio_domains.html
@@ -5,6 +5,12 @@
 {% block title %} Domains | {% endblock %}
 
 {% block portfolio_content %}
+
+{% block messages %}
+    {% include "includes/form_messages.html" %}
+{% endblock %}
+
+
 <div id="main-content">
     <h1 id="domains-header">Domains</h1>
     <section class="section-outlined">
diff --git a/src/registrar/templates/portfolio_base.html b/src/registrar/templates/portfolio_base.html
index f6b97afbc..d39a44879 100644
--- a/src/registrar/templates/portfolio_base.html
+++ b/src/registrar/templates/portfolio_base.html
@@ -9,9 +9,6 @@
             {# the entire logged in page goes here #}
             
             <div class="tablet:grid-col-12">
-                {% block messages %}
-                    {% include "includes/form_messages.html" %}
-                {% endblock %}
             
                 {% block portfolio_content %}{% endblock %}
             
diff --git a/src/registrar/templates/portfolio_domains.html b/src/registrar/templates/portfolio_domains.html
index 51011a1a6..dde51ea59 100644
--- a/src/registrar/templates/portfolio_domains.html
+++ b/src/registrar/templates/portfolio_domains.html
@@ -9,6 +9,10 @@
 {% endblock %}
 
 {% block portfolio_content %}
+{% block messages %}
+  {% include "includes/form_messages.html" %}
+{% endblock %}
+
 <div id="main-content">
     <h1 id="domains-header">Domains</h1>
     {% include "includes/domains_table.html" with portfolio=portfolio user_domain_count=user_domain_count %}
diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html
index 4ae035ad4..523b036ae 100644
--- a/src/registrar/templates/portfolio_organization.html
+++ b/src/registrar/templates/portfolio_organization.html
@@ -19,6 +19,10 @@
 
     <div class="tablet:grid-col-9" id="main-content">
 
+        {% block messages %}
+            {% include "includes/form_messages.html" %}
+        {% endblock %}
+
         <h1>Organization</h1>
 
         <p>The name of your federal agency will be publicly listed as the domain registrant.</p>
@@ -31,7 +35,7 @@
 
             {% include "includes/form_errors.html" with form=form %}
             {% include "includes/required_fields.html" %}
-            <form class="usa-form usa-form--large" method="post" novalidate>
+            <form class="usa-form usa-form--large desktop:margin-top-4" method="post" novalidate>
                 {% csrf_token %}
                 <h4 class="read-only-label">Federal agency</h4>
                 <p class="read-only-value">
diff --git a/src/registrar/templates/portfolio_requests.html b/src/registrar/templates/portfolio_requests.html
index 9f97a25aa..96d4856b5 100644
--- a/src/registrar/templates/portfolio_requests.html
+++ b/src/registrar/templates/portfolio_requests.html
@@ -9,6 +9,10 @@
 {% endblock %}
 
 {% block portfolio_content %}
+{% block messages %}
+  {% include "includes/form_messages.html" %}
+{% endblock %}
+
 <div id="main-content">
     <h1 id="domain-requests-header">Domain requests</h1>
 
diff --git a/src/registrar/templates/portfolio_senior_official.html b/src/registrar/templates/portfolio_senior_official.html
index 51ef83be5..631db0206 100644
--- a/src/registrar/templates/portfolio_senior_official.html
+++ b/src/registrar/templates/portfolio_senior_official.html
@@ -6,6 +6,10 @@
 {% load static %}
 
 {% block portfolio_content %}
+{% block messages %}
+  {% include "includes/form_messages.html" %}
+{% endblock %}
+
 <div class="grid-row grid-gap">
     <div class="tablet:grid-col-3">
         <p class="font-body-md margin-top-0 margin-bottom-2

From c2bdfaaa3642e2fc33a5c496880b6f98cb1fc571 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 9 Sep 2024 15:26:00 -0400
Subject: [PATCH 051/118] final changes

---
 src/registrar/models/domain_request.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index 9f1c3ad5d..c545f9d96 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -1248,14 +1248,11 @@ class DomainRequest(TimeStampedModel):
         return self.is_policy_acknowledged is not None
 
     def _is_general_form_complete(self, request):
-        has_profile_feature_flag = flag_is_active(request, "profile_feature")
         return (
             self._is_organization_name_and_address_complete()
             and self._is_senior_official_complete()
             and self._is_requested_domain_complete()
             and self._is_purpose_complete()
-            # NOTE: This flag leaves submitter as empty (request wont submit) hence set to True
-            and (self._is_submitter_complete() if not has_profile_feature_flag else True)
             and self._is_other_contacts_complete()
             and self._is_additional_details_complete()
             and self._is_policy_acknowledgement_complete()

From 8954efb537c6ae9519092a26d9d3c4c770960f3e Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 9 Sep 2024 17:16:18 -0400
Subject: [PATCH 052/118] remvoed all reference to profile feature flag in code

---
 src/registrar/admin.py                        |  16 +-
 .../admin/includes/detail_table_fieldset.html |   2 +-
 src/registrar/templates/domain_detail.html    |   7 -
 .../templates/domain_request_intro.html       |   2 -
 .../templates/domain_request_status.html      |   4 -
 src/registrar/templates/domain_sidebar.html   |   7 -
 .../templates/includes/header_basic.html      |   2 -
 .../templates/includes/header_extended.html   |   2 -
 .../includes/non-production-alert.html        |   3 -
 src/registrar/tests/test_views.py             | 402 +++++-------------
 src/registrar/views/domain.py                 |   4 -
 src/registrar/views/domain_request.py         |   8 +-
 src/registrar/views/user_profile.py           |   4 -
 13 files changed, 121 insertions(+), 342 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index e3bd5c9f7..a3a57791c 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1989,13 +1989,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         """
 
         # TODO 2574: remove lines 1977-1978 (refactor as needed)
-        profile_flag = flag_is_active(request, "profile_feature")
-        if profile_flag and hasattr(obj, "creator"):
-            recipient = obj.creator
-        elif not profile_flag and hasattr(obj, "submitter"):
-            recipient = obj.submitter
-        else:
-            recipient = None
+        recipient = obj.creator
 
         # Displays a warning in admin when an email cannot be sent
         if recipient and recipient.email:
@@ -2200,7 +2194,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         extra_context["filtered_audit_log_entries"] = filtered_audit_log_entries
         emails = self.get_all_action_needed_reason_emails(obj)
         extra_context["action_needed_reason_emails"] = json.dumps(emails)
-        extra_context["has_profile_feature_flag"] = flag_is_active(request, "profile_feature")
 
         # Denote if an action needed email was sent or not
         email_sent = request.session.get("action_needed_email_sent", False)
@@ -2228,11 +2221,8 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         """Returns the default email associated with the given action needed reason"""
         if not action_needed_reason or action_needed_reason == DomainRequest.ActionNeededReasons.OTHER:
             return None
-
-        if flag_is_active(None, "profile_feature"):  # type: ignore
-            recipient = domain_request.creator
-        else:
-            recipient = domain_request.submitter
+        
+        recipient = domain_request.creator
 
         # Return the context of the rendered views
         context = {"domain_request": domain_request, "recipient": recipient}
diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
index 5e1057139..b183e1744 100644
--- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
+++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
@@ -70,7 +70,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
     <div class="readonly textarea-wrapper">
         <div id="action_needed_reason_email_readonly" class="dja-readonly-textarea-container padding-1 margin-top-0 padding-top-0 margin-bottom-1 thin-border collapse--dgsimple collapsed">
             <label class="max-full" for="action_needed_reason_email_view_more">
-                <strong>Sent to {% if has_profile_feature_flag %}creator{%else%}submitter{%endif%}</strong>
+                <strong>Sent to creator</strong>
             </label>
             <textarea id="action_needed_reason_email_view_more" cols="40" rows="20" class="{% if not original_object.action_needed_reason %}display-none{% endif %}" readonly>
                 {{ original_object.action_needed_reason_email }}
diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html
index d7bc277b3..f98994afc 100644
--- a/src/registrar/templates/domain_detail.html
+++ b/src/registrar/templates/domain_detail.html
@@ -83,13 +83,6 @@
       {% include "includes/summary_item.html" with title='Senior official' value=domain.domain_info.senior_official contact='true' edit_link=url editable=is_editable %}
     {% endif %}
 
-
-    {# Conditionally display profile #}
-    {% if not has_profile_feature_flag %}
-    {% url 'domain-your-contact-information' pk=domain.id as url %}
-    {% include "includes/summary_item.html" with title='Your contact information' value=request.user contact='true' edit_link=url editable=is_editable %}
-    {% endif %}
-
     {% url 'domain-security-email' pk=domain.id as url %}
     {% if security_email is not None and security_email not in hidden_security_emails%}
       {% include "includes/summary_item.html" with title='Security email' value=security_email edit_link=url editable=is_editable %}
diff --git a/src/registrar/templates/domain_request_intro.html b/src/registrar/templates/domain_request_intro.html
index f4319f53d..fd94e0ef1 100644
--- a/src/registrar/templates/domain_request_intro.html
+++ b/src/registrar/templates/domain_request_intro.html
@@ -16,11 +16,9 @@
         <h2>Time to complete the form</h2>
         <p>If you have <a href="{% public_site_url 'domains/before/#information-you%E2%80%99ll-need-to-complete-the-domain-request-form' %}" target="_blank" class="usa-link">all the information you need</a>,
           completing your domain request might take around 15 minutes.</p>
-        {% if has_profile_feature_flag %}
         <h2>How we’ll reach you</h2>
         <p>While reviewing your domain request, we may need to reach out with questions. We’ll also email you when we complete our review. If the contact information below is not correct, visit <a href="{% url 'user-profile' %}?redirect=domain-request:" class="usa-link">your profile</a> to make updates.</p>
         {% include "includes/profile_information.html" with user=user%}
-        {% endif %}
         
 
 {% block form_buttons %}
diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html
index 183a8be81..0107f84bd 100644
--- a/src/registrar/templates/domain_request_status.html
+++ b/src/registrar/templates/domain_request_status.html
@@ -109,10 +109,6 @@
       {% include "includes/summary_item.html" with title='Purpose of your domain' value=DomainRequest.purpose heading_level=heading_level %}
     {% endif %}
 
-    {% if DomainRequest.submitter and not has_profile_feature_flag %}
-      {% include "includes/summary_item.html" with title='Your contact information' value=DomainRequest.submitter contact='true' heading_level=heading_level %}
-    {% endif %}
-
     {% if DomainRequest.other_contacts.all %}
       {% include "includes/summary_item.html" with title='Other employees from your organization' value=DomainRequest.other_contacts.all contact='true' list='true' heading_level=heading_level %}
     {% else %}
diff --git a/src/registrar/templates/domain_sidebar.html b/src/registrar/templates/domain_sidebar.html
index 24f92bf16..726aef0cb 100644
--- a/src/registrar/templates/domain_sidebar.html
+++ b/src/registrar/templates/domain_sidebar.html
@@ -72,13 +72,6 @@
         {% endwith %}
       {% endif %}
 
-      {% if not has_profile_feature_flag %}
-      {# Conditionally display profile link in main nav #}
-        {% with url_name="domain-your-contact-information" %}
-          {% include "includes/domain_sidenav_item.html" with item_text="Your contact information" %}
-        {% endwith %}
-      {% endif %}
-
       {% with url_name="domain-security-email" %}
         {% include "includes/domain_sidenav_item.html" with item_text="Security email" %}
       {% endwith %}
diff --git a/src/registrar/templates/includes/header_basic.html b/src/registrar/templates/includes/header_basic.html
index fd3b71000..2f4604032 100644
--- a/src/registrar/templates/includes/header_basic.html
+++ b/src/registrar/templates/includes/header_basic.html
@@ -16,7 +16,6 @@
           {% if user.is_authenticated %}
           <span class="usa-nav__username ellipsis">{{ user.email }}</span>
         </li>
-        {% if has_profile_feature_flag %}
         <li class="usa-nav__primary-item">
           {% url 'user-profile' as user_profile_url %}
           {% url 'finish-user-profile-setup' as finish_setup_url %}
@@ -24,7 +23,6 @@
               <span class="text-primary">Your profile</span>
           </a>
         </li>
-        {% endif %}
         <li class="usa-nav__primary-item">
           <a href="{% url 'logout' %}"><span class="text-primary">Sign out</span></a>
           {% else %}
diff --git a/src/registrar/templates/includes/header_extended.html b/src/registrar/templates/includes/header_extended.html
index 5084b1a3d..e4cd95c11 100644
--- a/src/registrar/templates/includes/header_extended.html
+++ b/src/registrar/templates/includes/header_extended.html
@@ -18,7 +18,6 @@
                     {% if user.is_authenticated %}
                     <span class="ellipsis usa-nav__username">{{ user.email }}</span>
                 </li>
-                {% if has_profile_feature_flag %}
                 <li class="usa-nav__secondary-item">
                     {% url 'user-profile' as user_profile_url %}
                     {% url 'finish-user-profile-setup' as finish_setup_url %}
@@ -26,7 +25,6 @@
                         Your profile
                     </a>
                 </li>
-                {% endif %}
                 <li class="usa-nav__secondary-item">
                     <a class="usa-nav-link" href="{% url 'logout' %}">Sign out</a>
                     {% else %}
diff --git a/src/registrar/templates/includes/non-production-alert.html b/src/registrar/templates/includes/non-production-alert.html
index 661fb1397..6a27cff22 100644
--- a/src/registrar/templates/includes/non-production-alert.html
+++ b/src/registrar/templates/includes/non-production-alert.html
@@ -2,9 +2,6 @@
     <div class="usa-alert">
         <div class="usa-alert__body {% if add_body_class %}{{ add_body_class }}{% endif %}">
             <b>Attention:</b> You are on a test site.
-            {% if has_profile_feature_flag %}
-            The profile_feature flag is active.
-            {% endif %}
         </div>
     </div>
 </div>
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 6c2ad6b5e..ffd1fa16c 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -558,7 +558,6 @@ class FinishUserProfileTests(TestWithUser, WebTest):
         return page.follow() if follow else page
 
     @less_console_noise_decorator
-    @override_flag("profile_feature", active=True)
     def test_full_name_initial_value(self):
         """Test that full_name initial value is empty when first_name or last_name is empty.
         This will later be displayed as "unknown" using javascript."""
@@ -612,8 +611,8 @@ class FinishUserProfileTests(TestWithUser, WebTest):
         incomplete_regular_user.delete()
 
     @less_console_noise_decorator
-    def test_new_user_with_profile_feature_on(self):
-        """Tests that a new user is redirected to the profile setup page when profile_feature is on"""
+    def test_new_user_is_directed_to_profile_setup_page(self):
+        """Tests that a new user is redirected to the profile setup page"""
         username_regular_incomplete = "test_regular_user_incomplete"
         first_name_2 = "Incomplete"
         email_2 = "unicorn@igorville.com"
@@ -626,39 +625,39 @@ class FinishUserProfileTests(TestWithUser, WebTest):
         )
 
         self.app.set_user(incomplete_regular_user.username)
-        with override_flag("profile_feature", active=True):
-            # This will redirect the user to the setup page.
-            # Follow implicity checks if our redirect is working.
-            finish_setup_page = self.app.get(reverse("home")).follow()
-            self._set_session_cookie()
 
-            # Assert that we're on the right page
-            self.assertContains(finish_setup_page, "Finish setting up your profile")
+        # This will redirect the user to the setup page.
+         # Follow implicity checks if our redirect is working.
+        finish_setup_page = self.app.get(reverse("home")).follow()
+        self._set_session_cookie()
 
-            finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
+        # Assert that we're on the right page
+        self.assertContains(finish_setup_page, "Finish setting up your profile")
 
-            self.assertEqual(finish_setup_page.status_code, 200)
+        finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
+
+        self.assertEqual(finish_setup_page.status_code, 200)
 
             # We're missing a phone number, so the page should tell us that
-            self.assertContains(finish_setup_page, "Enter your phone number.")
+        self.assertContains(finish_setup_page, "Enter your phone number.")
 
             # Check for the name of the save button
-            self.assertContains(finish_setup_page, "user_setup_save_button")
+        self.assertContains(finish_setup_page, "user_setup_save_button")
 
             # Add a phone number
-            finish_setup_form = finish_setup_page.form
-            finish_setup_form["phone"] = "(201) 555-0123"
-            finish_setup_form["title"] = "CEO"
-            finish_setup_form["last_name"] = "example"
-            save_page = self._submit_form_webtest(finish_setup_form, follow=True)
+        finish_setup_form = finish_setup_page.form
+        finish_setup_form["phone"] = "(201) 555-0123"
+        finish_setup_form["title"] = "CEO"
+        finish_setup_form["last_name"] = "example"
+        save_page = self._submit_form_webtest(finish_setup_form, follow=True)
 
-            self.assertEqual(save_page.status_code, 200)
-            self.assertContains(save_page, "Your profile has been updated.")
+        self.assertEqual(save_page.status_code, 200)
+        self.assertContains(save_page, "Your profile has been updated.")
 
             # Try to navigate back to the home page.
             # This is the same as clicking the back button.
-            completed_setup_page = self.app.get(reverse("home"))
-            self.assertContains(completed_setup_page, "Manage your domain")
+        completed_setup_page = self.app.get(reverse("home"))
+        self.assertContains(completed_setup_page, "Manage your domain")
         incomplete_regular_user.delete()
 
     @less_console_noise_decorator
@@ -675,46 +674,43 @@ class FinishUserProfileTests(TestWithUser, WebTest):
             verification_type=User.VerificationTypeChoices.REGULAR,
         )
         self.app.set_user(incomplete_regular_user.username)
-        with override_flag("profile_feature", active=True):
-            # This will redirect the user to the setup page.
-            # Follow implicity checks if our redirect is working.
-            finish_setup_page = self.app.get(reverse("home")).follow()
-            self._set_session_cookie()
+        finish_setup_page = self.app.get(reverse("home")).follow()
+        self._set_session_cookie()
 
-            # Assert that we're on the right page
-            self.assertContains(finish_setup_page, "Finish setting up your profile")
+        # Assert that we're on the right page
+        self.assertContains(finish_setup_page, "Finish setting up your profile")
 
-            finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
+        finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
 
-            self.assertEqual(finish_setup_page.status_code, 200)
+        self.assertEqual(finish_setup_page.status_code, 200)
 
-            # We're missing a phone number, so the page should tell us that
-            self.assertContains(finish_setup_page, "Enter your phone number.")
+        # We're missing a phone number, so the page should tell us that
+        self.assertContains(finish_setup_page, "Enter your phone number.")
 
-            # Check for the name of the save button
-            self.assertContains(finish_setup_page, "user_setup_save_button")
+        # Check for the name of the save button
+        self.assertContains(finish_setup_page, "user_setup_save_button")
 
-            # Add a phone number
-            finish_setup_form = finish_setup_page.form
-            finish_setup_form["first_name"] = "test"
-            finish_setup_form["last_name"] = "test2"
-            finish_setup_form["phone"] = "(201) 555-0123"
-            finish_setup_form["title"] = "CEO"
-            finish_setup_form["last_name"] = "example"
-            save_page = self._submit_form_webtest(finish_setup_form, follow=True)
+        # Add a phone number
+        finish_setup_form = finish_setup_page.form
+        finish_setup_form["first_name"] = "test"
+        finish_setup_form["last_name"] = "test2"
+        finish_setup_form["phone"] = "(201) 555-0123"
+        finish_setup_form["title"] = "CEO"
+        finish_setup_form["last_name"] = "example"
+        save_page = self._submit_form_webtest(finish_setup_form, follow=True)
 
-            self.assertEqual(save_page.status_code, 200)
-            self.assertContains(save_page, "Your profile has been updated.")
+        self.assertEqual(save_page.status_code, 200)
+        self.assertContains(save_page, "Your profile has been updated.")
 
-            # Try to navigate back to the home page.
-            # This is the same as clicking the back button.
-            completed_setup_page = self.app.get(reverse("home"))
-            self.assertContains(completed_setup_page, "Manage your domain")
+        # Try to navigate back to the home page.
+        # This is the same as clicking the back button.
+        completed_setup_page = self.app.get(reverse("home"))
+        self.assertContains(completed_setup_page, "Manage your domain")
         incomplete_regular_user.delete()
 
     @less_console_noise_decorator
-    def test_new_user_goes_to_domain_request_with_profile_feature_on(self):
-        """Tests that a new user is redirected to the domain request page when profile_feature is on"""
+    def test_new_user_goes_to_domain_request(self):
+        """Tests that a new user is redirected to the domain request page"""
         username_regular_incomplete = "test_regular_user_incomplete"
         first_name_2 = "Incomplete"
         email_2 = "unicorn@igorville.com"
@@ -726,69 +722,49 @@ class FinishUserProfileTests(TestWithUser, WebTest):
             verification_type=User.VerificationTypeChoices.REGULAR,
         )
         self.app.set_user(incomplete_regular_user.username)
-        with override_flag("profile_feature", active=True):
-            # This will redirect the user to the setup page
-            finish_setup_page = self.app.get(reverse("domain-request:")).follow()
-            self._set_session_cookie()
+        # This will redirect the user to the setup page
+        finish_setup_page = self.app.get(reverse("domain-request:")).follow()
+        self._set_session_cookie()
 
-            # Assert that we're on the right page
-            self.assertContains(finish_setup_page, "Finish setting up your profile")
+        # Assert that we're on the right page
+        self.assertContains(finish_setup_page, "Finish setting up your profile")
 
-            finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
+        finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
 
-            self.assertEqual(finish_setup_page.status_code, 200)
+        self.assertEqual(finish_setup_page.status_code, 200)
 
-            # We're missing a phone number, so the page should tell us that
-            self.assertContains(finish_setup_page, "Enter your phone number.")
+        # We're missing a phone number, so the page should tell us that
+        self.assertContains(finish_setup_page, "Enter your phone number.")
 
-            # Check for the name of the save button
-            self.assertContains(finish_setup_page, "user_setup_save_button")
+        # Check for the name of the save button
+        self.assertContains(finish_setup_page, "user_setup_save_button")
 
             # Add a phone number
-            finish_setup_form = finish_setup_page.form
-            finish_setup_form["first_name"] = "firstname"
-            finish_setup_form["phone"] = "(201) 555-0123"
-            finish_setup_form["title"] = "CEO"
-            finish_setup_form["last_name"] = "example"
-            completed_setup_page = self._submit_form_webtest(finish_setup_page.form, follow=True)
+        finish_setup_form = finish_setup_page.form
+        finish_setup_form["first_name"] = "firstname"
+        finish_setup_form["phone"] = "(201) 555-0123"
+        finish_setup_form["title"] = "CEO"
+        finish_setup_form["last_name"] = "example"
+        completed_setup_page = self._submit_form_webtest(finish_setup_page.form, follow=True)
 
-            self.assertEqual(completed_setup_page.status_code, 200)
+        self.assertEqual(completed_setup_page.status_code, 200)
 
-            finish_setup_form = completed_setup_page.form
+        finish_setup_form = completed_setup_page.form
 
             # Submit the form using the specific submit button to execute the redirect
-            completed_setup_page = self._submit_form_webtest(
+        completed_setup_page = self._submit_form_webtest(
                 finish_setup_form, follow=True, name="user_setup_submit_button"
             )
-            self.assertEqual(completed_setup_page.status_code, 200)
+        self.assertEqual(completed_setup_page.status_code, 200)
 
             # Assert that we are still on the
             # Assert that we're on the domain request page
-            self.assertNotContains(completed_setup_page, "Finish setting up your profile")
-            self.assertNotContains(completed_setup_page, "What contact information should we use to reach you?")
+        self.assertNotContains(completed_setup_page, "Finish setting up your profile")
+        self.assertNotContains(completed_setup_page, "What contact information should we use to reach you?")
 
-            self.assertContains(completed_setup_page, "You’re about to start your .gov domain request")
+        self.assertContains(completed_setup_page, "You’re about to start your .gov domain request")
         incomplete_regular_user.delete()
 
-    @less_console_noise_decorator
-    def test_new_user_with_profile_feature_off(self):
-        """Tests that a new user is not redirected to the profile setup page when profile_feature is off"""
-        with override_flag("profile_feature", active=False):
-            response = self.client.get("/")
-        self.assertNotContains(response, "Finish setting up your profile")
-
-    @less_console_noise_decorator
-    def test_new_user_goes_to_domain_request_with_profile_feature_off(self):
-        """Tests that a new user is redirected to the domain request page
-        when profile_feature is off but not the setup page"""
-        with override_flag("profile_feature", active=False):
-            response = self.client.get("/request/")
-
-        self.assertNotContains(response, "Finish setting up your profile")
-        self.assertNotContains(response, "What contact information should we use to reach you?")
-
-        self.assertContains(response, "You’re about to start your .gov domain request")
-
 
 class FinishUserProfileForOtherUsersTests(TestWithUser, WebTest):
     """A series of tests that target the user profile page intercept for incomplete IAL1 user profiles."""
@@ -827,83 +803,6 @@ class FinishUserProfileForOtherUsersTests(TestWithUser, WebTest):
         self._set_session_cookie()
         return page.follow() if follow else page
 
-    @less_console_noise_decorator
-    def test_new_user_with_profile_feature_on(self):
-        """Tests that a new user is redirected to the profile setup page when profile_feature is on,
-        and testing that the confirmation modal is present"""
-        username_other_incomplete = "test_other_user_incomplete"
-        first_name_2 = "Incomplete"
-        email_2 = "unicorn@igorville.com"
-        # in the case below, other user is representative of GRANDFATHERED,
-        # VERIFIED_BY_STAFF, INVITED, FIXTURE_USER, ie. IAL1
-        incomplete_other_user = get_user_model().objects.create(
-            username=username_other_incomplete,
-            first_name=first_name_2,
-            email=email_2,
-            verification_type=User.VerificationTypeChoices.VERIFIED_BY_STAFF,
-        )
-        self.app.set_user(incomplete_other_user.username)
-        with override_flag("profile_feature", active=True):
-            # This will redirect the user to the user profile page.
-            # Follow implicity checks if our redirect is working.
-            user_profile_page = self.app.get(reverse("home")).follow()
-            self._set_session_cookie()
-
-            # Assert that we're on the right page by testing for the modal
-            self.assertContains(user_profile_page, "domain registrants must maintain accurate contact information")
-
-            user_profile_page = self._submit_form_webtest(user_profile_page.form)
-
-            self.assertEqual(user_profile_page.status_code, 200)
-
-            # Assert that modal does not appear on subsequent submits
-            self.assertNotContains(user_profile_page, "domain registrants must maintain accurate contact information")
-            # Assert that unique error message appears by testing the message in a specific div
-            html_content = user_profile_page.content.decode("utf-8")
-            # Normalize spaces and line breaks in the HTML content
-            normalized_html_content = " ".join(html_content.split())
-            # Expected string without extra spaces and line breaks
-            expected_string = "Before you can manage your domain, we need you to add contact information."
-            # Check for the presence of the <div> element with the specific text
-            self.assertIn(f'<div class="usa-alert__body"> {expected_string} </div>', normalized_html_content)
-
-            # We're missing a phone number, so the page should tell us that
-            self.assertContains(user_profile_page, "Enter your phone number.")
-
-            # We need to assert that links to manage your domain are not present (in both body and footer)
-            self.assertNotContains(user_profile_page, "Manage your domains")
-            # Assert the tooltip on the logo, indicating that the logo is not clickable
-            self.assertContains(
-                user_profile_page, 'title="Before you can manage your domains, we need you to add contact information."'
-            )
-            # Assert that modal does not appear on subsequent submits
-            self.assertNotContains(user_profile_page, "domain registrants must maintain accurate contact information")
-
-            # Add a phone number
-            finish_setup_form = user_profile_page.form
-            finish_setup_form["phone"] = "(201) 555-0123"
-            finish_setup_form["title"] = "CEO"
-            finish_setup_form["last_name"] = "example"
-            save_page = self._submit_form_webtest(finish_setup_form, follow=True)
-
-            self.assertEqual(save_page.status_code, 200)
-            self.assertContains(save_page, "Your profile has been updated.")
-
-            # We need to assert that logo is not clickable and links to manage your domain are not present
-            # NOTE: "anage" is not a typo.  It is to accomodate the fact that the "m" is uppercase in one
-            # instance and lowercase in the other.
-            self.assertContains(save_page, "anage your domains", count=2)
-            self.assertNotContains(
-                save_page, "Before you can manage your domains, we need you to add contact information"
-            )
-            # Assert that modal does not appear on subsequent submits
-            self.assertNotContains(save_page, "domain registrants must maintain accurate contact information")
-
-            # Try to navigate back to the home page.
-            # This is the same as clicking the back button.
-            completed_setup_page = self.app.get(reverse("home"))
-            self.assertContains(completed_setup_page, "Manage your domain")
-
 
 class UserProfileTests(TestWithUser, WebTest):
     """A series of tests that target your profile functionality"""
@@ -927,105 +826,60 @@ class UserProfileTests(TestWithUser, WebTest):
         DomainInformation.objects.all().delete()
 
     @less_console_noise_decorator
-    def error_500_main_nav_with_profile_feature_turned_on(self):
-        """test that Your profile is in main nav of 500 error page when profile_feature is on.
+    def error_500_main_nav(self):
+        """test that Your profile is in main nav of 500 error page.
 
         Our treatment of 401 and 403 error page handling with that waffle feature is similar, so we
         assume that the same test results hold true for 401 and 403."""
-        with override_flag("profile_feature", active=True):
-            with self.assertRaises(Exception):
-                response = self.client.get(reverse("home"), follow=True)
-                self.assertEqual(response.status_code, 500)
-                self.assertContains(response, "Your profile")
+        with self.assertRaises(Exception):
+            response = self.client.get(reverse("home"), follow=True)
+            self.assertEqual(response.status_code, 500)
+            self.assertContains(response, "Your profile")
+
 
     @less_console_noise_decorator
-    def error_500_main_nav_with_profile_feature_turned_off(self):
-        """test that Your profile is not in main nav of 500 error page when profile_feature is off.
+    def test_home_page_main_nav(self):
+        """test that Your profile is in main nav of home page"""
+       
+        response = self.client.get("/", follow=True)
+        self.assertContains(response, "Your profile")
 
-        Our treatment of 401 and 403 error page handling with that waffle feature is similar, so we
-        assume that the same test results hold true for 401 and 403."""
-        with override_flag("profile_feature", active=False):
-            with self.assertRaises(Exception):
-                response = self.client.get(reverse("home"), follow=True)
-                self.assertEqual(response.status_code, 500)
-                self.assertNotContains(response, "Your profile")
 
     @less_console_noise_decorator
-    def test_home_page_main_nav_with_profile_feature_on(self):
-        """test that Your profile is in main nav of home page when profile_feature is on"""
-        with override_flag("profile_feature", active=True):
-            response = self.client.get("/", follow=True)
+    def test_new_request_main_nav(self):
+        """test that Your profile is in main nav of new request"""
+        response = self.client.get("/request/", follow=True)
         self.assertContains(response, "Your profile")
 
     @less_console_noise_decorator
-    def test_home_page_main_nav_with_profile_feature_off(self):
-        """test that Your profile is not in main nav of home page when profile_feature is off"""
-        with override_flag("profile_feature", active=False):
-            response = self.client.get("/", follow=True)
-        self.assertNotContains(response, "Your profile")
-
-    @less_console_noise_decorator
-    def test_new_request_main_nav_with_profile_feature_on(self):
-        """test that Your profile is in main nav of new request when profile_feature is on"""
-        with override_flag("profile_feature", active=True):
-            response = self.client.get("/request/", follow=True)
+    def test_user_profile_main_nav(self):
+        """test that Your profile is in main nav of user profile"""
+        response = self.client.get("/user-profile", follow=True)
         self.assertContains(response, "Your profile")
 
-    @less_console_noise_decorator
-    def test_new_request_main_nav_with_profile_feature_off(self):
-        """test that Your profile is not in main nav of new request when profile_feature is off"""
-        with override_flag("profile_feature", active=False):
-            response = self.client.get("/request/", follow=True)
-        self.assertNotContains(response, "Your profile")
-
-    @less_console_noise_decorator
-    def test_user_profile_main_nav_with_profile_feature_on(self):
-        """test that Your profile is in main nav of user profile when profile_feature is on"""
-        with override_flag("profile_feature", active=True):
-            response = self.client.get("/user-profile", follow=True)
-        self.assertContains(response, "Your profile")
-
-    @less_console_noise_decorator
-    def test_user_profile_returns_404_when_feature_off(self):
-        """test that Your profile returns 404 when profile_feature is off"""
-        with override_flag("profile_feature", active=False):
-            response = self.client.get("/user-profile", follow=True)
-        self.assertEqual(response.status_code, 404)
-
     @less_console_noise_decorator
     def test_user_profile_back_button_when_coming_from_domain_request(self):
-        """tests user profile when profile_feature is on,
-        and when they are redirected from the domain request page"""
-        with override_flag("profile_feature", active=True):
-            response = self.client.get("/user-profile?redirect=domain-request:")
+        """tests user profile when they are redirected from the domain request page"""
+        response = self.client.get("/user-profile?redirect=domain-request:")
         self.assertContains(response, "Your profile")
         self.assertContains(response, "Go back to your domain request")
         self.assertNotContains(response, "Back to manage your domains")
 
     @less_console_noise_decorator
-    def test_domain_detail_profile_feature_on(self):
-        """test that domain detail view when profile_feature is on"""
-        with override_flag("profile_feature", active=True):
-            response = self.client.get(reverse("domain", args=[self.domain.pk]))
+    def test_domain_detail(self):
+        """test that domain detail view"""
+        response = self.client.get(reverse("domain", args=[self.domain.pk]))
         self.assertContains(response, "Your profile")
         self.assertNotContains(response, "Your contact information")
 
     @less_console_noise_decorator
-    def test_domain_your_contact_information_when_profile_feature_off(self):
-        """test that Your contact information is accessible when profile_feature is off"""
-        with override_flag("profile_feature", active=False):
-            response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
-        self.assertContains(response, "Your contact information")
-
-    @less_console_noise_decorator
-    def test_domain_your_contact_information_when_profile_feature_on(self):
-        """test that Your contact information is not accessible when profile feature is on"""
-        with override_flag("profile_feature", active=True):
-            response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
+    def test_domain_your_contact_information(self):
+        """test that Your contact information is not accessible"""
+        response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
         self.assertEqual(response.status_code, 404)
 
     @less_console_noise_decorator
-    def test_request_when_profile_feature_on(self):
+    def test_request_profile_request_page(self):
         """test that Your profile is in request page when profile feature is on"""
 
         contact_user, _ = Contact.objects.get_or_create(
@@ -1040,53 +894,27 @@ class UserProfileTests(TestWithUser, WebTest):
             senior_official=contact_user,
             submitter=contact_user,
         )
-        with override_flag("profile_feature", active=True):
-            response = self.client.get(f"/domain-request/{domain_request.id}", follow=True)
-            self.assertContains(response, "Your profile")
-            response = self.client.get(f"/domain-request/{domain_request.id}/withdraw", follow=True)
-            self.assertContains(response, "Your profile")
-
-    @less_console_noise_decorator
-    def test_request_when_profile_feature_off(self):
-        """test that Your profile is not in request page when profile feature is off"""
-
-        contact_user, _ = Contact.objects.get_or_create(
-            first_name="Hank",
-            last_name="McFakerson",
-        )
-        site = DraftDomain.objects.create(name="igorville.gov")
-        domain_request = DomainRequest.objects.create(
-            creator=self.user,
-            requested_domain=site,
-            status=DomainRequest.DomainRequestStatus.SUBMITTED,
-            senior_official=contact_user,
-            submitter=contact_user,
-        )
-        with override_flag("profile_feature", active=False):
-            response = self.client.get(f"/domain-request/{domain_request.id}", follow=True)
-            self.assertNotContains(response, "Your profile")
-            response = self.client.get(f"/domain-request/{domain_request.id}/withdraw", follow=True)
-            self.assertNotContains(response, "Your profile")
-        # cleanup
-        domain_request.delete()
-        site.delete()
+        
+        response = self.client.get(f"/domain-request/{domain_request.id}", follow=True)
+        self.assertContains(response, "Your profile")
+        response = self.client.get(f"/domain-request/{domain_request.id}/withdraw", follow=True)
+        self.assertContains(response, "Your profile")
 
     @less_console_noise_decorator
     def test_user_profile_form_submission(self):
         """test user profile form submission"""
         self.app.set_user(self.user.username)
-        with override_flag("profile_feature", active=True):
-            profile_page = self.app.get(reverse("user-profile"))
-            session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
-            self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
-            profile_form = profile_page.form
-            profile_form["title"] = "sample title"
-            profile_form["phone"] = "(201) 555-1212"
-            profile_page = profile_form.submit()
-            self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
-            profile_page = profile_page.follow()
-            self.assertEqual(profile_page.status_code, 200)
-            self.assertContains(profile_page, "Your profile has been updated")
+        profile_page = self.app.get(reverse("user-profile"))
+        session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
+        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+        profile_form = profile_page.form
+        profile_form["title"] = "sample title"
+        profile_form["phone"] = "(201) 555-1212"
+        profile_page = profile_form.submit()
+        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+        profile_page = profile_page.follow()
+        self.assertEqual(profile_page.status_code, 200)
+        self.assertContains(profile_page, "Your profile has been updated")
 
 
 class PortfoliosTests(TestWithUser, WebTest):
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 003f8dd0d..907486c8c 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -647,10 +647,6 @@ class DomainYourContactInformationView(DomainFormBaseView):
     template_name = "domain_your_contact_information.html"
     form_class = UserForm
 
-    @waffle_flag("!profile_feature")  # type: ignore
-    def dispatch(self, request, *args, **kwargs):  # type: ignore
-        return super().dispatch(request, *args, **kwargs)
-
     def get_form_kwargs(self, *args, **kwargs):
         """Add domain_info.submitter instance to make a bound form."""
         form_kwargs = super().get_form_kwargs(*args, **kwargs)
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index b691549cd..b231f194f 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -439,8 +439,8 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
             if condition:
                 step_list.append(step)
 
-        if flag_is_active(self.request, "profile_feature"):
-            step_list.remove(Step.YOUR_CONTACT)
+       
+        step_list.remove(Step.YOUR_CONTACT)
 
         return step_list
 
@@ -586,10 +586,6 @@ class YourContact(DomainRequestWizard):
     template_name = "domain_request_your_contact.html"
     forms = [forms.YourContactForm]
 
-    @waffle_flag("!profile_feature")  # type: ignore
-    def dispatch(self, request, *args, **kwargs):  # type: ignore
-        return super().dispatch(request, *args, **kwargs)
-
 
 class OtherContacts(DomainRequestWizard):
     template_name = "domain_request_other_contacts.html"
diff --git a/src/registrar/views/user_profile.py b/src/registrar/views/user_profile.py
index 1dc61e23f..be4a73ae2 100644
--- a/src/registrar/views/user_profile.py
+++ b/src/registrar/views/user_profile.py
@@ -46,10 +46,6 @@ class UserProfileView(UserProfilePermissionView, FormMixin):
 
         return self.render_to_response(context)
 
-    @waffle_flag("profile_feature")  # type: ignore
-    def dispatch(self, request, *args, **kwargs):  # type: ignore
-        return super().dispatch(request, *args, **kwargs)
-
     def get_context_data(self, **kwargs):
         """Extend get_context_data"""
         context = super().get_context_data(**kwargs)

From db46ca9fe49844a5aca59d47b6e2af4bc311151b Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Tue, 10 Sep 2024 10:27:28 -0400
Subject: [PATCH 053/118] adding back some conditionals for feature flag

---
 .../templates/domain_request_status.html      |  3 ++
 src/registrar/tests/test_models.py            | 52 +++++++------------
 src/registrar/views/domain.py                 |  1 -
 src/registrar/views/user_profile.py           |  3 ++
 4 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html
index 0107f84bd..b6ad3feb6 100644
--- a/src/registrar/templates/domain_request_status.html
+++ b/src/registrar/templates/domain_request_status.html
@@ -109,6 +109,9 @@
       {% include "includes/summary_item.html" with title='Purpose of your domain' value=DomainRequest.purpose heading_level=heading_level %}
     {% endif %}
 
+    {% if DomainRequest.creator %}
+    {% include "includes/summary_item.html" with title='Your contact information' value=DomainRequest.creator contact='true' heading_level=heading_level %}
+
     {% if DomainRequest.other_contacts.all %}
       {% include "includes/summary_item.html" with title='Other employees from your organization' value=DomainRequest.other_contacts.all contact='true' list='true' heading_level=heading_level %}
     {% else %}
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index fd42caee0..23b89b715 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -170,7 +170,6 @@ class TestDomainRequest(TestCase):
             zipcode="12345-6789",
             senior_official=contact,
             requested_domain=domain,
-            submitter=contact,
             purpose="Igorville rules!",
             anything_else="All of Igorville loves the dotgov program.",
             is_policy_acknowledged=True,
@@ -197,7 +196,6 @@ class TestDomainRequest(TestCase):
             state_territory="CA",
             zipcode="12345-6789",
             senior_official=contact,
-            submitter=contact,
             purpose="Igorville rules!",
             anything_else="All of Igorville loves the dotgov program.",
             is_policy_acknowledged=True,
@@ -225,7 +223,7 @@ class TestDomainRequest(TestCase):
         site = DraftDomain.objects.create(name="igorville.gov")
         domain_request = DomainRequest.objects.create(creator=user, requested_domain=site)
 
-        # no submitter email so this emits a log warning
+        # no email sent to creator so this emits a log warning
 
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client):
             with less_console_noise():
@@ -258,19 +256,19 @@ class TestDomainRequest(TestCase):
 
         email_allowed.delete()
 
-    @override_flag("profile_feature", active=False)
     @less_console_noise_decorator
     def test_submit_from_started_sends_email(self):
         msg = "Create a domain request and submit it and see if email was sent."
-        domain_request = completed_domain_request(submitter=self.dummy_user, user=self.dummy_user_2)
-        self.check_email_sent(domain_request, msg, "submit", 1, expected_content="Hello")
-
-    @override_flag("profile_feature", active=True)
+        domain_request = completed_domain_request(user=self.dummy_user_2)
+        self.check_email_sent(
+            domain_request, msg, "submit", 1, expected_content="Hi", expected_email=self.dummy_user_2.email
+        )
+        
     @less_console_noise_decorator
     def test_submit_from_started_sends_email_to_creator(self):
         """Tests if, when the profile feature flag is on, we send an email to the creator"""
         msg = "Create a domain request and submit it and see if email was sent when the feature flag is on."
-        domain_request = completed_domain_request(submitter=self.dummy_user, user=self.dummy_user_2)
+        domain_request = completed_domain_request(user=self.dummy_user_2)
         self.check_email_sent(
             domain_request, msg, "submit", 1, expected_content="Lava", expected_email="intern@igorville.com"
         )
@@ -278,10 +276,9 @@ class TestDomainRequest(TestCase):
     @less_console_noise_decorator
     def test_submit_from_withdrawn_sends_email(self):
         msg = "Create a withdrawn domain request and submit it and see if email was sent."
-        domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.WITHDRAWN, submitter=self.dummy_user
-        )
-        self.check_email_sent(domain_request, msg, "submit", 1, expected_content="Hello")
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.WITHDRAWN, user=user)
+        self.check_email_sent(domain_request, msg, "submit", 1, expected_content="Hi", expected_email=user.email)
 
     @less_console_noise_decorator
     def test_submit_from_action_needed_does_not_send_email(self):
@@ -298,26 +295,25 @@ class TestDomainRequest(TestCase):
     @less_console_noise_decorator
     def test_approve_sends_email(self):
         msg = "Create a domain request and approve it and see if email was sent."
-        domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.IN_REVIEW, submitter=self.dummy_user
-        )
-        self.check_email_sent(domain_request, msg, "approve", 1, expected_content="Hello")
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=user)
+        self.check_email_sent(domain_request, msg, "approve", 1, expected_content="approved", expected_email=user.email)
 
     @less_console_noise_decorator
     def test_withdraw_sends_email(self):
         msg = "Create a domain request and withdraw it and see if email was sent."
-        domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.IN_REVIEW, submitter=self.dummy_user
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=user)
+        self.check_email_sent(
+            domain_request, msg, "withdraw", 1, expected_content="withdrawn", expected_email=user.email
         )
-        self.check_email_sent(domain_request, msg, "withdraw", 1, expected_content="Hello")
 
     @less_console_noise_decorator
     def test_reject_sends_email(self):
         msg = "Create a domain request and reject it and see if email was sent."
-        domain_request = completed_domain_request(
-            status=DomainRequest.DomainRequestStatus.APPROVED, submitter=self.dummy_user
-        )
-        self.check_email_sent(domain_request, msg, "reject", 1, expected_content="Hello")
+        user, _ = User.objects.get_or_create(username="testy")
+        domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED, user=user)
+        self.check_email_sent(domain_request, msg, "reject", 1, expected_content="rejected", expected_email=user.email)
 
     @less_console_noise_decorator
     def test_reject_with_prejudice_does_not_send_email(self):
@@ -2069,7 +2065,6 @@ class TestDomainRequestIncomplete(TestCase):
             senior_official=so,
             requested_domain=draft_domain,
             purpose="Some purpose",
-            submitter=you,
             no_other_contacts_rationale=None,
             has_cisa_representative=True,
             cisa_representative_email="somerep@cisa.com",
@@ -2198,13 +2193,6 @@ class TestDomainRequestIncomplete(TestCase):
         self.domain_request.save()
         self.assertFalse(self.domain_request._is_purpose_complete())
 
-    @less_console_noise_decorator
-    def test_is_submitter_complete(self):
-        self.assertTrue(self.domain_request._is_submitter_complete())
-        self.domain_request.submitter = None
-        self.domain_request.save()
-        self.assertFalse(self.domain_request._is_submitter_complete())
-
     @less_console_noise_decorator
     def test_is_other_contacts_complete_missing_one_field(self):
         self.assertTrue(self.domain_request._is_other_contacts_complete())
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 907486c8c..436fa81ae 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -59,7 +59,6 @@ from epplibwrapper import (
 
 from ..utility.email import send_templated_email, EmailSendingError
 from .utility import DomainPermissionView, DomainInvitationPermissionDeleteView
-from waffle.decorators import waffle_flag
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/registrar/views/user_profile.py b/src/registrar/views/user_profile.py
index be4a73ae2..dc0ab34dc 100644
--- a/src/registrar/views/user_profile.py
+++ b/src/registrar/views/user_profile.py
@@ -45,6 +45,9 @@ class UserProfileView(UserProfilePermissionView, FormMixin):
             context["show_confirmation_modal"] = True
 
         return self.render_to_response(context)
+    
+    def dispatch(self, request, *args, **kwargs):  # type: ignore
+        return super().dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
         """Extend get_context_data"""

From f7c3579a93a8e8e5a1c9c2bb3646f634b373e66f Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Tue, 10 Sep 2024 10:31:52 -0400
Subject: [PATCH 054/118] removed submitter

---
 src/registrar/models/domain_request.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index c545f9d96..bf24c173c 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -1197,9 +1197,6 @@ class DomainRequest(TimeStampedModel):
     def _is_purpose_complete(self):
         return self.purpose is not None
 
-    def _is_submitter_complete(self):
-        return self.submitter is not None
-
     def _has_other_contacts_and_filled(self):
         # Other Contacts Radio button is Yes and if all required fields are filled
         return (

From e3a3e09cb23f0d02a98afc5839872cb56b8fdc11 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:14:09 -0600
Subject: [PATCH 055/118] Use searchParams

---
 src/registrar/assets/js/get-gov.js | 38 ++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 7c523a12a..fda709585 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -33,6 +33,26 @@ const showElement = (element) => {
   element.classList.remove('display-none');
 };
 
+/**
+ * Helper function that returns commonly used search params for tables
+ * @param {*} page - Used for the paginator to determine which page we reside on
+ * @param {*} sortBy - which value to sort on. Passed to sort_by in django
+ * @param {*} order - which value to order on. Passed to order_by in django
+ * @param {*} status - Represents the status filter button
+ * @param {*} searchTerm - Represents the value of the search bar
+ */
+function getGenericTableSearchParams(page, sortBy, order, status, searchTerm) {
+  return new URLSearchParams(
+    {
+      "page": page,
+      "sort_by": sortBy,
+      "order": order,
+      "status": status,
+      "search_term": searchTerm
+    }
+  );
+}
+
 /**
  * Helper function that scrolls to an element
  * @param {string} attributeName - The string "class" or "id"
@@ -1179,6 +1199,7 @@ document.addEventListener('DOMContentLoaded', function() {
      * @param {*} sortBy - the sort column option
      * @param {*} order - the sort order {asc, desc}
      * @param {*} scroll - control for the scrollToElement functionality
+     * @param {*} status - control for the status filter
      * @param {*} searchTerm - the search term
      * @param {*} portfolio - the portfolio id
      */
@@ -1195,10 +1216,11 @@ document.addEventListener('DOMContentLoaded', function() {
       }
 
       // fetch json of page of domains, given params
-      let url = `${baseUrlValue}?page=${page}&sort_by=${sortBy}&order=${order}&status=${status}&search_term=${searchTerm}`
+      let searchParams = getGenericTableSearchParams(page, sort_by, order, status, search_term);
       if (portfolio)
-        url += `&portfolio=${portfolio}`
+        searchParams.append("portfolio", portfolio)
 
+      let url = `${baseUrlValue}?${searchParams.toString()}`
       fetch(url)
         .then(response => response.json())
         .then(data => {
@@ -1485,6 +1507,8 @@ document.addEventListener('DOMContentLoaded', function() {
     const tableHeaders = document.querySelectorAll('.domain-requests__table th[data-sortable]');
     const tableAnnouncementRegion = document.querySelector('.domain-requests__table-wrapper .usa-table__announcement-region');
     const resetSearchButton = document.querySelector('.domain-requests__reset-search');
+    const portfolioElement = document.getElementById('portfolio-js-value');
+    const portfolioValue = portfolioElement ? portfolioElement.getAttribute('data-portfolio') : null;
 
     /**
      * Delete is actually a POST API that requires a csrf token. The token will be waiting for us in the template as a hidden input.
@@ -1524,6 +1548,7 @@ document.addEventListener('DOMContentLoaded', function() {
       return document.querySelector('input[name="csrfmiddlewaretoken"]').value;
     }
 
+    let currentStatus = []
     /**
      * Loads rows in the domain requests list, as well as updates pagination around the domain requests list
      * based on the supplied attributes.
@@ -1533,7 +1558,7 @@ document.addEventListener('DOMContentLoaded', function() {
      * @param {*} scroll - control for the scrollToElement functionality
      * @param {*} searchTerm - the search term
      */
-    function loadDomainRequests(page, sortBy = currentSortBy, order = currentOrder, scroll = scrollToTable, searchTerm = currentSearchTerm) {
+    function loadDomainRequests(page, sortBy = currentSortBy, order = currentOrder, scroll = scrollToTable, status = currentStatus, searchTerm = currentSearchTerm, portfolio = portfolioValue) {
       // fetch json of page of domain requests, given params
       let baseUrl = document.getElementById("get_domain_requests_json_url");
       if (!baseUrl) {
@@ -1545,7 +1570,12 @@ document.addEventListener('DOMContentLoaded', function() {
         return;
       }
 
-      fetch(`${baseUrlValue}?page=${page}&sort_by=${sortBy}&order=${order}&search_term=${searchTerm}`)
+      let searchParams = getGenericTableSearchParams(page, sort_by, order, status, search_term);
+      if (portfolio)
+        searchParams.append("portfolio", portfolio)
+
+      let url = `${baseUrlValue}?${searchParams.toString()}`
+      fetch(url)
         .then(response => response.json())
         .then(data => {
           if (data.error) {

From fb36ec1a54c7c7720e3821f8f0fd79014abc42df Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:21:28 -0600
Subject: [PATCH 056/118] Remove unneeded function

---
 src/registrar/assets/js/get-gov.js | 40 ++++++++++++++----------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index fda709585..2cb3eb23c 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -33,26 +33,6 @@ const showElement = (element) => {
   element.classList.remove('display-none');
 };
 
-/**
- * Helper function that returns commonly used search params for tables
- * @param {*} page - Used for the paginator to determine which page we reside on
- * @param {*} sortBy - which value to sort on. Passed to sort_by in django
- * @param {*} order - which value to order on. Passed to order_by in django
- * @param {*} status - Represents the status filter button
- * @param {*} searchTerm - Represents the value of the search bar
- */
-function getGenericTableSearchParams(page, sortBy, order, status, searchTerm) {
-  return new URLSearchParams(
-    {
-      "page": page,
-      "sort_by": sortBy,
-      "order": order,
-      "status": status,
-      "search_term": searchTerm
-    }
-  );
-}
-
 /**
  * Helper function that scrolls to an element
  * @param {string} attributeName - The string "class" or "id"
@@ -1216,7 +1196,15 @@ document.addEventListener('DOMContentLoaded', function() {
       }
 
       // fetch json of page of domains, given params
-      let searchParams = getGenericTableSearchParams(page, sort_by, order, status, search_term);
+      let searchParams = new URLSearchParams(
+        {
+          "page": page,
+          "sort_by": sortBy,
+          "order": order,
+          "status": status,
+          "search_term": searchTerm
+        }
+      );
       if (portfolio)
         searchParams.append("portfolio", portfolio)
 
@@ -1570,7 +1558,15 @@ document.addEventListener('DOMContentLoaded', function() {
         return;
       }
 
-      let searchParams = getGenericTableSearchParams(page, sort_by, order, status, search_term);
+      let searchParams = new URLSearchParams(
+        {
+          "page": page,
+          "sort_by": sortBy,
+          "order": order,
+          "status": status,
+          "search_term": searchTerm
+        }
+      );
       if (portfolio)
         searchParams.append("portfolio", portfolio)
 

From 1203e543522cba0851878e05cd017c114dc88239 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Tue, 10 Sep 2024 11:27:32 -0400
Subject: [PATCH 057/118] ran formatting command

---
 src/registrar/admin.py                |  2 +-
 src/registrar/registrar_middleware.py |  1 -
 src/registrar/tests/test_models.py    |  2 +-
 src/registrar/tests/test_views.py     | 30 +++++++++++++--------------
 src/registrar/views/domain_request.py |  1 -
 src/registrar/views/user_profile.py   |  2 +-
 6 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index a3a57791c..97339b07f 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -2221,7 +2221,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         """Returns the default email associated with the given action needed reason"""
         if not action_needed_reason or action_needed_reason == DomainRequest.ActionNeededReasons.OTHER:
             return None
-        
+
         recipient = domain_request.creator
 
         # Return the context of the rendered views
diff --git a/src/registrar/registrar_middleware.py b/src/registrar/registrar_middleware.py
index 0d0f55024..9c08a6ae6 100644
--- a/src/registrar/registrar_middleware.py
+++ b/src/registrar/registrar_middleware.py
@@ -73,7 +73,6 @@ class CheckUserProfileMiddleware:
         finished_setup flag on the current user. If they haven't done so,
         then we redirect them to the finish setup page."""
 
-
         if request.user.is_authenticated:
             profile_page = self.profile_page
             if request.user.verification_type == User.VerificationTypeChoices.REGULAR:
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 23b89b715..ca2685dc0 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -263,7 +263,7 @@ class TestDomainRequest(TestCase):
         self.check_email_sent(
             domain_request, msg, "submit", 1, expected_content="Hi", expected_email=self.dummy_user_2.email
         )
-        
+
     @less_console_noise_decorator
     def test_submit_from_started_sends_email_to_creator(self):
         """Tests if, when the profile feature flag is on, we send an email to the creator"""
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index ffd1fa16c..9ab40ebd9 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -627,7 +627,7 @@ class FinishUserProfileTests(TestWithUser, WebTest):
         self.app.set_user(incomplete_regular_user.username)
 
         # This will redirect the user to the setup page.
-         # Follow implicity checks if our redirect is working.
+        # Follow implicity checks if our redirect is working.
         finish_setup_page = self.app.get(reverse("home")).follow()
         self._set_session_cookie()
 
@@ -638,13 +638,13 @@ class FinishUserProfileTests(TestWithUser, WebTest):
 
         self.assertEqual(finish_setup_page.status_code, 200)
 
-            # We're missing a phone number, so the page should tell us that
+        # We're missing a phone number, so the page should tell us that
         self.assertContains(finish_setup_page, "Enter your phone number.")
 
-            # Check for the name of the save button
+        # Check for the name of the save button
         self.assertContains(finish_setup_page, "user_setup_save_button")
 
-            # Add a phone number
+        # Add a phone number
         finish_setup_form = finish_setup_page.form
         finish_setup_form["phone"] = "(201) 555-0123"
         finish_setup_form["title"] = "CEO"
@@ -654,8 +654,8 @@ class FinishUserProfileTests(TestWithUser, WebTest):
         self.assertEqual(save_page.status_code, 200)
         self.assertContains(save_page, "Your profile has been updated.")
 
-            # Try to navigate back to the home page.
-            # This is the same as clicking the back button.
+        # Try to navigate back to the home page.
+        # This is the same as clicking the back button.
         completed_setup_page = self.app.get(reverse("home"))
         self.assertContains(completed_setup_page, "Manage your domain")
         incomplete_regular_user.delete()
@@ -739,7 +739,7 @@ class FinishUserProfileTests(TestWithUser, WebTest):
         # Check for the name of the save button
         self.assertContains(finish_setup_page, "user_setup_save_button")
 
-            # Add a phone number
+        # Add a phone number
         finish_setup_form = finish_setup_page.form
         finish_setup_form["first_name"] = "firstname"
         finish_setup_form["phone"] = "(201) 555-0123"
@@ -751,14 +751,14 @@ class FinishUserProfileTests(TestWithUser, WebTest):
 
         finish_setup_form = completed_setup_page.form
 
-            # Submit the form using the specific submit button to execute the redirect
+        # Submit the form using the specific submit button to execute the redirect
         completed_setup_page = self._submit_form_webtest(
-                finish_setup_form, follow=True, name="user_setup_submit_button"
-            )
+            finish_setup_form, follow=True, name="user_setup_submit_button"
+        )
         self.assertEqual(completed_setup_page.status_code, 200)
 
-            # Assert that we are still on the
-            # Assert that we're on the domain request page
+        # Assert that we are still on the
+        # Assert that we're on the domain request page
         self.assertNotContains(completed_setup_page, "Finish setting up your profile")
         self.assertNotContains(completed_setup_page, "What contact information should we use to reach you?")
 
@@ -836,15 +836,13 @@ class UserProfileTests(TestWithUser, WebTest):
             self.assertEqual(response.status_code, 500)
             self.assertContains(response, "Your profile")
 
-
     @less_console_noise_decorator
     def test_home_page_main_nav(self):
         """test that Your profile is in main nav of home page"""
-       
+
         response = self.client.get("/", follow=True)
         self.assertContains(response, "Your profile")
 
-
     @less_console_noise_decorator
     def test_new_request_main_nav(self):
         """test that Your profile is in main nav of new request"""
@@ -894,7 +892,7 @@ class UserProfileTests(TestWithUser, WebTest):
             senior_official=contact_user,
             submitter=contact_user,
         )
-        
+
         response = self.client.get(f"/domain-request/{domain_request.id}", follow=True)
         self.assertContains(response, "Your profile")
         response = self.client.get(f"/domain-request/{domain_request.id}/withdraw", follow=True)
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index b231f194f..0ac5b0064 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -439,7 +439,6 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
             if condition:
                 step_list.append(step)
 
-       
         step_list.remove(Step.YOUR_CONTACT)
 
         return step_list
diff --git a/src/registrar/views/user_profile.py b/src/registrar/views/user_profile.py
index dc0ab34dc..3605de345 100644
--- a/src/registrar/views/user_profile.py
+++ b/src/registrar/views/user_profile.py
@@ -45,7 +45,7 @@ class UserProfileView(UserProfilePermissionView, FormMixin):
             context["show_confirmation_modal"] = True
 
         return self.render_to_response(context)
-    
+
     def dispatch(self, request, *args, **kwargs):  # type: ignore
         return super().dispatch(request, *args, **kwargs)
 

From d0ae331f4a4fe9346b661f97ef1f243569be224e Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Tue, 10 Sep 2024 08:48:33 -0700
Subject: [PATCH 058/118] Address feedback

---
 .../admin/includes/detail_table_fieldset.html |  7 +---
 .../templates/domain_request_status.html      |  2 +-
 .../domain_your_contact_information.html      | 37 -------------------
 src/registrar/tests/test_admin_request.py     | 12 ++++--
 src/registrar/tests/test_models.py            | 10 ++---
 5 files changed, 15 insertions(+), 53 deletions(-)
 delete mode 100644 src/registrar/templates/domain_your_contact_information.html

diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
index 9b2c1b287..9bb2eb8e5 100644
--- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
+++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html
@@ -70,7 +70,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
     <div class="readonly textarea-wrapper">
         <div id="action_needed_reason_email_readonly" class="dja-readonly-textarea-container padding-1 margin-top-0 padding-top-0 margin-bottom-1 thin-border collapse--dgsimple collapsed">
             <label class="max-full" for="action_needed_reason_email_view_more">
-                <strong>Sent to {% if has_profile_feature_flag %}creator{%else%}creator{%endif%}</strong>
+                <strong>Sent to creator</strong>
             </label>
             <textarea id="action_needed_reason_email_view_more" cols="40" rows="20" class="{% if not original_object.action_needed_reason %}display-none{% endif %}" readonly>
                 {{ original_object.action_needed_reason_email }}
@@ -287,11 +287,6 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
         {% if not skip_additional_contact_info %}
             {% include "django/admin/includes/user_detail_list.html" with user=original_object.creator no_title_top_padding=field.is_readonly %}
         {% endif%}
-    {% elif field.field.name == "creator" %}
-        <div class="flex-container tablet:margin-top-2">
-        <label aria-label="Creator contact details"></label>
-        {% include "django/admin/includes/contact_detail_list.html" with user=original_object.creator no_title_top_padding=field.is_readonly %}
-        </div>
     {% elif field.field.name == "senior_official" %}
         <div class="flex-container">
         <label aria-label="Senior official contact details"></label>
diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html
index c870f5ab1..7a215f879 100644
--- a/src/registrar/templates/domain_request_status.html
+++ b/src/registrar/templates/domain_request_status.html
@@ -109,7 +109,7 @@
       {% include "includes/summary_item.html" with title='Purpose of your domain' value=DomainRequest.purpose heading_level=heading_level %}
     {% endif %}
 
-    {% if DomainRequest.creator and not has_profile_feature_flag %}
+    {% if DomainRequest.creator %}
       {% include "includes/summary_item.html" with title='Your contact information' value=DomainRequest.creator contact='true' heading_level=heading_level %}
     {% endif %}
 
diff --git a/src/registrar/templates/domain_your_contact_information.html b/src/registrar/templates/domain_your_contact_information.html
deleted file mode 100644
index 4611c9438..000000000
--- a/src/registrar/templates/domain_your_contact_information.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "domain_base.html" %}
-{% load static field_helpers %}
-
-{% block title %}Your contact information | {{ domain.name }} | {% endblock %}
-
-{% block domain_content %}
-  {% include "includes/form_errors.html" with form=form %}
-
-  <h1>Your contact information</h1>
-
-<p>If you’d like us to use a different name, email, or phone number you can make those changes below. <strong>Updating your contact information here will update the contact information for all domains in your account.</strong> Changing your information here won’t affect your Login.gov account information. The contact information you provide here won’t be made public and will only be used for the .gov program.
-</p>
-
-  {% include "includes/required_fields.html" %}
-
-  <form class="usa-form usa-form--large" method="post" novalidate id="form-container">
-    {% csrf_token %}
-
-    {% input_with_errors form.first_name %}
-
-    {% input_with_errors form.middle_name %}
-
-    {% input_with_errors form.last_name %}
-
-    {% input_with_errors form.title %}
-
-    {% input_with_errors form.email %}
-    
-    {% input_with_errors form.phone %}
-
-    <button
-      type="submit"
-      class="usa-button"
-    >Save</button>
-  </form>
-
-{% endblock %}  {# domain_content #}
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 400862168..65aeed1c6 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -663,11 +663,13 @@ class TestDomainRequestAdmin(MockEppLib):
         """When an action needed reason is set, an email is sent out and help@get.gov
         is BCC'd in production"""
         # Create fake creator
+        EMAIL = "meoward.jones@igorville.gov"
+
         _creator = User.objects.create(
             username="MrMeoward",
             first_name="Meoward",
             last_name="Jones",
-            email="meoward.jones@igorville.gov",
+            email=EMAIL,
             phone="(555) 123 12345",
             title="Treat inspector",
         )
@@ -819,12 +821,14 @@ class TestDomainRequestAdmin(MockEppLib):
         Also test that the default email set in settings is NOT BCCd on non-prod whenever
         an email does go out."""
 
+        EMAIL = "meoward.jones@igorville.gov"
+
         # Create fake creator
         _creator = User.objects.create(
             username="MrMeoward",
             first_name="Meoward",
             last_name="Jones",
-            email="meoward.jones@igorville.gov",
+            email=EMAIL,
             phone="(555) 123 12345",
             title="Treat inspector",
         )
@@ -1106,11 +1110,13 @@ class TestDomainRequestAdmin(MockEppLib):
         """When transitioning to rejected on a domain request, an email is sent
         explaining why when the reason is contacts or org legitimacy."""
         # Create fake creator
+
+        EMAIL = "meoward.jones@igorville.gov"
         _creator = User.objects.create(
             username="MrMeoward",
             first_name="Meoward",
             last_name="Jones",
-            email="meoward.jones@igorville.gov",
+            email=EMAIL,
             phone="(555) 123 12345",
             title="Treat inspector",
         )
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 6875fc71c..b42b252e2 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -262,7 +262,7 @@ class TestDomainRequest(TestCase):
         msg = "Create a domain request and submit it and see if email was sent."
         domain_request = completed_domain_request(user=self.dummy_user_2)
         self.check_email_sent(
-            domain_request, msg, "submit", 1, expected_content="Hi", expected_email=self.dummy_user_2.email
+            domain_request, msg, "submit", 1, expected_content="Hello", expected_email=self.dummy_user_2.email
         )
 
     @override_flag("profile_feature", active=True)
@@ -272,7 +272,7 @@ class TestDomainRequest(TestCase):
         msg = "Create a domain request and submit it and see if email was sent when the feature flag is on."
         domain_request = completed_domain_request(user=self.dummy_user_2)
         self.check_email_sent(
-            domain_request, msg, "submit", 1, expected_content="Lava", expected_email="intern@igorville.com"
+            domain_request, msg, "submit", 1, expected_content="Hello", expected_email="intern@igorville.com"
         )
 
     @less_console_noise_decorator
@@ -306,16 +306,14 @@ class TestDomainRequest(TestCase):
         msg = "Create a domain request and withdraw it and see if email was sent."
         user, _ = User.objects.get_or_create(username="testy")
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=user)
-        self.check_email_sent(
-            domain_request, msg, "withdraw", 1, expected_content="withdrawn", expected_email=user.email
-        )
+        self.check_email_sent(domain_request, msg, "withdraw", 1, expected_content="Hello", expected_email=user.email)
 
     @less_console_noise_decorator
     def test_reject_sends_email(self):
         msg = "Create a domain request and reject it and see if email was sent."
         user, _ = User.objects.get_or_create(username="testy")
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED, user=user)
-        self.check_email_sent(domain_request, msg, "reject", 1, expected_content="rejected", expected_email=user.email)
+        self.check_email_sent(domain_request, msg, "reject", 1, expected_content="Hello", expected_email=user.email)
 
     @less_console_noise_decorator
     def test_reject_with_prejudice_does_not_send_email(self):

From acfaaa0b1489d1d8d8e5acf812170b55d081c198 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Tue, 10 Sep 2024 11:52:17 -0400
Subject: [PATCH 059/118] removed unused reference

---
 src/registrar/models/domain_request.py | 1 -
 src/registrar/views/domain_request.py  | 2 --
 src/registrar/views/user_profile.py    | 1 -
 3 files changed, 4 deletions(-)

diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index bf24c173c..88f766114 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -6,7 +6,6 @@ from django.conf import settings
 from django.db import models
 from django_fsm import FSMField, transition  # type: ignore
 from django.utils import timezone
-from waffle import flag_is_active
 from registrar.models.domain import Domain
 from registrar.models.federal_agency import FederalAgency
 from registrar.models.utility.generic_helper import CreateOrUpdateOrganizationTypeHelper
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 0ac5b0064..22eb81ac3 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -22,8 +22,6 @@ from .utility import (
     DomainRequestWizardPermissionView,
 )
 
-from waffle.decorators import flag_is_active, waffle_flag
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/src/registrar/views/user_profile.py b/src/registrar/views/user_profile.py
index 3605de345..4d3b44366 100644
--- a/src/registrar/views/user_profile.py
+++ b/src/registrar/views/user_profile.py
@@ -11,7 +11,6 @@ from django.urls import NoReverseMatch, reverse
 from registrar.models.user import User
 from registrar.models.utility.generic_helper import replace_url_queryparams
 from registrar.views.utility.permission_views import UserProfilePermissionView
-from waffle.decorators import waffle_flag
 
 logger = logging.getLogger(__name__)
 

From c11a282f270c80dfc926994b04fdb248feee0a15 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 10 Sep 2024 10:01:30 -0600
Subject: [PATCH 060/118] Update get-gov.js

---
 src/registrar/assets/js/get-gov.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index b5f028bb5..b12c7d001 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1559,6 +1559,7 @@ document.addEventListener('DOMContentLoaded', function() {
         return;
       }
 
+      // add searchParams
       let searchParams = new URLSearchParams(
         {
           "page": page,

From 6d57f5115bef255109477a59bd14aca6fe76f3a7 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Tue, 10 Sep 2024 12:05:34 -0400
Subject: [PATCH 061/118] fixed linting issues

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

diff --git a/src/registrar/context_processors.py b/src/registrar/context_processors.py
index 7f09df310..1d236f8a4 100644
--- a/src/registrar/context_processors.py
+++ b/src/registrar/context_processors.py
@@ -1,5 +1,4 @@
 from django.conf import settings
-from waffle.decorators import flag_is_active
 
 
 def language_code(request):

From c909c2a094dfdfbdad6199f690fb06e095b67052 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Tue, 10 Sep 2024 09:07:01 -0700
Subject: [PATCH 062/118] Update unit tests

---
 src/registrar/tests/test_models.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index b42b252e2..082cee472 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -262,7 +262,7 @@ class TestDomainRequest(TestCase):
         msg = "Create a domain request and submit it and see if email was sent."
         domain_request = completed_domain_request(user=self.dummy_user_2)
         self.check_email_sent(
-            domain_request, msg, "submit", 1, expected_content="Hello", expected_email=self.dummy_user_2.email
+            domain_request, msg, "submit", 1, expected_content="Lava", expected_email=self.dummy_user_2.email
         )
 
     @override_flag("profile_feature", active=True)
@@ -272,7 +272,7 @@ class TestDomainRequest(TestCase):
         msg = "Create a domain request and submit it and see if email was sent when the feature flag is on."
         domain_request = completed_domain_request(user=self.dummy_user_2)
         self.check_email_sent(
-            domain_request, msg, "submit", 1, expected_content="Hello", expected_email="intern@igorville.com"
+            domain_request, msg, "submit", 1, expected_content="Lava", expected_email="intern@igorville.com"
         )
 
     @less_console_noise_decorator
@@ -306,14 +306,16 @@ class TestDomainRequest(TestCase):
         msg = "Create a domain request and withdraw it and see if email was sent."
         user, _ = User.objects.get_or_create(username="testy")
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW, user=user)
-        self.check_email_sent(domain_request, msg, "withdraw", 1, expected_content="Hello", expected_email=user.email)
+        self.check_email_sent(
+            domain_request, msg, "withdraw", 1, expected_content="withdrawn", expected_email=user.email
+        )
 
     @less_console_noise_decorator
     def test_reject_sends_email(self):
         msg = "Create a domain request and reject it and see if email was sent."
         user, _ = User.objects.get_or_create(username="testy")
         domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.APPROVED, user=user)
-        self.check_email_sent(domain_request, msg, "reject", 1, expected_content="Hello", expected_email=user.email)
+        self.check_email_sent(domain_request, msg, "reject", 1, expected_content="Hi", expected_email=user.email)
 
     @less_console_noise_decorator
     def test_reject_with_prejudice_does_not_send_email(self):

From b036b701122ebef9ea48d51c70585dc51e813913 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 10 Sep 2024 13:16:41 -0400
Subject: [PATCH 063/118] functionality done

---
 src/registrar/assets/js/get-gov.js            | 141 ++++++++++++++----
 .../includes/domain_requests_table.html       | 121 ++++++++++++++-
 .../templates/includes/domains_table.html     |   2 +-
 src/registrar/views/domain_requests_json.py   |  22 ++-
 4 files changed, 258 insertions(+), 28 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index b12c7d001..d1adece6e 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1166,7 +1166,7 @@ document.addEventListener('DOMContentLoaded', function() {
     const resetSearchButton = document.querySelector('.domains__reset-search');
     const resetFiltersButton = document.querySelector('.domains__reset-filters');
     const statusCheckboxes = document.querySelectorAll('input[name="filter-status"]');
-    const statusIndicator = document.querySelector('.domain__filter-indicator');
+    const statusIndicator = document.querySelector('.filter-indicator');
     const statusToggle = document.querySelector('.usa-button--filter');
     const portfolioElement = document.getElementById('portfolio-js-value');
     const portfolioValue = portfolioElement ? portfolioElement.getAttribute('data-portfolio') : null;
@@ -1419,10 +1419,10 @@ document.addEventListener('DOMContentLoaded', function() {
     function updateStatusIndicator() {
       statusIndicator.innerHTML = '';
       // Even if the element is empty, it'll mess up the flex layout unless we set display none
-      statusIndicator.hideElement();
+      hideElement(statusIndicator);
       if (currentStatus.length)
         statusIndicator.innerHTML = '(' + currentStatus.length + ')';
-        statusIndicator.showElement();
+        showElement(statusIndicator);
     }
 
     function closeFilters() {
@@ -1436,9 +1436,9 @@ document.addEventListener('DOMContentLoaded', function() {
     // NOTE: We may need to evolve this as we add more filters.
     document.addEventListener('focusin', function(event) {
       const accordion = document.querySelector('.usa-accordion--select');
-      const accordionIsOpen = document.querySelector('.usa-button--filter[aria-expanded="true"]');
+      const openFilterAccordion = document.querySelector('.usa-button--filter[aria-expanded="true"]');
       
-      if (accordionIsOpen && !accordion.contains(event.target)) {
+      if (openFilterAccordion && !accordion.contains(event.target)) {
         closeFilters();
       }
     });
@@ -1447,9 +1447,9 @@ document.addEventListener('DOMContentLoaded', function() {
     // NOTE: We may need to evolve this as we add more filters.
     document.addEventListener('click', function(event) {
       const accordion = document.querySelector('.usa-accordion--select');
-      const accordionIsOpen = document.querySelector('.usa-button--filter[aria-expanded="true"]');
+      const openFilterAccordion = document.querySelector('.usa-button--filter[aria-expanded="true"]');
     
-      if (accordionIsOpen && !accordion.contains(event.target)) {
+      if (openFilterAccordion && !accordion.contains(event.target)) {
         closeFilters();
       }
     });
@@ -1488,14 +1488,17 @@ document.addEventListener('DOMContentLoaded', function() {
     const noDomainRequestsWrapper = document.querySelector('.domain-requests__no-data');
     const noSearchResultsWrapper = document.querySelector('.domain-requests__no-search-results');
     let scrollToTable = false;
+    let currentStatus = [];
     let currentSearchTerm = '';
     const domainRequestsSearchInput = document.getElementById('domain-requests__search-field');
     const domainRequestsSearchSubmit = document.getElementById('domain-requests__search-field-submit');
     const tableHeaders = document.querySelectorAll('.domain-requests__table th[data-sortable]');
     const tableAnnouncementRegion = document.querySelector('.domain-requests__table-wrapper .usa-table__announcement-region');
     const resetSearchButton = document.querySelector('.domain-requests__reset-search');
-    const portfolioElement = document.getElementById('portfolio-js-value');
-    const portfolioValue = portfolioElement ? portfolioElement.getAttribute('data-portfolio') : null;
+    const resetFiltersButton = document.querySelector('.domains__reset-filters');
+    const statusCheckboxes = document.querySelectorAll('input[name="filter-status"]');
+    const statusIndicator = document.querySelector('.filter-indicator');
+    const statusToggle = document.querySelector('.usa-button--filter');
     const portfolioElement = document.getElementById('portfolio-js-value');
     const portfolioValue = portfolioElement ? portfolioElement.getAttribute('data-portfolio') : null;
 
@@ -1537,7 +1540,6 @@ document.addEventListener('DOMContentLoaded', function() {
       return document.querySelector('input[name="csrfmiddlewaretoken"]').value;
     }
 
-    let currentStatus = []
     /**
      * Loads rows in the domain requests list, as well as updates pagination around the domain requests list
      * based on the supplied attributes.
@@ -1547,7 +1549,7 @@ document.addEventListener('DOMContentLoaded', function() {
      * @param {*} scroll - control for the scrollToElement functionality
      * @param {*} searchTerm - the search term
      */
-    function loadDomainRequests(page, sortBy = currentSortBy, order = currentOrder, scroll = scrollToTable, searchTerm = currentSearchTerm, status = currentStatus, portfolio = portfolioValue, portfolio = portfolioValue) {
+    function loadDomainRequests(page, sortBy = currentSortBy, order = currentOrder, scroll = scrollToTable, searchTerm = currentSearchTerm, status = currentStatus, portfolio = portfolioValue) {
       // fetch json of page of domain requests, given params
       let baseUrl = document.getElementById("get_domain_requests_json_url");
       if (!baseUrl) {
@@ -1882,6 +1884,44 @@ document.addEventListener('DOMContentLoaded', function() {
       resetHeaders();
     });
 
+    if (statusToggle) {
+      statusToggle.addEventListener('click', function() {
+        toggleCaret(statusToggle);
+      });
+    }
+
+    // Add event listeners to status filter checkboxes
+    statusCheckboxes.forEach(checkbox => {
+      checkbox.addEventListener('change', function() {
+        const checkboxValue = this.value;
+        
+        // Update currentStatus array based on checkbox state
+        if (this.checked) {
+          currentStatus.push(checkboxValue);
+        } else {
+          const index = currentStatus.indexOf(checkboxValue);
+          if (index > -1) {
+            currentStatus.splice(index, 1);
+          }
+        }
+
+        // Manage visibility of reset filters button
+        if (currentStatus.length == 0) {
+          hideElement(resetFiltersButton);
+        } else {
+          showElement(resetFiltersButton);
+        }
+
+        // Disable the auto scroll
+        scrollToTable = false;
+
+        // Call loadDomains with updated status
+        loadDomainRequests(1, 'id', 'asc');
+        resetHeaders();
+        updateStatusIndicator();
+      });
+    });
+
     // Reset UI and accessibility
     function resetHeaders() {
       tableHeaders.forEach(header => {
@@ -1906,34 +1946,85 @@ document.addEventListener('DOMContentLoaded', function() {
       });
     }
 
-    function closeMoreActionMenu(accordionIsOpen) {
-      if (accordionIsOpen.getAttribute("aria-expanded") === "true") {
-        accordionIsOpen.click();
+    function closeMoreActionMenu(openFilterAccordion) {
+      if (openFilterAccordion.getAttribute("aria-expanded") === "true") {
+        openFilterAccordion.click();
+      }
+    }
+
+    function resetFilters() {
+      currentStatus = [];
+      statusCheckboxes.forEach(checkbox => {
+        checkbox.checked = false; 
+      });
+      hideElement(resetFiltersButton);
+
+      // Disable the auto scroll
+      scrollToTable = false;
+
+      loadDomainRequests(1, 'id', 'asc');
+      resetHeaders();
+      updateStatusIndicator();
+      // No need to toggle close the filters. The focus shift will trigger that for us.
+    }
+
+    if (resetFiltersButton) {
+      resetFiltersButton.addEventListener('click', function() {
+        resetFilters();
+      });
+    }
+
+    function updateStatusIndicator() {
+      statusIndicator.innerHTML = '';
+      // Even if the element is empty, it'll mess up the flex layout unless we set display none
+      hideElement(statusIndicator);
+      if (currentStatus.length)
+        statusIndicator.innerHTML = '(' + currentStatus.length + ')';
+        showElement(statusIndicator);
+    }
+
+    function closeFilters() {
+      if (statusToggle.getAttribute("aria-expanded") === "true") {
+        statusToggle.click();
       }
     }
 
     document.addEventListener('focusin', function(event) {
-      const accordions = document.querySelectorAll('.usa-accordion--more-actions');
-      const openAccordions = document.querySelectorAll('.usa-button--more-actions[aria-expanded="true"]');
+      const openMoreActionsAccordions = document.querySelectorAll('.usa-button--more-actions[aria-expanded="true"]');
       
-      openAccordions.forEach((openAccordionButton) => {
-        const accordion = openAccordionButton.closest('.usa-accordion--more-actions'); // Find the corresponding accordion
-        if (accordion && !accordion.contains(event.target)) {
-          closeMoreActionMenu(openAccordionButton); // Close the accordion if the focus is outside
+      openMoreActionsAccordions.forEach((openMoreActionsAccordionButton) => {
+        const moreActionsAccordion = openMoreActionsAccordionButton.closest('.usa-accordion--more-actions'); // Find the corresponding accordion
+        if (moreActionsAccordion && !moreActionsAccordion.contains(event.target)) {
+          closeMoreActionMenu(openMoreActionsAccordionButton); // Close the accordion if the focus is outside
         }
       });
+
+      const openFilterAccordion = document.querySelector('.usa-button--filter[aria-expanded="true"]');
+      const moreFilterAccordion = openFilterAccordion ? openFilterAccordion.closest('.usa-accordion--select') : undefined;
+
+      if (openFilterAccordion) {
+        if (!moreFilterAccordion.contains(event.target)) {
+          closeFilters();
+        }
+      }
     });
     
     document.addEventListener('click', function(event) {
-      const accordions = document.querySelectorAll('.usa-accordion--more-actions');
-      const openAccordions = document.querySelectorAll('.usa-button--more-actions[aria-expanded="true"]');
+      const openMoreActionsAccordions = document.querySelectorAll('.usa-button--more-actions[aria-expanded="true"]');
     
-      openAccordions.forEach((openAccordionButton) => {
-        const accordion = openAccordionButton.closest('.usa-accordion--more-actions'); // Find the corresponding accordion
+      openMoreActionsAccordions.forEach((openMoreActionsAccordionButton) => {
+        const accordion = openMoreActionsAccordionButton.closest('.usa-accordion--more-actions'); // Find the corresponding accordion
         if (accordion && !accordion.contains(event.target)) {
-          closeMoreActionMenu(openAccordionButton); // Close the accordion if the click is outside
+          closeMoreActionMenu(openMoreActionsAccordionButton); // Close the accordion if the click is outside
         }
       });
+
+      const openFilterAccordion = document.querySelector('.usa-button--filter[aria-expanded="true"]');
+      const moreFilterAccordion = openFilterAccordion ? openFilterAccordion.closest('.usa-accordion--select') : undefined;
+
+      if (openFilterAccordion && moreFilterAccordion && !moreFilterAccordion.contains(event.target)) {
+        closeFilters();
+      }
     });
 
     // Initial load
diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html
index 0c123948e..e4a61a095 100644
--- a/src/registrar/templates/includes/domain_requests_table.html
+++ b/src/registrar/templates/includes/domain_requests_table.html
@@ -23,7 +23,7 @@
               </svg>
               Reset
             </button>
-            <label class="usa-sr-only" for="domain-requests__search-field">Search by domain name</label>
+            <label class="usa-sr-only" for="domain-requests__search-field">Search by domain name or creator</label>
             <input
               class="usa-input"
               id="domain-requests__search-field"
@@ -42,6 +42,125 @@
         </section>
       </div>
     </div>
+    {% if portfolio %}
+    <div class="display-flex flex-align-center"> 
+      <span class="margin-right-2 margin-top-neg-1 usa-prose text-base-darker">Filter by</span>
+      <div class="usa-accordion usa-accordion--select margin-right-2">
+        <div class="usa-accordion__heading">
+          <button
+            type="button"
+            class="usa-button usa-button--small padding--8-8-9 usa-button--outline usa-button--filter usa-accordion__button"
+            aria-expanded="false"
+            aria-controls="filter-status"
+          >
+            <span class="filter-indicator text-bold display-none"></span> Status
+            <svg class="usa-icon top-2px" aria-hidden="true" focusable="false" role="img" width="24">
+              <use xlink:href="/public/img/sprite.svg#expand_more"></use>
+            </svg>
+          </button>
+        </div>
+        <div id="filter-status" class="usa-accordion__content usa-prose shadow-1">
+          <h2>Status</h2>
+          <fieldset class="usa-fieldset margin-top-0">
+            <legend class="usa-legend">Select to apply <span class="sr-only">status</span> filter</legend>
+            <div class="usa-checkbox">
+              <input
+                class="usa-checkbox__input"
+                id="filter-status-started"
+                type="checkbox"
+                name="filter-status"
+                value="started"
+              />
+              <label class="usa-checkbox__label" for="filter-status-started"
+                >Started</label
+              >
+            </div>
+            <div class="usa-checkbox">
+              <input
+                class="usa-checkbox__input"
+                id="filter-status-submitted"
+                type="checkbox"
+                name="filter-status"
+                value="submitted"
+              />
+              <label class="usa-checkbox__label" for="filter-status-submitted"
+                >Submitted</label
+              >
+            </div>
+            <div class="usa-checkbox">
+              <input
+                class="usa-checkbox__input"
+                id="filter-status-in-review"
+                type="checkbox"
+                name="filter-status"
+                value="in review"
+              />
+              <label class="usa-checkbox__label" for="filter-status-in-review"
+                >In review</label
+              >
+            </div>
+            <div class="usa-checkbox">
+              <input
+                class="usa-checkbox__input"
+                id="filter-status-action-needed"
+                type="checkbox"
+                name="filter-status"
+                value="action needed"
+              />
+              <label class="usa-checkbox__label" for="filter-status-action-needed"
+                >Action needed</label
+              >
+            </div>
+            <div class="usa-checkbox">
+              <input
+                class="usa-checkbox__input"
+                id="filter-status-rejected"
+                type="checkbox"
+                name="filter-status"
+                value="rejected"
+              />
+              <label class="usa-checkbox__label" for="filter-status-rejected"
+                >Rejected</label
+              >
+            </div>
+            <div class="usa-checkbox">
+              <input
+                class="usa-checkbox__input"
+                id="filter-status-withdrawn"
+                type="checkbox"
+                name="filter-status"
+                value="withdrawn"
+              />
+              <label class="usa-checkbox__label" for="filter-status-withdrawn"
+                >Withdrawn</label
+              >
+            </div>
+            <div class="usa-checkbox">
+              <input
+                class="usa-checkbox__input"
+                id="filter-status-ineligible"
+                type="checkbox"
+                name="filter-status"
+                value="ineligible"
+              />
+              <label class="usa-checkbox__label" for="filter-status-ineligible"
+                >Ineligible</label
+              >
+            </div>
+          </fieldset>
+        </div>
+      </div>
+      <button
+        type="button"
+        class="usa-button usa-button--small padding--8-12-9-12 usa-button--outline usa-button--filter domains__reset-filters display-none"
+      >
+        Clear filters
+        <svg class="usa-icon top-1px" aria-hidden="true" focusable="false" role="img" width="24">
+          <use xlink:href="/public/img/sprite.svg#close"></use>
+        </svg>
+      </button>
+    </div>
+    {% endif %}
     <div class="domain-requests__table-wrapper display-none usa-table-container--scrollable margin-top-0" tabindex="0">
       <table class="usa-table usa-table--borderless usa-table--stacked dotgov-table dotgov-table--stacked domain-requests__table">
         <caption class="sr-only">Your domain requests</caption>
diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index 414325e89..76ead3a2c 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -64,7 +64,7 @@
             aria-expanded="false"
             aria-controls="filter-status"
           >
-            <span class="domain__filter-indicator text-bold display-none"></span> Status
+            <span class="filter-indicator text-bold display-none"></span> Status
             <svg class="usa-icon top-2px" aria-hidden="true" focusable="false" role="img" width="24">
               <use xlink:href="/public/img/sprite.svg#expand_more"></use>
             </svg>
diff --git a/src/registrar/views/domain_requests_json.py b/src/registrar/views/domain_requests_json.py
index fe86e7a7f..76fa94662 100644
--- a/src/registrar/views/domain_requests_json.py
+++ b/src/registrar/views/domain_requests_json.py
@@ -18,6 +18,7 @@ def get_domain_requests_json(request):
     unfiltered_total = objects.count()
 
     objects = apply_search(objects, request)
+    objects = apply_status_filter(objects, request)
     objects = apply_sorting(objects, request)
 
     paginator = Paginator(objects, 10)
@@ -62,6 +63,7 @@ def get_domain_request_ids_from_request(request):
 
 def apply_search(queryset, request):
     search_term = request.GET.get("search_term")
+    is_portfolio = request.GET.get("portfolio")
 
     if search_term:
         search_term_lower = search_term.lower()
@@ -73,12 +75,30 @@ def apply_search(queryset, request):
         if search_term_lower in new_domain_request_text:
             queryset = queryset.filter(
                 Q(requested_domain__name__icontains=search_term) | Q(requested_domain__isnull=True)
-            )
+            ) 
+        elif is_portfolio:
+            queryset = queryset.filter(Q(requested_domain__name__icontains=search_term) | Q(creator__first_name__icontains=search_term) | Q(creator__last_name__icontains=search_term) | Q(creator__email__icontains=search_term))
+        # For non org users
         else:
             queryset = queryset.filter(Q(requested_domain__name__icontains=search_term))
     return queryset
 
 
+def apply_status_filter(queryset, request):
+    status_param = request.GET.get("status")
+    if status_param:
+        status_list = status_param.split(",")
+        statuses = [status for status in status_list if status in DomainRequest.DomainRequestStatus.values]
+        # Construct Q objects for statuses that can be queried through ORM
+        status_query = Q()
+        if statuses:
+            status_query |= Q(status__in=statuses)
+        # Apply the combined query
+        queryset = queryset.filter(status_query)
+
+    return queryset
+
+
 def apply_sorting(queryset, request):
     sort_by = request.GET.get("sort_by", "id")  # Default to 'id'
     order = request.GET.get("order", "asc")  # Default to 'asc'

From b17ef347c45e3f72b9e93f76a54bbae5feaf4d22 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Tue, 10 Sep 2024 13:29:21 -0400
Subject: [PATCH 064/118] reverted tests

---
 src/registrar/tests/test_views.py | 402 +++++++++++++++++++++---------
 1 file changed, 278 insertions(+), 124 deletions(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 9ab40ebd9..178474866 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -558,6 +558,7 @@ class FinishUserProfileTests(TestWithUser, WebTest):
         return page.follow() if follow else page
 
     @less_console_noise_decorator
+    @override_flag("profile_feature", active=True)
     def test_full_name_initial_value(self):
         """Test that full_name initial value is empty when first_name or last_name is empty.
         This will later be displayed as "unknown" using javascript."""
@@ -611,8 +612,8 @@ class FinishUserProfileTests(TestWithUser, WebTest):
         incomplete_regular_user.delete()
 
     @less_console_noise_decorator
-    def test_new_user_is_directed_to_profile_setup_page(self):
-        """Tests that a new user is redirected to the profile setup page"""
+    def test_new_user_with_profile_feature_on(self):
+        """Tests that a new user is redirected to the profile setup page when profile_feature is on"""
         username_regular_incomplete = "test_regular_user_incomplete"
         first_name_2 = "Incomplete"
         email_2 = "unicorn@igorville.com"
@@ -625,39 +626,39 @@ class FinishUserProfileTests(TestWithUser, WebTest):
         )
 
         self.app.set_user(incomplete_regular_user.username)
+        with override_flag("profile_feature", active=True):
+            # This will redirect the user to the setup page.
+            # Follow implicity checks if our redirect is working.
+            finish_setup_page = self.app.get(reverse("home")).follow()
+            self._set_session_cookie()
 
-        # This will redirect the user to the setup page.
-        # Follow implicity checks if our redirect is working.
-        finish_setup_page = self.app.get(reverse("home")).follow()
-        self._set_session_cookie()
+            # Assert that we're on the right page
+            self.assertContains(finish_setup_page, "Finish setting up your profile")
 
-        # Assert that we're on the right page
-        self.assertContains(finish_setup_page, "Finish setting up your profile")
+            finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
 
-        finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
+            self.assertEqual(finish_setup_page.status_code, 200)
 
-        self.assertEqual(finish_setup_page.status_code, 200)
+            # We're missing a phone number, so the page should tell us that
+            self.assertContains(finish_setup_page, "Enter your phone number.")
 
-        # We're missing a phone number, so the page should tell us that
-        self.assertContains(finish_setup_page, "Enter your phone number.")
+            # Check for the name of the save button
+            self.assertContains(finish_setup_page, "user_setup_save_button")
 
-        # Check for the name of the save button
-        self.assertContains(finish_setup_page, "user_setup_save_button")
+            # Add a phone number
+            finish_setup_form = finish_setup_page.form
+            finish_setup_form["phone"] = "(201) 555-0123"
+            finish_setup_form["title"] = "CEO"
+            finish_setup_form["last_name"] = "example"
+            save_page = self._submit_form_webtest(finish_setup_form, follow=True)
 
-        # Add a phone number
-        finish_setup_form = finish_setup_page.form
-        finish_setup_form["phone"] = "(201) 555-0123"
-        finish_setup_form["title"] = "CEO"
-        finish_setup_form["last_name"] = "example"
-        save_page = self._submit_form_webtest(finish_setup_form, follow=True)
+            self.assertEqual(save_page.status_code, 200)
+            self.assertContains(save_page, "Your profile has been updated.")
 
-        self.assertEqual(save_page.status_code, 200)
-        self.assertContains(save_page, "Your profile has been updated.")
-
-        # Try to navigate back to the home page.
-        # This is the same as clicking the back button.
-        completed_setup_page = self.app.get(reverse("home"))
-        self.assertContains(completed_setup_page, "Manage your domain")
+            # Try to navigate back to the home page.
+            # This is the same as clicking the back button.
+            completed_setup_page = self.app.get(reverse("home"))
+            self.assertContains(completed_setup_page, "Manage your domain")
         incomplete_regular_user.delete()
 
     @less_console_noise_decorator
@@ -674,43 +675,46 @@ class FinishUserProfileTests(TestWithUser, WebTest):
             verification_type=User.VerificationTypeChoices.REGULAR,
         )
         self.app.set_user(incomplete_regular_user.username)
-        finish_setup_page = self.app.get(reverse("home")).follow()
-        self._set_session_cookie()
+        with override_flag("profile_feature", active=True):
+            # This will redirect the user to the setup page.
+            # Follow implicity checks if our redirect is working.
+            finish_setup_page = self.app.get(reverse("home")).follow()
+            self._set_session_cookie()
 
-        # Assert that we're on the right page
-        self.assertContains(finish_setup_page, "Finish setting up your profile")
+            # Assert that we're on the right page
+            self.assertContains(finish_setup_page, "Finish setting up your profile")
 
-        finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
+            finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
 
-        self.assertEqual(finish_setup_page.status_code, 200)
+            self.assertEqual(finish_setup_page.status_code, 200)
 
-        # We're missing a phone number, so the page should tell us that
-        self.assertContains(finish_setup_page, "Enter your phone number.")
+            # We're missing a phone number, so the page should tell us that
+            self.assertContains(finish_setup_page, "Enter your phone number.")
 
-        # Check for the name of the save button
-        self.assertContains(finish_setup_page, "user_setup_save_button")
+            # Check for the name of the save button
+            self.assertContains(finish_setup_page, "user_setup_save_button")
 
-        # Add a phone number
-        finish_setup_form = finish_setup_page.form
-        finish_setup_form["first_name"] = "test"
-        finish_setup_form["last_name"] = "test2"
-        finish_setup_form["phone"] = "(201) 555-0123"
-        finish_setup_form["title"] = "CEO"
-        finish_setup_form["last_name"] = "example"
-        save_page = self._submit_form_webtest(finish_setup_form, follow=True)
+            # Add a phone number
+            finish_setup_form = finish_setup_page.form
+            finish_setup_form["first_name"] = "test"
+            finish_setup_form["last_name"] = "test2"
+            finish_setup_form["phone"] = "(201) 555-0123"
+            finish_setup_form["title"] = "CEO"
+            finish_setup_form["last_name"] = "example"
+            save_page = self._submit_form_webtest(finish_setup_form, follow=True)
 
-        self.assertEqual(save_page.status_code, 200)
-        self.assertContains(save_page, "Your profile has been updated.")
+            self.assertEqual(save_page.status_code, 200)
+            self.assertContains(save_page, "Your profile has been updated.")
 
-        # Try to navigate back to the home page.
-        # This is the same as clicking the back button.
-        completed_setup_page = self.app.get(reverse("home"))
-        self.assertContains(completed_setup_page, "Manage your domain")
+            # Try to navigate back to the home page.
+            # This is the same as clicking the back button.
+            completed_setup_page = self.app.get(reverse("home"))
+            self.assertContains(completed_setup_page, "Manage your domain")
         incomplete_regular_user.delete()
 
     @less_console_noise_decorator
-    def test_new_user_goes_to_domain_request(self):
-        """Tests that a new user is redirected to the domain request page"""
+    def test_new_user_goes_to_domain_request_with_profile_feature_on(self):
+        """Tests that a new user is redirected to the domain request page when profile_feature is on"""
         username_regular_incomplete = "test_regular_user_incomplete"
         first_name_2 = "Incomplete"
         email_2 = "unicorn@igorville.com"
@@ -722,50 +726,50 @@ class FinishUserProfileTests(TestWithUser, WebTest):
             verification_type=User.VerificationTypeChoices.REGULAR,
         )
         self.app.set_user(incomplete_regular_user.username)
-        # This will redirect the user to the setup page
-        finish_setup_page = self.app.get(reverse("domain-request:")).follow()
-        self._set_session_cookie()
+        with override_flag("profile_feature", active=True):
+            # This will redirect the user to the setup page
+            finish_setup_page = self.app.get(reverse("domain-request:")).follow()
+            self._set_session_cookie()
 
-        # Assert that we're on the right page
-        self.assertContains(finish_setup_page, "Finish setting up your profile")
+            # Assert that we're on the right page
+            self.assertContains(finish_setup_page, "Finish setting up your profile")
 
-        finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
+            finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
 
-        self.assertEqual(finish_setup_page.status_code, 200)
+            self.assertEqual(finish_setup_page.status_code, 200)
 
-        # We're missing a phone number, so the page should tell us that
-        self.assertContains(finish_setup_page, "Enter your phone number.")
+            # We're missing a phone number, so the page should tell us that
+            self.assertContains(finish_setup_page, "Enter your phone number.")
 
-        # Check for the name of the save button
-        self.assertContains(finish_setup_page, "user_setup_save_button")
+            # Check for the name of the save button
+            self.assertContains(finish_setup_page, "user_setup_save_button")
 
-        # Add a phone number
-        finish_setup_form = finish_setup_page.form
-        finish_setup_form["first_name"] = "firstname"
-        finish_setup_form["phone"] = "(201) 555-0123"
-        finish_setup_form["title"] = "CEO"
-        finish_setup_form["last_name"] = "example"
-        completed_setup_page = self._submit_form_webtest(finish_setup_page.form, follow=True)
+            # Add a phone number
+            finish_setup_form = finish_setup_page.form
+            finish_setup_form["first_name"] = "firstname"
+            finish_setup_form["phone"] = "(201) 555-0123"
+            finish_setup_form["title"] = "CEO"
+            finish_setup_form["last_name"] = "example"
+            completed_setup_page = self._submit_form_webtest(finish_setup_page.form, follow=True)
 
-        self.assertEqual(completed_setup_page.status_code, 200)
+            self.assertEqual(completed_setup_page.status_code, 200)
 
-        finish_setup_form = completed_setup_page.form
+            finish_setup_form = completed_setup_page.form
 
-        # Submit the form using the specific submit button to execute the redirect
-        completed_setup_page = self._submit_form_webtest(
-            finish_setup_form, follow=True, name="user_setup_submit_button"
-        )
-        self.assertEqual(completed_setup_page.status_code, 200)
+            # Submit the form using the specific submit button to execute the redirect
+            completed_setup_page = self._submit_form_webtest(
+                finish_setup_form, follow=True, name="user_setup_submit_button"
+            )
+            self.assertEqual(completed_setup_page.status_code, 200)
 
-        # Assert that we are still on the
-        # Assert that we're on the domain request page
-        self.assertNotContains(completed_setup_page, "Finish setting up your profile")
-        self.assertNotContains(completed_setup_page, "What contact information should we use to reach you?")
+            # Assert that we are still on the
+            # Assert that we're on the domain request page
+            self.assertNotContains(completed_setup_page, "Finish setting up your profile")
+            self.assertNotContains(completed_setup_page, "What contact information should we use to reach you?")
 
-        self.assertContains(completed_setup_page, "You’re about to start your .gov domain request")
+            self.assertContains(completed_setup_page, "You’re about to start your .gov domain request")
         incomplete_regular_user.delete()
 
-
 class FinishUserProfileForOtherUsersTests(TestWithUser, WebTest):
     """A series of tests that target the user profile page intercept for incomplete IAL1 user profiles."""
 
@@ -803,6 +807,83 @@ class FinishUserProfileForOtherUsersTests(TestWithUser, WebTest):
         self._set_session_cookie()
         return page.follow() if follow else page
 
+    @less_console_noise_decorator
+    def test_new_user_with_profile_feature_on(self):
+        """Tests that a new user is redirected to the profile setup page when profile_feature is on,
+        and testing that the confirmation modal is present"""
+        username_other_incomplete = "test_other_user_incomplete"
+        first_name_2 = "Incomplete"
+        email_2 = "unicorn@igorville.com"
+        # in the case below, other user is representative of GRANDFATHERED,
+        # VERIFIED_BY_STAFF, INVITED, FIXTURE_USER, ie. IAL1
+        incomplete_other_user = get_user_model().objects.create(
+            username=username_other_incomplete,
+            first_name=first_name_2,
+            email=email_2,
+            verification_type=User.VerificationTypeChoices.VERIFIED_BY_STAFF,
+        )
+        self.app.set_user(incomplete_other_user.username)
+        with override_flag("profile_feature", active=True):
+            # This will redirect the user to the user profile page.
+            # Follow implicity checks if our redirect is working.
+            user_profile_page = self.app.get(reverse("home")).follow()
+            self._set_session_cookie()
+
+            # Assert that we're on the right page by testing for the modal
+            self.assertContains(user_profile_page, "domain registrants must maintain accurate contact information")
+
+            user_profile_page = self._submit_form_webtest(user_profile_page.form)
+
+            self.assertEqual(user_profile_page.status_code, 200)
+
+            # Assert that modal does not appear on subsequent submits
+            self.assertNotContains(user_profile_page, "domain registrants must maintain accurate contact information")
+            # Assert that unique error message appears by testing the message in a specific div
+            html_content = user_profile_page.content.decode("utf-8")
+            # Normalize spaces and line breaks in the HTML content
+            normalized_html_content = " ".join(html_content.split())
+            # Expected string without extra spaces and line breaks
+            expected_string = "Before you can manage your domain, we need you to add contact information."
+            # Check for the presence of the <div> element with the specific text
+            self.assertIn(f'<div class="usa-alert__body"> {expected_string} </div>', normalized_html_content)
+
+            # We're missing a phone number, so the page should tell us that
+            self.assertContains(user_profile_page, "Enter your phone number.")
+
+            # We need to assert that links to manage your domain are not present (in both body and footer)
+            self.assertNotContains(user_profile_page, "Manage your domains")
+            # Assert the tooltip on the logo, indicating that the logo is not clickable
+            self.assertContains(
+                user_profile_page, 'title="Before you can manage your domains, we need you to add contact information."'
+            )
+            # Assert that modal does not appear on subsequent submits
+            self.assertNotContains(user_profile_page, "domain registrants must maintain accurate contact information")
+
+            # Add a phone number
+            finish_setup_form = user_profile_page.form
+            finish_setup_form["phone"] = "(201) 555-0123"
+            finish_setup_form["title"] = "CEO"
+            finish_setup_form["last_name"] = "example"
+            save_page = self._submit_form_webtest(finish_setup_form, follow=True)
+
+            self.assertEqual(save_page.status_code, 200)
+            self.assertContains(save_page, "Your profile has been updated.")
+
+            # We need to assert that logo is not clickable and links to manage your domain are not present
+            # NOTE: "anage" is not a typo.  It is to accomodate the fact that the "m" is uppercase in one
+            # instance and lowercase in the other.
+            self.assertContains(save_page, "anage your domains", count=2)
+            self.assertNotContains(
+                save_page, "Before you can manage your domains, we need you to add contact information"
+            )
+            # Assert that modal does not appear on subsequent submits
+            self.assertNotContains(save_page, "domain registrants must maintain accurate contact information")
+
+            # Try to navigate back to the home page.
+            # This is the same as clicking the back button.
+            completed_setup_page = self.app.get(reverse("home"))
+            self.assertContains(completed_setup_page, "Manage your domain")
+
 
 class UserProfileTests(TestWithUser, WebTest):
     """A series of tests that target your profile functionality"""
@@ -826,58 +907,105 @@ class UserProfileTests(TestWithUser, WebTest):
         DomainInformation.objects.all().delete()
 
     @less_console_noise_decorator
-    def error_500_main_nav(self):
-        """test that Your profile is in main nav of 500 error page.
+    def error_500_main_nav_with_profile_feature_turned_on(self):
+        """test that Your profile is in main nav of 500 error page when profile_feature is on.
 
         Our treatment of 401 and 403 error page handling with that waffle feature is similar, so we
         assume that the same test results hold true for 401 and 403."""
-        with self.assertRaises(Exception):
-            response = self.client.get(reverse("home"), follow=True)
-            self.assertEqual(response.status_code, 500)
-            self.assertContains(response, "Your profile")
+        with override_flag("profile_feature", active=True):
+            with self.assertRaises(Exception):
+                response = self.client.get(reverse("home"), follow=True)
+                self.assertEqual(response.status_code, 500)
+                self.assertContains(response, "Your profile")
 
     @less_console_noise_decorator
-    def test_home_page_main_nav(self):
-        """test that Your profile is in main nav of home page"""
+    def error_500_main_nav_with_profile_feature_turned_off(self):
+        """test that Your profile is not in main nav of 500 error page when profile_feature is off.
 
-        response = self.client.get("/", follow=True)
+        Our treatment of 401 and 403 error page handling with that waffle feature is similar, so we
+        assume that the same test results hold true for 401 and 403."""
+        with override_flag("profile_feature", active=False):
+            with self.assertRaises(Exception):
+                response = self.client.get(reverse("home"), follow=True)
+                self.assertEqual(response.status_code, 500)
+                self.assertNotContains(response, "Your profile")
+
+    @less_console_noise_decorator
+    def test_home_page_main_nav_with_profile_feature_on(self):
+        """test that Your profile is in main nav of home page when profile_feature is on"""
+        with override_flag("profile_feature", active=True):
+            response = self.client.get("/", follow=True)
         self.assertContains(response, "Your profile")
 
     @less_console_noise_decorator
-    def test_new_request_main_nav(self):
-        """test that Your profile is in main nav of new request"""
-        response = self.client.get("/request/", follow=True)
+    def test_home_page_main_nav_with_profile_feature_off(self):
+        """test that Your profile is not in main nav of home page when profile_feature is off"""
+        with override_flag("profile_feature", active=False):
+            response = self.client.get("/", follow=True)
+        self.assertNotContains(response, "Your profile")
+
+    @less_console_noise_decorator
+    def test_new_request_main_nav_with_profile_feature_on(self):
+        """test that Your profile is in main nav of new request when profile_feature is on"""
+        with override_flag("profile_feature", active=True):
+            response = self.client.get("/request/", follow=True)
         self.assertContains(response, "Your profile")
 
     @less_console_noise_decorator
-    def test_user_profile_main_nav(self):
-        """test that Your profile is in main nav of user profile"""
-        response = self.client.get("/user-profile", follow=True)
+    def test_new_request_main_nav_with_profile_feature_off(self):
+        """test that Your profile is not in main nav of new request when profile_feature is off"""
+        with override_flag("profile_feature", active=False):
+            response = self.client.get("/request/", follow=True)
+        self.assertNotContains(response, "Your profile")
+
+    @less_console_noise_decorator
+    def test_user_profile_main_nav_with_profile_feature_on(self):
+        """test that Your profile is in main nav of user profile when profile_feature is on"""
+        with override_flag("profile_feature", active=True):
+            response = self.client.get("/user-profile", follow=True)
         self.assertContains(response, "Your profile")
 
+    @less_console_noise_decorator
+    def test_user_profile_returns_404_when_feature_off(self):
+        """test that Your profile returns 404 when profile_feature is off"""
+        with override_flag("profile_feature", active=False):
+            response = self.client.get("/user-profile", follow=True)
+        self.assertEqual(response.status_code, 404)
+
     @less_console_noise_decorator
     def test_user_profile_back_button_when_coming_from_domain_request(self):
-        """tests user profile when they are redirected from the domain request page"""
-        response = self.client.get("/user-profile?redirect=domain-request:")
+        """tests user profile when profile_feature is on,
+        and when they are redirected from the domain request page"""
+        with override_flag("profile_feature", active=True):
+            response = self.client.get("/user-profile?redirect=domain-request:")
         self.assertContains(response, "Your profile")
         self.assertContains(response, "Go back to your domain request")
         self.assertNotContains(response, "Back to manage your domains")
 
     @less_console_noise_decorator
-    def test_domain_detail(self):
-        """test that domain detail view"""
-        response = self.client.get(reverse("domain", args=[self.domain.pk]))
+    def test_domain_detail_profile_feature_on(self):
+        """test that domain detail view when profile_feature is on"""
+        with override_flag("profile_feature", active=True):
+            response = self.client.get(reverse("domain", args=[self.domain.pk]))
         self.assertContains(response, "Your profile")
         self.assertNotContains(response, "Your contact information")
 
     @less_console_noise_decorator
-    def test_domain_your_contact_information(self):
-        """test that Your contact information is not accessible"""
-        response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
+    def test_domain_your_contact_information_when_profile_feature_off(self):
+        """test that Your contact information is accessible when profile_feature is off"""
+        with override_flag("profile_feature", active=False):
+            response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
+        self.assertContains(response, "Your contact information")
+
+    @less_console_noise_decorator
+    def test_domain_your_contact_information_when_profile_feature_on(self):
+        """test that Your contact information is not accessible when profile feature is on"""
+        with override_flag("profile_feature", active=True):
+            response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
         self.assertEqual(response.status_code, 404)
 
     @less_console_noise_decorator
-    def test_request_profile_request_page(self):
+    def test_request_when_profile_feature_on(self):
         """test that Your profile is in request page when profile feature is on"""
 
         contact_user, _ = Contact.objects.get_or_create(
@@ -892,27 +1020,53 @@ class UserProfileTests(TestWithUser, WebTest):
             senior_official=contact_user,
             submitter=contact_user,
         )
+        with override_flag("profile_feature", active=True):
+            response = self.client.get(f"/domain-request/{domain_request.id}", follow=True)
+            self.assertContains(response, "Your profile")
+            response = self.client.get(f"/domain-request/{domain_request.id}/withdraw", follow=True)
+            self.assertContains(response, "Your profile")
 
-        response = self.client.get(f"/domain-request/{domain_request.id}", follow=True)
-        self.assertContains(response, "Your profile")
-        response = self.client.get(f"/domain-request/{domain_request.id}/withdraw", follow=True)
-        self.assertContains(response, "Your profile")
+    @less_console_noise_decorator
+    def test_request_when_profile_feature_off(self):
+        """test that Your profile is not in request page when profile feature is off"""
+
+        contact_user, _ = Contact.objects.get_or_create(
+            first_name="Hank",
+            last_name="McFakerson",
+        )
+        site = DraftDomain.objects.create(name="igorville.gov")
+        domain_request = DomainRequest.objects.create(
+            creator=self.user,
+            requested_domain=site,
+            status=DomainRequest.DomainRequestStatus.SUBMITTED,
+            senior_official=contact_user,
+            submitter=contact_user,
+        )
+        with override_flag("profile_feature", active=False):
+            response = self.client.get(f"/domain-request/{domain_request.id}", follow=True)
+            self.assertNotContains(response, "Your profile")
+            response = self.client.get(f"/domain-request/{domain_request.id}/withdraw", follow=True)
+            self.assertNotContains(response, "Your profile")
+        # cleanup
+        domain_request.delete()
+        site.delete()
 
     @less_console_noise_decorator
     def test_user_profile_form_submission(self):
         """test user profile form submission"""
         self.app.set_user(self.user.username)
-        profile_page = self.app.get(reverse("user-profile"))
-        session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
-        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
-        profile_form = profile_page.form
-        profile_form["title"] = "sample title"
-        profile_form["phone"] = "(201) 555-1212"
-        profile_page = profile_form.submit()
-        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
-        profile_page = profile_page.follow()
-        self.assertEqual(profile_page.status_code, 200)
-        self.assertContains(profile_page, "Your profile has been updated")
+        with override_flag("profile_feature", active=True):
+            profile_page = self.app.get(reverse("user-profile"))
+            session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
+            self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+            profile_form = profile_page.form
+            profile_form["title"] = "sample title"
+            profile_form["phone"] = "(201) 555-1212"
+            profile_page = profile_form.submit()
+            self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+            profile_page = profile_page.follow()
+            self.assertEqual(profile_page.status_code, 200)
+            self.assertContains(profile_page, "Your profile has been updated")
 
 
 class PortfoliosTests(TestWithUser, WebTest):
@@ -972,4 +1126,4 @@ class PortfoliosTests(TestWithUser, WebTest):
 
             self.assertNotContains(home_page, self.portfolio.organization_name)
 
-            self.assertContains(home_page, 'id="domain-requests-header"')
+            self.assertContains(home_page, 'id="domain-requests-header"')
\ No newline at end of file

From cac684a1f1d9d96bcf5d85bc335dba1a13ac6d6c Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 10 Sep 2024 14:27:43 -0400
Subject: [PATCH 065/118] fix spacing on SO page

---
 .../templates/includes/senior_official.html   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/registrar/templates/includes/senior_official.html b/src/registrar/templates/includes/senior_official.html
index 98afa4dec..da6c0ac36 100644
--- a/src/registrar/templates/includes/senior_official.html
+++ b/src/registrar/templates/includes/senior_official.html
@@ -24,7 +24,7 @@
 {% endif %}
 
 {% if can_edit %}
-    <form class="usa-form usa-form--large" method="post" novalidate id="form-container">
+    <form class="usa-form usa-form--large desktop:margin-top-4" method="post" novalidate id="form-container">
         {% csrf_token %}
         {% input_with_errors form.first_name %}
         {% input_with_errors form.last_name %}
@@ -35,15 +35,17 @@
 {% elif not form.full_name.value and not form.title.value and not form.email.value %}
     <h4>No senior official was found.</h4>
 {% else %}
-    {% if form.full_name.value is not None %}
-        {% include "includes/input_read_only.html" with field=form.full_name %}
-    {% endif %}
+    <div class="desktop:margin-top-4">
+        {% if form.full_name.value is not None %}
+            {% include "includes/input_read_only.html" with field=form.full_name %}
+        {% endif %}
 
-    {% if form.title.value is not None %}
-        {% include "includes/input_read_only.html" with field=form.title %}
-    {% endif %}
+        {% if form.title.value is not None %}
+            {% include "includes/input_read_only.html" with field=form.title %}
+        {% endif %}
 
-    {% if form.email.value is not None %}
-        {% include "includes/input_read_only.html" with field=form.email %}
-    {% endif %}
+        {% if form.email.value is not None %}
+            {% include "includes/input_read_only.html" with field=form.email %}
+        {% endif %}
+    </div>
 {% endif %}

From 78a762a2eac91e880adbbcb8c08e907fa2752880 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 10 Sep 2024 12:54:06 -0600
Subject: [PATCH 066/118] Unit tests

---
 .../tests/test_views_requests_json.py         | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/src/registrar/tests/test_views_requests_json.py b/src/registrar/tests/test_views_requests_json.py
index cef608567..d9e154421 100644
--- a/src/registrar/tests/test_views_requests_json.py
+++ b/src/registrar/tests/test_views_requests_json.py
@@ -458,3 +458,85 @@ class GetRequestsJsonTest(TestWithUser, WebTest):
         # Ensure no approved requests are included
         for domain_request in data["domain_requests"]:
             self.assertNotEqual(domain_request["status"], DomainRequest.DomainRequestStatus.APPROVED)
+
+
+    def test_search(self):
+        """Tests our search functionality. We expect that search filters on creator only when we are in portfolio mode"""
+        # Test search for domain name
+        response = self.app.get(reverse("get_domain_requests_json"), {"search_term": "lamb"})
+        self.assertEqual(response.status_code, 200)
+        data = response.json
+        self.assertEqual(len(data["domain_requests"]), 1)
+
+        requested_domain = data["domain_requests"][0]["requested_domain"]
+        print(f"requested domain is: {requested_domain}")
+        self.assertEqual(requested_domain, "lamb-chops.gov")
+
+        # Test search for 'New domain request'
+        response = self.app.get(reverse("get_domain_requests_json"), {"search_term": "new domain"})
+        self.assertEqual(response.status_code, 200)
+        data = response.json
+        self.assertTrue(any(req["requested_domain"] is None for req in data["domain_requests"]))
+
+        # Test search with portfolio (including creator search)
+        self.client.force_login(self.user)
+        with override_flag("organization_feature", active=True), override_flag("organization_requests", active=True):
+            user_perm, _ = UserPortfolioPermission.objects.get_or_create(
+                user=self.user,
+                portfolio=self.portfolio,
+                roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            )
+            response = self.app.get(reverse("get_domain_requests_json"), {
+                "search_term": "info",
+                "portfolio": self.portfolio.id
+            })
+            self.assertEqual(response.status_code, 200)
+            data = response.json
+            self.assertTrue(any(req["creator"].startswith("info") for req in data["domain_requests"]))
+
+        # Test search without portfolio (should not search on creator)
+        with override_flag("organization_feature", active=False), override_flag("organization_requests", active=False):
+            user_perm.delete()
+            response = self.app.get(reverse("get_domain_requests_json"), {"search_term": "info"})
+            self.assertEqual(response.status_code, 200)
+            data = response.json
+            self.assertEqual(len(data["domain_requests"]), 0)
+
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_requests", active=True)
+    def test_status_filter(self):
+        """Test that status filtering works properly"""
+        # Test a single status
+        response = self.app.get(reverse("get_domain_requests_json"), {"status": "started"})
+        self.assertEqual(response.status_code, 200)
+        data = response.json
+        self.assertTrue(all(req["status"] == "Started" for req in data["domain_requests"]))
+
+        # Test an invalid status
+        response = self.app.get(reverse("get_domain_requests_json"), {"status": "approved"})
+        self.assertEqual(response.status_code, 200)
+        data = response.json
+        self.assertEqual(len(data["domain_requests"]), 0)
+
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_requests", active=True)
+    def test_combined_filtering_and_sorting(self):
+        """Test that combining filters and sorting works properly"""
+        user_perm, _ = UserPortfolioPermission.objects.get_or_create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+        )
+        self.client.force_login(self.user)
+        response = self.app.get(reverse("get_domain_requests_json"), {
+            "search_term": "beef",
+            "status": "started",
+            "portfolio": self.portfolio.id
+        })
+        self.assertEqual(response.status_code, 200)
+        data = response.json
+        self.assertTrue(all("beef" in req["requested_domain"] for req in data["domain_requests"]))
+        self.assertTrue(all(req["status"] == "Started" for req in data["domain_requests"]))
+        created_at_dates = [req["created_at"] for req in data["domain_requests"]]
+        self.assertEqual(created_at_dates, sorted(created_at_dates, reverse=True))
+        user_perm.delete()

From f9a39fcca800da8365671b093a888279d8b63c6f Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:13:18 -0600
Subject: [PATCH 067/118] linting

---
 .../tests/test_views_requests_json.py          | 18 +++++++-----------
 src/registrar/views/domain_requests_json.py    |  9 +++++++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/registrar/tests/test_views_requests_json.py b/src/registrar/tests/test_views_requests_json.py
index d9e154421..12b2a898e 100644
--- a/src/registrar/tests/test_views_requests_json.py
+++ b/src/registrar/tests/test_views_requests_json.py
@@ -459,7 +459,6 @@ class GetRequestsJsonTest(TestWithUser, WebTest):
         for domain_request in data["domain_requests"]:
             self.assertNotEqual(domain_request["status"], DomainRequest.DomainRequestStatus.APPROVED)
 
-
     def test_search(self):
         """Tests our search functionality. We expect that search filters on creator only when we are in portfolio mode"""
         # Test search for domain name
@@ -469,7 +468,6 @@ class GetRequestsJsonTest(TestWithUser, WebTest):
         self.assertEqual(len(data["domain_requests"]), 1)
 
         requested_domain = data["domain_requests"][0]["requested_domain"]
-        print(f"requested domain is: {requested_domain}")
         self.assertEqual(requested_domain, "lamb-chops.gov")
 
         # Test search for 'New domain request'
@@ -486,10 +484,9 @@ class GetRequestsJsonTest(TestWithUser, WebTest):
                 portfolio=self.portfolio,
                 roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
             )
-            response = self.app.get(reverse("get_domain_requests_json"), {
-                "search_term": "info",
-                "portfolio": self.portfolio.id
-            })
+            response = self.app.get(
+                reverse("get_domain_requests_json"), {"search_term": "info", "portfolio": self.portfolio.id}
+            )
             self.assertEqual(response.status_code, 200)
             data = response.json
             self.assertTrue(any(req["creator"].startswith("info") for req in data["domain_requests"]))
@@ -528,11 +525,10 @@ class GetRequestsJsonTest(TestWithUser, WebTest):
             roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
         )
         self.client.force_login(self.user)
-        response = self.app.get(reverse("get_domain_requests_json"), {
-            "search_term": "beef",
-            "status": "started",
-            "portfolio": self.portfolio.id
-        })
+        response = self.app.get(
+            reverse("get_domain_requests_json"),
+            {"search_term": "beef", "status": "started", "portfolio": self.portfolio.id},
+        )
         self.assertEqual(response.status_code, 200)
         data = response.json
         self.assertTrue(all("beef" in req["requested_domain"] for req in data["domain_requests"]))
diff --git a/src/registrar/views/domain_requests_json.py b/src/registrar/views/domain_requests_json.py
index 76fa94662..f8eb52f57 100644
--- a/src/registrar/views/domain_requests_json.py
+++ b/src/registrar/views/domain_requests_json.py
@@ -75,9 +75,14 @@ def apply_search(queryset, request):
         if search_term_lower in new_domain_request_text:
             queryset = queryset.filter(
                 Q(requested_domain__name__icontains=search_term) | Q(requested_domain__isnull=True)
-            ) 
+            )
         elif is_portfolio:
-            queryset = queryset.filter(Q(requested_domain__name__icontains=search_term) | Q(creator__first_name__icontains=search_term) | Q(creator__last_name__icontains=search_term) | Q(creator__email__icontains=search_term))
+            queryset = queryset.filter(
+                Q(requested_domain__name__icontains=search_term)
+                | Q(creator__first_name__icontains=search_term)
+                | Q(creator__last_name__icontains=search_term)
+                | Q(creator__email__icontains=search_term)
+            )
         # For non org users
         else:
             queryset = queryset.filter(Q(requested_domain__name__icontains=search_term))

From 8e2cddfe5d4bd56acc77aa1cb8c09d5c192ddb89 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:29:13 -0600
Subject: [PATCH 068/118] Update test_views_requests_json.py

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

diff --git a/src/registrar/tests/test_views_requests_json.py b/src/registrar/tests/test_views_requests_json.py
index 12b2a898e..c6eb8a1dc 100644
--- a/src/registrar/tests/test_views_requests_json.py
+++ b/src/registrar/tests/test_views_requests_json.py
@@ -460,7 +460,7 @@ class GetRequestsJsonTest(TestWithUser, WebTest):
             self.assertNotEqual(domain_request["status"], DomainRequest.DomainRequestStatus.APPROVED)
 
     def test_search(self):
-        """Tests our search functionality. We expect that search filters on creator only when we are in portfolio mode"""
+        """Tests our search functionality. We expect that search filters on creator only when we are in a portfolio"""
         # Test search for domain name
         response = self.app.get(reverse("get_domain_requests_json"), {"search_term": "lamb"})
         self.assertEqual(response.status_code, 200)

From f3ae6f884c09323a26d8d1f388b9b31662a150e0 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Tue, 10 Sep 2024 14:13:10 -0700
Subject: [PATCH 069/118] Remove your contact information pointers and update
 tests

---
 src/registrar/forms/domain_request_wizard.py | 58 --------------------
 src/registrar/templates/domain_sidebar.html  |  7 ---
 src/registrar/tests/test_admin_request.py    |  8 +--
 src/registrar/tests/test_emails.py           | 14 ++++-
 src/registrar/tests/test_forms.py            | 14 -----
 5 files changed, 14 insertions(+), 87 deletions(-)

diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index 764436bb2..f2fdd32bc 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -386,64 +386,6 @@ class PurposeForm(RegistrarForm):
     )
 
 
-class YourContactForm(RegistrarForm):
-    JOIN = "creator"
-
-    def to_database(self, obj):
-        if not self.is_valid():
-            return
-        contact = getattr(obj, "creator", None)
-        if contact is not None and not contact.has_more_than_one_join("submitted_domain_requests"):
-            # if contact exists in the database and is not joined to other entities
-            super().to_database(contact)
-        else:
-            # no contact exists OR contact exists which is joined also to other entities;
-            # in either case, create a new contact and update it
-            contact = Contact()
-            super().to_database(contact)
-            obj.creator = contact
-            obj.save()
-
-    @classmethod
-    def from_database(cls, obj):
-        contact = getattr(obj, "creator", None)
-        return super().from_database(contact)
-
-    first_name = forms.CharField(
-        label="First name / given name",
-        error_messages={"required": "Enter your first name / given name."},
-    )
-    middle_name = forms.CharField(
-        required=False,
-        label="Middle name (optional)",
-    )
-    last_name = forms.CharField(
-        label="Last name / family name",
-        error_messages={"required": "Enter your last name / family name."},
-    )
-    title = forms.CharField(
-        label="Title or role in your organization",
-        error_messages={
-            "required": ("Enter your title or role in your organization (e.g., Chief Information Officer).")
-        },
-    )
-    email = forms.EmailField(
-        label="Email",
-        max_length=None,
-        error_messages={"invalid": ("Enter your email address in the required format, like name@example.com.")},
-        validators=[
-            MaxLengthValidator(
-                320,
-                message="Response must be less than 320 characters.",
-            )
-        ],
-    )
-    phone = PhoneNumberField(
-        label="Phone",
-        error_messages={"invalid": "Enter a valid 10-digit phone number.", "required": "Enter your phone number."},
-    )
-
-
 class OtherContactsYesNoForm(BaseYesNoForm):
     """The yes/no field for the OtherContacts form."""
 
diff --git a/src/registrar/templates/domain_sidebar.html b/src/registrar/templates/domain_sidebar.html
index 24f92bf16..726aef0cb 100644
--- a/src/registrar/templates/domain_sidebar.html
+++ b/src/registrar/templates/domain_sidebar.html
@@ -72,13 +72,6 @@
         {% endwith %}
       {% endif %}
 
-      {% if not has_profile_feature_flag %}
-      {# Conditionally display profile link in main nav #}
-        {% with url_name="domain-your-contact-information" %}
-          {% include "includes/domain_sidenav_item.html" with item_text="Your contact information" %}
-        {% endwith %}
-      {% endif %}
-
       {% with url_name="domain-security-email" %}
         {% include "includes/domain_sidenav_item.html" with item_text="Security email" %}
       {% endwith %}
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 65aeed1c6..797bf2d72 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -685,16 +685,14 @@ class TestDomainRequestAdmin(MockEppLib):
         already_has_domains = DomainRequest.ActionNeededReasons.ALREADY_HAS_DOMAINS
         self.transition_state_and_send_email(domain_request, action_needed, action_needed_reason=already_has_domains)
 
-        self.assert_email_is_accurate(
-            "ORGANIZATION ALREADY HAS A .GOV DOMAIN", 0, _creator.email, bcc_email_address=BCC_EMAIL
-        )
+        self.assert_email_is_accurate("ORGANIZATION ALREADY HAS A .GOV DOMAIN", 0, EMAIL, bcc_email_address=BCC_EMAIL)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 1)
 
         # Test the email sent out for bad_name
         bad_name = DomainRequest.ActionNeededReasons.BAD_NAME
         self.transition_state_and_send_email(domain_request, action_needed, action_needed_reason=bad_name)
         self.assert_email_is_accurate(
-            "DOMAIN NAME DOES NOT MEET .GOV REQUIREMENTS", 1, _creator.email, bcc_email_address=BCC_EMAIL
+            "DOMAIN NAME DOES NOT MEET .GOV REQUIREMENTS", 1, EMAIL, bcc_email_address=BCC_EMAIL
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 2)
 
@@ -702,7 +700,7 @@ class TestDomainRequestAdmin(MockEppLib):
         eligibility_unclear = DomainRequest.ActionNeededReasons.ELIGIBILITY_UNCLEAR
         self.transition_state_and_send_email(domain_request, action_needed, action_needed_reason=eligibility_unclear)
         self.assert_email_is_accurate(
-            "ORGANIZATION MAY NOT MEET ELIGIBILITY REQUIREMENTS", 2, _creator.email, bcc_email_address=BCC_EMAIL
+            "ORGANIZATION MAY NOT MEET ELIGIBILITY REQUIREMENTS", 2, EMAIL, bcc_email_address=BCC_EMAIL
         )
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 3)
 
diff --git a/src/registrar/tests/test_emails.py b/src/registrar/tests/test_emails.py
index f5ba6b955..55b9267e4 100644
--- a/src/registrar/tests/test_emails.py
+++ b/src/registrar/tests/test_emails.py
@@ -7,7 +7,7 @@ from waffle.testutils import override_flag
 from registrar.utility import email
 from registrar.utility.email import send_templated_email
 from .common import completed_domain_request
-from registrar.models import AllowedEmail
+from registrar.models import AllowedEmail, User
 
 from api.tests.common import less_console_noise_decorator
 from datetime import datetime
@@ -129,13 +129,21 @@ class TestEmails(TestCase):
     @less_console_noise_decorator
     def test_submission_confirmation_other_contacts_spacing(self):
         """Test line spacing with other contacts."""
-        domain_request = completed_domain_request(has_other_contacts=True)
+
+        # Create fake creator
+        _creator = User.objects.create(
+            username="MrMeoward", first_name="Meoward", last_name="Jones", phone="(888) 888 8888"
+        )
+
+        # Create a fake domain request
+        domain_request = completed_domain_request(has_other_contacts=True, user=_creator)
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client_class):
             domain_request.submit()
         _, kwargs = self.mock_client.send_email.call_args
         body = kwargs["Content"]["Simple"]["Body"]["Text"]["Data"]
         self.assertIn("Other employees from your organization:", body)
-        # spacing should be right between adjacent elements        self.assertRegex(body, r"5557\n\nAnything else")
+        self.assertRegex(body, r"8888\n\nOther employees")
+        self.assertRegex(body, r"5557\n\nAnything else")
 
     @boto3_mocking.patching
     @less_console_noise_decorator
diff --git a/src/registrar/tests/test_forms.py b/src/registrar/tests/test_forms.py
index a8d85597b..eb4cad040 100644
--- a/src/registrar/tests/test_forms.py
+++ b/src/registrar/tests/test_forms.py
@@ -10,7 +10,6 @@ from registrar.forms.domain_request_wizard import (
     DotGovDomainForm,
     SeniorOfficialForm,
     OrganizationContactForm,
-    YourContactForm,
     OtherContactsForm,
     RequirementsForm,
     TribalGovernmentForm,
@@ -366,19 +365,6 @@ class TestFormValidation(MockEppLib):
             ["Response must be less than 2000 characters."],
         )
 
-    def test_your_contact_email_invalid(self):
-        """must be a valid email address."""
-        form = YourContactForm(data={"email": "boss@boss"})
-        self.assertEqual(
-            form.errors["email"],
-            ["Enter your email address in the required format, like name@example.com."],
-        )
-
-    def test_your_contact_phone_invalid(self):
-        """Must be a valid phone number."""
-        form = YourContactForm(data={"phone": "boss@boss"})
-        self.assertTrue(form.errors["phone"][0].startswith("Enter a valid 10-digit phone number."))
-
     def test_other_contact_email_invalid(self):
         """must be a valid email address."""
         form = OtherContactsForm(data={"email": "splendid@boss"})

From 519c9428434eff7373240cf1a6d8ab7fe14a4b88 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Tue, 10 Sep 2024 17:36:50 -0400
Subject: [PATCH 070/118] made changes to the tests

---
 src/registrar/tests/test_views.py | 108 ++++++++----------------------
 1 file changed, 27 insertions(+), 81 deletions(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 178474866..c2e56c1c5 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -510,6 +510,8 @@ class HomeTests(TestWithUser):
         )
         self.client.force_login(restricted_user)
         response = self.client.get("/request/", follow=True)
+        print('response')
+        print(response)
         self.assertEqual(response.status_code, 403)
         restricted_user.delete()
 
@@ -937,13 +939,6 @@ class UserProfileTests(TestWithUser, WebTest):
             response = self.client.get("/", follow=True)
         self.assertContains(response, "Your profile")
 
-    @less_console_noise_decorator
-    def test_home_page_main_nav_with_profile_feature_off(self):
-        """test that Your profile is not in main nav of home page when profile_feature is off"""
-        with override_flag("profile_feature", active=False):
-            response = self.client.get("/", follow=True)
-        self.assertNotContains(response, "Your profile")
-
     @less_console_noise_decorator
     def test_new_request_main_nav_with_profile_feature_on(self):
         """test that Your profile is in main nav of new request when profile_feature is on"""
@@ -951,27 +946,13 @@ class UserProfileTests(TestWithUser, WebTest):
             response = self.client.get("/request/", follow=True)
         self.assertContains(response, "Your profile")
 
-    @less_console_noise_decorator
-    def test_new_request_main_nav_with_profile_feature_off(self):
-        """test that Your profile is not in main nav of new request when profile_feature is off"""
-        with override_flag("profile_feature", active=False):
-            response = self.client.get("/request/", follow=True)
-        self.assertNotContains(response, "Your profile")
-
     @less_console_noise_decorator
     def test_user_profile_main_nav_with_profile_feature_on(self):
         """test that Your profile is in main nav of user profile when profile_feature is on"""
         with override_flag("profile_feature", active=True):
             response = self.client.get("/user-profile", follow=True)
         self.assertContains(response, "Your profile")
-
-    @less_console_noise_decorator
-    def test_user_profile_returns_404_when_feature_off(self):
-        """test that Your profile returns 404 when profile_feature is off"""
-        with override_flag("profile_feature", active=False):
-            response = self.client.get("/user-profile", follow=True)
-        self.assertEqual(response.status_code, 404)
-
+        
     @less_console_noise_decorator
     def test_user_profile_back_button_when_coming_from_domain_request(self):
         """tests user profile when profile_feature is on,
@@ -983,30 +964,21 @@ class UserProfileTests(TestWithUser, WebTest):
         self.assertNotContains(response, "Back to manage your domains")
 
     @less_console_noise_decorator
-    def test_domain_detail_profile_feature_on(self):
-        """test that domain detail view when profile_feature is on"""
-        with override_flag("profile_feature", active=True):
-            response = self.client.get(reverse("domain", args=[self.domain.pk]))
+    def test_domain_detail(self):
+        """test that domain detail view"""
+        response = self.client.get(reverse("domain", args=[self.domain.pk]))
         self.assertContains(response, "Your profile")
         self.assertNotContains(response, "Your contact information")
 
     @less_console_noise_decorator
-    def test_domain_your_contact_information_when_profile_feature_off(self):
-        """test that Your contact information is accessible when profile_feature is off"""
-        with override_flag("profile_feature", active=False):
-            response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
-        self.assertContains(response, "Your contact information")
-
-    @less_console_noise_decorator
-    def test_domain_your_contact_information_when_profile_feature_on(self):
-        """test that Your contact information is not accessible when profile feature is on"""
-        with override_flag("profile_feature", active=True):
-            response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
+    def test_domain_your_contact_information(self):
+        """test that Your contact information is not accessible """
+        response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
         self.assertEqual(response.status_code, 404)
 
     @less_console_noise_decorator
-    def test_request_when_profile_feature_on(self):
-        """test that Your profile is in request page when profile feature is on"""
+    def test_profile_request_page(self):
+        """test that Your profile is in request"""
 
         contact_user, _ = Contact.objects.get_or_create(
             first_name="Hank",
@@ -1020,53 +992,27 @@ class UserProfileTests(TestWithUser, WebTest):
             senior_official=contact_user,
             submitter=contact_user,
         )
-        with override_flag("profile_feature", active=True):
-            response = self.client.get(f"/domain-request/{domain_request.id}", follow=True)
-            self.assertContains(response, "Your profile")
-            response = self.client.get(f"/domain-request/{domain_request.id}/withdraw", follow=True)
-            self.assertContains(response, "Your profile")
-
-    @less_console_noise_decorator
-    def test_request_when_profile_feature_off(self):
-        """test that Your profile is not in request page when profile feature is off"""
-
-        contact_user, _ = Contact.objects.get_or_create(
-            first_name="Hank",
-            last_name="McFakerson",
-        )
-        site = DraftDomain.objects.create(name="igorville.gov")
-        domain_request = DomainRequest.objects.create(
-            creator=self.user,
-            requested_domain=site,
-            status=DomainRequest.DomainRequestStatus.SUBMITTED,
-            senior_official=contact_user,
-            submitter=contact_user,
-        )
-        with override_flag("profile_feature", active=False):
-            response = self.client.get(f"/domain-request/{domain_request.id}", follow=True)
-            self.assertNotContains(response, "Your profile")
-            response = self.client.get(f"/domain-request/{domain_request.id}/withdraw", follow=True)
-            self.assertNotContains(response, "Your profile")
-        # cleanup
-        domain_request.delete()
-        site.delete()
+    
+        response = self.client.get(f"/domain-request/{domain_request.id}", follow=True)
+        self.assertContains(response, "Your profile")
+        response = self.client.get(f"/domain-request/{domain_request.id}/withdraw", follow=True)
+        self.assertContains(response, "Your profile")
 
     @less_console_noise_decorator
     def test_user_profile_form_submission(self):
         """test user profile form submission"""
         self.app.set_user(self.user.username)
-        with override_flag("profile_feature", active=True):
-            profile_page = self.app.get(reverse("user-profile"))
-            session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
-            self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
-            profile_form = profile_page.form
-            profile_form["title"] = "sample title"
-            profile_form["phone"] = "(201) 555-1212"
-            profile_page = profile_form.submit()
-            self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
-            profile_page = profile_page.follow()
-            self.assertEqual(profile_page.status_code, 200)
-            self.assertContains(profile_page, "Your profile has been updated")
+        profile_page = self.app.get(reverse("user-profile"))
+        session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
+        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+        profile_form = profile_page.form
+        profile_form["title"] = "sample title"
+        profile_form["phone"] = "(201) 555-1212"
+        profile_page = profile_form.submit()
+        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+        profile_page = profile_page.follow()
+        self.assertEqual(profile_page.status_code, 200)
+        self.assertContains(profile_page, "Your profile has been updated")
 
 
 class PortfoliosTests(TestWithUser, WebTest):

From 7242594e04dd013dabc10a5fffbc9a9f110039d9 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 11 Sep 2024 15:40:00 -0400
Subject: [PATCH 071/118] Change fed agency label to org name

---
 src/registrar/templates/portfolio_organization.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html
index 523b036ae..c8d839f9b 100644
--- a/src/registrar/templates/portfolio_organization.html
+++ b/src/registrar/templates/portfolio_organization.html
@@ -25,11 +25,11 @@
 
         <h1>Organization</h1>
 
-        <p>The name of your federal agency will be publicly listed as the domain registrant.</p>
+        <p>The name of your organization will be publicly listed as the domain registrant.</p>
 
         {% if has_edit_org_portfolio_permission %}
             <p>
-                The federal agency for your organization can’t be updated here.
+                Your organization name can’t be updated here.
                 To suggest an update, email <a href="mailto:help@get.gov" class="usa-link">help@get.gov</a>.
             </p>
 
@@ -37,7 +37,7 @@
             {% include "includes/required_fields.html" %}
             <form class="usa-form usa-form--large desktop:margin-top-4" method="post" novalidate>
                 {% csrf_token %}
-                <h4 class="read-only-label">Federal agency</h4>
+                <h4 class="read-only-label">Organization name</h4>
                 <p class="read-only-value">
                     {{ portfolio.federal_agency }}
                 </p>
@@ -53,7 +53,7 @@
                 </button>
             </form>
         {% else %}
-            <h4 class="read-only-label">Federal agency</h4>
+            <h4 class="read-only-label">Organization name</h4>
             <p class="read-only-value">
                 {{ portfolio.federal_agency }}
             </p>

From 91532adc30e328e5f702b4b9827c6ea0dd2daa07 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Wed, 11 Sep 2024 16:36:58 -0400
Subject: [PATCH 072/118] updated to main

---
 src/registrar/templates/domain_request_sidebar.html |  2 +-
 src/registrar/templates/domain_request_status.html  |  5 +++--
 src/registrar/tests/test_views.py                   | 11 +++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/registrar/templates/domain_request_sidebar.html b/src/registrar/templates/domain_request_sidebar.html
index f9ca5397d..fc6ab5b33 100644
--- a/src/registrar/templates/domain_request_sidebar.html
+++ b/src/registrar/templates/domain_request_sidebar.html
@@ -16,7 +16,7 @@
             {% endif %}
           {% endif %}
         <a href="{% namespaced_url 'domain-request' this_step %}" 
-           {% if this_step == steps.current %}
+           {% if this_step = steps.current %}
            class="usa-current"
            {% else %}
            class="link_usa-checked"
diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html
index b6ad3feb6..0f2bbe106 100644
--- a/src/registrar/templates/domain_request_status.html
+++ b/src/registrar/templates/domain_request_status.html
@@ -110,8 +110,9 @@
     {% endif %}
 
     {% if DomainRequest.creator %}
-    {% include "includes/summary_item.html" with title='Your contact information' value=DomainRequest.creator contact='true' heading_level=heading_level %}
-
+      {% include "includes/summary_item.html" with title='Your contact information' value=DomainRequest.creator contact='true' heading_level=heading_level %}
+    {% endif %}
+    
     {% if DomainRequest.other_contacts.all %}
       {% include "includes/summary_item.html" with title='Other employees from your organization' value=DomainRequest.other_contacts.all contact='true' list='true' heading_level=heading_level %}
     {% else %}
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index c2e56c1c5..255cdc54b 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -510,8 +510,6 @@ class HomeTests(TestWithUser):
         )
         self.client.force_login(restricted_user)
         response = self.client.get("/request/", follow=True)
-        print('response')
-        print(response)
         self.assertEqual(response.status_code, 403)
         restricted_user.delete()
 
@@ -772,6 +770,7 @@ class FinishUserProfileTests(TestWithUser, WebTest):
             self.assertContains(completed_setup_page, "You’re about to start your .gov domain request")
         incomplete_regular_user.delete()
 
+
 class FinishUserProfileForOtherUsersTests(TestWithUser, WebTest):
     """A series of tests that target the user profile page intercept for incomplete IAL1 user profiles."""
 
@@ -952,7 +951,7 @@ class UserProfileTests(TestWithUser, WebTest):
         with override_flag("profile_feature", active=True):
             response = self.client.get("/user-profile", follow=True)
         self.assertContains(response, "Your profile")
-        
+
     @less_console_noise_decorator
     def test_user_profile_back_button_when_coming_from_domain_request(self):
         """tests user profile when profile_feature is on,
@@ -972,7 +971,7 @@ class UserProfileTests(TestWithUser, WebTest):
 
     @less_console_noise_decorator
     def test_domain_your_contact_information(self):
-        """test that Your contact information is not accessible """
+        """test that Your contact information is not accessible"""
         response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
         self.assertEqual(response.status_code, 404)
 
@@ -992,7 +991,7 @@ class UserProfileTests(TestWithUser, WebTest):
             senior_official=contact_user,
             submitter=contact_user,
         )
-    
+
         response = self.client.get(f"/domain-request/{domain_request.id}", follow=True)
         self.assertContains(response, "Your profile")
         response = self.client.get(f"/domain-request/{domain_request.id}/withdraw", follow=True)
@@ -1072,4 +1071,4 @@ class PortfoliosTests(TestWithUser, WebTest):
 
             self.assertNotContains(home_page, self.portfolio.organization_name)
 
-            self.assertContains(home_page, 'id="domain-requests-header"')
\ No newline at end of file
+            self.assertContains(home_page, 'id="domain-requests-header"')

From d386e69c9de508f536e5d2cc3b0febbc89031348 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Wed, 11 Sep 2024 16:49:30 -0400
Subject: [PATCH 073/118] closed a tag

---
 src/registrar/templates/domain_request_sidebar.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/registrar/templates/domain_request_sidebar.html b/src/registrar/templates/domain_request_sidebar.html
index fc6ab5b33..bca47bff2 100644
--- a/src/registrar/templates/domain_request_sidebar.html
+++ b/src/registrar/templates/domain_request_sidebar.html
@@ -15,8 +15,8 @@
               </svg>
             {% endif %}
           {% endif %}
-        <a href="{% namespaced_url 'domain-request' this_step %}" 
-           {% if this_step = steps.current %}
+        <a href="{% namespaced_url 'domain-request' this_step %}">
+           {% if this_step == steps.current %}
            class="usa-current"
            {% else %}
            class="link_usa-checked"
@@ -39,4 +39,4 @@
     {% endfor %}
     </ul>
   </nav>
-</div>
+</div>
\ No newline at end of file

From 6c5f566155a58eca953b971242e8eea8072a354c Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 11 Sep 2024 17:01:15 -0400
Subject: [PATCH 074/118] org name compoenents title change, State / territory
 lbel change

---
 ...aininformation_state_territory_and_more.py | 229 ++++++++++++++++++
 src/registrar/models/domain_information.py    |   2 +-
 src/registrar/models/domain_request.py        |   2 +-
 src/registrar/models/portfolio.py             |   2 +-
 src/registrar/templates/domain_detail.html    |   2 +-
 .../templates/domain_org_name_address.html    |   2 +-
 .../templates/domain_request_status.html      |   2 +-
 src/registrar/templates/domain_sidebar.html   |   2 +-
 .../includes/domain_request_summary.txt       |   2 +-
 .../templates/portfolio_organization.html     |   2 +-
 src/registrar/tests/test_views_domain.py      |   2 +-
 src/registrar/views/domain.py                 |   2 +-
 src/registrar/views/domain_request.py         |   2 +-
 13 files changed, 241 insertions(+), 12 deletions(-)
 create mode 100644 src/registrar/migrations/0124_alter_domaininformation_state_territory_and_more.py

diff --git a/src/registrar/migrations/0124_alter_domaininformation_state_territory_and_more.py b/src/registrar/migrations/0124_alter_domaininformation_state_territory_and_more.py
new file mode 100644
index 000000000..62a84d570
--- /dev/null
+++ b/src/registrar/migrations/0124_alter_domaininformation_state_territory_and_more.py
@@ -0,0 +1,229 @@
+# Generated by Django 4.2.10 on 2024-09-11 21:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0123_alter_portfolioinvitation_portfolio_additional_permissions_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="domaininformation",
+            name="state_territory",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("AL", "Alabama (AL)"),
+                    ("AK", "Alaska (AK)"),
+                    ("AS", "American Samoa (AS)"),
+                    ("AZ", "Arizona (AZ)"),
+                    ("AR", "Arkansas (AR)"),
+                    ("CA", "California (CA)"),
+                    ("CO", "Colorado (CO)"),
+                    ("CT", "Connecticut (CT)"),
+                    ("DE", "Delaware (DE)"),
+                    ("DC", "District of Columbia (DC)"),
+                    ("FL", "Florida (FL)"),
+                    ("GA", "Georgia (GA)"),
+                    ("GU", "Guam (GU)"),
+                    ("HI", "Hawaii (HI)"),
+                    ("ID", "Idaho (ID)"),
+                    ("IL", "Illinois (IL)"),
+                    ("IN", "Indiana (IN)"),
+                    ("IA", "Iowa (IA)"),
+                    ("KS", "Kansas (KS)"),
+                    ("KY", "Kentucky (KY)"),
+                    ("LA", "Louisiana (LA)"),
+                    ("ME", "Maine (ME)"),
+                    ("MD", "Maryland (MD)"),
+                    ("MA", "Massachusetts (MA)"),
+                    ("MI", "Michigan (MI)"),
+                    ("MN", "Minnesota (MN)"),
+                    ("MS", "Mississippi (MS)"),
+                    ("MO", "Missouri (MO)"),
+                    ("MT", "Montana (MT)"),
+                    ("NE", "Nebraska (NE)"),
+                    ("NV", "Nevada (NV)"),
+                    ("NH", "New Hampshire (NH)"),
+                    ("NJ", "New Jersey (NJ)"),
+                    ("NM", "New Mexico (NM)"),
+                    ("NY", "New York (NY)"),
+                    ("NC", "North Carolina (NC)"),
+                    ("ND", "North Dakota (ND)"),
+                    ("MP", "Northern Mariana Islands (MP)"),
+                    ("OH", "Ohio (OH)"),
+                    ("OK", "Oklahoma (OK)"),
+                    ("OR", "Oregon (OR)"),
+                    ("PA", "Pennsylvania (PA)"),
+                    ("PR", "Puerto Rico (PR)"),
+                    ("RI", "Rhode Island (RI)"),
+                    ("SC", "South Carolina (SC)"),
+                    ("SD", "South Dakota (SD)"),
+                    ("TN", "Tennessee (TN)"),
+                    ("TX", "Texas (TX)"),
+                    ("UM", "United States Minor Outlying Islands (UM)"),
+                    ("UT", "Utah (UT)"),
+                    ("VT", "Vermont (VT)"),
+                    ("VI", "Virgin Islands (VI)"),
+                    ("VA", "Virginia (VA)"),
+                    ("WA", "Washington (WA)"),
+                    ("WV", "West Virginia (WV)"),
+                    ("WI", "Wisconsin (WI)"),
+                    ("WY", "Wyoming (WY)"),
+                    ("AA", "Armed Forces Americas (AA)"),
+                    ("AE", "Armed Forces Africa, Canada, Europe, Middle East (AE)"),
+                    ("AP", "Armed Forces Pacific (AP)"),
+                ],
+                max_length=2,
+                null=True,
+                verbose_name="state, territory, or military post",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="domainrequest",
+            name="state_territory",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("AL", "Alabama (AL)"),
+                    ("AK", "Alaska (AK)"),
+                    ("AS", "American Samoa (AS)"),
+                    ("AZ", "Arizona (AZ)"),
+                    ("AR", "Arkansas (AR)"),
+                    ("CA", "California (CA)"),
+                    ("CO", "Colorado (CO)"),
+                    ("CT", "Connecticut (CT)"),
+                    ("DE", "Delaware (DE)"),
+                    ("DC", "District of Columbia (DC)"),
+                    ("FL", "Florida (FL)"),
+                    ("GA", "Georgia (GA)"),
+                    ("GU", "Guam (GU)"),
+                    ("HI", "Hawaii (HI)"),
+                    ("ID", "Idaho (ID)"),
+                    ("IL", "Illinois (IL)"),
+                    ("IN", "Indiana (IN)"),
+                    ("IA", "Iowa (IA)"),
+                    ("KS", "Kansas (KS)"),
+                    ("KY", "Kentucky (KY)"),
+                    ("LA", "Louisiana (LA)"),
+                    ("ME", "Maine (ME)"),
+                    ("MD", "Maryland (MD)"),
+                    ("MA", "Massachusetts (MA)"),
+                    ("MI", "Michigan (MI)"),
+                    ("MN", "Minnesota (MN)"),
+                    ("MS", "Mississippi (MS)"),
+                    ("MO", "Missouri (MO)"),
+                    ("MT", "Montana (MT)"),
+                    ("NE", "Nebraska (NE)"),
+                    ("NV", "Nevada (NV)"),
+                    ("NH", "New Hampshire (NH)"),
+                    ("NJ", "New Jersey (NJ)"),
+                    ("NM", "New Mexico (NM)"),
+                    ("NY", "New York (NY)"),
+                    ("NC", "North Carolina (NC)"),
+                    ("ND", "North Dakota (ND)"),
+                    ("MP", "Northern Mariana Islands (MP)"),
+                    ("OH", "Ohio (OH)"),
+                    ("OK", "Oklahoma (OK)"),
+                    ("OR", "Oregon (OR)"),
+                    ("PA", "Pennsylvania (PA)"),
+                    ("PR", "Puerto Rico (PR)"),
+                    ("RI", "Rhode Island (RI)"),
+                    ("SC", "South Carolina (SC)"),
+                    ("SD", "South Dakota (SD)"),
+                    ("TN", "Tennessee (TN)"),
+                    ("TX", "Texas (TX)"),
+                    ("UM", "United States Minor Outlying Islands (UM)"),
+                    ("UT", "Utah (UT)"),
+                    ("VT", "Vermont (VT)"),
+                    ("VI", "Virgin Islands (VI)"),
+                    ("VA", "Virginia (VA)"),
+                    ("WA", "Washington (WA)"),
+                    ("WV", "West Virginia (WV)"),
+                    ("WI", "Wisconsin (WI)"),
+                    ("WY", "Wyoming (WY)"),
+                    ("AA", "Armed Forces Americas (AA)"),
+                    ("AE", "Armed Forces Africa, Canada, Europe, Middle East (AE)"),
+                    ("AP", "Armed Forces Pacific (AP)"),
+                ],
+                max_length=2,
+                null=True,
+                verbose_name="state, territory, or military post",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="portfolio",
+            name="state_territory",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("AL", "Alabama (AL)"),
+                    ("AK", "Alaska (AK)"),
+                    ("AS", "American Samoa (AS)"),
+                    ("AZ", "Arizona (AZ)"),
+                    ("AR", "Arkansas (AR)"),
+                    ("CA", "California (CA)"),
+                    ("CO", "Colorado (CO)"),
+                    ("CT", "Connecticut (CT)"),
+                    ("DE", "Delaware (DE)"),
+                    ("DC", "District of Columbia (DC)"),
+                    ("FL", "Florida (FL)"),
+                    ("GA", "Georgia (GA)"),
+                    ("GU", "Guam (GU)"),
+                    ("HI", "Hawaii (HI)"),
+                    ("ID", "Idaho (ID)"),
+                    ("IL", "Illinois (IL)"),
+                    ("IN", "Indiana (IN)"),
+                    ("IA", "Iowa (IA)"),
+                    ("KS", "Kansas (KS)"),
+                    ("KY", "Kentucky (KY)"),
+                    ("LA", "Louisiana (LA)"),
+                    ("ME", "Maine (ME)"),
+                    ("MD", "Maryland (MD)"),
+                    ("MA", "Massachusetts (MA)"),
+                    ("MI", "Michigan (MI)"),
+                    ("MN", "Minnesota (MN)"),
+                    ("MS", "Mississippi (MS)"),
+                    ("MO", "Missouri (MO)"),
+                    ("MT", "Montana (MT)"),
+                    ("NE", "Nebraska (NE)"),
+                    ("NV", "Nevada (NV)"),
+                    ("NH", "New Hampshire (NH)"),
+                    ("NJ", "New Jersey (NJ)"),
+                    ("NM", "New Mexico (NM)"),
+                    ("NY", "New York (NY)"),
+                    ("NC", "North Carolina (NC)"),
+                    ("ND", "North Dakota (ND)"),
+                    ("MP", "Northern Mariana Islands (MP)"),
+                    ("OH", "Ohio (OH)"),
+                    ("OK", "Oklahoma (OK)"),
+                    ("OR", "Oregon (OR)"),
+                    ("PA", "Pennsylvania (PA)"),
+                    ("PR", "Puerto Rico (PR)"),
+                    ("RI", "Rhode Island (RI)"),
+                    ("SC", "South Carolina (SC)"),
+                    ("SD", "South Dakota (SD)"),
+                    ("TN", "Tennessee (TN)"),
+                    ("TX", "Texas (TX)"),
+                    ("UM", "United States Minor Outlying Islands (UM)"),
+                    ("UT", "Utah (UT)"),
+                    ("VT", "Vermont (VT)"),
+                    ("VI", "Virgin Islands (VI)"),
+                    ("VA", "Virginia (VA)"),
+                    ("WA", "Washington (WA)"),
+                    ("WV", "West Virginia (WV)"),
+                    ("WI", "Wisconsin (WI)"),
+                    ("WY", "Wyoming (WY)"),
+                    ("AA", "Armed Forces Americas (AA)"),
+                    ("AE", "Armed Forces Africa, Canada, Europe, Middle East (AE)"),
+                    ("AP", "Armed Forces Pacific (AP)"),
+                ],
+                max_length=2,
+                null=True,
+                verbose_name="state, territory, or military post",
+            ),
+        ),
+    ]
diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py
index 774dba897..19b1cdba1 100644
--- a/src/registrar/models/domain_information.py
+++ b/src/registrar/models/domain_information.py
@@ -160,7 +160,7 @@ class DomainInformation(TimeStampedModel):
         choices=StateTerritoryChoices.choices,
         null=True,
         blank=True,
-        verbose_name="state / territory",
+        verbose_name="state, territory, or military post",
     )
     zipcode = models.CharField(
         max_length=10,
diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index b80e063cd..091f63dca 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -424,7 +424,7 @@ class DomainRequest(TimeStampedModel):
         choices=StateTerritoryChoices.choices,
         null=True,
         blank=True,
-        verbose_name="state / territory",
+        verbose_name="state, territory, or military post",
     )
     zipcode = models.CharField(
         max_length=10,
diff --git a/src/registrar/models/portfolio.py b/src/registrar/models/portfolio.py
index fadcf8cac..61d4f7a30 100644
--- a/src/registrar/models/portfolio.py
+++ b/src/registrar/models/portfolio.py
@@ -89,7 +89,7 @@ class Portfolio(TimeStampedModel):
         choices=StateTerritoryChoices.choices,
         null=True,
         blank=True,
-        verbose_name="state / territory",
+        verbose_name="state, territory, or military post",
     )
 
     zipcode = models.CharField(
diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html
index d7bc277b3..8e25b1c9f 100644
--- a/src/registrar/templates/domain_detail.html
+++ b/src/registrar/templates/domain_detail.html
@@ -77,7 +77,7 @@
       {% include "includes/summary_item.html" with title='Suborganization' value=domain.domain_info.sub_organization edit_link=url editable=is_editable|and:has_edit_suborganization %}
     {% else %}
       {% url 'domain-org-name-address' pk=domain.id as url %}
-      {% include "includes/summary_item.html" with title='Organization name and mailing address' value=domain.domain_info address='true' edit_link=url editable=is_editable %}
+      {% include "includes/summary_item.html" with title='Organization name' value=domain.domain_info address='true' edit_link=url editable=is_editable %}
 
       {% url 'domain-senior-official' pk=domain.id as url %}
       {% include "includes/summary_item.html" with title='Senior official' value=domain.domain_info.senior_official contact='true' edit_link=url editable=is_editable %}
diff --git a/src/registrar/templates/domain_org_name_address.html b/src/registrar/templates/domain_org_name_address.html
index a7eb02b59..ee586a41d 100644
--- a/src/registrar/templates/domain_org_name_address.html
+++ b/src/registrar/templates/domain_org_name_address.html
@@ -7,7 +7,7 @@
   {# this is right after the messages block in the parent template #}
   {% include "includes/form_errors.html" with form=form %}
 
-  <h1>Organization name and mailing address </h1>
+  <h1>Organization name</h1>
 
   <p>The name of your organization will be publicly listed as the domain registrant.</p>
 
diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html
index 183a8be81..ef5e9db59 100644
--- a/src/registrar/templates/domain_request_status.html
+++ b/src/registrar/templates/domain_request_status.html
@@ -82,7 +82,7 @@
     {% endif %}
 
     {% if DomainRequest.organization_name %}
-      {% include "includes/summary_item.html" with title='Organization name and mailing address' value=DomainRequest  address='true' heading_level=heading_level %}
+      {% include "includes/summary_item.html" with title='Organization name' value=DomainRequest  address='true' heading_level=heading_level %}
     {% endif %}
 
     {% if DomainRequest.about_your_organization %}
diff --git a/src/registrar/templates/domain_sidebar.html b/src/registrar/templates/domain_sidebar.html
index 24f92bf16..b6a46ca31 100644
--- a/src/registrar/templates/domain_sidebar.html
+++ b/src/registrar/templates/domain_sidebar.html
@@ -12,7 +12,7 @@
 
       {% if not portfolio %}
         {% with url_name="domain-org-name-address" %}
-          {% include "includes/domain_sidenav_item.html" with item_text="Organization name and mailing address" %}
+          {% include "includes/domain_sidenav_item.html" with item_text="Organization name" %}
         {% endwith %}
       {% endif %}    
 
diff --git a/src/registrar/templates/emails/includes/domain_request_summary.txt b/src/registrar/templates/emails/includes/domain_request_summary.txt
index 9294420c4..ee8feaa42 100644
--- a/src/registrar/templates/emails/includes/domain_request_summary.txt
+++ b/src/registrar/templates/emails/includes/domain_request_summary.txt
@@ -15,7 +15,7 @@ State-recognized tribe
 Election office:
 {{ domain_request.is_election_board|yesno:"Yes,No,Incomplete" }}
 {% endif %}
-Organization name and mailing address:
+Organization name:
 {% spaceless %}{{ domain_request.federal_agency }}
 {{ domain_request.organization_name }}
 {{ domain_request.address_line1 }}{% if  domain_request.address_line2  %}
diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html
index c8d839f9b..2e6a1f488 100644
--- a/src/registrar/templates/portfolio_organization.html
+++ b/src/registrar/templates/portfolio_organization.html
@@ -1,7 +1,7 @@
 {% extends 'portfolio_base.html' %}
 {% load static field_helpers%}
 
-{% block title %}Organization mailing address | {{ portfolio.name }}{% endblock %}
+{% block title %}Organization name and mailing address | {{ portfolio.name }}{% endblock %}
 
 {% load static %}
 
diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index b096527f9..277d1dc5c 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -1301,7 +1301,7 @@ class TestDomainOrganization(TestDomainOverview):
         """Can load domain's org name and mailing address page."""
         page = self.client.get(reverse("domain-org-name-address", kwargs={"pk": self.domain.id}))
         # once on the sidebar, once in the page title, once as H1
-        self.assertContains(page, "Organization name and mailing address", count=4)
+        self.assertContains(page, "Organization name", count=4)
 
     @less_console_noise_decorator
     def test_domain_org_name_address_content(self):
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 003f8dd0d..3dd02876a 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -206,7 +206,7 @@ class DomainView(DomainBaseView):
 
 
 class DomainOrgNameAddressView(DomainFormBaseView):
-    """Organization name and mailing address view"""
+    """Organization name view"""
 
     model = Domain
     template_name = "domain_org_name_address.html"
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index b691549cd..9bb78bbc2 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -85,7 +85,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         Step.TRIBAL_GOVERNMENT: _("Tribal government"),
         Step.ORGANIZATION_FEDERAL: _("Federal government branch"),
         Step.ORGANIZATION_ELECTION: _("Election office"),
-        Step.ORGANIZATION_CONTACT: _("Organization name and mailing address"),
+        Step.ORGANIZATION_CONTACT: _("Organization name"),
         Step.ABOUT_YOUR_ORGANIZATION: _("About your organization"),
         Step.SENIOR_OFFICIAL: _("Senior official"),
         Step.CURRENT_SITES: _("Current websites"),

From da0487b0f2eac5889cc62e3219c5c8e40be14e2f Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 11 Sep 2024 17:07:11 -0400
Subject: [PATCH 075/118] fix unit tests

---
 src/registrar/tests/test_views_portfolio.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 807c66cf7..993e7ae5e 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -198,7 +198,7 @@ class TestPortfolio(WebTest):
             # Assert the response is a 200
             self.assertEqual(response.status_code, 200)
             # The label for Federal agency will always be a h4
-            self.assertContains(response, '<h4 class="read-only-label">Federal agency</h4>')
+            self.assertContains(response, '<h4 class="read-only-label">Organization name</h4>')
             # The read only label for city will be a h4
             self.assertContains(response, '<h4 class="read-only-label">City</h4>')
             self.assertNotContains(response, 'for="id_city"')
@@ -223,7 +223,7 @@ class TestPortfolio(WebTest):
             # Assert the response is a 200
             self.assertEqual(response.status_code, 200)
             # The label for Federal agency will always be a h4
-            self.assertContains(response, '<h4 class="read-only-label">Federal agency</h4>')
+            self.assertContains(response, '<h4 class="read-only-label">Organization name</h4>')
             # The read only label for city will be a h4
             self.assertNotContains(response, '<h4 class="read-only-label">City</h4>')
             self.assertNotContains(response, '<p class="read-only-value">Los Angeles</p>>')

From 4a5213aeb1aa199ea8b46cb956861e5fce145cbe Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 11 Sep 2024 20:12:12 -0400
Subject: [PATCH 076/118] fix Organization page headers

---
 src/registrar/templates/domain_detail.html                    | 2 +-
 src/registrar/templates/domain_org_name_address.html          | 2 +-
 src/registrar/templates/domain_request_status.html            | 2 +-
 .../templates/emails/includes/domain_request_summary.txt      | 2 +-
 src/registrar/templates/portfolio_organization.html           | 2 +-
 src/registrar/tests/test_views_domain.py                      | 4 ++--
 src/registrar/tests/test_views_portfolio.py                   | 2 +-
 src/registrar/views/domain.py                                 | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html
index 8e25b1c9f..13ed98663 100644
--- a/src/registrar/templates/domain_detail.html
+++ b/src/registrar/templates/domain_detail.html
@@ -77,7 +77,7 @@
       {% include "includes/summary_item.html" with title='Suborganization' value=domain.domain_info.sub_organization edit_link=url editable=is_editable|and:has_edit_suborganization %}
     {% else %}
       {% url 'domain-org-name-address' pk=domain.id as url %}
-      {% include "includes/summary_item.html" with title='Organization name' value=domain.domain_info address='true' edit_link=url editable=is_editable %}
+      {% include "includes/summary_item.html" with title='Organization' value=domain.domain_info address='true' edit_link=url editable=is_editable %}
 
       {% url 'domain-senior-official' pk=domain.id as url %}
       {% include "includes/summary_item.html" with title='Senior official' value=domain.domain_info.senior_official contact='true' edit_link=url editable=is_editable %}
diff --git a/src/registrar/templates/domain_org_name_address.html b/src/registrar/templates/domain_org_name_address.html
index ee586a41d..78baed09e 100644
--- a/src/registrar/templates/domain_org_name_address.html
+++ b/src/registrar/templates/domain_org_name_address.html
@@ -7,7 +7,7 @@
   {# this is right after the messages block in the parent template #}
   {% include "includes/form_errors.html" with form=form %}
 
-  <h1>Organization name</h1>
+  <h1>Organization</h1>
 
   <p>The name of your organization will be publicly listed as the domain registrant.</p>
 
diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html
index ef5e9db59..2e423a6b6 100644
--- a/src/registrar/templates/domain_request_status.html
+++ b/src/registrar/templates/domain_request_status.html
@@ -82,7 +82,7 @@
     {% endif %}
 
     {% if DomainRequest.organization_name %}
-      {% include "includes/summary_item.html" with title='Organization name' value=DomainRequest  address='true' heading_level=heading_level %}
+      {% include "includes/summary_item.html" with title='Organization' value=DomainRequest  address='true' heading_level=heading_level %}
     {% endif %}
 
     {% if DomainRequest.about_your_organization %}
diff --git a/src/registrar/templates/emails/includes/domain_request_summary.txt b/src/registrar/templates/emails/includes/domain_request_summary.txt
index ee8feaa42..c58aef5e1 100644
--- a/src/registrar/templates/emails/includes/domain_request_summary.txt
+++ b/src/registrar/templates/emails/includes/domain_request_summary.txt
@@ -15,7 +15,7 @@ State-recognized tribe
 Election office:
 {{ domain_request.is_election_board|yesno:"Yes,No,Incomplete" }}
 {% endif %}
-Organization name:
+Organization:
 {% spaceless %}{{ domain_request.federal_agency }}
 {{ domain_request.organization_name }}
 {{ domain_request.address_line1 }}{% if  domain_request.address_line2  %}
diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html
index 2e6a1f488..bc3f23d43 100644
--- a/src/registrar/templates/portfolio_organization.html
+++ b/src/registrar/templates/portfolio_organization.html
@@ -37,7 +37,7 @@
             {% include "includes/required_fields.html" %}
             <form class="usa-form usa-form--large desktop:margin-top-4" method="post" novalidate>
                 {% csrf_token %}
-                <h4 class="read-only-label">Organization name</h4>
+                <h4 class="read-only-label">Organization</h4>
                 <p class="read-only-value">
                     {{ portfolio.federal_agency }}
                 </p>
diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index 277d1dc5c..7b4374212 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -1301,7 +1301,7 @@ class TestDomainOrganization(TestDomainOverview):
         """Can load domain's org name and mailing address page."""
         page = self.client.get(reverse("domain-org-name-address", kwargs={"pk": self.domain.id}))
         # once on the sidebar, once in the page title, once as H1
-        self.assertContains(page, "Organization name", count=4)
+        self.assertContains(page, "Organization", count=4)
 
     @less_console_noise_decorator
     def test_domain_org_name_address_content(self):
@@ -1610,7 +1610,7 @@ class TestDomainSuborganization(TestDomainOverview):
 
         # Test for the title change
         self.assertContains(page, "Suborganization")
-        self.assertNotContains(page, "Organization name")
+        self.assertNotContains(page, "Organization")
 
         # Test for the good value
         self.assertContains(page, "Ice Cream")
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 993e7ae5e..976ca2c46 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -226,7 +226,7 @@ class TestPortfolio(WebTest):
             self.assertContains(response, '<h4 class="read-only-label">Organization name</h4>')
             # The read only label for city will be a h4
             self.assertNotContains(response, '<h4 class="read-only-label">City</h4>')
-            self.assertNotContains(response, '<p class="read-only-value">Los Angeles</p>>')
+            self.assertNotContains(response, '<p class="read-only-value">Los Angeles</p>')
             self.assertContains(response, 'for="id_city"')
 
     @less_console_noise_decorator
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 3dd02876a..f6a2ef4a9 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -206,7 +206,7 @@ class DomainView(DomainBaseView):
 
 
 class DomainOrgNameAddressView(DomainFormBaseView):
-    """Organization name view"""
+    """Organization view"""
 
     model = Domain
     template_name = "domain_org_name_address.html"

From 71e46c79257479a104e23f9dd0a3ed11ad39ff2c Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 11 Sep 2024 20:17:25 -0400
Subject: [PATCH 077/118] fix Organization sidenav links

---
 src/registrar/templates/domain_sidebar.html | 2 +-
 src/registrar/views/domain_request.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/domain_sidebar.html b/src/registrar/templates/domain_sidebar.html
index b6a46ca31..0942e5751 100644
--- a/src/registrar/templates/domain_sidebar.html
+++ b/src/registrar/templates/domain_sidebar.html
@@ -12,7 +12,7 @@
 
       {% if not portfolio %}
         {% with url_name="domain-org-name-address" %}
-          {% include "includes/domain_sidenav_item.html" with item_text="Organization name" %}
+          {% include "includes/domain_sidenav_item.html" with item_text="Organization" %}
         {% endwith %}
       {% endif %}    
 
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 9bb78bbc2..e681d92cb 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -85,7 +85,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         Step.TRIBAL_GOVERNMENT: _("Tribal government"),
         Step.ORGANIZATION_FEDERAL: _("Federal government branch"),
         Step.ORGANIZATION_ELECTION: _("Election office"),
-        Step.ORGANIZATION_CONTACT: _("Organization name"),
+        Step.ORGANIZATION_CONTACT: _("Organization"),
         Step.ABOUT_YOUR_ORGANIZATION: _("About your organization"),
         Step.SENIOR_OFFICIAL: _("Senior official"),
         Step.CURRENT_SITES: _("Current websites"),

From e16dd2ea93128165657c426347c810ca01b902b0 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Wed, 11 Sep 2024 21:50:58 -0400
Subject: [PATCH 078/118] Fix unit tests

---
 src/registrar/templates/portfolio_organization.html | 2 +-
 src/registrar/tests/test_views_domain.py            | 4 +++-
 src/registrar/tests/test_views_portfolio.py         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/registrar/templates/portfolio_organization.html b/src/registrar/templates/portfolio_organization.html
index bc3f23d43..2e6a1f488 100644
--- a/src/registrar/templates/portfolio_organization.html
+++ b/src/registrar/templates/portfolio_organization.html
@@ -37,7 +37,7 @@
             {% include "includes/required_fields.html" %}
             <form class="usa-form usa-form--large desktop:margin-top-4" method="post" novalidate>
                 {% csrf_token %}
-                <h4 class="read-only-label">Organization</h4>
+                <h4 class="read-only-label">Organization name</h4>
                 <p class="read-only-value">
                     {{ portfolio.federal_agency }}
                 </p>
diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index 7b4374212..10ba808af 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -1301,7 +1301,9 @@ class TestDomainOrganization(TestDomainOverview):
         """Can load domain's org name and mailing address page."""
         page = self.client.get(reverse("domain-org-name-address", kwargs={"pk": self.domain.id}))
         # once on the sidebar, once in the page title, once as H1
-        self.assertContains(page, "Organization", count=4)
+        self.assertContains(page, "Organization</a>")
+        self.assertContains(page, "Organization name and mailing address")
+        self.assertContains(page, "Organization</h1>")
 
     @less_console_noise_decorator
     def test_domain_org_name_address_content(self):
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 976ca2c46..f73b48b30 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -341,7 +341,7 @@ class TestPortfolio(WebTest):
             )
             page = self.app.get(reverse("organization"))
             self.assertContains(
-                page, "The name of your federal agency will be publicly listed as the domain registrant."
+                page, "The name of your organization will be publicly listed as the domain registrant."
             )
 
     @less_console_noise_decorator

From 71a69fa9955e6fa96115decd7f1123714af58cff Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 12 Sep 2024 01:06:26 -0400
Subject: [PATCH 079/118] cleanup

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

diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index 10ba808af..288ddda84 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -1301,7 +1301,7 @@ class TestDomainOrganization(TestDomainOverview):
         """Can load domain's org name and mailing address page."""
         page = self.client.get(reverse("domain-org-name-address", kwargs={"pk": self.domain.id}))
         # once on the sidebar, once in the page title, once as H1
-        self.assertContains(page, "Organization</a>")
+        self.assertContains(page, "Organization </a>")
         self.assertContains(page, "Organization name and mailing address")
         self.assertContains(page, "Organization</h1>")
 

From 0073f3499f5dab8e8f718d3bfba6d09f79e126f3 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 12 Sep 2024 09:54:39 -0600
Subject: [PATCH 080/118] Fix merge conflict

---
 src/registrar/assets/js/get-gov.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 8d0862207..f4dc75728 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -2007,6 +2007,15 @@ document.addEventListener('DOMContentLoaded', function() {
           closeMoreActionMenu(openAccordionButton);
         }
       });
+
+      // Close the filter accordion
+      const openFilterAccordion = document.querySelector('.usa-button--filter[aria-expanded="true"]');
+      const moreFilterAccordion = openFilterAccordion ? openFilterAccordion.closest('.usa-accordion--select') : undefined;
+      if (openFilterAccordion) {
+        if (!moreFilterAccordion.contains(event.target)) {
+          closeFilters();
+        }
+      }
     }
 
     // Initial load

From 46730b07cc331dbc84d95b3077e6d241f8ee89db Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 12 Sep 2024 10:02:12 -0600
Subject: [PATCH 081/118] Add logic to change placeholder text

---
 .../templates/includes/domain_requests_table.html         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html
index e4a61a095..1fa46225a 100644
--- a/src/registrar/templates/includes/domain_requests_table.html
+++ b/src/registrar/templates/includes/domain_requests_table.html
@@ -23,13 +23,21 @@
               </svg>
               Reset
             </button>
+            {% if portfolio %}
             <label class="usa-sr-only" for="domain-requests__search-field">Search by domain name or creator</label>
+            {% else %}
+            <label class="usa-sr-only" for="domain-requests__search-field">Search by domain name</label>
+            {% endif %}
             <input
               class="usa-input"
               id="domain-requests__search-field"
               type="search"
               name="search"
+              {% if portfolio %}
+              placeholder="Search by domain name or creator"
+              {% else %}
               placeholder="Search by domain name"
+              {% endif %}
             />
             <button class="usa-button" type="submit" id="domain-requests__search-field-submit">
               <img

From bfb942a43dab7e76f082b1697541b75027a2ce1f Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Thu, 12 Sep 2024 14:57:52 -0400
Subject: [PATCH 082/118] table ajax refactor

---
 src/registrar/assets/js/get-gov.js | 674 +++++++++++++++--------------
 1 file changed, 361 insertions(+), 313 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index f4dc75728..92ae303e6 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -994,184 +994,370 @@ function unloadModals() {
   window.modal.off();
 }
 
-/**
+class LoadTableBase {
+  constructor(tableSelector, tableWrapper, searchFieldId, searchSubmitId, resetSearchBtn, resetFiltersBtn, noDataDisplay, noSearchresultsDisplay) {
+    this.domainsWrapper = document.querySelector(tableWrapper);
+    this.tableHeaders = document.querySelectorAll(`${tableSelector} th[data-sortable]`);
+    this.currentSortBy = 'id';
+    this.currentOrder = 'asc';
+    this.currentStatus = [];
+    this.currentSearchTerm = '';
+    this.scrollToTable = false;
+    this.domainsSearchInput = document.querySelector(searchFieldId);
+    this.domainsSearchSubmit = document.querySelector(searchSubmitId);
+    this.tableAnnouncementRegion = document.querySelector(`${tableWrapper} .usa-table__announcement-region`);
+    this.resetSearchButton = document.querySelector(resetSearchBtn);
+    this.resetFiltersButton = document.querySelector(resetFiltersBtn);
+    // NOTE: these 3 can't be used if filters are active on a page with more than 1 table
+    this.statusCheckboxes = document.querySelectorAll('input[name="filter-status"]');
+    this.statusIndicator = document.querySelector('.filter-indicator');
+    this.statusToggle = document.querySelector('.usa-button--filter');
+    this.noDomainsWrapper = document.querySelector(noDataDisplay);
+    this.noSearchResultsWrapper = document.querySelector(noSearchresultsDisplay);
+    this.portfolioElement = document.getElementById('portfolio-js-value');
+    this.portfolioValue = this.portfolioElement ? this.portfolioElement.getAttribute('data-portfolio') : null;
+    this.initializetableHeaders();
+    this.initializeSearchHandler();
+    this.initializeStatusToggleHandler();
+    this.initializeFilterCheckboxes();
+    this.initializeResetSearchButton();
+    this.initializeResetFiltersButton();
+    this.initializeAccordionAccessibilityListeners();
+  }
+
+  /**
  * Generalized function to update pagination for a list.
  * @param {string} itemName - The name displayed in the counter
  * @param {string} paginationSelector - CSS selector for the pagination container.
  * @param {string} counterSelector - CSS selector for the pagination counter.
- * @param {string} linkAnchor - CSS selector for the header element to anchor the links to.
- * @param {Function} loadPageFunction - Function to call when a page link is clicked.
+ * @param {string} tableSelector - CSS selector for the header element to anchor the links to.
  * @param {number} currentPage - The current page number (starting with 1).
  * @param {number} numPages - The total number of pages.
  * @param {boolean} hasPrevious - Whether there is a page before the current page.
  * @param {boolean} hasNext - Whether there is a page after the current page.
- * @param {number} totalItems - The total number of items.
- * @param {string} searchTerm - The search term
- */
-function updatePagination(itemName, paginationSelector, counterSelector, linkAnchor, loadPageFunction, currentPage, numPages, hasPrevious, hasNext, totalItems, searchTerm) {
-  const paginationContainer = document.querySelector(paginationSelector);
-  const paginationCounter = document.querySelector(counterSelector);
-  const paginationButtons = document.querySelector(`${paginationSelector} .usa-pagination__list`);
-  paginationCounter.innerHTML = '';
-  paginationButtons.innerHTML = '';
+ * @param {number} total - The total number of items.
+ */  
+  updatePagination(
+    itemName,
+    paginationSelector,
+    counterSelector,
+    tableSelector,
+    currentPage,
+    numPages,
+    hasPrevious,
+    hasNext,
+    totalItems,
+  ) {
+    const paginationButtons = document.querySelector(`${paginationSelector} .usa-pagination__list`);
+    const counterSelectorEl = document.querySelector(counterSelector);
+    const paginationSelectorEl = document.querySelector(paginationSelector);
+    counterSelectorEl.innerHTML = '';
+    paginationButtons.innerHTML = '';
 
-  // Buttons should only be displayed if there are more than one pages of results
-  paginationButtons.classList.toggle('display-none', numPages <= 1);
+    // Buttons should only be displayed if there are more than one pages of results
+    paginationButtons.classList.toggle('display-none', numPages <= 1);
 
-  // Counter should only be displayed if there is more than 1 item
-  paginationContainer.classList.toggle('display-none', totalItems < 1);
+    // Counter should only be displayed if there is more than 1 item
+    paginationSelectorEl.classList.toggle('display-none', totalItems < 1);
 
-  paginationCounter.innerHTML = `${totalItems} ${itemName}${totalItems > 1 ? 's' : ''}${searchTerm ? ' for ' + '"' + searchTerm + '"' : ''}`;
+    counterSelectorEl.innerHTML = `${totalItems} ${itemName}${totalItems > 1 ? 's' : ''}${this.currentSearchTerm ? ' for ' + '"' + this.currentSearchTerm + '"' : ''}`;
 
-  if (hasPrevious) {
-    const prevPageItem = document.createElement('li');
-    prevPageItem.className = 'usa-pagination__item usa-pagination__arrow';
-    prevPageItem.innerHTML = `
-      <a href="${linkAnchor}" class="usa-pagination__link usa-pagination__previous-page" aria-label="Previous page">
-        <svg class="usa-icon" aria-hidden="true" role="img">
-          <use xlink:href="/public/img/sprite.svg#navigate_before"></use>
-        </svg>
-        <span class="usa-pagination__link-text">Previous</span>
-      </a>
-    `;
-    prevPageItem.querySelector('a').addEventListener('click', (event) => {
-      event.preventDefault();
-      loadPageFunction(currentPage - 1);
-    });
-    paginationButtons.appendChild(prevPageItem);
-  }
-
-  // Helper function to create a page item
-  function createPageItem(page) {
-    const pageItem = document.createElement('li');
-    pageItem.className = 'usa-pagination__item usa-pagination__page-no';
-    pageItem.innerHTML = `
-      <a href="${linkAnchor}" class="usa-pagination__button" aria-label="Page ${page}">${page}</a>
-    `;
-    if (page === currentPage) {
-      pageItem.querySelector('a').classList.add('usa-current');
-      pageItem.querySelector('a').setAttribute('aria-current', 'page');
+    if (hasPrevious) {
+      const prevPageItem = document.createElement('li');
+      prevPageItem.className = 'usa-pagination__item usa-pagination__arrow';
+      prevPageItem.innerHTML = `
+        <a href="${tableSelector}" class="usa-pagination__link usa-pagination__previous-page" aria-label="Previous page">
+          <svg class="usa-icon" aria-hidden="true" role="img">
+            <use xlink:href="/public/img/sprite.svg#navigate_before"></use>
+          </svg>
+          <span class="usa-pagination__link-text">Previous</span>
+        </a>
+      `;
+      prevPageItem.querySelector('a').addEventListener('click', (event) => {
+        event.preventDefault();
+        this.loadTable(currentPage - 1);
+      });
+      paginationButtons.appendChild(prevPageItem);
     }
-    pageItem.querySelector('a').addEventListener('click', (event) => {
-      event.preventDefault();
-      loadPageFunction(page);
-    });
-    return pageItem;
-  }
 
-  // Add first page and ellipsis if necessary
-  if (currentPage > 2) {
-    paginationButtons.appendChild(createPageItem(1));
-    if (currentPage > 3) {
-      const ellipsis = document.createElement('li');
-      ellipsis.className = 'usa-pagination__item usa-pagination__overflow';
-      ellipsis.setAttribute('aria-label', 'ellipsis indicating non-visible pages');
-      ellipsis.innerHTML = '<span>…</span>';
-      paginationButtons.appendChild(ellipsis);
+    // Helper function to create a page item
+    function createPageItem(page) {
+      const pageItem = document.createElement('li');
+      pageItem.className = 'usa-pagination__item usa-pagination__page-no';
+      pageItem.innerHTML = `
+        <a href="${tableSelector}" class="usa-pagination__button" aria-label="Page ${page}">${page}</a>
+      `;
+      if (page === currentPage) {
+        pageItem.querySelector('a').classList.add('usa-current');
+        pageItem.querySelector('a').setAttribute('aria-current', 'page');
+      }
+      pageItem.querySelector('a').addEventListener('click', (event) => {
+        event.preventDefault();
+        this.loadTable(page);
+      });
+      return pageItem;
+    }
+
+    // Add first page and ellipsis if necessary
+    if (currentPage > 2) {
+      paginationButtons.appendChild(createPageItem(1));
+      if (currentPage > 3) {
+        const ellipsis = document.createElement('li');
+        ellipsis.className = 'usa-pagination__item usa-pagination__overflow';
+        ellipsis.setAttribute('aria-label', 'ellipsis indicating non-visible pages');
+        ellipsis.innerHTML = '<span>…</span>';
+        paginationButtons.appendChild(ellipsis);
+      }
+    }
+
+    // Add pages around the current page
+    for (let i = Math.max(1, currentPage - 1); i <= Math.min(numPages, currentPage + 1); i++) {
+      paginationButtons.appendChild(createPageItem(i));
+    }
+
+    // Add last page and ellipsis if necessary
+    if (currentPage < numPages - 1) {
+      if (currentPage < numPages - 2) {
+        const ellipsis = document.createElement('li');
+        ellipsis.className = 'usa-pagination__item usa-pagination__overflow';
+        ellipsis.setAttribute('aria-label', 'ellipsis indicating non-visible pages');
+        ellipsis.innerHTML = '<span>…</span>';
+        paginationButtons.appendChild(ellipsis);
+      }
+      paginationButtons.appendChild(createPageItem(numPages));
+    }
+
+    if (hasNext) {
+      const nextPageItem = document.createElement('li');
+      nextPageItem.className = 'usa-pagination__item usa-pagination__arrow';
+      nextPageItem.innerHTML = `
+        <a href="${tableSelector}" class="usa-pagination__link usa-pagination__next-page" aria-label="Next page">
+          <span class="usa-pagination__link-text">Next</span>
+          <svg class="usa-icon" aria-hidden="true" role="img">
+            <use xlink:href="/public/img/sprite.svg#navigate_next"></use>
+          </svg>
+        </a>
+      `;
+      nextPageItem.querySelector('a').addEventListener('click', (event) => {
+        event.preventDefault();
+        this.loadTable(currentPage + 1);
+      });
+      paginationButtons.appendChild(nextPageItem);
     }
   }
 
-  // Add pages around the current page
-  for (let i = Math.max(1, currentPage - 1); i <= Math.min(numPages, currentPage + 1); i++) {
-    paginationButtons.appendChild(createPageItem(i));
-  }
-
-  // Add last page and ellipsis if necessary
-  if (currentPage < numPages - 1) {
-    if (currentPage < numPages - 2) {
-      const ellipsis = document.createElement('li');
-      ellipsis.className = 'usa-pagination__item usa-pagination__overflow';
-      ellipsis.setAttribute('aria-label', 'ellipsis indicating non-visible pages');
-      ellipsis.innerHTML = '<span>…</span>';
-      paginationButtons.appendChild(ellipsis);
+  /**
+   * A helper that toggles content/ no content/ no search results
+   *
+  */
+  updateDisplay = (data, dataWrapper, noDataWrapper, noSearchResultsWrapper) => {
+    const { unfiltered_total, total } = data;
+    if (unfiltered_total) {
+      if (total) {
+        showElement(dataWrapper);
+        hideElement(noSearchResultsWrapper);
+        hideElement(noDataWrapper);
+      } else {
+        hideElement(dataWrapper);
+        showElement(noSearchResultsWrapper);
+        hideElement(noDataWrapper);
+      }
+    } else {
+      hideElement(dataWrapper);
+      hideElement(noSearchResultsWrapper);
+      showElement(noDataWrapper);
     }
-    paginationButtons.appendChild(createPageItem(numPages));
+  };
+
+  /**
+   * A helper that resets sortable table headers
+   *
+  */
+  unsetHeader = (header) => {
+    header.removeAttribute('aria-sort');
+    let headerName = header.innerText;
+    const headerLabel = `${headerName}, sortable column, currently unsorted"`;
+    const headerButtonLabel = `Click to sort by ascending order.`;
+    header.setAttribute("aria-label", headerLabel);
+    header.querySelector('.usa-table__header__button').setAttribute("title", headerButtonLabel);
+  };
+
+  // Abstract method (to be implemented in the child class)
+  loadTable(page, sortBy, order) {
+    throw new Error('loadData() must be implemented in a subclass');
   }
 
-  if (hasNext) {
-    const nextPageItem = document.createElement('li');
-    nextPageItem.className = 'usa-pagination__item usa-pagination__arrow';
-    nextPageItem.innerHTML = `
-      <a href="${linkAnchor}" class="usa-pagination__link usa-pagination__next-page" aria-label="Next page">
-        <span class="usa-pagination__link-text">Next</span>
-        <svg class="usa-icon" aria-hidden="true" role="img">
-          <use xlink:href="/public/img/sprite.svg#navigate_next"></use>
-        </svg>
-      </a>
-    `;
-    nextPageItem.querySelector('a').addEventListener('click', (event) => {
-      event.preventDefault();
-      loadPageFunction(currentPage + 1);
+  // Add event listeners to table headers for sorting
+  initializetableHeaders() {
+    this.tableHeaders.forEach(header => {
+      header.addEventListener('click', () => {
+        const sortBy = header.getAttribute('data-sortable');
+        let order = 'asc';
+        // sort order will be ascending, unless the currently sorted column is ascending, and the user
+        // is selecting the same column to sort in descending order
+        if (sortBy === this.currentSortBy) {
+          order = this.currentOrder === 'asc' ? 'desc' : 'asc';
+        }
+        // load the results with the updated sort
+        this.loadTable(1, sortBy, order);
+      });
+    });
+  }
+
+  initializeSearchHandler() {
+    this.domainsSearchSubmit.addEventListener('click', (e) => {
+      e.preventDefault();
+      this.currentSearchTerm = this.domainsSearchInput.value;
+      // If the search is blank, we match the resetSearch functionality
+      if (this.currentSearchTerm) {
+        showElement(this.resetSearchButton);
+      } else {
+        hideElement(this.resetSearchButton);
+      }
+      this.loadTable(1, 'id', 'asc');
+      this.resetHeaders();
+    });
+  }
+
+  initializeStatusToggleHandler() {
+    if (this.statusToggle) {
+      this.statusToggle.addEventListener('click', () => {
+        toggleCaret(this.statusToggle);
+      });
+    }
+  }
+
+  // Add event listeners to status filter checkboxes
+  initializeFilterCheckboxes() {
+    this.statusCheckboxes.forEach(checkbox => {
+      checkbox.addEventListener('change', () => {
+        const checkboxValue = checkbox.value;
+        
+        // Update currentStatus array based on checkbox state
+        if (checkbox.checked) {
+          this.currentStatus.push(checkboxValue);
+        } else {
+          const index = this.currentStatus.indexOf(checkboxValue);
+          if (index > -1) {
+            this.currentStatus.splice(index, 1);
+          }
+        }
+
+        // Manage visibility of reset filters button
+        if (this.currentStatus.length == 0) {
+          hideElement(this.resetFiltersButton);
+        } else {
+          showElement(this.resetFiltersButton);
+        }
+
+        // Disable the auto scroll
+        this.scrollToTable = false;
+
+        // Call loadTable with updated status
+        this.loadTable(1, 'id', 'asc');
+        this.resetHeaders();
+        this.updateStatusIndicator();
+      });
+    });
+  }
+
+  // Reset UI and accessibility
+  resetHeaders() {
+    this.tableHeaders.forEach(header => {
+      // Unset sort UI in headers
+      this.unsetHeader(header);
+    });
+    // Reset the announcement region
+    this.tableAnnouncementRegion.innerHTML = '';
+  }
+
+  resetSearch() {
+    this.domainsSearchInput.value = '';
+    this.currentSearchTerm = '';
+    hideElement(this.resetSearchButton);
+    this.loadTable(1, 'id', 'asc');
+    this.resetHeaders();
+  }
+
+  initializeResetSearchButton() {
+    if (this.resetSearchButton) {
+      this.resetSearchButton.addEventListener('click', () => {
+        this.resetSearch();
+      });
+    }
+  }
+
+  resetFilters() {
+    this.currentStatus = [];
+    this.statusCheckboxes.forEach(checkbox => {
+      checkbox.checked = false; 
+    });
+    hideElement(this.resetFiltersButton);
+
+    // Disable the auto scroll
+    this.scrollToTable = false;
+
+    this.loadTable(1, 'id', 'asc');
+    this.resetHeaders();
+    this.updateStatusIndicator();
+    // No need to toggle close the filters. The focus shift will trigger that for us.
+  }
+
+  initializeResetFiltersButton() {
+    if (this.resetFiltersButton) {
+      this.resetFiltersButton.addEventListener('click', () => {
+        this.resetFilters();
+      });
+    }
+  }
+
+  updateStatusIndicator() {
+    this.statusIndicator.innerHTML = '';
+    // Even if the element is empty, it'll mess up the flex layout unless we set display none
+    hideElement(this.statusIndicator);
+    if (this.currentStatus.length)
+      this.statusIndicator.innerHTML = '(' + this.currentStatus.length + ')';
+      showElement(this.statusIndicator);
+  }
+
+  closeFilters() {
+    if (this.statusToggle.getAttribute("aria-expanded") === "true") {
+      this.statusToggle.click();
+    }
+  }
+
+  initializeAccordionAccessibilityListeners() {
+    // Instead of managing the toggle/close on the filter buttons in all edge cases (user clicks on search, user clicks on ANOTHER filter,
+    // user clicks on main nav...) we add a listener and close the filters whenever the focus shifts out of the dropdown menu/filter button.
+    // NOTE: We may need to evolve this as we add more filters.
+    document.addEventListener('focusin', (event) => {
+      const accordion = document.querySelector('.usa-accordion--select');
+      const accordionThatIsOpen = document.querySelector('.usa-button--filter[aria-expanded="true"]');
+      
+      if (accordionThatIsOpen && !accordion.contains(event.target)) {
+        this.closeFilters();
+      }
+    });
+
+    // Close when user clicks outside
+    // NOTE: We may need to evolve this as we add more filters.
+    document.addEventListener('click', (event) => {
+      const accordion = document.querySelector('.usa-accordion--select');
+      const accordionThatIsOpen = document.querySelector('.usa-button--filter[aria-expanded="true"]');
+    
+      if (accordionThatIsOpen && !accordion.contains(event.target)) {
+        this.closeFilters();
+      }
     });
-    paginationButtons.appendChild(nextPageItem);
   }
 }
 
-/**
- * A helper that toggles content/ no content/ no search results
- *
-*/
-const updateDisplay = (data, dataWrapper, noDataWrapper, noSearchResultsWrapper) => {
-  const { unfiltered_total, total } = data;
-  if (unfiltered_total) {
-    if (total) {
-      showElement(dataWrapper);
-      hideElement(noSearchResultsWrapper);
-      hideElement(noDataWrapper);
-    } else {
-      hideElement(dataWrapper);
-      showElement(noSearchResultsWrapper);
-      hideElement(noDataWrapper);
-    }
-  } else {
-    hideElement(dataWrapper);
-    hideElement(noSearchResultsWrapper);
-    showElement(noDataWrapper);
+class DomainsTable extends LoadTableBase {
+
+  constructor() {
+    super('.domains__table', '.domains__table-wrapper', '#domains__search-field', '#domains__search-field-submit', '.domains__reset-search', '.domains__reset-filters', '.domains__no-data', '.domains__no-search-results');
   }
-};
-
-/**
- * A helper that resets sortable table headers
- *
-*/
-const unsetHeader = (header) => {
-  header.removeAttribute('aria-sort');
-  let headerName = header.innerText;
-  const headerLabel = `${headerName}, sortable column, currently unsorted"`;
-  const headerButtonLabel = `Click to sort by ascending order.`;
-  header.setAttribute("aria-label", headerLabel);
-  header.querySelector('.usa-table__header__button').setAttribute("title", headerButtonLabel);
-};
-
-/**
- * An IIFE that listens for DOM Content to be loaded, then executes.  This function
- * initializes the domains list and associated functionality on the home page of the app.
- *
- */
-document.addEventListener('DOMContentLoaded', function() {
-  const domainsWrapper = document.querySelector('.domains__table-wrapper');
-
-  if (domainsWrapper) {
-    let currentSortBy = 'id';
-    let currentOrder = 'asc';
-    const noDomainsWrapper = document.querySelector('.domains__no-data');
-    const noSearchResultsWrapper = document.querySelector('.domains__no-search-results');
-    let scrollToTable = false;
-    let currentStatus = [];
-    let currentSearchTerm = '';
-    const domainsSearchInput = document.getElementById('domains__search-field');
-    const domainsSearchSubmit = document.getElementById('domains__search-field-submit');
-    const tableHeaders = document.querySelectorAll('.domains__table th[data-sortable]');
-    const tableAnnouncementRegion = document.querySelector('.domains__table-wrapper  .usa-table__announcement-region');
-    const resetSearchButton = document.querySelector('.domains__reset-search');
-    const resetFiltersButton = document.querySelector('.domains__reset-filters');
-    const statusCheckboxes = document.querySelectorAll('input[name="filter-status"]');
-    const statusIndicator = document.querySelector('.filter-indicator');
-    const statusToggle = document.querySelector('.usa-button--filter');
-    const portfolioElement = document.getElementById('portfolio-js-value');
-    const portfolioValue = portfolioElement ? portfolioElement.getAttribute('data-portfolio') : null;
-
-    /**
+  /**
      * Loads rows in the domains list, as well as updates pagination around the domains list
      * based on the supplied attributes.
      * @param {*} page - the page number of the results (starts with 1)
@@ -1182,7 +1368,8 @@ document.addEventListener('DOMContentLoaded', function() {
      * @param {*} searchTerm - the search term
      * @param {*} portfolio - the portfolio id
      */
-    function loadDomains(page, sortBy = currentSortBy, order = currentOrder, scroll = scrollToTable, status = currentStatus, searchTerm = currentSearchTerm, portfolio = portfolioValue) {
+  loadTable(page, sortBy = this.currentSortBy, order = this.currentOrder, scroll = this.scrollToTable, status = this.currentStatus, searchTerm =this.currentSearchTerm, portfolio = this.portfolioValue) {
+
       // fetch json of page of domais, given params
       let baseUrl = document.getElementById("get_domains_json_url");
       if (!baseUrl) {
@@ -1217,7 +1404,7 @@ document.addEventListener('DOMContentLoaded', function() {
           }
 
           // handle the display of proper messaging in the event that no domains exist in the list or search returns no results
-          updateDisplay(data, domainsWrapper, noDomainsWrapper, noSearchResultsWrapper, currentSearchTerm);
+          this.updateDisplay(data, this.domainsWrapper, this.noDomainsWrapper, this.noSearchResultsWrapper, this.currentSearchTerm);
 
           // identify the DOM element where the domain list will be inserted into the DOM
           const domainList = document.querySelector('.domains__table tbody');
@@ -1235,7 +1422,7 @@ document.addEventListener('DOMContentLoaded', function() {
 
             let markupForSuborganizationRow = '';
 
-            if (portfolioValue) {
+            if (this.portfolioValue) {
               markupForSuborganizationRow = `
                 <td>
                     <span class="text-wrap" aria-label="${domain.suborganization ? suborganization : 'No suborganization'}">${suborganization}</span>
@@ -1281,181 +1468,42 @@ document.addEventListener('DOMContentLoaded', function() {
           // Do not scroll on first page load
           if (scroll)
             ScrollToElement('class', 'domains');
-          scrollToTable = true;
+          this.scrollToTable = true;
 
           // update pagination
-          updatePagination(
+          this.updatePagination(
             'domain',
             '#domains-pagination',
             '#domains-pagination .usa-pagination__counter',
             '#domains',
-            loadDomains,
             data.page,
             data.num_pages,
             data.has_previous,
             data.has_next,
             data.total,
-            currentSearchTerm
           );
-          currentSortBy = sortBy;
-          currentOrder = order;
-          currentSearchTerm = searchTerm;
+          this.currentSortBy = sortBy;
+          this.currentOrder = order;
+          this.currentSearchTerm = searchTerm;
         })
         .catch(error => console.error('Error fetching domains:', error));
-    }
+  }
+}
 
-    // Add event listeners to table headers for sorting
-    tableHeaders.forEach(header => {
-      header.addEventListener('click', function() {
-        const sortBy = this.getAttribute('data-sortable');
-        let order = 'asc';
-        // sort order will be ascending, unless the currently sorted column is ascending, and the user
-        // is selecting the same column to sort in descending order
-        if (sortBy === currentSortBy) {
-          order = currentOrder === 'asc' ? 'desc' : 'asc';
-        }
-        // load the results with the updated sort
-        loadDomains(1, sortBy, order);
-      });
-    });
 
-    domainsSearchSubmit.addEventListener('click', function(e) {
-      e.preventDefault();
-      currentSearchTerm = domainsSearchInput.value;
-      // If the search is blank, we match the resetSearch functionality
-      if (currentSearchTerm) {
-        showElement(resetSearchButton);
-      } else {
-        hideElement(resetSearchButton);
-      }
-      loadDomains(1, 'id', 'asc');
-      resetHeaders();
-    });
+/**
+ * An IIFE that listens for DOM Content to be loaded, then executes.  This function
+ * initializes the domains list and associated functionality on the home page of the app.
+ *
+ */
+document.addEventListener('DOMContentLoaded', function() {
+  const domainsTable = new DomainsTable();
 
-    if (statusToggle) {
-      statusToggle.addEventListener('click', function() {
-        toggleCaret(statusToggle);
-      });
-    }
-
-    // Add event listeners to status filter checkboxes
-    statusCheckboxes.forEach(checkbox => {
-      checkbox.addEventListener('change', function() {
-        const checkboxValue = this.value;
-        
-        // Update currentStatus array based on checkbox state
-        if (this.checked) {
-          currentStatus.push(checkboxValue);
-        } else {
-          const index = currentStatus.indexOf(checkboxValue);
-          if (index > -1) {
-            currentStatus.splice(index, 1);
-          }
-        }
-
-        // Manage visibility of reset filters button
-        if (currentStatus.length == 0) {
-          hideElement(resetFiltersButton);
-        } else {
-          showElement(resetFiltersButton);
-        }
-
-        // Disable the auto scroll
-        scrollToTable = false;
-
-        // Call loadDomains with updated status
-        loadDomains(1, 'id', 'asc');
-        resetHeaders();
-        updateStatusIndicator();
-      });
-    });
-
-    // Reset UI and accessibility
-    function resetHeaders() {
-      tableHeaders.forEach(header => {
-        // Unset sort UI in headers
-        unsetHeader(header);
-      });
-      // Reset the announcement region
-      tableAnnouncementRegion.innerHTML = '';
-    }
-
-    function resetSearch() {
-      domainsSearchInput.value = '';
-      currentSearchTerm = '';
-      hideElement(resetSearchButton);
-      loadDomains(1, 'id', 'asc');
-      resetHeaders();
-    }
-
-    if (resetSearchButton) {
-      resetSearchButton.addEventListener('click', function() {
-        resetSearch();
-      });
-    }
-
-    function resetFilters() {
-      currentStatus = [];
-      statusCheckboxes.forEach(checkbox => {
-        checkbox.checked = false; 
-      });
-      hideElement(resetFiltersButton);
-
-      // Disable the auto scroll
-      scrollToTable = false;
-
-      loadDomains(1, 'id', 'asc');
-      resetHeaders();
-      updateStatusIndicator();
-      // No need to toggle close the filters. The focus shift will trigger that for us.
-    }
-
-    if (resetFiltersButton) {
-      resetFiltersButton.addEventListener('click', function() {
-        resetFilters();
-      });
-    }
-
-    function updateStatusIndicator() {
-      statusIndicator.innerHTML = '';
-      // Even if the element is empty, it'll mess up the flex layout unless we set display none
-      hideElement(statusIndicator);
-      if (currentStatus.length)
-        statusIndicator.innerHTML = '(' + currentStatus.length + ')';
-        showElement(statusIndicator);
-    }
-
-    function closeFilters() {
-      if (statusToggle.getAttribute("aria-expanded") === "true") {
-        statusToggle.click();
-      }
-    }
-
-    // Instead of managing the toggle/close on the filter buttons in all edge cases (user clicks on search, user clicks on ANOTHER filter,
-    // user clicks on main nav...) we add a listener and close the filters whenever the focus shifts out of the dropdown menu/filter button.
-    // NOTE: We may need to evolve this as we add more filters.
-    document.addEventListener('focusin', function(event) {
-      const accordion = document.querySelector('.usa-accordion--select');
-      const accordionThatIsOpen = document.querySelector('.usa-button--filter[aria-expanded="true"]');
-      
-      if (accordionThatIsOpen && !accordion.contains(event.target)) {
-        closeFilters();
-      }
-    });
-
-    // Close when user clicks outside
-    // NOTE: We may need to evolve this as we add more filters.
-    document.addEventListener('click', function(event) {
-      const accordion = document.querySelector('.usa-accordion--select');
-      const accordionThatIsOpen = document.querySelector('.usa-button--filter[aria-expanded="true"]');
-    
-      if (accordionThatIsOpen && !accordion.contains(event.target)) {
-        closeFilters();
-      }
-    });
+ 
+  if (domainsTable.domainsWrapper) {
 
     // Initial load
-    loadDomains(1);
+    domainsTable.loadTable(1);
   }
 });
 
@@ -1915,7 +1963,7 @@ document.addEventListener('DOMContentLoaded', function() {
         // Disable the auto scroll
         scrollToTable = false;
 
-        // Call loadDomains with updated status
+        // Call loadTable with updated status
         loadDomainRequests(1, 'id', 'asc');
         resetHeaders();
         updateStatusIndicator();

From 0126d6e81f0c734011b00c7b11315f75f810f173 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 12 Sep 2024 14:09:33 -0600
Subject: [PATCH 083/118] refactor domain requests

---
 src/registrar/assets/js/get-gov.js            | 990 ++++++++----------
 .../includes/domain_requests_table.html       |   2 +-
 2 files changed, 424 insertions(+), 568 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 92ae303e6..0a4d28577 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -33,6 +33,14 @@ const showElement = (element) => {
   element.classList.remove('display-none');
 };
 
+/**
+ * Helper function to get the CSRF token from the cookie
+ *
+*/
+function getCsrfToken() {
+  return document.querySelector('input[name="csrfmiddlewaretoken"]').value;
+}
+
 /**
  * Helper function that scrolls to an element
  * @param {string} attributeName - The string "class" or "id"
@@ -995,28 +1003,28 @@ function unloadModals() {
 }
 
 class LoadTableBase {
-  constructor(tableSelector, tableWrapper, searchFieldId, searchSubmitId, resetSearchBtn, resetFiltersBtn, noDataDisplay, noSearchresultsDisplay) {
-    this.domainsWrapper = document.querySelector(tableWrapper);
+  constructor(tableSelector, tableWrapperSelector, searchFieldId, searchSubmitId, resetSearchBtn, resetFiltersBtn, noDataDisplay, noSearchresultsDisplay) {
+    this.tableWrapper = document.querySelector(tableWrapperSelector);
     this.tableHeaders = document.querySelectorAll(`${tableSelector} th[data-sortable]`);
     this.currentSortBy = 'id';
     this.currentOrder = 'asc';
     this.currentStatus = [];
     this.currentSearchTerm = '';
     this.scrollToTable = false;
-    this.domainsSearchInput = document.querySelector(searchFieldId);
-    this.domainsSearchSubmit = document.querySelector(searchSubmitId);
-    this.tableAnnouncementRegion = document.querySelector(`${tableWrapper} .usa-table__announcement-region`);
+    this.searchInput = document.querySelector(searchFieldId);
+    this.searchSubmit = document.querySelector(searchSubmitId);
+    this.tableAnnouncementRegion = document.querySelector(`${tableWrapperSelector} .usa-table__announcement-region`);
     this.resetSearchButton = document.querySelector(resetSearchBtn);
     this.resetFiltersButton = document.querySelector(resetFiltersBtn);
     // NOTE: these 3 can't be used if filters are active on a page with more than 1 table
     this.statusCheckboxes = document.querySelectorAll('input[name="filter-status"]');
     this.statusIndicator = document.querySelector('.filter-indicator');
     this.statusToggle = document.querySelector('.usa-button--filter');
-    this.noDomainsWrapper = document.querySelector(noDataDisplay);
+    this.noTableWrapper = document.querySelector(noDataDisplay);
     this.noSearchResultsWrapper = document.querySelector(noSearchresultsDisplay);
     this.portfolioElement = document.getElementById('portfolio-js-value');
     this.portfolioValue = this.portfolioElement ? this.portfolioElement.getAttribute('data-portfolio') : null;
-    this.initializetableHeaders();
+    this.initializeTableHeaders();
     this.initializeSearchHandler();
     this.initializeStatusToggleHandler();
     this.initializeFilterCheckboxes();
@@ -1188,7 +1196,7 @@ class LoadTableBase {
   }
 
   // Add event listeners to table headers for sorting
-  initializetableHeaders() {
+  initializeTableHeaders() {
     this.tableHeaders.forEach(header => {
       header.addEventListener('click', () => {
         const sortBy = header.getAttribute('data-sortable');
@@ -1205,9 +1213,9 @@ class LoadTableBase {
   }
 
   initializeSearchHandler() {
-    this.domainsSearchSubmit.addEventListener('click', (e) => {
+    this.searchSubmit.addEventListener('click', (e) => {
       e.preventDefault();
-      this.currentSearchTerm = this.domainsSearchInput.value;
+      this.currentSearchTerm = this.searchInput.value;
       // If the search is blank, we match the resetSearch functionality
       if (this.currentSearchTerm) {
         showElement(this.resetSearchButton);
@@ -1272,7 +1280,7 @@ class LoadTableBase {
   }
 
   resetSearch() {
-    this.domainsSearchInput.value = '';
+    this.searchInput.value = '';
     this.currentSearchTerm = '';
     hideElement(this.resetSearchButton);
     this.loadTable(1, 'id', 'asc');
@@ -1404,7 +1412,7 @@ class DomainsTable extends LoadTableBase {
           }
 
           // handle the display of proper messaging in the event that no domains exist in the list or search returns no results
-          this.updateDisplay(data, this.domainsWrapper, this.noDomainsWrapper, this.noSearchResultsWrapper, this.currentSearchTerm);
+          this.updateDisplay(data, this.tableWrapper, this.noTableWrapper, this.noSearchResultsWrapper, this.currentSearchTerm);
 
           // identify the DOM element where the domain list will be inserted into the DOM
           const domainList = document.querySelector('.domains__table tbody');
@@ -1491,19 +1499,417 @@ class DomainsTable extends LoadTableBase {
 }
 
 
+class DomainRequestsTable extends LoadTableBase {
+
+  constructor() {
+    super('.domain-requests__table', '.domain-requests__table-wrapper', '#domain-requests__search-field', '#domain-requests__search-field-submit', '.domain-requests__reset-search', '.domain-requests__reset-filters', '.domain-requests__no-data', '.domain-requests__no-search-results');
+    this.domainRequestPk = 1
+
+  }
+  /**
+     * Loads rows in the domains list, as well as updates pagination around the domains list
+     * based on the supplied attributes.
+     * @param {*} page - the page number of the results (starts with 1)
+     * @param {*} sortBy - the sort column option
+     * @param {*} order - the sort order {asc, desc}
+     * @param {*} scroll - control for the scrollToElement functionality
+     * @param {*} status - control for the status filter
+     * @param {*} searchTerm - the search term
+     * @param {*} portfolio - the portfolio id
+     */
+  loadTable(page, sortBy = this.currentSortBy, order = this.currentOrder, scroll = this.scrollToTable, status = this.currentStatus, searchTerm = this.currentSearchTerm, portfolio = this.portfolioValue) {
+    let baseUrl = document.getElementById("get_domain_requests_json_url");
+    if (!baseUrl) {
+      return;
+    }
+
+    let baseUrlValue = baseUrl.innerHTML;
+    if (!baseUrlValue) {
+      return;
+    }
+
+    // add searchParams
+    let searchParams = new URLSearchParams(
+      {
+        "page": page,
+        "sort_by": sortBy,
+        "order": order,
+        "status": status,
+        "search_term": searchTerm
+      }
+    );
+    if (portfolio)
+      searchParams.append("portfolio", portfolio)
+
+    let url = `${baseUrlValue}?${searchParams.toString()}`
+    fetch(url)
+      .then(response => response.json())
+      .then(data => {
+        if (data.error) {
+          console.error('Error in AJAX call: ' + data.error);
+          return;
+        }
+
+        // handle the display of proper messaging in the event that no requests exist in the list or search returns no results
+        this.updateDisplay(data, this.tableWrapper, this.noTableWrapper, this.noSearchResultsWrapper, this.currentSearchTerm);
+
+        // identify the DOM element where the domain request list will be inserted into the DOM
+        const tbody = document.querySelector('.domain-requests__table tbody');
+        tbody.innerHTML = '';
+
+        // Unload modals will re-inject the DOM with the initial placeholders to allow for .on() in regular use cases
+        // We do NOT want that as it will cause multiple placeholders and therefore multiple inits on delete,
+        // which will cause bad delete requests to be sent.
+        const preExistingModalPlaceholders = document.querySelectorAll('[data-placeholder-for^="toggle-delete-domain-alert"]');
+        preExistingModalPlaceholders.forEach(element => {
+            element.remove();
+        });
+
+        // remove any existing modal elements from the DOM so they can be properly re-initialized
+        // after the DOM content changes and there are new delete modal buttons added
+        unloadModals();
+
+        let needsDeleteColumn = false;
+
+        needsDeleteColumn = data.domain_requests.some(request => request.is_deletable);
+
+        // Remove existing delete th and td if they exist
+        let existingDeleteTh =  document.querySelector('.delete-header');
+        if (!needsDeleteColumn) {
+          if (existingDeleteTh)
+            existingDeleteTh.remove();
+        } else {
+          if (!existingDeleteTh) {
+            const delheader = document.createElement('th');
+            delheader.setAttribute('scope', 'col');
+            delheader.setAttribute('role', 'columnheader');
+            delheader.setAttribute('class', 'delete-header');
+            delheader.innerHTML = `
+              <span class="usa-sr-only">Delete Action</span>`;
+            let tableHeaderRow = document.querySelector('.domain-requests__table thead tr');
+            tableHeaderRow.appendChild(delheader);
+          }
+        }
+
+        data.domain_requests.forEach(request => {
+          const options = { year: 'numeric', month: 'short', day: 'numeric' };
+          const domainName = request.requested_domain ? request.requested_domain : `New domain request <br><span class="text-base font-body-xs">(${utcDateString(request.created_at)})</span>`;
+          const actionUrl = request.action_url;
+          const actionLabel = request.action_label;
+          const submissionDate = request.last_submitted_date ? new Date(request.last_submitted_date).toLocaleDateString('en-US', options) : `<span class="text-base">Not submitted</span>`;
+          
+          // The markup for the delete function either be a simple trigger or a 3 dots menu with a hidden trigger (in the case of portfolio requests page)
+          // Even if the request is not deletable, we may need these empty strings for the td if the deletable column is displayed
+          let modalTrigger = '';
+
+          let markupCreatorRow = '';
+
+          if (this.portfolioValue) {
+            markupCreatorRow = `
+              <td>
+                  <span class="text-wrap break-word">${request.creator ? request.creator : ''}</span>
+              </td>
+            `
+          }
+
+          // If the request is deletable, create modal body and insert it. This is true for both requests and portfolio requests pages
+          if (request.is_deletable) {
+            let modalHeading = '';
+            let modalDescription = '';
+
+            if (request.requested_domain) {
+              modalHeading = `Are you sure you want to delete ${request.requested_domain}?`;
+              modalDescription = 'This will remove the domain request from the .gov registrar. This action cannot be undone.';
+            } else {
+              if (request.created_at) {
+                modalHeading = 'Are you sure you want to delete this domain request?';
+                modalDescription = `This will remove the domain request (created ${utcDateString(request.created_at)}) from the .gov registrar. This action cannot be undone`;
+              } else {
+                modalHeading = 'Are you sure you want to delete New domain request?';
+                modalDescription = 'This will remove the domain request from the .gov registrar. This action cannot be undone.';
+              }
+            }
+
+            modalTrigger = `
+              <a 
+                role="button" 
+                id="button-toggle-delete-domain-alert-${request.id}"
+                href="#toggle-delete-domain-alert-${request.id}"
+                class="usa-button text-secondary usa-button--unstyled text-no-underline late-loading-modal-trigger line-height-sans-5"
+                aria-controls="toggle-delete-domain-alert-${request.id}"
+                data-open-modal
+              >
+                <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
+                  <use xlink:href="/public/img/sprite.svg#delete"></use>
+                </svg> Delete <span class="usa-sr-only">${domainName}</span>
+              </a>`
+
+            const modalSubmit = `
+              <button type="button"
+              class="usa-button usa-button--secondary usa-modal__submit"
+              data-pk = ${request.id}
+              name="delete-domain-request">Yes, delete request</button>
+            `
+
+            const modal = document.createElement('div');
+            modal.setAttribute('class', 'usa-modal');
+            modal.setAttribute('id', `toggle-delete-domain-alert-${request.id}`);
+            modal.setAttribute('aria-labelledby', 'Are you sure you want to continue?');
+            modal.setAttribute('aria-describedby', 'Domain will be removed');
+            modal.setAttribute('data-force-action', '');
+
+            modal.innerHTML = `
+              <div class="usa-modal__content">
+                <div class="usa-modal__main">
+                  <h2 class="usa-modal__heading" id="modal-1-heading">
+                    ${modalHeading}
+                  </h2>
+                  <div class="usa-prose">
+                    <p id="modal-1-description">
+                      ${modalDescription}
+                    </p>
+                  </div>
+                  <div class="usa-modal__footer">
+                      <ul class="usa-button-group">
+                        <li class="usa-button-group__item">
+                          ${modalSubmit}
+                        </li>      
+                        <li class="usa-button-group__item">
+                            <button
+                                type="button"
+                                class="usa-button usa-button--unstyled padding-105 text-center"
+                                data-close-modal
+                            >
+                                Cancel
+                            </button>
+                        </li>
+                      </ul>
+                  </div>
+                </div>
+                <button
+                  type="button"
+                  class="usa-button usa-modal__close"
+                  aria-label="Close this window"
+                  data-close-modal
+                >
+                  <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+                    <use xlink:href="/public/img/sprite.svg#close"></use>
+                  </svg>
+                </button>
+              </div>
+              `
+
+            this.tableWrapper.appendChild(modal);
+
+            // Request is deletable, modal and modalTrigger are built. Now check if we are on the portfolio requests page (by seeing if there is a portfolio value) and enhance the modalTrigger accordingly
+            if (this.portfolioValue) {
+              modalTrigger = `
+              <a 
+                role="button" 
+                id="button-toggle-delete-domain-alert-${request.id}"
+                href="#toggle-delete-domain-alert-${request.id}"
+                class="usa-button text-secondary usa-button--unstyled text-no-underline late-loading-modal-trigger margin-top-2 visible-mobile-flex line-height-sans-5"
+                aria-controls="toggle-delete-domain-alert-${request.id}"
+                data-open-modal
+              >
+                <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
+                  <use xlink:href="/public/img/sprite.svg#delete"></use>
+                </svg> Delete <span class="usa-sr-only">${domainName}</span>
+              </a>
+
+              <div class="usa-accordion usa-accordion--more-actions margin-right-2 hidden-mobile-flex">
+                <div class="usa-accordion__heading">
+                  <button
+                    type="button"
+                    class="usa-button usa-button--unstyled usa-button--with-icon usa-accordion__button usa-button--more-actions"
+                    aria-expanded="false"
+                    aria-controls="more-actions-${request.id}"
+                  >
+                    <svg class="usa-icon top-2px" aria-hidden="true" focusable="false" role="img" width="24">
+                      <use xlink:href="/public/img/sprite.svg#more_vert"></use>
+                    </svg>
+                  </button>
+                </div>
+                <div id="more-actions-${request.id}" class="usa-accordion__content usa-prose shadow-1 left-auto right-0" hidden>
+                  <h2>More options</h2>
+                  <a 
+                    role="button" 
+                    id="button-toggle-delete-domain-alert-${request.id}"
+                    href="#toggle-delete-domain-alert-${request.id}"
+                    class="usa-button text-secondary usa-button--unstyled text-no-underline late-loading-modal-trigger margin-top-2 line-height-sans-5"
+                    aria-controls="toggle-delete-domain-alert-${request.id}"
+                    data-open-modal
+                  >
+                    <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
+                      <use xlink:href="/public/img/sprite.svg#delete"></use>
+                    </svg> Delete <span class="usa-sr-only">${domainName}</span>
+                  </a>
+                </div>
+              </div>
+              `
+            }
+          }
+
+
+          const row = document.createElement('tr');
+          row.innerHTML = `
+            <th scope="row" role="rowheader" data-label="Domain name">
+              ${domainName}
+            </th>
+            <td data-sort-value="${new Date(request.last_submitted_date).getTime()}" data-label="Date submitted">
+              ${submissionDate}
+            </td>
+            ${markupCreatorRow}
+            <td data-label="Status">
+              ${request.status}
+            </td>
+            <td>
+              <a href="${actionUrl}">
+                <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
+                  <use xlink:href="/public/img/sprite.svg#${request.svg_icon}"></use>
+                </svg>
+                ${actionLabel} <span class="usa-sr-only">${request.requested_domain ? request.requested_domain : 'New domain request'}</span>
+              </a>
+            </td>
+            ${needsDeleteColumn ? '<td>'+modalTrigger+'</td>' : ''}
+          `;
+          tbody.appendChild(row);
+        });
+
+        // initialize modals immediately after the DOM content is updated
+        initializeModals();
+
+        // Now the DOM and modals are ready, add listeners to the submit buttons
+        const modals = document.querySelectorAll('.usa-modal__content');
+
+        modals.forEach(modal => {
+          const submitButton = modal.querySelector('.usa-modal__submit');
+          const closeButton = modal.querySelector('.usa-modal__close');
+          submitButton.addEventListener('click', () => {
+            let pk = submitButton.getAttribute('data-pk');
+            // Close the modal to remove the USWDS UI local classes
+            closeButton.click();
+            // If we're deleting the last item on a page that is not page 1, we'll need to refresh the display to the previous page
+            let pageToDisplay = data.page;
+            if (data.total == 1 && data.unfiltered_total > 1) {
+              pageToDisplay--;
+            }
+            this.deleteDomainRequest(pk, pageToDisplay);
+          });
+        });
+
+        // Do not scroll on first page load
+        if (scroll)
+          ScrollToElement('class', 'domain-requests');
+        this.scrollToTable = true;
+
+        // update the pagination after the domain requests list is updated
+        this.updatePagination(
+          'domain request',
+          '#domain-requests-pagination',
+          '#domain-requests-pagination .usa-pagination__counter',
+          '#domain-requests',
+          data.page,
+          data.num_pages,
+          data.has_previous,
+          data.has_next,
+          data.total,
+        );
+        this.currentSortBy = sortBy;
+        this.currentOrder = order;
+        this.currentSearchTerm = searchTerm;
+      })
+      .catch(error => console.error('Error fetching domain requests:', error));
+  }
+
+  /**
+   * Delete is actually a POST API that requires a csrf token. The token will be waiting for us in the template as a hidden input.
+   * @param {*} domainRequestPk - the identifier for the request that we're deleting
+   * @param {*} pageToDisplay - If we're deleting the last item on a page that is not page 1, we'll need to display the previous page
+  */
+  deleteDomainRequest(domainRequestPk, pageToDisplay) {
+    // Use to debug uswds modal issues
+    //console.log('deleteDomainRequest')
+    
+    // Get csrf token
+    const csrfToken = getCsrfToken();
+    // Create FormData object and append the CSRF token
+    const formData = `csrfmiddlewaretoken=${encodeURIComponent(csrfToken)}&delete-domain-request=`;
+
+    fetch(`/domain-request/${domainRequestPk}/delete`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        'X-CSRFToken': csrfToken,
+      },
+      body: formData
+    })
+    .then(response => {
+      if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`);
+      }
+      // Update data and UI
+      this.loadTable(pageToDisplay, this.currentSortBy, this.currentOrder, this.scrollToTable, this.currentSearchTerm);
+    })
+    .catch(error => console.error('Error fetching domain requests:', error));
+  }
+}
+
+
 /**
  * An IIFE that listens for DOM Content to be loaded, then executes.  This function
  * initializes the domains list and associated functionality on the home page of the app.
  *
  */
 document.addEventListener('DOMContentLoaded', function() {
-  const domainsTable = new DomainsTable();
+  const isDomainsPage = document.querySelector("#domains") 
+  if (isDomainsPage){
+    const domainsTable = new DomainsTable();
+    if (domainsTable.tableWrapper) {
+      // Initial load
+      domainsTable.loadTable(1);
+    }
+  }
+});
 
- 
-  if (domainsTable.domainsWrapper) {
+/**
+ * An IIFE that listens for DOM Content to be loaded, then executes. This function
+ * initializes the domain requests list and associated functionality on the home page of the app.
+ *
+ */
+document.addEventListener('DOMContentLoaded', function() {
+  const domainRequestsSectionWrapper = document.querySelector('.domain-requests');
+  if (domainRequestsSectionWrapper) {
+    const domainRequestsTable = new DomainRequestsTable();
+    if (domainRequestsTable.tableWrapper) {
+      domainRequestsTable.loadTable(1);
+    }
+  }
 
-    // Initial load
-    domainsTable.loadTable(1);
+  document.addEventListener('focusin', function(event) {
+    closeOpenAccordions(event);
+  });
+  
+  document.addEventListener('click', function(event) {
+    closeOpenAccordions(event);
+  });
+
+  function closeMoreActionMenu(accordionThatIsOpen) {
+    if (accordionThatIsOpen.getAttribute("aria-expanded") === "true") {
+      accordionThatIsOpen.click();
+    }
+  }
+
+  function closeOpenAccordions(event) {
+    const openAccordions = document.querySelectorAll('.usa-button--more-actions[aria-expanded="true"]');
+    openAccordions.forEach((openAccordionButton) => {
+      // Find the corresponding accordion
+      const accordion = openAccordionButton.closest('.usa-accordion--more-actions');
+      if (accordion && !accordion.contains(event.target)) {
+        // Close the accordion if the click is outside
+        closeMoreActionMenu(openAccordionButton);
+      }
+    });
   }
 });
 
@@ -1521,556 +1927,6 @@ const utcDateString = (dateString) => {
   return `${utcMonth} ${utcDay}, ${utcYear}, ${utcHours}:${utcMinutes} ${ampm} UTC`;
 };
 
-/**
- * An IIFE that listens for DOM Content to be loaded, then executes. This function
- * initializes the domain requests list and associated functionality on the home page of the app.
- *
- */
-document.addEventListener('DOMContentLoaded', function() {
-  const domainRequestsSectionWrapper = document.querySelector('.domain-requests');
-  const domainRequestsWrapper = document.querySelector('.domain-requests__table-wrapper');
-
-  if (domainRequestsWrapper) {
-    let currentSortBy = 'id';
-    let currentOrder = 'asc';
-    const noDomainRequestsWrapper = document.querySelector('.domain-requests__no-data');
-    const noSearchResultsWrapper = document.querySelector('.domain-requests__no-search-results');
-    let scrollToTable = false;
-    let currentStatus = [];
-    let currentSearchTerm = '';
-    const domainRequestsSearchInput = document.getElementById('domain-requests__search-field');
-    const domainRequestsSearchSubmit = document.getElementById('domain-requests__search-field-submit');
-    const tableHeaders = document.querySelectorAll('.domain-requests__table th[data-sortable]');
-    const tableAnnouncementRegion = document.querySelector('.domain-requests__table-wrapper .usa-table__announcement-region');
-    const resetSearchButton = document.querySelector('.domain-requests__reset-search');
-    const resetFiltersButton = document.querySelector('.domains__reset-filters');
-    const statusCheckboxes = document.querySelectorAll('input[name="filter-status"]');
-    const statusIndicator = document.querySelector('.filter-indicator');
-    const statusToggle = document.querySelector('.usa-button--filter');
-    const portfolioElement = document.getElementById('portfolio-js-value');
-    const portfolioValue = portfolioElement ? portfolioElement.getAttribute('data-portfolio') : null;
-
-    /**
-     * Delete is actually a POST API that requires a csrf token. The token will be waiting for us in the template as a hidden input.
-     * @param {*} domainRequestPk - the identifier for the request that we're deleting
-     * @param {*} pageToDisplay - If we're deleting the last item on a page that is not page 1, we'll need to display the previous page
-    */
-    function deleteDomainRequest(domainRequestPk,pageToDisplay) {
-      
-      // Use to debug uswds modal issues
-      //console.log('deleteDomainRequest')
-      
-      // Get csrf token
-      const csrfToken = getCsrfToken();
-      // Create FormData object and append the CSRF token
-      const formData = `csrfmiddlewaretoken=${encodeURIComponent(csrfToken)}&delete-domain-request=`;
-
-      fetch(`/domain-request/${domainRequestPk}/delete`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          'X-CSRFToken': csrfToken,
-        },
-        body: formData
-      })
-      .then(response => {
-        if (!response.ok) {
-          throw new Error(`HTTP error! status: ${response.status}`);
-        }
-        // Update data and UI
-        loadDomainRequests(pageToDisplay, currentSortBy, currentOrder, scrollToTable, currentSearchTerm);
-      })
-      .catch(error => console.error('Error fetching domain requests:', error));
-    }
-  
-    // Helper function to get the CSRF token from the cookie
-    function getCsrfToken() {
-      return document.querySelector('input[name="csrfmiddlewaretoken"]').value;
-    }
-
-    /**
-     * Loads rows in the domain requests list, as well as updates pagination around the domain requests list
-     * based on the supplied attributes.
-     * @param {*} page - the page number of the results (starts with 1)
-     * @param {*} sortBy - the sort column option
-     * @param {*} order - the sort order {asc, desc}
-     * @param {*} scroll - control for the scrollToElement functionality
-     * @param {*} searchTerm - the search term
-     */
-    function loadDomainRequests(page, sortBy = currentSortBy, order = currentOrder, scroll = scrollToTable, searchTerm = currentSearchTerm, status = currentStatus, portfolio = portfolioValue) {
-      // fetch json of page of domain requests, given params
-      let baseUrl = document.getElementById("get_domain_requests_json_url");
-      if (!baseUrl) {
-        return;
-      }
-
-      let baseUrlValue = baseUrl.innerHTML;
-      if (!baseUrlValue) {
-        return;
-      }
-
-      // add searchParams
-      let searchParams = new URLSearchParams(
-        {
-          "page": page,
-          "sort_by": sortBy,
-          "order": order,
-          "status": status,
-          "search_term": searchTerm
-        }
-      );
-      if (portfolio)
-        searchParams.append("portfolio", portfolio)
-
-      let url = `${baseUrlValue}?${searchParams.toString()}`
-      fetch(url)
-        .then(response => response.json())
-        .then(data => {
-          if (data.error) {
-            console.error('Error in AJAX call: ' + data.error);
-            return;
-          }
-
-          // handle the display of proper messaging in the event that no requests exist in the list or search returns no results
-          updateDisplay(data, domainRequestsWrapper, noDomainRequestsWrapper, noSearchResultsWrapper, currentSearchTerm);
-
-          // identify the DOM element where the domain request list will be inserted into the DOM
-          const tbody = document.querySelector('.domain-requests__table tbody');
-          tbody.innerHTML = '';
-
-          // Unload modals will re-inject the DOM with the initial placeholders to allow for .on() in regular use cases
-          // We do NOT want that as it will cause multiple placeholders and therefore multiple inits on delete,
-          // which will cause bad delete requests to be sent.
-          const preExistingModalPlaceholders = document.querySelectorAll('[data-placeholder-for^="toggle-delete-domain-alert"]');
-          preExistingModalPlaceholders.forEach(element => {
-              element.remove();
-          });
-
-          // remove any existing modal elements from the DOM so they can be properly re-initialized
-          // after the DOM content changes and there are new delete modal buttons added
-          unloadModals();
-
-          let needsDeleteColumn = false;
-
-          needsDeleteColumn = data.domain_requests.some(request => request.is_deletable);
-
-          // Remove existing delete th and td if they exist
-          let existingDeleteTh =  document.querySelector('.delete-header');
-          if (!needsDeleteColumn) {
-            if (existingDeleteTh)
-              existingDeleteTh.remove();
-          } else {
-            if (!existingDeleteTh) {
-              const delheader = document.createElement('th');
-              delheader.setAttribute('scope', 'col');
-              delheader.setAttribute('role', 'columnheader');
-              delheader.setAttribute('class', 'delete-header');
-              delheader.innerHTML = `
-                <span class="usa-sr-only">Delete Action</span>`;
-              let tableHeaderRow = document.querySelector('.domain-requests__table thead tr');
-              tableHeaderRow.appendChild(delheader);
-            }
-          }
-
-          data.domain_requests.forEach(request => {
-            const options = { year: 'numeric', month: 'short', day: 'numeric' };
-            const domainName = request.requested_domain ? request.requested_domain : `New domain request <br><span class="text-base font-body-xs">(${utcDateString(request.created_at)})</span>`;
-            const actionUrl = request.action_url;
-            const actionLabel = request.action_label;
-            const submissionDate = request.last_submitted_date ? new Date(request.last_submitted_date).toLocaleDateString('en-US', options) : `<span class="text-base">Not submitted</span>`;
-            
-            // The markup for the delete function either be a simple trigger or a 3 dots menu with a hidden trigger (in the case of portfolio requests page)
-            // Even if the request is not deletable, we may need these empty strings for the td if the deletable column is displayed
-            let modalTrigger = '';
-
-            let markupCreatorRow = '';
-
-            if (portfolioValue) {
-              markupCreatorRow = `
-                <td>
-                    <span class="text-wrap break-word">${request.creator ? request.creator : ''}</span>
-                </td>
-              `
-            }
-
-            // If the request is deletable, create modal body and insert it. This is true for both requests and portfolio requests pages
-            if (request.is_deletable) {
-              let modalHeading = '';
-              let modalDescription = '';
-
-              if (request.requested_domain) {
-                modalHeading = `Are you sure you want to delete ${request.requested_domain}?`;
-                modalDescription = 'This will remove the domain request from the .gov registrar. This action cannot be undone.';
-              } else {
-                if (request.created_at) {
-                  modalHeading = 'Are you sure you want to delete this domain request?';
-                  modalDescription = `This will remove the domain request (created ${utcDateString(request.created_at)}) from the .gov registrar. This action cannot be undone`;
-                } else {
-                  modalHeading = 'Are you sure you want to delete New domain request?';
-                  modalDescription = 'This will remove the domain request from the .gov registrar. This action cannot be undone.';
-                }
-              }
-
-              modalTrigger = `
-                <a 
-                  role="button" 
-                  id="button-toggle-delete-domain-alert-${request.id}"
-                  href="#toggle-delete-domain-alert-${request.id}"
-                  class="usa-button text-secondary usa-button--unstyled text-no-underline late-loading-modal-trigger line-height-sans-5"
-                  aria-controls="toggle-delete-domain-alert-${request.id}"
-                  data-open-modal
-                >
-                  <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
-                    <use xlink:href="/public/img/sprite.svg#delete"></use>
-                  </svg> Delete <span class="usa-sr-only">${domainName}</span>
-                </a>`
-
-              const modalSubmit = `
-                <button type="button"
-                class="usa-button usa-button--secondary usa-modal__submit"
-                data-pk = ${request.id}
-                name="delete-domain-request">Yes, delete request</button>
-              `
-
-              const modal = document.createElement('div');
-              modal.setAttribute('class', 'usa-modal');
-              modal.setAttribute('id', `toggle-delete-domain-alert-${request.id}`);
-              modal.setAttribute('aria-labelledby', 'Are you sure you want to continue?');
-              modal.setAttribute('aria-describedby', 'Domain will be removed');
-              modal.setAttribute('data-force-action', '');
-
-              modal.innerHTML = `
-                <div class="usa-modal__content">
-                  <div class="usa-modal__main">
-                    <h2 class="usa-modal__heading" id="modal-1-heading">
-                      ${modalHeading}
-                    </h2>
-                    <div class="usa-prose">
-                      <p id="modal-1-description">
-                        ${modalDescription}
-                      </p>
-                    </div>
-                    <div class="usa-modal__footer">
-                        <ul class="usa-button-group">
-                          <li class="usa-button-group__item">
-                            ${modalSubmit}
-                          </li>      
-                          <li class="usa-button-group__item">
-                              <button
-                                  type="button"
-                                  class="usa-button usa-button--unstyled padding-105 text-center"
-                                  data-close-modal
-                              >
-                                  Cancel
-                              </button>
-                          </li>
-                        </ul>
-                    </div>
-                  </div>
-                  <button
-                    type="button"
-                    class="usa-button usa-modal__close"
-                    aria-label="Close this window"
-                    data-close-modal
-                  >
-                    <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-                      <use xlink:href="/public/img/sprite.svg#close"></use>
-                    </svg>
-                  </button>
-                </div>
-                `
-
-              domainRequestsSectionWrapper.appendChild(modal);
-
-              // Request is deletable, modal and modalTrigger are built. Now check if we are on the portfolio requests page (by seeing if there is a portfolio value) and enhance the modalTrigger accordingly
-              if (portfolioValue) {
-                modalTrigger = `
-                <a 
-                  role="button" 
-                  id="button-toggle-delete-domain-alert-${request.id}"
-                  href="#toggle-delete-domain-alert-${request.id}"
-                  class="usa-button text-secondary usa-button--unstyled text-no-underline late-loading-modal-trigger margin-top-2 visible-mobile-flex line-height-sans-5"
-                  aria-controls="toggle-delete-domain-alert-${request.id}"
-                  data-open-modal
-                >
-                  <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
-                    <use xlink:href="/public/img/sprite.svg#delete"></use>
-                  </svg> Delete <span class="usa-sr-only">${domainName}</span>
-                </a>
-
-                <div class="usa-accordion usa-accordion--more-actions margin-right-2 hidden-mobile-flex">
-                  <div class="usa-accordion__heading">
-                    <button
-                      type="button"
-                      class="usa-button usa-button--unstyled usa-button--with-icon usa-accordion__button usa-button--more-actions"
-                      aria-expanded="false"
-                      aria-controls="more-actions-${request.id}"
-                    >
-                      <svg class="usa-icon top-2px" aria-hidden="true" focusable="false" role="img" width="24">
-                        <use xlink:href="/public/img/sprite.svg#more_vert"></use>
-                      </svg>
-                    </button>
-                  </div>
-                  <div id="more-actions-${request.id}" class="usa-accordion__content usa-prose shadow-1 left-auto right-0" hidden>
-                    <h2>More options</h2>
-                    <a 
-                      role="button" 
-                      id="button-toggle-delete-domain-alert-${request.id}"
-                      href="#toggle-delete-domain-alert-${request.id}"
-                      class="usa-button text-secondary usa-button--unstyled text-no-underline late-loading-modal-trigger margin-top-2 line-height-sans-5"
-                      aria-controls="toggle-delete-domain-alert-${request.id}"
-                      data-open-modal
-                    >
-                      <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
-                        <use xlink:href="/public/img/sprite.svg#delete"></use>
-                      </svg> Delete <span class="usa-sr-only">${domainName}</span>
-                    </a>
-                  </div>
-                </div>
-                `
-              }
-            }
-
-
-            const row = document.createElement('tr');
-            row.innerHTML = `
-              <th scope="row" role="rowheader" data-label="Domain name">
-                ${domainName}
-              </th>
-              <td data-sort-value="${new Date(request.last_submitted_date).getTime()}" data-label="Date submitted">
-                ${submissionDate}
-              </td>
-              ${markupCreatorRow}
-              <td data-label="Status">
-                ${request.status}
-              </td>
-              <td>
-                <a href="${actionUrl}">
-                  <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
-                    <use xlink:href="/public/img/sprite.svg#${request.svg_icon}"></use>
-                  </svg>
-                  ${actionLabel} <span class="usa-sr-only">${request.requested_domain ? request.requested_domain : 'New domain request'}</span>
-                </a>
-              </td>
-              ${needsDeleteColumn ? '<td>'+modalTrigger+'</td>' : ''}
-            `;
-            tbody.appendChild(row);
-          });
-
-          // initialize modals immediately after the DOM content is updated
-          initializeModals();
-
-          // Now the DOM and modals are ready, add listeners to the submit buttons
-          const modals = document.querySelectorAll('.usa-modal__content');
-
-          modals.forEach(modal => {
-            const submitButton = modal.querySelector('.usa-modal__submit');
-            const closeButton = modal.querySelector('.usa-modal__close');
-            submitButton.addEventListener('click', function() {
-              pk = submitButton.getAttribute('data-pk');
-              // Close the modal to remove the USWDS UI local classes
-              closeButton.click();
-              // If we're deleting the last item on a page that is not page 1, we'll need to refresh the display to the previous page
-              let pageToDisplay = data.page;
-              if (data.total == 1 && data.unfiltered_total > 1) {
-                pageToDisplay--;
-              }
-              deleteDomainRequest(pk, pageToDisplay);
-            });
-          });
-
-          // Do not scroll on first page load
-          if (scroll)
-            ScrollToElement('class', 'domain-requests');
-          scrollToTable = true;
-
-          // update the pagination after the domain requests list is updated
-          updatePagination(
-            'domain request',
-            '#domain-requests-pagination',
-            '#domain-requests-pagination .usa-pagination__counter',
-            '#domain-requests',
-            loadDomainRequests,
-            data.page,
-            data.num_pages,
-            data.has_previous,
-            data.has_next,
-            data.total,
-            currentSearchTerm
-          );
-          currentSortBy = sortBy;
-          currentOrder = order;
-          currentSearchTerm = searchTerm;
-        })
-        .catch(error => console.error('Error fetching domain requests:', error));
-    }
-
-    // Add event listeners to table headers for sorting
-    tableHeaders.forEach(header => {
-      header.addEventListener('click', function() {
-        const sortBy = this.getAttribute('data-sortable');
-        let order = 'asc';
-        // sort order will be ascending, unless the currently sorted column is ascending, and the user
-        // is selecting the same column to sort in descending order
-        if (sortBy === currentSortBy) {
-          order = currentOrder === 'asc' ? 'desc' : 'asc';
-        }
-        loadDomainRequests(1, sortBy, order);
-      });
-    });
-
-    domainRequestsSearchSubmit.addEventListener('click', function(e) {
-      e.preventDefault();
-      currentSearchTerm = domainRequestsSearchInput.value;
-      // If the search is blank, we match the resetSearch functionality
-      if (currentSearchTerm) {
-        showElement(resetSearchButton);
-      } else {
-        hideElement(resetSearchButton);
-      }
-      loadDomainRequests(1, 'id', 'asc');
-      resetHeaders();
-    });
-
-    if (statusToggle) {
-      statusToggle.addEventListener('click', function() {
-        toggleCaret(statusToggle);
-      });
-    }
-
-    // Add event listeners to status filter checkboxes
-    statusCheckboxes.forEach(checkbox => {
-      checkbox.addEventListener('change', function() {
-        const checkboxValue = this.value;
-        
-        // Update currentStatus array based on checkbox state
-        if (this.checked) {
-          currentStatus.push(checkboxValue);
-        } else {
-          const index = currentStatus.indexOf(checkboxValue);
-          if (index > -1) {
-            currentStatus.splice(index, 1);
-          }
-        }
-
-        // Manage visibility of reset filters button
-        if (currentStatus.length == 0) {
-          hideElement(resetFiltersButton);
-        } else {
-          showElement(resetFiltersButton);
-        }
-
-        // Disable the auto scroll
-        scrollToTable = false;
-
-        // Call loadTable with updated status
-        loadDomainRequests(1, 'id', 'asc');
-        resetHeaders();
-        updateStatusIndicator();
-      });
-    });
-
-    // Reset UI and accessibility
-    function resetHeaders() {
-      tableHeaders.forEach(header => {
-        // unset sort UI in headers
-        unsetHeader(header);
-      });
-      // Reset the announcement region
-      tableAnnouncementRegion.innerHTML = '';
-    }
-
-    function resetSearch() {
-      domainRequestsSearchInput.value = '';
-      currentSearchTerm = '';
-      hideElement(resetSearchButton);
-      loadDomainRequests(1, 'id', 'asc');
-      resetHeaders();
-    }
-
-    if (resetSearchButton) {
-      resetSearchButton.addEventListener('click', function() {
-        resetSearch();
-      });
-    }
-
-    function closeMoreActionMenu(accordionThatIsOpen) {
-      if (accordionThatIsOpen.getAttribute("aria-expanded") === "true") {
-        accordionThatIsOpen.click();
-      }
-    }
-
-    function resetFilters() {
-      currentStatus = [];
-      statusCheckboxes.forEach(checkbox => {
-        checkbox.checked = false; 
-      });
-      hideElement(resetFiltersButton);
-
-      // Disable the auto scroll
-      scrollToTable = false;
-
-      loadDomainRequests(1, 'id', 'asc');
-      resetHeaders();
-      updateStatusIndicator();
-      // No need to toggle close the filters. The focus shift will trigger that for us.
-    }
-
-    if (resetFiltersButton) {
-      resetFiltersButton.addEventListener('click', function() {
-        resetFilters();
-      });
-    }
-
-    function updateStatusIndicator() {
-      statusIndicator.innerHTML = '';
-      // Even if the element is empty, it'll mess up the flex layout unless we set display none
-      hideElement(statusIndicator);
-      if (currentStatus.length)
-        statusIndicator.innerHTML = '(' + currentStatus.length + ')';
-        showElement(statusIndicator);
-    }
-
-    function closeFilters() {
-      if (statusToggle.getAttribute("aria-expanded") === "true") {
-        statusToggle.click();
-      }
-    }
-
-    document.addEventListener('focusin', function(event) {
-      closeOpenAccordions(event);
-    });
-    
-    document.addEventListener('click', function(event) {
-      closeOpenAccordions(event);
-    });
-
-    function closeOpenAccordions(event) {
-      const openAccordions = document.querySelectorAll('.usa-button--more-actions[aria-expanded="true"]');
-      openAccordions.forEach((openAccordionButton) => {
-        // Find the corresponding accordion
-        const accordion = openAccordionButton.closest('.usa-accordion--more-actions');
-        if (accordion && !accordion.contains(event.target)) {
-          // Close the accordion if the click is outside
-          closeMoreActionMenu(openAccordionButton);
-        }
-      });
-
-      // Close the filter accordion
-      const openFilterAccordion = document.querySelector('.usa-button--filter[aria-expanded="true"]');
-      const moreFilterAccordion = openFilterAccordion ? openFilterAccordion.closest('.usa-accordion--select') : undefined;
-      if (openFilterAccordion) {
-        if (!moreFilterAccordion.contains(event.target)) {
-          closeFilters();
-        }
-      }
-    }
-
-    // Initial load
-    loadDomainRequests(1);
-  }
-});
-
 
 /**
  * An IIFE that displays confirmation modal on the user profile page
diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html
index 1fa46225a..375e0229c 100644
--- a/src/registrar/templates/includes/domain_requests_table.html
+++ b/src/registrar/templates/includes/domain_requests_table.html
@@ -160,7 +160,7 @@
       </div>
       <button
         type="button"
-        class="usa-button usa-button--small padding--8-12-9-12 usa-button--outline usa-button--filter domains__reset-filters display-none"
+        class="usa-button usa-button--small padding--8-12-9-12 usa-button--outline usa-button--filter domain-requests__reset-filters display-none"
       >
         Clear filters
         <svg class="usa-icon top-1px" aria-hidden="true" focusable="false" role="img" width="24">

From 0f1f3d088fb1314e1d18233a9318598e78494f85 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 12 Sep 2024 14:17:14 -0600
Subject: [PATCH 084/118] fix createPageItem

---
 src/registrar/assets/js/get-gov.js | 48 +++++++++++++++---------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 0a4d28577..c5ad54c32 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1049,7 +1049,7 @@ class LoadTableBase {
     itemName,
     paginationSelector,
     counterSelector,
-    tableSelector,
+    parentTableSelector,
     currentPage,
     numPages,
     hasPrevious,
@@ -1074,7 +1074,7 @@ class LoadTableBase {
       const prevPageItem = document.createElement('li');
       prevPageItem.className = 'usa-pagination__item usa-pagination__arrow';
       prevPageItem.innerHTML = `
-        <a href="${tableSelector}" class="usa-pagination__link usa-pagination__previous-page" aria-label="Previous page">
+        <a href="${parentTableSelector}" class="usa-pagination__link usa-pagination__previous-page" aria-label="Previous page">
           <svg class="usa-icon" aria-hidden="true" role="img">
             <use xlink:href="/public/img/sprite.svg#navigate_before"></use>
           </svg>
@@ -1088,27 +1088,9 @@ class LoadTableBase {
       paginationButtons.appendChild(prevPageItem);
     }
 
-    // Helper function to create a page item
-    function createPageItem(page) {
-      const pageItem = document.createElement('li');
-      pageItem.className = 'usa-pagination__item usa-pagination__page-no';
-      pageItem.innerHTML = `
-        <a href="${tableSelector}" class="usa-pagination__button" aria-label="Page ${page}">${page}</a>
-      `;
-      if (page === currentPage) {
-        pageItem.querySelector('a').classList.add('usa-current');
-        pageItem.querySelector('a').setAttribute('aria-current', 'page');
-      }
-      pageItem.querySelector('a').addEventListener('click', (event) => {
-        event.preventDefault();
-        this.loadTable(page);
-      });
-      return pageItem;
-    }
-
     // Add first page and ellipsis if necessary
     if (currentPage > 2) {
-      paginationButtons.appendChild(createPageItem(1));
+      paginationButtons.appendChild(this.createPageItem(1, parentTableSelector, currentPage));
       if (currentPage > 3) {
         const ellipsis = document.createElement('li');
         ellipsis.className = 'usa-pagination__item usa-pagination__overflow';
@@ -1120,7 +1102,7 @@ class LoadTableBase {
 
     // Add pages around the current page
     for (let i = Math.max(1, currentPage - 1); i <= Math.min(numPages, currentPage + 1); i++) {
-      paginationButtons.appendChild(createPageItem(i));
+      paginationButtons.appendChild(this.createPageItem(i, parentTableSelector, currentPage));
     }
 
     // Add last page and ellipsis if necessary
@@ -1132,14 +1114,14 @@ class LoadTableBase {
         ellipsis.innerHTML = '<span>…</span>';
         paginationButtons.appendChild(ellipsis);
       }
-      paginationButtons.appendChild(createPageItem(numPages));
+      paginationButtons.appendChild(this.createPageItem(numPages, parentTableSelector, currentPage));
     }
 
     if (hasNext) {
       const nextPageItem = document.createElement('li');
       nextPageItem.className = 'usa-pagination__item usa-pagination__arrow';
       nextPageItem.innerHTML = `
-        <a href="${tableSelector}" class="usa-pagination__link usa-pagination__next-page" aria-label="Next page">
+        <a href="${parentTableSelector}" class="usa-pagination__link usa-pagination__next-page" aria-label="Next page">
           <span class="usa-pagination__link-text">Next</span>
           <svg class="usa-icon" aria-hidden="true" role="img">
             <use xlink:href="/public/img/sprite.svg#navigate_next"></use>
@@ -1177,6 +1159,24 @@ class LoadTableBase {
     }
   };
 
+  // Helper function to create a page item
+  createPageItem(page, parentTableSelector, currentPage) {
+    const pageItem = document.createElement('li');
+    pageItem.className = 'usa-pagination__item usa-pagination__page-no';
+    pageItem.innerHTML = `
+      <a href="${parentTableSelector}" class="usa-pagination__button" aria-label="Page ${page}">${page}</a>
+    `;
+    if (page === currentPage) {
+      pageItem.querySelector('a').classList.add('usa-current');
+      pageItem.querySelector('a').setAttribute('aria-current', 'page');
+    }
+    pageItem.querySelector('a').addEventListener('click', (event) => {
+      event.preventDefault();
+      this.loadTable(page);
+    });
+    return pageItem;
+  }
+
   /**
    * A helper that resets sortable table headers
    *

From e5a0f9401cd5c05452fe304d83009e5be2395caa Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Thu, 12 Sep 2024 14:31:24 -0700
Subject: [PATCH 085/118] Remove extraneous submitter

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

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 82bbc4e3a..744bc4d2e 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1976,12 +1976,8 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
 
         """
 
-        # TODO 2574: remove lines 1977-1978 (refactor as needed)
-        profile_flag = flag_is_active(request, "profile_feature")
-        if profile_flag and hasattr(obj, "creator"):
+        if hasattr(obj, "creator"):
             recipient = obj.creator
-        elif not profile_flag and hasattr(obj, "submitter"):
-            recipient = obj.submitter
         else:
             recipient = None
 

From 1eac50b23a788dfbe551dda491651f7bda4d160c Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Thu, 12 Sep 2024 14:35:18 -0700
Subject: [PATCH 086/118] Fix linter

---
 src/registrar/tests/test_admin.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 57b391a3b..88482e4db 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -67,7 +67,6 @@ from django.contrib.auth import get_user_model
 from unittest.mock import ANY, patch, Mock
 
 
-
 import logging
 
 logger = logging.getLogger(__name__)

From 5f3b1b1e677b0e054ac40372445958f72cb5cec1 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Thu, 12 Sep 2024 14:41:17 -0700
Subject: [PATCH 087/118] Update migration numerics

---
 ...re.py => 0125_alter_domaininformation_submitter_and_more.py} | 2 +-
 ...er_contacts.py => 0126_delete_cascade_submitter_contacts.py} | 2 +-
 ...e.py => 0127_remove_domaininformation_submitter_and_more.py} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename src/registrar/migrations/{0124_alter_domaininformation_submitter_and_more.py => 0125_alter_domaininformation_submitter_and_more.py} (95%)
 rename src/registrar/migrations/{0125_delete_cascade_submitter_contacts.py => 0126_delete_cascade_submitter_contacts.py} (93%)
 rename src/registrar/migrations/{0126_remove_domaininformation_submitter_and_more.py => 0127_remove_domaininformation_submitter_and_more.py} (93%)

diff --git a/src/registrar/migrations/0124_alter_domaininformation_submitter_and_more.py b/src/registrar/migrations/0125_alter_domaininformation_submitter_and_more.py
similarity index 95%
rename from src/registrar/migrations/0124_alter_domaininformation_submitter_and_more.py
rename to src/registrar/migrations/0125_alter_domaininformation_submitter_and_more.py
index f72fc2d86..ea95cbc05 100644
--- a/src/registrar/migrations/0124_alter_domaininformation_submitter_and_more.py
+++ b/src/registrar/migrations/0125_alter_domaininformation_submitter_and_more.py
@@ -7,7 +7,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0123_alter_portfolioinvitation_portfolio_additional_permissions_and_more"),
+        ("registrar", "0124_alter_portfolioinvitation_portfolio_additional_permissions_and_more"),
     ]
 
     operations = [
diff --git a/src/registrar/migrations/0125_delete_cascade_submitter_contacts.py b/src/registrar/migrations/0126_delete_cascade_submitter_contacts.py
similarity index 93%
rename from src/registrar/migrations/0125_delete_cascade_submitter_contacts.py
rename to src/registrar/migrations/0126_delete_cascade_submitter_contacts.py
index 44bd6c1fa..d798ae283 100644
--- a/src/registrar/migrations/0125_delete_cascade_submitter_contacts.py
+++ b/src/registrar/migrations/0126_delete_cascade_submitter_contacts.py
@@ -19,7 +19,7 @@ def cascade_delete_submitter_contacts(apps, schema_editor) -> Any:
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("registrar", "0124_alter_domaininformation_submitter_and_more"),
+        ("registrar", "0125_alter_domaininformation_submitter_and_more"),
     ]
 
     operations = [
diff --git a/src/registrar/migrations/0126_remove_domaininformation_submitter_and_more.py b/src/registrar/migrations/0127_remove_domaininformation_submitter_and_more.py
similarity index 93%
rename from src/registrar/migrations/0126_remove_domaininformation_submitter_and_more.py
rename to src/registrar/migrations/0127_remove_domaininformation_submitter_and_more.py
index 8f04497df..78c764e0f 100644
--- a/src/registrar/migrations/0126_remove_domaininformation_submitter_and_more.py
+++ b/src/registrar/migrations/0127_remove_domaininformation_submitter_and_more.py
@@ -8,7 +8,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0125_delete_cascade_submitter_contacts"),
+        ("registrar", "0126_delete_cascade_submitter_contacts"),
     ]
 
     operations = [

From 289f7bd184f6456767688356d8dcabeab4e56492 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Thu, 12 Sep 2024 14:46:38 -0700
Subject: [PATCH 088/118] Remove line from unit test - no submitter anymore for
 domain request

---
 src/registrar/tests/test_views_request.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 87c90a59d..6dde70f1a 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -2789,7 +2789,6 @@ class DomainRequestTestDifferentStatuses(TestWithUser, WebTest):
         self.assertContains(detail_page, "city1.gov")
         self.assertContains(detail_page, "Chief Tester")
         self.assertContains(detail_page, "testy@town.com")
-        self.assertContains(detail_page, "Admin Tester")
         self.assertContains(detail_page, "Status:")
         # click the "Withdraw request" button
         mock_client = MockSESClient()

From 9d24d720edeb81fdac2c04154cf5d87e3fc03852 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 13 Sep 2024 08:09:42 -0600
Subject: [PATCH 089/118] Remove unused value

---
 src/registrar/assets/js/get-gov.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index c5ad54c32..027ef4344 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -1503,8 +1503,6 @@ class DomainRequestsTable extends LoadTableBase {
 
   constructor() {
     super('.domain-requests__table', '.domain-requests__table-wrapper', '#domain-requests__search-field', '#domain-requests__search-field-submit', '.domain-requests__reset-search', '.domain-requests__reset-filters', '.domain-requests__no-data', '.domain-requests__no-search-results');
-    this.domainRequestPk = 1
-
   }
   /**
      * Loads rows in the domains list, as well as updates pagination around the domains list

From a55c0191ace831bca93e869c0094d410c7985e99 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Fri, 13 Sep 2024 13:02:49 -0400
Subject: [PATCH 090/118] put the end tag back in its correct spot

---
 src/registrar/templates/domain_request_sidebar.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/domain_request_sidebar.html b/src/registrar/templates/domain_request_sidebar.html
index bca47bff2..894d4576a 100644
--- a/src/registrar/templates/domain_request_sidebar.html
+++ b/src/registrar/templates/domain_request_sidebar.html
@@ -15,12 +15,12 @@
               </svg>
             {% endif %}
           {% endif %}
-        <a href="{% namespaced_url 'domain-request' this_step %}">
+        <a href="{% namespaced_url 'domain-request' this_step %}""
            {% if this_step == steps.current %}
            class="usa-current"
            {% else %}
            class="link_usa-checked"
-           {% endif%}>
+           {% endif%} >
           {{ form_titles|get_item:this_step }}
         </a>
       </span>

From d4475f074e18ce033ab461b4617aaa946f74f55b Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Fri, 13 Sep 2024 14:28:52 -0400
Subject: [PATCH 091/118] finalized updates

---
 .../templates/domain_request_sidebar.html     |  4 +--
 src/registrar/tests/test_models.py            |  8 -----
 src/registrar/tests/test_views.py             | 32 -------------------
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/src/registrar/templates/domain_request_sidebar.html b/src/registrar/templates/domain_request_sidebar.html
index 894d4576a..b7abede5c 100644
--- a/src/registrar/templates/domain_request_sidebar.html
+++ b/src/registrar/templates/domain_request_sidebar.html
@@ -15,12 +15,12 @@
               </svg>
             {% endif %}
           {% endif %}
-        <a href="{% namespaced_url 'domain-request' this_step %}""
+        <a href="{% namespaced_url 'domain-request' this_step %}"
            {% if this_step == steps.current %}
            class="usa-current"
            {% else %}
            class="link_usa-checked"
-           {% endif%} >
+           {% endif%}>
           {{ form_titles|get_item:this_step }}
         </a>
       </span>
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index d4944d5f4..8390e0bbf 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -256,14 +256,6 @@ class TestDomainRequest(TestCase):
 
         email_allowed.delete()
 
-    @less_console_noise_decorator
-    def test_submit_from_started_sends_email(self):
-        msg = "Create a domain request and submit it and see if email was sent."
-        domain_request = completed_domain_request(user=self.dummy_user_2)
-        self.check_email_sent(
-            domain_request, msg, "submit", 1, expected_content="Lava", expected_email=self.dummy_user_2.email
-        )
-
     @override_flag("profile_feature", active=True)
     @less_console_noise_decorator
     def test_submit_from_started_sends_email_to_creator(self):
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index f43cd8228..a615d4207 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -957,13 +957,6 @@ class UserProfileTests(TestWithUser, WebTest):
         self.assertContains(response, "Your profile")
         self.assertNotContains(response, "Your contact information")
 
-    @less_console_noise_decorator
-    def test_domain_your_contact_information_when_profile_feature_off(self):
-        """test that Your contact information is accessible when profile_feature is off"""
-        with override_flag("profile_feature", active=False):
-            response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
-        self.assertContains(response, "Your contact information")
-
     @less_console_noise_decorator
     def test_domain_your_contact_information_when_profile_feature_on(self):
         """test that Your contact information is not accessible when profile feature is on"""
@@ -992,31 +985,6 @@ class UserProfileTests(TestWithUser, WebTest):
         response = self.client.get(f"/domain-request/{domain_request.id}/withdraw", follow=True)
         self.assertContains(response, "Your profile")
 
-    @less_console_noise_decorator
-    def test_request_when_profile_feature_off(self):
-        """test that Your profile is not in request page when profile feature is off"""
-
-        contact_user, _ = Contact.objects.get_or_create(
-            first_name="Hank",
-            last_name="McFakerson",
-        )
-        site = DraftDomain.objects.create(name="igorville.gov")
-        domain_request = DomainRequest.objects.create(
-            creator=self.user,
-            requested_domain=site,
-            status=DomainRequest.DomainRequestStatus.SUBMITTED,
-            senior_official=contact_user,
-            submitter=contact_user,
-        )
-        with override_flag("profile_feature", active=False):
-            response = self.client.get(f"/domain-request/{domain_request.id}", follow=True)
-            self.assertNotContains(response, "Your profile")
-            response = self.client.get(f"/domain-request/{domain_request.id}/withdraw", follow=True)
-            self.assertNotContains(response, "Your profile")
-        # cleanup
-        domain_request.delete()
-        site.delete()
-
     @less_console_noise_decorator
     def test_user_profile_form_submission(self):
         """test user profile form submission"""

From 4b8f77436d5693854238ef4703e1096b446cf507 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:48:47 -0600
Subject: [PATCH 092/118] Add corrected delete logic

---
 src/registrar/views/domain_request.py       |  6 ++++++
 src/registrar/views/domain_requests_json.py | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 0abe6d69a..864225dcc 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -796,6 +796,12 @@ class DomainRequestDeleteView(DomainRequestPermissionDeleteView):
         if status not in valid_statuses:
             return False
 
+        # Portfolio users cannot delete their requests if they aren't permissioned to do so 
+        if self.request.user.is_org_user(self.request):
+            portfolio = self.request.session.get("portfolio")
+            if not self.request.user.has_edit_request_portfolio_permission(portfolio):
+                return False
+
         return True
 
     def get_success_url(self):
diff --git a/src/registrar/views/domain_requests_json.py b/src/registrar/views/domain_requests_json.py
index 7b86cd9ef..bc880cdaf 100644
--- a/src/registrar/views/domain_requests_json.py
+++ b/src/registrar/views/domain_requests_json.py
@@ -25,9 +25,8 @@ def get_domain_requests_json(request):
     paginator = Paginator(objects, 10)
     page_number = request.GET.get("page", 1)
     page_obj = paginator.get_page(page_number)
-
     domain_requests = [
-        serialize_domain_request(domain_request, request.user) for domain_request in page_obj.object_list
+        serialize_domain_request(request, domain_request, request.user) for domain_request in page_obj.object_list
     ]
 
     return JsonResponse(
@@ -90,13 +89,22 @@ def apply_sorting(queryset, request):
     return queryset.order_by(sort_by)
 
 
-def serialize_domain_request(domain_request, user):
-    # Determine if the request is deletable
-    is_deletable = domain_request.status in [
+def serialize_domain_request(request, domain_request, user):
+
+    deletable_statuses = [
         DomainRequest.DomainRequestStatus.STARTED,
         DomainRequest.DomainRequestStatus.WITHDRAWN,
     ]
 
+    # Determine if the request is deletable
+    if not user.is_org_user(request):
+        is_deletable = domain_request.status in deletable_statuses
+    else:
+        portfolio = request.session.get("portfolio")
+        is_deletable = (
+            domain_request.status in deletable_statuses and user.has_edit_request_portfolio_permission(portfolio)
+        ) and domain_request.creator == user
+
     # Determine action label based on user permissions and request status
     editable_statuses = [
         DomainRequest.DomainRequestStatus.STARTED,

From 939f94a4c7c8b3d565932723c64af4ee1b120604 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:51:14 -0600
Subject: [PATCH 093/118] fix spacing issue

---
 src/registrar/templates/portfolio_requests.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/registrar/templates/portfolio_requests.html b/src/registrar/templates/portfolio_requests.html
index 868c9bd2a..70d17feae 100644
--- a/src/registrar/templates/portfolio_requests.html
+++ b/src/registrar/templates/portfolio_requests.html
@@ -12,10 +12,11 @@
 <div id="main-content">
     <h1 id="domain-requests-header">Domain requests</h1>
     <div class="grid-row grid-gap">
-        <div class="mobile:grid-col-12 tablet:grid-col-6">
-            <p class="margin-y-0">Domain requests can only be modified by the person who created the request.</p>
-        </div>
+
         {% if has_edit_request_portfolio_permission %}
+            <div class="mobile:grid-col-12 tablet:grid-col-6">
+                <p class="margin-y-0">Domain requests can only be modified by the person who created the request.</p>
+            </div>
             <div class="mobile:grid-col-12 tablet:grid-col-6">
                 {% comment %}
                 IMPORTANT:
@@ -29,6 +30,8 @@
                     </a>
                 </p>
             </div>
+        {% else %}
+            <p class="margin-y-0">Domain requests can only be modified by the person who created the request.</p>
         {% endif %}
     </div>
     

From b0b08dc74a34f78a9b99f939429c66bb3292ac91 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:26:45 -0600
Subject: [PATCH 094/118] unit tests

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

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index aaafa3262..a960b2fd2 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -837,3 +837,99 @@ class TestPortfolio(WebTest):
             response = self.client.get(reverse("home"))
             self.assertIsNone(self.client.session.get("portfolio"))
             self.assertNotContains(response, "Hotel California")
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_requests", active=True)
+    def test_delete_domain_request_as_org_user_with_permission_and_deletable_status(self):
+        """Test that an org user with edit permission can delete their own DomainRequest with a deletable status."""
+
+        # Assign the user to a portfolio with edit permission
+        UserPortfolioPermission.objects.get_or_create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
+            additional_permissions=[UserPortfolioPermissionChoices.EDIT_REQUESTS]
+        )
+
+        # Create a domain request with status WITHDRAWN
+        domain_request = completed_domain_request(
+            name="test-domain.gov",
+            status=DomainRequest.DomainRequestStatus.WITHDRAWN,
+            portfolio=self.portfolio,
+        )
+
+        self.client.force_login(self.user)
+        # Perform delete
+        response = self.client.post(reverse("domain-request-delete", kwargs={"pk": domain_request.pk}), follow=True)
+
+        # Check that the response is 200
+        self.assertEqual(response.status_code, 200)
+
+        # Check that the domain request no longer exists
+        self.assertFalse(DomainRequest.objects.filter(pk=domain_request.pk).exists())
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_requests", active=True)
+    def test_delete_domain_request_as_org_user_without_permission_with_deletable_status(self):
+        """Test that an org user without edit permission cannot delete their DomainRequest even if status is deletable."""
+
+        # Assign the user to a portfolio without edit permission
+        UserPortfolioPermission.objects.get_or_create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
+            additional_permissions=[]
+        )
+
+        # Create a domain request with status STARTED
+        domain_request = completed_domain_request(
+            name="test-domain.gov",
+            status=DomainRequest.DomainRequestStatus.STARTED,
+            portfolio=self.portfolio,
+        )
+
+        self.client.force_login(self.user)
+        # Attempt to delete
+        response = self.client.post(reverse("domain-request-delete", kwargs={"pk": domain_request.pk}), follow=True)
+
+        # Check response is 403 Forbidden
+        self.assertEqual(response.status_code, 403)
+
+        # Check that the domain request still exists
+        self.assertTrue(DomainRequest.objects.filter(pk=domain_request.pk).exists())
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_requests", active=True)
+    def test_delete_domain_request_as_org_user_not_creator_with_permission_and_deletable_status(self):
+        """Test that an org user with edit permission cannot delete DomainRequests they did not create."""
+
+        # Assign the user to a portfolio with edit permission
+        UserPortfolioPermission.objects.get_or_create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
+            additional_permissions=[UserPortfolioPermissionChoices.EDIT_REQUESTS]
+        )
+
+        # Create another user and a domain request
+        other_user = User.objects.create(username="other_user")
+        domain_request = completed_domain_request(
+            name="test-domain.gov",
+            status=DomainRequest.DomainRequestStatus.STARTED,
+            portfolio=self.portfolio,
+        )
+        domain_request.creator = other_user
+        domain_request.save()
+
+        self.client.force_login(self.user)
+        # Perform delete as self.user
+        response = self.client.post(reverse("domain-request-delete", kwargs={"pk": domain_request.pk}), follow=True)
+
+        # Check response is 403 Forbidden
+        self.assertEqual(response.status_code, 403)
+
+        # Check that the domain request still exists
+        self.assertTrue(DomainRequest.objects.filter(pk=domain_request.pk).exists())
\ No newline at end of file

From 8d58b38900e8c1454fd7095206e50897d2ebeed3 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:27:56 -0600
Subject: [PATCH 095/118] Update test_views_portfolio.py

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

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index a960b2fd2..6d50c9b0a 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -858,6 +858,8 @@ class TestPortfolio(WebTest):
             status=DomainRequest.DomainRequestStatus.WITHDRAWN,
             portfolio=self.portfolio,
         )
+        domain_request.creator = self.user
+        domain_request.save()
 
         self.client.force_login(self.user)
         # Perform delete
@@ -889,6 +891,8 @@ class TestPortfolio(WebTest):
             status=DomainRequest.DomainRequestStatus.STARTED,
             portfolio=self.portfolio,
         )
+        domain_request.creator = self.user
+        domain_request.save()
 
         self.client.force_login(self.user)
         # Attempt to delete

From a03769350ac4ec713db0ba332e27b80fa28eeeae Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:29:28 -0600
Subject: [PATCH 096/118] lint

---
 src/registrar/tests/test_views_portfolio.py | 8 ++++----
 src/registrar/views/domain_request.py       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 6d50c9b0a..a952da5e7 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -849,7 +849,7 @@ class TestPortfolio(WebTest):
             user=self.user,
             portfolio=self.portfolio,
             roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
-            additional_permissions=[UserPortfolioPermissionChoices.EDIT_REQUESTS]
+            additional_permissions=[UserPortfolioPermissionChoices.EDIT_REQUESTS],
         )
 
         # Create a domain request with status WITHDRAWN
@@ -882,7 +882,7 @@ class TestPortfolio(WebTest):
             user=self.user,
             portfolio=self.portfolio,
             roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
-            additional_permissions=[]
+            additional_permissions=[],
         )
 
         # Create a domain request with status STARTED
@@ -915,7 +915,7 @@ class TestPortfolio(WebTest):
             user=self.user,
             portfolio=self.portfolio,
             roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
-            additional_permissions=[UserPortfolioPermissionChoices.EDIT_REQUESTS]
+            additional_permissions=[UserPortfolioPermissionChoices.EDIT_REQUESTS],
         )
 
         # Create another user and a domain request
@@ -936,4 +936,4 @@ class TestPortfolio(WebTest):
         self.assertEqual(response.status_code, 403)
 
         # Check that the domain request still exists
-        self.assertTrue(DomainRequest.objects.filter(pk=domain_request.pk).exists())
\ No newline at end of file
+        self.assertTrue(DomainRequest.objects.filter(pk=domain_request.pk).exists())
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 864225dcc..5fed89215 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -796,7 +796,7 @@ class DomainRequestDeleteView(DomainRequestPermissionDeleteView):
         if status not in valid_statuses:
             return False
 
-        # Portfolio users cannot delete their requests if they aren't permissioned to do so 
+        # Portfolio users cannot delete their requests if they aren't permissioned to do so
         if self.request.user.is_org_user(self.request):
             portfolio = self.request.session.get("portfolio")
             if not self.request.user.has_edit_request_portfolio_permission(portfolio):

From e078248e02e73e45023df72147ee54227a932650 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:32:57 -0600
Subject: [PATCH 097/118] Update test_views_portfolio.py

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

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index a952da5e7..edac1d783 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -875,7 +875,7 @@ class TestPortfolio(WebTest):
     @override_flag("organization_feature", active=True)
     @override_flag("organization_requests", active=True)
     def test_delete_domain_request_as_org_user_without_permission_with_deletable_status(self):
-        """Test that an org user without edit permission cannot delete their DomainRequest even if status is deletable."""
+        """Test that an org user without edit permission cant delete their DomainRequest even if status is deletable."""
 
         # Assign the user to a portfolio without edit permission
         UserPortfolioPermission.objects.get_or_create(

From 897fd86e5753fa7c5f9d0174d93cf64c393a6725 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:36:15 -0600
Subject: [PATCH 098/118] add delete

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

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index edac1d783..e238ea0d6 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -870,6 +870,7 @@ class TestPortfolio(WebTest):
 
         # Check that the domain request no longer exists
         self.assertFalse(DomainRequest.objects.filter(pk=domain_request.pk).exists())
+        domain_request.delete()
 
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
@@ -903,6 +904,7 @@ class TestPortfolio(WebTest):
 
         # Check that the domain request still exists
         self.assertTrue(DomainRequest.objects.filter(pk=domain_request.pk).exists())
+        domain_request.delete()
 
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
@@ -937,3 +939,4 @@ class TestPortfolio(WebTest):
 
         # Check that the domain request still exists
         self.assertTrue(DomainRequest.objects.filter(pk=domain_request.pk).exists())
+        domain_request.delete()

From ffeed489c46330d852df830d8d32f994998fc11e Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 16 Sep 2024 16:43:15 -0400
Subject: [PATCH 099/118] tentative changes to tests" "

---
 src/api/tests/common.py                  | 14 ++++++++++++++
 src/api/tests/test_available.py          |  4 ++--
 src/registrar/tests/common.py            | 12 +++++++++++-
 src/registrar/tests/test_reports.py      |  3 +++
 src/registrar/tests/test_views.py        |  8 +++++++-
 src/registrar/tests/test_views_domain.py |  4 ++--
 6 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/api/tests/common.py b/src/api/tests/common.py
index 1a8c32526..d975a8012 100644
--- a/src/api/tests/common.py
+++ b/src/api/tests/common.py
@@ -2,6 +2,7 @@ import os
 import logging
 
 from contextlib import contextmanager
+from django.contrib.auth import get_user_model
 
 
 def get_handlers():
@@ -63,3 +64,16 @@ def less_console_noise_decorator(func):
             return func(*args, **kwargs)
 
     return wrapper
+
+
+def create_user():
+    username = "restricted_user"
+    first_name = "First"
+    last_name = "Last"
+    email = "restricted@example.com"
+    phone = "8003111234"
+    title = "title"
+    user = get_user_model().objects.create(
+        username=username, first_name=first_name, last_name=last_name, email=email, phone=phone, title=title
+    )
+    return user
diff --git a/src/api/tests/test_available.py b/src/api/tests/test_available.py
index b85ea6335..a23b18820 100644
--- a/src/api/tests/test_available.py
+++ b/src/api/tests/test_available.py
@@ -6,7 +6,7 @@ from django.contrib.auth import get_user_model
 from django.test import RequestFactory
 
 from ..views import available, check_domain_available
-from .common import less_console_noise
+from .common import less_console_noise, create_user
 from registrar.tests.common import MockEppLib
 from registrar.utility.errors import GenericError, GenericErrorCodes
 from unittest.mock import call
@@ -126,7 +126,7 @@ class AvailableAPITest(MockEppLib):
 
     def setUp(self):
         super().setUp()
-        self.user = get_user_model().objects.create(username="username")
+        self.user = create_user()
 
     def test_available_get(self):
         self.client.force_login(self.user)
diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py
index c75fa1940..c1058b031 100644
--- a/src/registrar/tests/common.py
+++ b/src/registrar/tests/common.py
@@ -845,6 +845,7 @@ def create_superuser():
         last_name="last",
         is_staff=True,
         password=p,
+        phone="8003111234",
     )
     # Retrieve the group or create it if it doesn't exist
     group, _ = UserGroup.objects.get_or_create(name="full_access_group")
@@ -862,7 +863,9 @@ def create_user():
         first_name="first",
         last_name="last",
         is_staff=True,
+        title="title",
         password=p,
+        phone="8003111234",
     )
     # Retrieve the group or create it if it doesn't exist
     group, _ = UserGroup.objects.get_or_create(name="cisa_analysts_group")
@@ -878,8 +881,15 @@ def create_test_user():
     email = "info@example.com"
     phone = "8003111234"
     title = "test title"
+    password = "password"
     user = get_user_model().objects.create(
-        username=username, first_name=first_name, last_name=last_name, email=email, phone=phone, title=title
+        username=username,
+        first_name=first_name,
+        last_name=last_name,
+        email=email,
+        phone=phone,
+        title=title,
+        password=password,
     )
     return user
 
diff --git a/src/registrar/tests/test_reports.py b/src/registrar/tests/test_reports.py
index ed2b75791..24dfe7dbd 100644
--- a/src/registrar/tests/test_reports.py
+++ b/src/registrar/tests/test_reports.py
@@ -350,6 +350,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
 
         # Get the csv content
         csv_content = self._run_domain_data_type_user_export(request)
+        print(csv_content)
 
         # We expect only domains associated with the user's portfolio
         self.assertIn(self.domain_1.name, csv_content)
@@ -389,6 +390,8 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
         DomainDataTypeUser.export_data_to_csv(csv_file, request=request)
         # Reset the CSV file's position to the beginning
         csv_file.seek(0)
+        print(csv_file)
+        print(csv_file.seek(0))
         # Read the content into a variable
         csv_content = csv_file.read()
 
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index a615d4207..14b894a9c 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -494,7 +494,13 @@ class HomeTests(TestWithUser):
         phone = "8003111234"
         status = User.RESTRICTED
         restricted_user = get_user_model().objects.create(
-            username=username, first_name=first_name, last_name=last_name, email=email, phone=phone, status=status
+            username=username,
+            first_name=first_name,
+            last_name=last_name,
+            email=email,
+            phone=phone,
+            status=status,
+            title="title",
         )
         self.client.force_login(restricted_user)
         response = self.client.get("/request/", follow=True)
diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index c57cbe483..87ecd9b04 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -723,7 +723,7 @@ class TestDomainManagers(TestDomainOverview):
         email_address = "mayor@igorville.gov"
         invitation, _ = DomainInvitation.objects.get_or_create(domain=self.domain, email=email_address)
 
-        other_user = User()
+        other_user = create_user()
         other_user.save()
         self.client.force_login(other_user)
         mock_client = MagicMock()
@@ -759,7 +759,7 @@ class TestDomainManagers(TestDomainOverview):
         new_user.on_each_login()
 
         # Now load the home page and make sure our domain appears there
-        home_page = self.app.get(reverse("home"))
+        home_page = self.app.get(reverse("user-profile"))
         self.assertContains(home_page, self.domain.name)
 
 

From 2fd84a9ae4bacdba72ecb0fe45bc5d73c98c15b3 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 16 Sep 2024 16:54:17 -0400
Subject: [PATCH 100/118] removed print statements

---
 src/registrar/tests/test_reports.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/registrar/tests/test_reports.py b/src/registrar/tests/test_reports.py
index 24dfe7dbd..ed2b75791 100644
--- a/src/registrar/tests/test_reports.py
+++ b/src/registrar/tests/test_reports.py
@@ -350,7 +350,6 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
 
         # Get the csv content
         csv_content = self._run_domain_data_type_user_export(request)
-        print(csv_content)
 
         # We expect only domains associated with the user's portfolio
         self.assertIn(self.domain_1.name, csv_content)
@@ -390,8 +389,6 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
         DomainDataTypeUser.export_data_to_csv(csv_file, request=request)
         # Reset the CSV file's position to the beginning
         csv_file.seek(0)
-        print(csv_file)
-        print(csv_file.seek(0))
         # Read the content into a variable
         csv_content = csv_file.read()
 

From 013e566bcbe8120531752ec70fa34b2512f63458 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 16 Sep 2024 17:04:28 -0400
Subject: [PATCH 101/118] removed the password

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

diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py
index c1058b031..cabcf529f 100644
--- a/src/registrar/tests/common.py
+++ b/src/registrar/tests/common.py
@@ -881,7 +881,6 @@ def create_test_user():
     email = "info@example.com"
     phone = "8003111234"
     title = "test title"
-    password = "password"
     user = get_user_model().objects.create(
         username=username,
         first_name=first_name,
@@ -889,7 +888,6 @@ def create_test_user():
         email=email,
         phone=phone,
         title=title,
-        password=password,
     )
     return user
 

From f4e746b4be2639a8d99c0ec03fe1369b44313e4f Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Mon, 16 Sep 2024 18:52:51 -0400
Subject: [PATCH 102/118] design tweaks, unit test fix, linting

---
 .../assets/sass/_theme/_buttons.scss          | 89 ++++++++++++-------
 .../templates/includes/senior_official.html   |  2 +-
 src/registrar/tests/test_views_domain.py      |  2 +-
 src/registrar/tests/test_views_portfolio.py   |  4 +-
 4 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_buttons.scss b/src/registrar/assets/sass/_theme/_buttons.scss
index 12eee9926..2e4469e12 100644
--- a/src/registrar/assets/sass/_theme/_buttons.scss
+++ b/src/registrar/assets/sass/_theme/_buttons.scss
@@ -1,7 +1,8 @@
 @use "uswds-core" as *;
 @use "cisa_colors" as *;
 
-/* Make "placeholder" links visually obvious */
+// Used on: TODO links
+// Used on: NONE
 a[href$="todo"]::after {
   background-color: yellow;
   color: color(blue-80v);
@@ -9,10 +10,14 @@ a[href$="todo"]::after {
   font-style: italic;
 }
 
+// Used on: profile
+// Note: Is this needed?
 a.usa-link.usa-link--always-blue {
   color: #{$dhs-blue};
 }
 
+// Used on: breadcrumbs
+// Note: This could potentially be simplified and use usa-button--with-icon
 a.breadcrumb__back {
   display:flex;
   align-items: center;
@@ -28,10 +33,18 @@ a.breadcrumb__back {
   }
 }
 
+// Remove anchor buttons' underline
 a.usa-button {
   text-decoration: none;
 }
 
+// Unstyled anchor buttons
+a.usa-button--unstyled:visited {
+  color: color('primary');
+}
+
+// Disabled anchor buttons
+// NOTE: Not used
 a.usa-button.disabled-link {
   background-color: #ccc !important;
   color: #454545 !important
@@ -58,6 +71,8 @@ a.usa-button--unstyled.disabled-link:focus {
   text-decoration: none !important;
 }
 
+// Disabled buttons
+// Used on: Domain managers, disabled logo on profile 
 .usa-button--unstyled.disabled-button,
 .usa-button--unstyled.disabled-button:hover,
 .usa-button--unstyled.disabled-button:focus {
@@ -66,6 +81,16 @@ a.usa-button--unstyled.disabled-link:focus {
   text-decoration: none !important;
 }
 
+// Unstyled variant for reverse out?
+// Used on: NONE
+.usa-button--unstyled--white,
+.usa-button--unstyled--white:hover,
+.usa-button--unstyled--white:focus,
+.usa-button--unstyled--white:active {
+  color: color('white');
+}
+
+// Solid anchor buttons
 a.usa-button:not(.usa-button--unstyled, .usa-button--outline) {
   color: color('white');
 }
@@ -76,7 +101,8 @@ a.usa-button:not(.usa-button--unstyled, .usa-button--outline):focus,
 a.usa-button:not(.usa-button--unstyled, .usa-button--outline):active {
   color: color('white');
 }
-  
+
+// Outline anchor buttons
 a.usa-button--outline,
 a.usa-button--outline:visited {
   box-shadow: inset 0 0 0 2px color('primary');
@@ -94,10 +120,22 @@ a.usa-button--outline:active {
   color: color('primary-darker');
 }
 
+// Used on: Domain request withdraw confirmation
 a.withdraw {
   background-color: color('error');
 }
+
+a.withdraw:hover,
+a.withdraw:focus {
+  background-color: color('error-dark');
+}
   
+a.withdraw:active {
+  background-color: color('error-darker');
+}
+
+// Used on: Domain request status
+//NOTE: Revise to BEM convention usa-button--outline-secondary
 a.withdraw_outline,
 a.withdraw_outline:visited {
   box-shadow: inset 0 0 0 2px color('error');
@@ -115,19 +153,8 @@ a.withdraw_outline:active {
   color: color('error-darker');
 }
 
-a.withdraw:hover,
-a.withdraw:focus {
-  background-color: color('error-dark');
-}
-  
-a.withdraw:active {
-  background-color: color('error-darker');
-}
 
-a.usa-button--unstyled:visited {
-  color: color('primary');
-}
-  
+// Used on: Domain request submit
 .dotgov-button--green {
   background-color: color('success-dark');
 
@@ -140,15 +167,8 @@ a.usa-button--unstyled:visited {
   }
 }
 
-.usa-button--unstyled--white,
-.usa-button--unstyled--white:hover,
-.usa-button--unstyled--white:focus,
-.usa-button--unstyled--white:active {
-  color: color('white');
-}
-
-// Cancel button used on the
-// DNSSEC main page
+// Cancel button
+// Used on: DNSSEC main page
 // We want to center this button on mobile
 // and add some extra left margin on tablet+
 .usa-button--cancel {
@@ -175,6 +195,8 @@ a.usa-button--unstyled:visited {
   }
 }
 
+// Used on: Profile page, toggleable fields
+// Note: Could potentially be cleaned up by using usa-button--with-icon
 // We need to deviate from some default USWDS styles here
 // in this particular case, so we have to override this.
 .usa-form .usa-button.readonly-edit-button {
@@ -186,6 +208,7 @@ a.usa-button--unstyled:visited {
   }
 }
 
+//Used on: Domains and Requests tables
 .usa-button--filter {
   width: auto;
   // For mobile stacking
@@ -201,6 +224,8 @@ a.usa-button--unstyled:visited {
   }
 }
 
+// Buttons with nested icons
+// Note: Can be simplified by adding usa-link--icon to anchors in tables
 .dotgov-table a,
 .usa-link--icon,
 .usa-button--with-icon {
@@ -211,14 +236,7 @@ a.usa-button--unstyled:visited {
     align-items: center;
 }
 
-
-.dotgov-table a,
-.usa-link--icon {
-    &:visited {
-        color: color('primary');   
-    }
-}
-
+.dotgov-table a
 a .usa-icon,
 .usa-button--with-icon .usa-icon {
   height: 1.3em;
@@ -230,3 +248,12 @@ a .usa-icon,
   height: 1.5em;
   width: 1.5em;
 }
+
+// Red, for delete buttons
+// Used on: All delete buttons
+// Note: Can be simplified by adding text-secondary to delete anchors in tables
+button.text-secondary,
+button.text-secondary:hover,
+.dotgov-table a.text-secondary {
+  color: $theme-color-error;
+}
diff --git a/src/registrar/templates/includes/senior_official.html b/src/registrar/templates/includes/senior_official.html
index da6c0ac36..bb47a9167 100644
--- a/src/registrar/templates/includes/senior_official.html
+++ b/src/registrar/templates/includes/senior_official.html
@@ -33,7 +33,7 @@
         <button type="submit" class="usa-button">Save</button>
     </form>
 {% elif not form.full_name.value and not form.title.value and not form.email.value %}
-    <h4>No senior official was found.</h4>
+    <h4 class="text-primary-dark">No senior official was found.</h4>
 {% else %}
     <div class="desktop:margin-top-4">
         {% if form.full_name.value is not None %}
diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index 288ddda84..e481a8eba 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -1301,7 +1301,7 @@ class TestDomainOrganization(TestDomainOverview):
         """Can load domain's org name and mailing address page."""
         page = self.client.get(reverse("domain-org-name-address", kwargs={"pk": self.domain.id}))
         # once on the sidebar, once in the page title, once as H1
-        self.assertContains(page, "Organization </a>")
+        self.assertContains(page, "/org-name-address")
         self.assertContains(page, "Organization name and mailing address")
         self.assertContains(page, "Organization</h1>")
 
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index f73b48b30..9e942164d 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -340,9 +340,7 @@ class TestPortfolio(WebTest):
                 user=self.user, portfolio=self.portfolio, additional_permissions=portfolio_additional_permissions
             )
             page = self.app.get(reverse("organization"))
-            self.assertContains(
-                page, "The name of your organization will be publicly listed as the domain registrant."
-            )
+            self.assertContains(page, "The name of your organization will be publicly listed as the domain registrant.")
 
     @less_console_noise_decorator
     def test_domain_org_name_address_content(self):

From d3b5ee03613921a32054a9f3490caf07d1be49da Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Mon, 16 Sep 2024 19:02:16 -0400
Subject: [PATCH 103/118] migrations

---
 ...=> 0128_alter_domaininformation_state_territory_and_more.py} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/registrar/migrations/{0124_alter_domaininformation_state_territory_and_more.py => 0128_alter_domaininformation_state_territory_and_more.py} (99%)

diff --git a/src/registrar/migrations/0124_alter_domaininformation_state_territory_and_more.py b/src/registrar/migrations/0128_alter_domaininformation_state_territory_and_more.py
similarity index 99%
rename from src/registrar/migrations/0124_alter_domaininformation_state_territory_and_more.py
rename to src/registrar/migrations/0128_alter_domaininformation_state_territory_and_more.py
index 62a84d570..a6b8d0519 100644
--- a/src/registrar/migrations/0124_alter_domaininformation_state_territory_and_more.py
+++ b/src/registrar/migrations/0128_alter_domaininformation_state_territory_and_more.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0123_alter_portfolioinvitation_portfolio_additional_permissions_and_more"),
+        ("registrar", "0127_remove_domaininformation_submitter_and_more"),
     ]
 
     operations = [

From 2679f0ac99aed9265383bb2871535a478eb307ec Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 16 Sep 2024 22:20:49 -0400
Subject: [PATCH 104/118] fix for recent test fail

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

diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py
index cabcf529f..305e78dcd 100644
--- a/src/registrar/tests/common.py
+++ b/src/registrar/tests/common.py
@@ -536,7 +536,7 @@ class MockDb(TestCase):
         last_name = "Last"
         email = "info@example.com"
         cls.user = get_user_model().objects.create(
-            username=username, first_name=first_name, last_name=last_name, email=email
+            username=username, first_name=first_name, last_name=last_name, email=email, title="title", phone="8080102431"
         )
 
         current_date = get_time_aware_date(datetime(2024, 4, 2))

From ef40468ec847403fde3e02a04d1e7d6c0f936be4 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 17 Sep 2024 08:32:51 -0600
Subject: [PATCH 105/118] Rename tests to be actually readable

---
 src/registrar/tests/test_views_portfolio.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index e238ea0d6..b8392a370 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -841,7 +841,7 @@ class TestPortfolio(WebTest):
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     @override_flag("organization_requests", active=True)
-    def test_delete_domain_request_as_org_user_with_permission_and_deletable_status(self):
+    def test_org_user_can_delete_own_domain_request_with_permission(self):
         """Test that an org user with edit permission can delete their own DomainRequest with a deletable status."""
 
         # Assign the user to a portfolio with edit permission
@@ -909,7 +909,7 @@ class TestPortfolio(WebTest):
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     @override_flag("organization_requests", active=True)
-    def test_delete_domain_request_as_org_user_not_creator_with_permission_and_deletable_status(self):
+    def test_org_user_cannot_delete_others_domain_requests(self):
         """Test that an org user with edit permission cannot delete DomainRequests they did not create."""
 
         # Assign the user to a portfolio with edit permission

From 171894d692cf52a173c824e3d1b6454928fc75be Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Tue, 17 Sep 2024 11:27:09 -0400
Subject: [PATCH 106/118] cleaning up some code

---
 src/api/tests/common.py         | 14 --------------
 src/api/tests/test_available.py |  6 ++++--
 src/registrar/tests/common.py   |  4 +++-
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/api/tests/common.py b/src/api/tests/common.py
index d975a8012..1a8c32526 100644
--- a/src/api/tests/common.py
+++ b/src/api/tests/common.py
@@ -2,7 +2,6 @@ import os
 import logging
 
 from contextlib import contextmanager
-from django.contrib.auth import get_user_model
 
 
 def get_handlers():
@@ -64,16 +63,3 @@ def less_console_noise_decorator(func):
             return func(*args, **kwargs)
 
     return wrapper
-
-
-def create_user():
-    username = "restricted_user"
-    first_name = "First"
-    last_name = "Last"
-    email = "restricted@example.com"
-    phone = "8003111234"
-    title = "title"
-    user = get_user_model().objects.create(
-        username=username, first_name=first_name, last_name=last_name, email=email, phone=phone, title=title
-    )
-    return user
diff --git a/src/api/tests/test_available.py b/src/api/tests/test_available.py
index a23b18820..09fd4a2cf 100644
--- a/src/api/tests/test_available.py
+++ b/src/api/tests/test_available.py
@@ -6,7 +6,7 @@ from django.contrib.auth import get_user_model
 from django.test import RequestFactory
 
 from ..views import available, check_domain_available
-from .common import less_console_noise, create_user
+from .common import less_console_noise
 from registrar.tests.common import MockEppLib
 from registrar.utility.errors import GenericError, GenericErrorCodes
 from unittest.mock import call
@@ -126,7 +126,9 @@ class AvailableAPITest(MockEppLib):
 
     def setUp(self):
         super().setUp()
-        self.user = create_user()
+        username = "username"
+        title = "title"
+        self.user = get_user_model().objects.create(username=username, title=title)
 
     def test_available_get(self):
         self.client.force_login(self.user)
diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py
index 305e78dcd..4edfbe680 100644
--- a/src/registrar/tests/common.py
+++ b/src/registrar/tests/common.py
@@ -535,8 +535,10 @@ class MockDb(TestCase):
         first_name = "First"
         last_name = "Last"
         email = "info@example.com"
+        title = "title"
+        phone = "8080102431"
         cls.user = get_user_model().objects.create(
-            username=username, first_name=first_name, last_name=last_name, email=email, title="title", phone="8080102431"
+            username=username, first_name=first_name, last_name=last_name, email=email, title=title, phone=phone
         )
 
         current_date = get_time_aware_date(datetime(2024, 4, 2))

From eabbc086efb519dee291ce653b370663fd66374f Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Tue, 17 Sep 2024 13:32:10 -0400
Subject: [PATCH 107/118] added back the user info

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

diff --git a/src/api/tests/test_available.py b/src/api/tests/test_available.py
index 09fd4a2cf..35b2e3971 100644
--- a/src/api/tests/test_available.py
+++ b/src/api/tests/test_available.py
@@ -126,9 +126,15 @@ class AvailableAPITest(MockEppLib):
 
     def setUp(self):
         super().setUp()
-        username = "username"
+        username = "test_user"
+        first_name = "First"
+        last_name = "Last"
+        email = "info@example.com"
         title = "title"
-        self.user = get_user_model().objects.create(username=username, title=title)
+        phone = "8080102431"
+        self.user = get_user_model().objects.create(
+            username=username, title=title, first_name=first_name, last_name=last_name, email=email, phone=phone
+        )
 
     def test_available_get(self):
         self.client.force_login(self.user)

From fc8239956918dfe7c21c36a77d0105393a770551 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 17 Sep 2024 14:16:07 -0400
Subject: [PATCH 108/118] change color on the labels for read only inputs

---
 src/registrar/assets/sass/_theme/_forms.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/assets/sass/_theme/_forms.scss b/src/registrar/assets/sass/_theme/_forms.scss
index 0aedfcdba..44c224aad 100644
--- a/src/registrar/assets/sass/_theme/_forms.scss
+++ b/src/registrar/assets/sass/_theme/_forms.scss
@@ -85,7 +85,7 @@ legend.float-left-tablet + button.float-right-tablet {
 
 .read-only-label {
   font-size: size('body', 'sm');
-  color: color('primary');
+  color: color('primary-dark');
   margin-bottom: units(0.5);
 }
 

From e8d36b9d941693406f8c5428a3a846df161c9990 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Tue, 17 Sep 2024 17:41:34 -0400
Subject: [PATCH 109/118] removed the remaining profile feature"

---
 src/registrar/tests/test_admin_request.py |   1 -
 src/registrar/tests/test_models.py        |   1 -
 src/registrar/tests/test_views.py         | 271 ++++++++++------------
 3 files changed, 123 insertions(+), 150 deletions(-)

diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 797bf2d72..8da003ba3 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -957,7 +957,6 @@ class TestDomainRequestAdmin(MockEppLib):
         self.transition_state_and_send_email(domain_request, DomainRequest.DomainRequestStatus.SUBMITTED)
         self.assertEqual(len(self.mock_client.EMAILS_SENT), 3)
 
-    @override_flag("profile_feature", True)
     @less_console_noise_decorator
     def test_save_model_sends_approved_email(self):
         """When transitioning to approved on a domain request,
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 8390e0bbf..151ed4abd 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -256,7 +256,6 @@ class TestDomainRequest(TestCase):
 
         email_allowed.delete()
 
-    @override_flag("profile_feature", active=True)
     @less_console_noise_decorator
     def test_submit_from_started_sends_email_to_creator(self):
         """Tests if, when the profile feature flag is on, we send an email to the creator"""
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 14b894a9c..8510c711c 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -552,7 +552,6 @@ class FinishUserProfileTests(TestWithUser, WebTest):
         return page.follow() if follow else page
 
     @less_console_noise_decorator
-    @override_flag("profile_feature", active=True)
     def test_full_name_initial_value(self):
         """Test that full_name initial value is empty when first_name or last_name is empty.
         This will later be displayed as "unknown" using javascript."""
@@ -606,8 +605,8 @@ class FinishUserProfileTests(TestWithUser, WebTest):
         incomplete_regular_user.delete()
 
     @less_console_noise_decorator
-    def test_new_user_with_profile_feature_on(self):
-        """Tests that a new user is redirected to the profile setup page when profile_feature is on"""
+    def test_new_user(self):
+        """Tests that a new user is redirected to the profile setup page"""
         username_regular_incomplete = "test_regular_user_incomplete"
         first_name_2 = "Incomplete"
         email_2 = "unicorn@igorville.com"
@@ -620,39 +619,37 @@ class FinishUserProfileTests(TestWithUser, WebTest):
         )
 
         self.app.set_user(incomplete_regular_user.username)
-        with override_flag("profile_feature", active=True):
-            # This will redirect the user to the setup page.
-            # Follow implicity checks if our redirect is working.
-            finish_setup_page = self.app.get(reverse("home")).follow()
-            self._set_session_cookie()
+        # This will redirect the user to the setup page.
+        # Follow implicity checks if our redirect is working.
+        finish_setup_page = self.app.get(reverse("home")).follow()
+        self._set_session_cookie()
+        # Assert that we're on the right page
+        self.assertContains(finish_setup_page, "Finish setting up your profile")
 
-            # Assert that we're on the right page
-            self.assertContains(finish_setup_page, "Finish setting up your profile")
+        finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
 
-            finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
+        self.assertEqual(finish_setup_page.status_code, 200)
 
-            self.assertEqual(finish_setup_page.status_code, 200)
+        # We're missing a phone number, so the page should tell us that
+        self.assertContains(finish_setup_page, "Enter your phone number.")
 
-            # We're missing a phone number, so the page should tell us that
-            self.assertContains(finish_setup_page, "Enter your phone number.")
+        # Check for the name of the save button
+        self.assertContains(finish_setup_page, "user_setup_save_button")
 
-            # Check for the name of the save button
-            self.assertContains(finish_setup_page, "user_setup_save_button")
+        # Add a phone number
+        finish_setup_form = finish_setup_page.form
+        finish_setup_form["phone"] = "(201) 555-0123"
+        finish_setup_form["title"] = "CEO"
+        finish_setup_form["last_name"] = "example"
+        save_page = self._submit_form_webtest(finish_setup_form, follow=True)
 
-            # Add a phone number
-            finish_setup_form = finish_setup_page.form
-            finish_setup_form["phone"] = "(201) 555-0123"
-            finish_setup_form["title"] = "CEO"
-            finish_setup_form["last_name"] = "example"
-            save_page = self._submit_form_webtest(finish_setup_form, follow=True)
+        self.assertEqual(save_page.status_code, 200)
+        self.assertContains(save_page, "Your profile has been updated.")
 
-            self.assertEqual(save_page.status_code, 200)
-            self.assertContains(save_page, "Your profile has been updated.")
-
-            # Try to navigate back to the home page.
-            # This is the same as clicking the back button.
-            completed_setup_page = self.app.get(reverse("home"))
-            self.assertContains(completed_setup_page, "Manage your domain")
+        # Try to navigate back to the home page.
+        # This is the same as clicking the back button.
+        completed_setup_page = self.app.get(reverse("home"))
+        self.assertContains(completed_setup_page, "Manage your domain")
         incomplete_regular_user.delete()
 
     @less_console_noise_decorator
@@ -669,46 +666,45 @@ class FinishUserProfileTests(TestWithUser, WebTest):
             verification_type=User.VerificationTypeChoices.REGULAR,
         )
         self.app.set_user(incomplete_regular_user.username)
-        with override_flag("profile_feature", active=True):
-            # This will redirect the user to the setup page.
-            # Follow implicity checks if our redirect is working.
-            finish_setup_page = self.app.get(reverse("home")).follow()
-            self._set_session_cookie()
+        # This will redirect the user to the setup page.
+        # Follow implicity checks if our redirect is working.
+        finish_setup_page = self.app.get(reverse("home")).follow()
+        self._set_session_cookie()
 
-            # Assert that we're on the right page
-            self.assertContains(finish_setup_page, "Finish setting up your profile")
+        # Assert that we're on the right page
+        self.assertContains(finish_setup_page, "Finish setting up your profile")
 
-            finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
+        finish_setup_page = self._submit_form_webtest(finish_setup_page.form)
 
-            self.assertEqual(finish_setup_page.status_code, 200)
+        self.assertEqual(finish_setup_page.status_code, 200)
 
-            # We're missing a phone number, so the page should tell us that
-            self.assertContains(finish_setup_page, "Enter your phone number.")
+        # We're missing a phone number, so the page should tell us that
+        self.assertContains(finish_setup_page, "Enter your phone number.")
 
-            # Check for the name of the save button
-            self.assertContains(finish_setup_page, "user_setup_save_button")
+        # Check for the name of the save button
+        self.assertContains(finish_setup_page, "user_setup_save_button")
 
-            # Add a phone number
-            finish_setup_form = finish_setup_page.form
-            finish_setup_form["first_name"] = "test"
-            finish_setup_form["last_name"] = "test2"
-            finish_setup_form["phone"] = "(201) 555-0123"
-            finish_setup_form["title"] = "CEO"
-            finish_setup_form["last_name"] = "example"
-            save_page = self._submit_form_webtest(finish_setup_form, follow=True)
+        # Add a phone number
+        finish_setup_form = finish_setup_page.form
+        finish_setup_form["first_name"] = "test"
+        finish_setup_form["last_name"] = "test2"
+        finish_setup_form["phone"] = "(201) 555-0123"
+        finish_setup_form["title"] = "CEO"
+        finish_setup_form["last_name"] = "example"
+        save_page = self._submit_form_webtest(finish_setup_form, follow=True)
 
-            self.assertEqual(save_page.status_code, 200)
-            self.assertContains(save_page, "Your profile has been updated.")
+        self.assertEqual(save_page.status_code, 200)
+        self.assertContains(save_page, "Your profile has been updated.")
 
-            # Try to navigate back to the home page.
-            # This is the same as clicking the back button.
-            completed_setup_page = self.app.get(reverse("home"))
-            self.assertContains(completed_setup_page, "Manage your domain")
+        # Try to navigate back to the home page.
+        # This is the same as clicking the back button.
+        completed_setup_page = self.app.get(reverse("home"))
+        self.assertContains(completed_setup_page, "Manage your domain")
         incomplete_regular_user.delete()
 
     @less_console_noise_decorator
-    def test_new_user_goes_to_domain_request_with_profile_feature_on(self):
-        """Tests that a new user is redirected to the domain request page when profile_feature is on"""
+    def test_new_user_goes_to_domain_request(self):
+        """Tests that a new user is redirected to the domain request page"""
         username_regular_incomplete = "test_regular_user_incomplete"
         first_name_2 = "Incomplete"
         email_2 = "unicorn@igorville.com"
@@ -720,7 +716,7 @@ class FinishUserProfileTests(TestWithUser, WebTest):
             verification_type=User.VerificationTypeChoices.REGULAR,
         )
         self.app.set_user(incomplete_regular_user.username)
-        with override_flag("profile_feature", active=True):
+        with override_flag("", active=True):
             # This will redirect the user to the setup page
             finish_setup_page = self.app.get(reverse("domain-request:")).follow()
             self._set_session_cookie()
@@ -803,8 +799,8 @@ class FinishUserProfileForOtherUsersTests(TestWithUser, WebTest):
         return page.follow() if follow else page
 
     @less_console_noise_decorator
-    def test_new_user_with_profile_feature_on(self):
-        """Tests that a new user is redirected to the profile setup page when profile_feature is on,
+    def test_new_user(self):
+        """Tests that a new user is redirected to the profile setup page,
         and testing that the confirmation modal is present"""
         username_other_incomplete = "test_other_user_incomplete"
         first_name_2 = "Incomplete"
@@ -818,66 +814,63 @@ class FinishUserProfileForOtherUsersTests(TestWithUser, WebTest):
             verification_type=User.VerificationTypeChoices.VERIFIED_BY_STAFF,
         )
         self.app.set_user(incomplete_other_user.username)
-        with override_flag("profile_feature", active=True):
-            # This will redirect the user to the user profile page.
-            # Follow implicity checks if our redirect is working.
-            user_profile_page = self.app.get(reverse("home")).follow()
-            self._set_session_cookie()
+        # This will redirect the user to the user profile page.
+        # Follow implicity checks if our redirect is working.
+        user_profile_page = self.app.get(reverse("home")).follow()
+        self._set_session_cookie()
 
-            # Assert that we're on the right page by testing for the modal
-            self.assertContains(user_profile_page, "domain registrants must maintain accurate contact information")
+        # Assert that we're on the right page by testing for the modal
+        self.assertContains(user_profile_page, "domain registrants must maintain accurate contact information")
 
-            user_profile_page = self._submit_form_webtest(user_profile_page.form)
+        user_profile_page = self._submit_form_webtest(user_profile_page.form)
 
-            self.assertEqual(user_profile_page.status_code, 200)
+        self.assertEqual(user_profile_page.status_code, 200)
 
-            # Assert that modal does not appear on subsequent submits
-            self.assertNotContains(user_profile_page, "domain registrants must maintain accurate contact information")
-            # Assert that unique error message appears by testing the message in a specific div
-            html_content = user_profile_page.content.decode("utf-8")
-            # Normalize spaces and line breaks in the HTML content
-            normalized_html_content = " ".join(html_content.split())
-            # Expected string without extra spaces and line breaks
-            expected_string = "Before you can manage your domain, we need you to add contact information."
-            # Check for the presence of the <div> element with the specific text
-            self.assertIn(f'<div class="usa-alert__body"> {expected_string} </div>', normalized_html_content)
+        # Assert that modal does not appear on subsequent submits
+        self.assertNotContains(user_profile_page, "domain registrants must maintain accurate contact information")
+        # Assert that unique error message appears by testing the message in a specific div
+        html_content = user_profile_page.content.decode("utf-8")
+        # Normalize spaces and line breaks in the HTML content
+        normalized_html_content = " ".join(html_content.split())
+        # Expected string without extra spaces and line breaks
+        expected_string = "Before you can manage your domain, we need you to add contact information."
+        # Check for the presence of the <div> element with the specific text
+        self.assertIn(f'<div class="usa-alert__body"> {expected_string} </div>', normalized_html_content)
 
-            # We're missing a phone number, so the page should tell us that
-            self.assertContains(user_profile_page, "Enter your phone number.")
+        # We're missing a phone number, so the page should tell us that
+        self.assertContains(user_profile_page, "Enter your phone number.")
 
-            # We need to assert that links to manage your domain are not present (in both body and footer)
-            self.assertNotContains(user_profile_page, "Manage your domains")
-            # Assert the tooltip on the logo, indicating that the logo is not clickable
-            self.assertContains(
-                user_profile_page, 'title="Before you can manage your domains, we need you to add contact information."'
-            )
-            # Assert that modal does not appear on subsequent submits
-            self.assertNotContains(user_profile_page, "domain registrants must maintain accurate contact information")
+        # We need to assert that links to manage your domain are not present (in both body and footer)
+        self.assertNotContains(user_profile_page, "Manage your domains")
+        # Assert the tooltip on the logo, indicating that the logo is not clickable
+        self.assertContains(
+            user_profile_page, 'title="Before you can manage your domains, we need you to add contact information."'
+        )
+        # Assert that modal does not appear on subsequent submits
+        self.assertNotContains(user_profile_page, "domain registrants must maintain accurate contact information")
 
-            # Add a phone number
-            finish_setup_form = user_profile_page.form
-            finish_setup_form["phone"] = "(201) 555-0123"
-            finish_setup_form["title"] = "CEO"
-            finish_setup_form["last_name"] = "example"
-            save_page = self._submit_form_webtest(finish_setup_form, follow=True)
+        # Add a phone number
+        finish_setup_form = user_profile_page.form
+        finish_setup_form["phone"] = "(201) 555-0123"
+        finish_setup_form["title"] = "CEO"
+        finish_setup_form["last_name"] = "example"
+        save_page = self._submit_form_webtest(finish_setup_form, follow=True)
 
-            self.assertEqual(save_page.status_code, 200)
-            self.assertContains(save_page, "Your profile has been updated.")
+        self.assertEqual(save_page.status_code, 200)
+        self.assertContains(save_page, "Your profile has been updated.")
 
-            # We need to assert that logo is not clickable and links to manage your domain are not present
-            # NOTE: "anage" is not a typo.  It is to accomodate the fact that the "m" is uppercase in one
-            # instance and lowercase in the other.
-            self.assertContains(save_page, "anage your domains", count=2)
-            self.assertNotContains(
-                save_page, "Before you can manage your domains, we need you to add contact information"
-            )
-            # Assert that modal does not appear on subsequent submits
-            self.assertNotContains(save_page, "domain registrants must maintain accurate contact information")
+        # We need to assert that logo is not clickable and links to manage your domain are not present
+        # NOTE: "anage" is not a typo.  It is to accomodate the fact that the "m" is uppercase in one
+        # instance and lowercase in the other.
+        self.assertContains(save_page, "anage your domains", count=2)
+        self.assertNotContains(save_page, "Before you can manage your domains, we need you to add contact information")
+        # Assert that modal does not appear on subsequent submits
+        self.assertNotContains(save_page, "domain registrants must maintain accurate contact information")
 
-            # Try to navigate back to the home page.
-            # This is the same as clicking the back button.
-            completed_setup_page = self.app.get(reverse("home"))
-            self.assertContains(completed_setup_page, "Manage your domain")
+        # Try to navigate back to the home page.
+        # This is the same as clicking the back button.
+        completed_setup_page = self.app.get(reverse("home"))
+        self.assertContains(completed_setup_page, "Manage your domain")
 
 
 class UserProfileTests(TestWithUser, WebTest):
@@ -902,56 +895,39 @@ class UserProfileTests(TestWithUser, WebTest):
         DomainInformation.objects.all().delete()
 
     @less_console_noise_decorator
-    def error_500_main_nav_with_profile_feature_turned_on(self):
-        """test that Your profile is in main nav of 500 error page when profile_feature is on.
+    def error_500_main_nav(self):
+        """test that Your profile is in main nav of 500 error page.
 
         Our treatment of 401 and 403 error page handling with that waffle feature is similar, so we
         assume that the same test results hold true for 401 and 403."""
-        with override_flag("profile_feature", active=True):
-            with self.assertRaises(Exception):
-                response = self.client.get(reverse("home"), follow=True)
-                self.assertEqual(response.status_code, 500)
-                self.assertContains(response, "Your profile")
+        with self.assertRaises(Exception):
+            response = self.client.get(reverse("home"), follow=True)
+            self.assertEqual(response.status_code, 500)
+            self.assertContains(response, "Your profile")
 
     @less_console_noise_decorator
-    def error_500_main_nav_with_profile_feature_turned_off(self):
-        """test that Your profile is not in main nav of 500 error page when profile_feature is off.
-
-        Our treatment of 401 and 403 error page handling with that waffle feature is similar, so we
-        assume that the same test results hold true for 401 and 403."""
-        with override_flag("profile_feature", active=False):
-            with self.assertRaises(Exception):
-                response = self.client.get(reverse("home"), follow=True)
-                self.assertEqual(response.status_code, 500)
-                self.assertNotContains(response, "Your profile")
-
-    @less_console_noise_decorator
-    def test_home_page_main_nav_with_profile_feature_on(self):
-        """test that Your profile is in main nav of home page when profile_feature is on"""
-        with override_flag("profile_feature", active=True):
-            response = self.client.get("/", follow=True)
+    def test_home_page_main_nav(self):
+        """test that Your profile is in main nav of home page"""
+        response = self.client.get("/", follow=True)
         self.assertContains(response, "Your profile")
 
     @less_console_noise_decorator
-    def test_new_request_main_nav_with_profile_feature_on(self):
-        """test that Your profile is in main nav of new request when profile_feature is on"""
-        with override_flag("profile_feature", active=True):
-            response = self.client.get("/request/", follow=True)
+    def test_new_request_main_nav(self):
+        """test that Your profile is in main nav of new request"""
+        response = self.client.get("/request/", follow=True)
         self.assertContains(response, "Your profile")
 
     @less_console_noise_decorator
-    def test_user_profile_main_nav_with_profile_feature_on(self):
-        """test that Your profile is in main nav of user profile when profile_feature is on"""
-        with override_flag("profile_feature", active=True):
-            response = self.client.get("/user-profile", follow=True)
+    def test_user_profile_main_nav(self):
+        """test that Your profile is in main nav of user profile"""
+        response = self.client.get("/user-profile", follow=True)
         self.assertContains(response, "Your profile")
 
     @less_console_noise_decorator
     def test_user_profile_back_button_when_coming_from_domain_request(self):
-        """tests user profile when profile_feature is on,
+        """tests user profile,
         and when they are redirected from the domain request page"""
-        with override_flag("profile_feature", active=True):
-            response = self.client.get("/user-profile?redirect=domain-request:")
+        response = self.client.get("/user-profile?redirect=domain-request:")
         self.assertContains(response, "Your profile")
         self.assertContains(response, "Go back to your domain request")
         self.assertNotContains(response, "Back to manage your domains")
@@ -964,10 +940,9 @@ class UserProfileTests(TestWithUser, WebTest):
         self.assertNotContains(response, "Your contact information")
 
     @less_console_noise_decorator
-    def test_domain_your_contact_information_when_profile_feature_on(self):
+    def test_domain_your_contact_information(self):
         """test that Your contact information is not accessible when profile feature is on"""
-        with override_flag("profile_feature", active=True):
-            response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
+        response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
         self.assertEqual(response.status_code, 404)
 
     @less_console_noise_decorator

From 847ab047d2c181a12b08694eb1118cc75b05aad4 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 17 Sep 2024 17:48:05 -0400
Subject: [PATCH 110/118] SO html tweaks

---
 .../templates/includes/senior_official.html     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/registrar/templates/includes/senior_official.html b/src/registrar/templates/includes/senior_official.html
index bb47a9167..0302bc71f 100644
--- a/src/registrar/templates/includes/senior_official.html
+++ b/src/registrar/templates/includes/senior_official.html
@@ -16,14 +16,6 @@
 
 {% if can_edit %}
     {% include "includes/required_fields.html" %}
-{% else %}
-    <p>
-        The senior official for your organization can’t be updated here. 
-        To suggest an update, email <a href="mailto:help@get.gov" class="usa-link">help@get.gov</a>.
-    </p>
-{% endif %}
-
-{% if can_edit %}
     <form class="usa-form usa-form--large desktop:margin-top-4" method="post" novalidate id="form-container">
         {% csrf_token %}
         {% input_with_errors form.first_name %}
@@ -33,8 +25,15 @@
         <button type="submit" class="usa-button">Save</button>
     </form>
 {% elif not form.full_name.value and not form.title.value and not form.email.value %}
-    <h4 class="text-primary-dark">No senior official was found.</h4>
+    <p>
+        Your senior official is a person within your organization who can authorize domain requests.
+        We don't have information about your organization's senior official. To suggest an update, email <a href="mailto:help@get.gov" class="usa-link">help@get.gov</a>.
+    </p>
 {% else %}
+    <p>
+        The senior official for your organization can’t be updated here. 
+        To suggest an update, email <a href="mailto:help@get.gov" class="usa-link">help@get.gov</a>.
+    </p>
     <div class="desktop:margin-top-4">
         {% if form.full_name.value is not None %}
             {% include "includes/input_read_only.html" with field=form.full_name %}

From 441095f952bea4e5765d2e4ef34f23746aff9328 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Tue, 17 Sep 2024 17:50:27 -0400
Subject: [PATCH 111/118] fixing format

---
 src/registrar/admin.py                              | 2 --
 src/registrar/templates/domain_request_sidebar.html | 2 +-
 src/registrar/templates/domain_request_status.html  | 1 -
 src/registrar/tests/test_views_request.py           | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 24139fd47..40c2bc050 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1977,8 +1977,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         so we should display that information using this function.
 
         """
-
-        # TODO 2574: remove lines 1977-1978 (refactor as needed)
         recipient = obj.creator
 
         # Displays a warning in admin when an email cannot be sent
diff --git a/src/registrar/templates/domain_request_sidebar.html b/src/registrar/templates/domain_request_sidebar.html
index b7abede5c..5af03627f 100644
--- a/src/registrar/templates/domain_request_sidebar.html
+++ b/src/registrar/templates/domain_request_sidebar.html
@@ -15,7 +15,7 @@
               </svg>
             {% endif %}
           {% endif %}
-        <a href="{% namespaced_url 'domain-request' this_step %}"
+        <a href="{% namespaced_url 'domain-request' this_step %}" 
            {% if this_step == steps.current %}
            class="usa-current"
            {% else %}
diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html
index b73fa771f..fc0650ecb 100644
--- a/src/registrar/templates/domain_request_status.html
+++ b/src/registrar/templates/domain_request_status.html
@@ -130,7 +130,6 @@
     {% if DomainRequest.creator %}
       {% include "includes/summary_item.html" with title='Your contact information' value=DomainRequest.creator contact='true' heading_level=heading_level %}
     {% endif %}
-    
     {% if DomainRequest.other_contacts.all %}
       {% include "includes/summary_item.html" with title='Other employees from your organization' value=DomainRequest.other_contacts.all contact='true' list='true' heading_level=heading_level %}
     {% else %}
diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 6dde70f1a..b2c0361dd 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -2206,7 +2206,6 @@ class DomainRequestTests(TestWithUser, WebTest):
         senior_official = domain_request.senior_official
         self.assertEquals("Testy2", senior_official.first_name)
 
-    @override_flag("profile_feature", active=True)
     @less_console_noise_decorator
     def test_edit_creator_in_place(self):
         """When you:

From 270094e0937ddebda74d2554490f45f97e841d62 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Tue, 17 Sep 2024 17:51:40 -0400
Subject: [PATCH 112/118] added new line

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

diff --git a/src/registrar/templates/domain_request_sidebar.html b/src/registrar/templates/domain_request_sidebar.html
index 5af03627f..f9ca5397d 100644
--- a/src/registrar/templates/domain_request_sidebar.html
+++ b/src/registrar/templates/domain_request_sidebar.html
@@ -39,4 +39,4 @@
     {% endfor %}
     </ul>
   </nav>
-</div>
\ No newline at end of file
+</div>

From 0d695584c46306cf964abe0f7a28b19c27f1fe2c Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Wed, 18 Sep 2024 09:43:18 -0400
Subject: [PATCH 113/118] removed unused reference

---
 src/registrar/tests/test_admin_request.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 8da003ba3..28639e69b 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -37,7 +37,6 @@ from .common import (
     GenericTestHelper,
 )
 from unittest.mock import patch
-from waffle.testutils import override_flag
 
 from django.conf import settings
 import boto3_mocking  # type: ignore

From 294fbee5c3f3379a9db374eb4bd2ae15e3307b5e Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Wed, 18 Sep 2024 12:01:46 -0400
Subject: [PATCH 114/118] added more detail for test based on suggestion:

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

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 8510c711c..978c1be05 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -933,8 +933,8 @@ class UserProfileTests(TestWithUser, WebTest):
         self.assertNotContains(response, "Back to manage your domains")
 
     @less_console_noise_decorator
-    def test_domain_detail(self):
-        """test that domain detail view"""
+    def test_domain_detail_contains_your_profile(self):
+        """Tests that the domain detail view contains 'your profile' rather than 'your contact information'"""
         response = self.client.get(reverse("domain", args=[self.domain.pk]))
         self.assertContains(response, "Your profile")
         self.assertNotContains(response, "Your contact information")

From f3159b57e4a35a715d4e96f5422b6373c83bf952 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Wed, 18 Sep 2024 14:20:57 -0400
Subject: [PATCH 115/118] refactored test

---
 src/registrar/tests/test_views_domain.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index 87ecd9b04..6738fa454 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -737,6 +737,12 @@ class TestDomainManagers(TestDomainOverview):
     def test_domain_invitation_flow(self):
         """Send an invitation to a new user, log in and load the dashboard."""
         email_address = "mayor@igorville.gov"
+        username="mayor"
+        first_name = "First"
+        last_name = "Last"
+        title = "title"
+        phone = "8080102431"
+        title="title"
         User.objects.filter(email=email_address).delete()
 
         add_page = self.app.get(reverse("domain-users-add", kwargs={"pk": self.domain.id}))
@@ -752,14 +758,14 @@ class TestDomainManagers(TestDomainOverview):
             add_page.form.submit()
 
         # user was invited, create them
-        new_user = User.objects.create(username=email_address, email=email_address)
+        new_user = User.objects.create(username=username, email=email_address, first_name=first_name, last_name=last_name, title=title, phone=phone)
         # log them in to `self.app`
         self.app.set_user(new_user.username)
         # and manually call the on each login callback
         new_user.on_each_login()
 
         # Now load the home page and make sure our domain appears there
-        home_page = self.app.get(reverse("user-profile"))
+        home_page = self.app.get(reverse("home"))
         self.assertContains(home_page, self.domain.name)
 
 

From 6be34e0677ad2956b78cfd205444b45d073fb4bf Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Wed, 18 Sep 2024 15:06:42 -0400
Subject: [PATCH 116/118] reformatted test file

---
 src/registrar/tests/test_views_domain.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index 6738fa454..97018ee14 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -737,12 +737,12 @@ class TestDomainManagers(TestDomainOverview):
     def test_domain_invitation_flow(self):
         """Send an invitation to a new user, log in and load the dashboard."""
         email_address = "mayor@igorville.gov"
-        username="mayor"
+        username = "mayor"
         first_name = "First"
         last_name = "Last"
         title = "title"
         phone = "8080102431"
-        title="title"
+        title = "title"
         User.objects.filter(email=email_address).delete()
 
         add_page = self.app.get(reverse("domain-users-add", kwargs={"pk": self.domain.id}))
@@ -758,7 +758,9 @@ class TestDomainManagers(TestDomainOverview):
             add_page.form.submit()
 
         # user was invited, create them
-        new_user = User.objects.create(username=username, email=email_address, first_name=first_name, last_name=last_name, title=title, phone=phone)
+        new_user = User.objects.create(
+            username=username, email=email_address, first_name=first_name, last_name=last_name, title=title, phone=phone
+        )
         # log them in to `self.app`
         self.app.set_user(new_user.username)
         # and manually call the on each login callback

From 7a812101c97956ae4457579fe1a59134dc152bdb Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Wed, 18 Sep 2024 15:47:49 -0400
Subject: [PATCH 117/118] removed profile feature from docs

---
 src/registrar/models/waffle_flag.py | 2 +-
 src/registrar/tests/test_models.py  | 2 +-
 src/registrar/tests/test_views.py   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/registrar/models/waffle_flag.py b/src/registrar/models/waffle_flag.py
index d185c2a82..9dd11a3d8 100644
--- a/src/registrar/models/waffle_flag.py
+++ b/src/registrar/models/waffle_flag.py
@@ -9,7 +9,7 @@ class WaffleFlag(AbstractUserFlag):
     Custom implementation of django-waffles 'Flag' object.
     Read more here: https://waffle.readthedocs.io/en/stable/types/flag.html
 
-    Use this class when dealing with feature flags, such as profile_feature.
+    Use this class when dealing with feature flags.
     """
 
     class Meta:
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 151ed4abd..a6e889503 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -258,7 +258,7 @@ class TestDomainRequest(TestCase):
 
     @less_console_noise_decorator
     def test_submit_from_started_sends_email_to_creator(self):
-        """Tests if, when the profile feature flag is on, we send an email to the creator"""
+        """tests that we send an email to the creator"""
         msg = "Create a domain request and submit it and see if email was sent when the feature flag is on."
         domain_request = completed_domain_request(user=self.dummy_user_2)
         self.check_email_sent(
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 978c1be05..85ff5edd6 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -941,13 +941,13 @@ class UserProfileTests(TestWithUser, WebTest):
 
     @less_console_noise_decorator
     def test_domain_your_contact_information(self):
-        """test that Your contact information is not accessible when profile feature is on"""
+        """test that your contact information is not accessible"""
         response = self.client.get(f"/domain/{self.domain.id}/your-contact-information", follow=True)
         self.assertEqual(response.status_code, 404)
 
     @less_console_noise_decorator
     def test_profile_request_page(self):
-        """test that Your profile is in request"""
+        """test that your profile is in request"""
 
         contact_user, _ = Contact.objects.get_or_create(
             first_name="Hank",

From d8d36051e3f9f33a464809fc26264e34757ec018 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Wed, 18 Sep 2024 15:49:13 -0400
Subject: [PATCH 118/118] removed profile feature from documentation

---
 docs/developer/adding-feature-flags.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/developer/adding-feature-flags.md b/docs/developer/adding-feature-flags.md
index dd97c7497..dc51b9e85 100644
--- a/docs/developer/adding-feature-flags.md
+++ b/docs/developer/adding-feature-flags.md
@@ -9,10 +9,10 @@ We use [django-waffle](https://waffle.readthedocs.io/en/stable/) for our feature
 3. Click `Add waffle flag`.
 4. Add the model as you would normally. Refer to waffle's documentation [regarding attributes](https://waffle.readthedocs.io/en/stable/types/flag.html#flag-attributes) for more information on them.
 
-### Enabling the profile_feature flag
+### Enabling a feature flag
 1. On the app, navigate to `\admin`.
 2. Under models, click `Waffle flags`.
-3. Click the `profile_feature` record. This should exist by default, if not - create one with that name.
+3. Click the featue flag record. This should exist by default, if not - create one with that name.
 4. (Important) Set the field `Everyone` to `Unknown`. This field overrides all other settings when set to anything else.
 5. Configure the settings as you see fit.