[Issue #1940] Fix factories to initialize sequence based on DB values

api/tests/lib/seed_local_db.py

@@ -7,7 +7,6 @@
 import src.logging
 import tests.src.db.models.factories as factories
 from src.adapters.db import PostgresDBClient
-from src.db.models.opportunity_models import Opportunity
 from src.db.models.transfer.topportunity_models import TransferTopportunity
 from src.util.local import error_if_not_local
 
@@ -17,16 +16,6 @@
 def _build_opportunities(db_session: db.Session, iterations: int) -> None:
     # Just create a variety of opportunities for local testing
     # we can eventually look into creating more specific scenarios
-
-    # Since the factory always starts counting at the same value for the opportunity ID, we
-    # need to configure that so it doesn't clash with values already in the DB
-    max_opportunity_id = db_session.query(func.max(Opportunity.opportunity_id)).scalar()
-    if max_opportunity_id is None:
-        max_opportunity_id = 0
-
-    logger.info(f"Creating opportunities starting with opportunity_id {max_opportunity_id + 1}")
-    factories.OpportunityFactory.reset_sequence(value=max_opportunity_id + 1)
-
     for i in range(iterations):
         logger.info(f"Creating opportunity batch number {i}")
         # Create a few opportunities in various scenarios

api/tests/src/db/models/factories.py

@@ -39,10 +39,6 @@ def sometimes_none(factory_value, none_chance: float = 0.5):
         yes_declaration=factory_value,
         no_declaration=None,
     )
-    if random.random() > none_chance:
-        return factory_value
-
-    return None
 
 
 class CustomProvider(BaseProvider):
@@ -234,17 +230,14 @@ class Meta:
 
     @classmethod
     def _setup_next_sequence(cls):
-        try:
-            value = (
-                get_db_session()
-                .query(func.max(opportunity_models.Opportunity.opportunity_id))
-                .scalar()
-            )
+        if _db_session is not None:
+            value = _db_session.query(
+                func.max(opportunity_models.Opportunity.opportunity_id)
+            ).scalar()
             if value is not None:
                 return value + 1
-            return 1
-        except Exception:
-            return 1
+
+        return 1
 
     opportunity_id = factory.Sequence(lambda n: n)
 
@@ -568,6 +561,19 @@ class OpportunityAssistanceListingFactory(BaseFactory):
     class Meta:
         model = opportunity_models.OpportunityAssistanceListing
 
+    @classmethod
+    def _setup_next_sequence(cls):
+        if _db_session is not None:
+            value = _db_session.query(
+                func.max(
+                    opportunity_models.OpportunityAssistanceListing.opportunity_assistance_listing_id
+                )
+            ).scalar()
+            if value is not None:
+                return value + 1
+
+        return 1
+
     opportunity_assistance_listing_id = factory.Sequence(lambda n: n)
 
     opportunity = factory.SubFactory(OpportunityFactory)