From b5935a36d690bfda88f7ec277f6e2313b28ca309 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 29 Jan 2025 11:10:12 -0700
Subject: [PATCH] lint

---
 src/registrar/tests/test_models.py    |  4 ++--
 src/registrar/views/domain_request.py | 22 ++++++----------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 45f8a15f0..2a44f7765 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -1719,7 +1719,7 @@ class TestDomainRequestIncomplete(TestCase):
         super().tearDownClass()
         cls.user.delete()
 
-    # @less_console_noise_decorator
+    @less_console_noise_decorator
     def test_is_federal_complete(self):
         self.assertTrue(self.wizard.form_is_complete())
         self.domain_request.federal_type = None
@@ -1747,7 +1747,7 @@ class TestDomainRequestIncomplete(TestCase):
         self.domain_request.save()
         self.assertFalse(self.wizard.form_is_complete())
 
-    # @less_console_noise_decorator
+    @less_console_noise_decorator
     def test_is_tribal_complete(self):
         self.domain_request.generic_org_type = DomainRequest.OrganizationChoices.TRIBAL
         self.domain_request.tribe_name = "Tribe Name"
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index e1f94391e..3248c1368 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -425,26 +425,16 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         return [key for key, is_unlocked_checker in self.unlocking_steps.items() if is_unlocked_checker(self)]
 
     def form_is_complete(self):
-        """
-        Determines if all required steps in the domain request form are complete.
-
-        This method:
-        1. Gets a list of all steps that have been completed (unlocked_steps)
-        2. Filters the full step list to only include steps that should be shown based on
-        the wizard conditions. For example, federal-specific steps are only required
-        if the organization type is federal.
-        3. Compares the number of completed steps to required steps to determine if
-        the form is complete.
-
+        """Determines if all required steps in the domain request form are complete.
         Returns:
             bool: True if all required steps are complete, False otherwise
         """
-        unlockable_steps = {step.value for step in self.db_check_for_unlocking_steps()}
+        # 1. Get all steps visibly present to the user (required steps)
+        # 2. Return every possible step that is "unlocked" (even hidden, conditional ones)
+        # 3. Narrows down the list to remove hidden conditional steps
         required_steps = set(self.steps.all)
-        unlocked_steps = set()
-        for step in required_steps:
-            if step in unlockable_steps:
-                unlocked_steps.add(step)
+        unlockable_steps = {step.value for step in self.db_check_for_unlocking_steps()}
+        unlocked_steps = {step for step in required_steps if step in unlockable_steps}
         return required_steps == unlocked_steps
 
     def get_context_data(self):