From b09f68946f61ce7cb465119e4279f1c22c8099e0 Mon Sep 17 00:00:00 2001
From: matthewswspence <Matthewswspence@gmail.com>
Date: Tue, 11 Mar 2025 10:48:54 -0500
Subject: [PATCH] review changes

---
 ...equest_feb_naming_requirements_and_more.py | 29 +++++++++++++-
 ...mainrequest_feb_purpose_choice_and_more.py | 40 -------------------
 src/registrar/models/domain_request.py        |  8 +---
 src/registrar/views/domain_request.py         |  4 --
 4 files changed, 30 insertions(+), 51 deletions(-)
 delete mode 100644 src/registrar/migrations/0142_domainrequest_feb_purpose_choice_and_more.py

diff --git a/src/registrar/migrations/0141_domainrequest_feb_naming_requirements_and_more.py b/src/registrar/migrations/0141_domainrequest_feb_naming_requirements_and_more.py
index 32634d8ee..ad29e57d0 100644
--- a/src/registrar/migrations/0141_domainrequest_feb_naming_requirements_and_more.py
+++ b/src/registrar/migrations/0141_domainrequest_feb_naming_requirements_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.17 on 2025-02-13 22:41
+# Generated by Django 4.2.17 on 2025-03-10 19:55
 
 from django.db import migrations, models
 
@@ -20,4 +20,31 @@ class Migration(migrations.Migration):
             name="feb_naming_requirements_details",
             field=models.TextField(blank=True, null=True),
         ),
+        migrations.AddField(
+            model_name="domainrequest",
+            name="feb_purpose_choice",
+            field=models.CharField(
+                blank=True, choices=[("website", "Website"), ("redirect", "Redirect"), ("other", "Other")], null=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="domainrequest",
+            name="has_timeframe",
+            field=models.BooleanField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="domainrequest",
+            name="interagency_initiative_details",
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="domainrequest",
+            name="is_interagency_initiative",
+            field=models.BooleanField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="domainrequest",
+            name="time_frame_details",
+            field=models.TextField(blank=True, null=True),
+        ),
     ]
diff --git a/src/registrar/migrations/0142_domainrequest_feb_purpose_choice_and_more.py b/src/registrar/migrations/0142_domainrequest_feb_purpose_choice_and_more.py
deleted file mode 100644
index 1cd5fb587..000000000
--- a/src/registrar/migrations/0142_domainrequest_feb_purpose_choice_and_more.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Generated by Django 4.2.17 on 2025-02-25 23:45
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("registrar", "0141_domainrequest_feb_naming_requirements_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="domainrequest",
-            name="feb_purpose_choice",
-            field=models.CharField(
-                blank=True, choices=[("website", "Website"), ("redirect", "Redirect"), ("other", "Other")], null=True
-            ),
-        ),
-        migrations.AddField(
-            model_name="domainrequest",
-            name="has_timeframe",
-            field=models.BooleanField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name="domainrequest",
-            name="interagency_initiative_details",
-            field=models.TextField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name="domainrequest",
-            name="is_interagency_initiative",
-            field=models.BooleanField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name="domainrequest",
-            name="time_frame_details",
-            field=models.TextField(blank=True, null=True),
-        ),
-    ]
diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index b7aaff65d..ac1adfad5 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -1436,13 +1436,9 @@ class DomainRequest(TimeStampedModel):
 
     def is_feb(self) -> bool:
         """Is this domain request for a Federal Executive Branch agency?"""
-        if not self.generic_org_type:
-            # generic_org_type is either blank or None, assume no
-            return False
-        if self.generic_org_type == DomainRequest.OrganizationChoices.FEDERAL:
-            return self.federal_type == BranchChoices.EXECUTIVE
+        if self.portfolio:
+            return self.portfolio.federal_type == BranchChoices.EXECUTIVE
         return False
-
     def is_federal(self) -> Union[bool, None]:
         """Is this domain request for a federal agency?
 
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 55cd9a19e..33de99c39 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -232,9 +232,6 @@ class DomainRequestWizard(TemplateView):
             if portfolio and not self._domain_request.generic_org_type:
                 self._domain_request.generic_org_type = portfolio.organization_type
                 self._domain_request.save()
-            if portfolio and not self._domain_request.federal_type:
-                self._domain_request.federal_type = portfolio.federal_type
-                self._domain_request.save()
         else:
             self._domain_request = DomainRequest.objects.create(creator=self.request.user)
         return self._domain_request
@@ -474,7 +471,6 @@ class DomainRequestWizard(TemplateView):
                 "requested_domain__name": requested_domain_name,
             }
         context["domain_request_id"] = self.domain_request.id
-        context["is_executive"] = self.domain_request.is_federal() and self.domain_request.federal_type == "Executive"
         return context
 
     def get_step_list(self) -> list: