cleanp

src/registrar/fixtures/fixtures_domains.py

@@ -109,7 +109,13 @@ class DomainFixture(DomainRequestFixture):
             if expired_domain:
                 domains_to_update.append(expired_domain)
 
-        # Bulk update approved domain requests
+        # Perform bulk updates
+        cls._bulk_update_requests(domain_requests_to_update)
+        cls._bulk_update_domains(domains_to_update)
+
+    @classmethod
+    def _bulk_update_requests(cls, domain_requests_to_update):
+        """Bulk update domain requests."""
         if domain_requests_to_update:
             try:
                 DomainRequest.objects.bulk_update(domain_requests_to_update, ["status", "investigator"])
@@ -117,7 +123,9 @@ class DomainFixture(DomainRequestFixture):
             except Exception as e:
                 logger.error(f"Unexpected error during requests bulk update: {e}")
 
-        # Bulk update domains with expiration dates
+    @classmethod
+    def _bulk_update_domains(cls, domains_to_update):
+        """Bulk update domains with expiration dates."""
         if domains_to_update:
             try:
                 Domain.objects.bulk_update(domains_to_update, ["expiration_date"])

src/registrar/fixtures/fixtures_requests.py

@@ -304,12 +304,7 @@ class DomainRequestFixture:
                     logger.warning(e)
 
         # Bulk create domain requests
-        if len(domain_requests_to_create) > 0:
-            try:
-                DomainRequest.objects.bulk_create(domain_requests_to_create)
-                logger.info(f"Successfully created {len(domain_requests_to_create)} requests.")
-            except Exception as e:
-                logger.error(f"Unexpected error during requests bulk creation: {e}")
+        cls._bulk_create_requests(domain_requests_to_create)
 
         # Now many-to-many relationships
         for domain_request in domain_requests_to_create:
@@ -317,3 +312,13 @@ class DomainRequestFixture:
                 cls._set_many_to_many_relations(domain_request, request_data)
             except Exception as e:
                 logger.warning(e)
+
+    @classmethod
+    def _bulk_create_requests(cls, domain_requests_to_create):
+        """Bulk create domain requests."""
+        if len(domain_requests_to_create) > 0:
+            try:
+                DomainRequest.objects.bulk_create(domain_requests_to_create)
+                logger.info(f"Successfully created {len(domain_requests_to_create)} requests.")
+            except Exception as e:
+                logger.error(f"Unexpected error during requests bulk creation: {e}")

src/registrar/fixtures/fixtures_suborganizations.py

@@ -45,7 +45,8 @@ class SuborganizationFixture:
 
     @classmethod
     def _get_portfolios(cls):
-        """Fetches portfolios with organization_name 'Hotel California' and 'Wish You Were Here' and logs warnings if not found."""
+        """Fetches portfolios with organization_name 'Hotel California' and 'Wish You Were Here'
+        and logs warnings if not found."""
         try:
             portfolio1 = Portfolio.objects.filter(organization_name="Hotel California").first()
             portfolio2 = Portfolio.objects.filter(organization_name="Wish You Were Here").first()

src/registrar/fixtures/fixtures_user_portfolio_permissions.py

@@ -1,5 +1,4 @@
 import logging
-from sqlite3 import DatabaseError
 from faker import Faker
 from django.db import transaction
 
@@ -68,15 +67,19 @@ class UserPortfolioPermissionFixture:
                     except Exception as e:
                         logger.warning(e)
 
-            # Bulk create domain requests
             # Bulk create permissions
-            if user_portfolio_permissions_to_create:
-                try:
-                    UserPortfolioPermission.objects.bulk_create(user_portfolio_permissions_to_create)
-                    logger.info(
-                        f"Successfully created {len(user_portfolio_permissions_to_create)} user portfolio permissions."
-                    )
-                except Exception as e:
-                    logger.error(f"Unexpected error during portfolio permission bulk creation: {e}")
-            else:
-                logger.info("No new user portfolio permissions to create.")
+            cls._bulk_create_permissions(user_portfolio_permissions_to_create)
+
+    @classmethod
+    def _bulk_create_permissions(cls, user_portfolio_permissions_to_create):
+        """Bulk creates permissions and logs success or errors."""
+        if user_portfolio_permissions_to_create:
+            try:
+                UserPortfolioPermission.objects.bulk_create(user_portfolio_permissions_to_create)
+                logger.info(
+                    f"Successfully created {len(user_portfolio_permissions_to_create)} user portfolio permissions."
+                )
+            except Exception as e:
+                logger.error(f"Unexpected error during portfolio permission bulk creation: {e}")
+        else:
+            logger.info("No new user portfolio permissions to create.")