Merge branch 'main' into za/1988-investigate-indexes

src/registrar/models/domain_request.py

@@ -9,6 +9,7 @@ from django.db import models
 from django_fsm import FSMField, transition  # type: ignore
 from django.utils import timezone
 from registrar.models.domain import Domain
+from registrar.models.federal_agency import FederalAgency
 from registrar.models.utility.generic_helper import CreateOrUpdateOrganizationTypeHelper
 from registrar.utility.errors import FSMDomainRequestError, FSMErrorCodes
 
@@ -758,6 +759,10 @@ class DomainRequest(TimeStampedModel):
         domain request into an admin on that domain. It also triggers an email
         notification."""
 
+        if self.federal_agency is None:
+            self.federal_agency = FederalAgency.objects.filter(agency="Non-Federal Agency").first()
+            self.save()
+
         # create the domain
         Domain = apps.get_model("registrar.Domain")