lint and fix test

src/registrar/forms/domain_request_wizard.py

@@ -367,7 +367,7 @@ class OrganizationContactForm(RegistrarForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        
+
         # Set the queryset for federal agency.
         # If the organization_requests flag is active, we hide data that exists in portfolios.
         federal_agency_queryset = FederalAgency.objects.exclude(agency__in=self.excluded_agencies)
@@ -376,7 +376,7 @@ class OrganizationContactForm(RegistrarForm):
             federal_agency_queryset = federal_agency_queryset.exclude(
                 agency__in=Portfolio.objects.values_list("organization_name", flat=True)
             )
-        
+
         self.fields["federal_agency"].queryset = federal_agency_queryset
 
     def clean_federal_agency(self):

src/registrar/models/domain.py

@@ -244,7 +244,6 @@ class Domain(TimeStampedModel, DomainHelper):
         is called in the validate function on the request/domain page
 
         throws- RegistryError or InvalidDomainError"""
-        return True
         if not cls.string_could_be_domain(domain):
             logger.warning("Not a valid domain: %s" % str(domain))
             # throw invalid domain error so that it can be caught in

src/registrar/models/domain_request.py

@@ -1293,9 +1293,13 @@ class DomainRequest(TimeStampedModel):
         if flag_is_active_anywhere("organization_feature") and flag_is_active_anywhere("organization_requests"):
             # Check if the current federal agency is an outlawed one
             Portfolio = apps.get_model("registrar.Portfolio")
-            return FederalAgency.objects.exclude(
+            return (
-                agency__in=Portfolio.objects.values_list("organization_name", flat=True),
+                FederalAgency.objects.exclude(
-            ).filter(agency=self.federal_agency).exists()
+                    agency__in=Portfolio.objects.values_list("organization_name", flat=True),
+                )
+                .filter(agency=self.federal_agency)
+                .exists()
+            )
 
         # NOTE: Shouldn't this be an AND on all required fields?
         return (

src/registrar/tests/test_utilities.py

@@ -28,29 +28,29 @@ class TestFlagIsActiveAnywhere(TestCase):
     def setUp(self):
         self.user = User.objects.create_user(username="testuser")
         self.flag_name = "test_flag"
-    
+
     @override_flag("test_flag", active=True)
     def test_flag_active_for_everyone(self):
         """Test when flag is active for everyone"""
         is_active = flag_is_active_anywhere("test_flag")
         self.assertTrue(is_active)
-    
+
     @override_flag("test_flag", active=False)
     def test_flag_inactive_for_everyone(self):
         """Test when flag is inactive for everyone"""
         is_active = flag_is_active_anywhere("test_flag")
         self.assertFalse(is_active)
-    
+
     def test_flag_active_for_some_users(self):
         """Test when flag is active for specific users"""
         flag, _ = get_waffle_flag_model().objects.get_or_create(name="test_flag")
         flag.everyone = None
         flag.save()
         flag.users.add(self.user)
-        
+
         is_active = flag_is_active_anywhere("test_flag")
         self.assertTrue(is_active)
-    
+
     def test_flag_inactive_with_no_users(self):
         """Test when flag has no users and everyone is None"""
         flag, _ = get_waffle_flag_model().objects.get_or_create(name="test_flag")

src/registrar/tests/test_views_request.py

@@ -3228,18 +3228,12 @@ class TestDomainRequestWizard(TestWithUser, WebTest):
         """Tests unlock_organization_contact when agency exists in a portfolio"""
         # Create a federal agency
         federal_agency = FederalAgency.objects.create(agency="Portfolio Agency")
-        
+
         # Create a portfolio with matching organization name
-        Portfolio.objects.create(
+        Portfolio.objects.create(creator=self.user, organization_name=federal_agency.agency)
-            creator=self.user,
+
-            organization_name=federal_agency.agency
-        )
-        
         # Create domain request with the portfolio agency
-        domain_request = completed_domain_request(
+        domain_request = completed_domain_request(federal_agency=federal_agency, user=self.user)
-            federal_agency=federal_agency,
-            user=self.user
-        )
         self.assertFalse(domain_request.unlock_organization_contact())
 
     @override_flag("organization_feature", active=False)
@@ -3247,19 +3241,13 @@ class TestDomainRequestWizard(TestWithUser, WebTest):
     @less_console_noise_decorator
     def test_unlock_organization_contact_flags_disabled(self):
         """Tests unlock_organization_contact when organization flags are disabled"""
-                # Create a federal agency
+        # Create a federal agency
         federal_agency = FederalAgency.objects.create(agency="Portfolio Agency")
-        
-        # Create a portfolio with matching organization name
-        Portfolio.objects.create(
-            creator=self.user,
-            organization_name=federal_agency.agency
-        )
 
-        domain_request = completed_domain_request(
+        # Create a portfolio with matching organization name
-            federal_agency=federal_agency,
+        Portfolio.objects.create(creator=self.user, organization_name=federal_agency.agency)
-            user=self.user
+
-        )
+        domain_request = completed_domain_request(federal_agency=federal_agency, user=self.user)
         self.assertTrue(domain_request.unlock_organization_contact())