Updated federal agency with new foreign key field

src/registrar/admin.py

@@ -1017,9 +1017,7 @@ class DomainInformationAdmin(ListHeaderAdmin):
                 "description": "Extends type of organization",
                 "fields": [
                     "federal_type",
-                    # "updated_federal_agency",
-                    # Above field commented out so it won't display
-                    "federal_agency",  # TODO: remove later
+                    "federal_agency",
                     "tribe_name",
                     "federally_recognized_tribe",
                     "state_recognized_tribe",
@@ -1270,9 +1268,7 @@ class DomainRequestAdmin(ListHeaderAdmin):
                 "description": "Extends type of organization",
                 "fields": [
                     "federal_type",
-                    # "updated_federal_agency",
-                    # Above field commented out so it won't display
-                    "federal_agency",  # TODO: remove later
+                    "federal_agency",
                     "tribe_name",
                     "federally_recognized_tribe",
                     "state_recognized_tribe",

src/registrar/fixtures_domain_requests.py

@@ -9,6 +9,7 @@ from registrar.models import (
     DraftDomain,
     Contact,
     Website,
+    FederalAgency
 )
 
 fake = Faker()
@@ -101,12 +102,6 @@ class DomainRequestFixture:
 
         # TODO for a future ticket: Allow for more than just "federal" here
         da.generic_org_type = app["generic_org_type"] if "generic_org_type" in app else "federal"
-        da.federal_agency = (
-            app["federal_agency"]
-            if "federal_agency" in app
-            # Random choice of agency for selects, used as placeholders for testing.
-            else random.choice(DomainRequest.AGENCIES)  # nosec
-        )
         da.submission_date = fake.date()
         da.federal_type = (
             app["federal_type"]
@@ -146,6 +141,12 @@ class DomainRequestFixture:
                 da.requested_domain, _ = DraftDomain.objects.get_or_create(name=app["requested_domain"])
             else:
                 da.requested_domain = DraftDomain.objects.create(name=cls.fake_dot_gov())
+        if not da.federal_agency:
+            if "federal_agency" in app and app["federal_agency"] is not None:
+                da.federal_agency, _ = FederalAgency.objects.get_or_create(name=app["federal_agency"])
+            else:
+                federal_agencies = FederalAgency.objects.all()
+                da.federal_agency = random.choice(federal_agencies)
 
     @classmethod
     def _set_many_to_many_relations(cls, da: DomainRequest, app: dict):

src/registrar/migrations/0090_remove_domaininformation_federal_agency_and_more.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.10 on 2024-05-02 17:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0089_user_verification_type"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="domaininformation",
+            name="federal_agency",
+        ),
+        migrations.RemoveField(
+            model_name="domainrequest",
+            name="federal_agency",
+        ),
+    ]

src/registrar/migrations/0091_rename_updated_federal_agency_domaininformation_federal_agency_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.10 on 2024-05-02 17:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0090_remove_domaininformation_federal_agency_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="domaininformation",
+            old_name="updated_federal_agency",
+            new_name="federal_agency",
+        ),
+        migrations.RenameField(
+            model_name="domainrequest",
+            old_name="updated_federal_agency",
+            new_name="federal_agency",
+        ),
+    ]

src/registrar/models/domain_information.py

@@ -32,7 +32,7 @@ class DomainInformation(TimeStampedModel):
     # TODO for #1975: Delete this after we run the new migration
     AGENCY_CHOICES = DomainRequest.AGENCY_CHOICES
 
-    updated_federal_agency = models.ForeignKey(
+    federal_agency = models.ForeignKey(
         "registrar.FederalAgency",
         on_delete=models.PROTECT,
         help_text="Associated federal agency",
@@ -98,12 +98,6 @@ class DomainInformation(TimeStampedModel):
         blank=True,
     )
 
-    federal_agency = models.CharField(
-        choices=AGENCY_CHOICES,
-        null=True,
-        blank=True,
-    )
-
     federal_type = models.CharField(
         max_length=50,
         choices=BranchChoices.choices,

src/registrar/models/domain_request.py

@@ -449,7 +449,7 @@ class DomainRequest(TimeStampedModel):
         blank=True,
     )
 
-    updated_federal_agency = models.ForeignKey(
+    federal_agency = models.ForeignKey(
         "registrar.FederalAgency",
         on_delete=models.PROTECT,
         help_text="Associated federal agency",
@@ -512,12 +512,6 @@ class DomainRequest(TimeStampedModel):
         blank=True,
     )
 
-    federal_agency = models.CharField(
-        choices=AGENCY_CHOICES,
-        null=True,
-        blank=True,
-    )
-
     federal_type = models.CharField(
         max_length=50,
         choices=BranchChoices.choices,