Update factories to pass their transaction through to all their track…

…ed_model fields, this highlights issues where synthetic fields (such as descriptions) attached to tracked_models can break record, subrecord ordering when placed in transactions together.
uktrade · Oct 25, 2021 · 27ce070 · 27ce070
1 parent b6f8c06
commit 27ce070
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 38 deletions.
diff --git a/common/tests/factories.py b/common/tests/factories.py
@@ -252,7 +252,7 @@ class Meta:
     )
     enacting_regulation = factory.SubFactory(
         RegulationFactory,
-        # FIXME synthetic-record-order make this field transaction=factory.SelfAttribute("..transaction")
+        transaction=factory.SelfAttribute("..transaction"),
     )
 
 
@@ -266,7 +266,7 @@ class Meta:
     )
     enacting_regulation = factory.SubFactory(
         RegulationFactory,
-        # FIXME synthetic-record-order make this field transaction=factory.SelfAttribute("..transaction")
+        transaction=factory.SelfAttribute("..transaction"),
     )
 
 
@@ -280,7 +280,7 @@ class Meta:
     )
     enacting_regulation = factory.SubFactory(
         RegulationFactory,
-        # FIXME synthetic-record-order make this field transaction=factory.SelfAttribute("..transaction")
+        transaction=factory.SelfAttribute("..transaction"),
     )
 
 
@@ -294,7 +294,7 @@ class Meta:
     )
     enacting_regulation = factory.SubFactory(
         RegulationFactory,
-        # FIXME synthetic-record-order make this field transaction=factory.SelfAttribute("..transaction")
+        transaction=factory.SelfAttribute("..transaction"),
     )
 
     effective_date = Dates().datetime_now
@@ -310,7 +310,7 @@ class Meta:
     )
     enacting_regulation = factory.SubFactory(
         RegulationFactory,
-        # FIXME synthetic-record-order make this field transaction=factory.SelfAttribute("..transaction")
+        transaction=factory.SelfAttribute("..transaction"),
     )
     measure_type_id = "123456"
     geographical_area_id = "GB"
@@ -355,7 +355,7 @@ class Meta:
     )
     member = factory.SubFactory(
         GeographicalAreaFactory,
-        # FIXME synthetic-record-order make this field transaction=factory.SelfAttribute("..transaction")
+        transaction=factory.SelfAttribute("..transaction"),
     )
 
 

diff --git a/workbaskets/tests/test_models.py b/workbaskets/tests/test_models.py
@@ -228,41 +228,10 @@ def test_user_partition_scheme_get_partition_does_not_allow_seed_after_revision(
         SEED_ONLY.get_partition(status)
 
 
-# FIXME synthetic-record-order:
-#        Factories named here have fields containing TrackedModels, prior to TP-841 these would have each
-#        been in their own transaction.
-#        This hides an issue where synthetic fields (those generated by templates such as description) are
-#        only relative to their own tracked_model, failing under certain circumstances, as exposed by
-#        TP-841 aimed to unify a factories output under one transaction.
-EXCLUDE_MULTI_TRANSACTION_FACTORIES = [
-    "AdditionalCodeTypeMeasureTypeFactory",
-    "AmendmentFactory",
-    "ExtensionFactory",
-    "FootnoteAssociationMeasureFactory",
-    "GeographicalMembershipFactory",
-    "MeasureComponentFactory",
-    "MeasureConditionComponentFactory",
-    "MeasureConditionFactory",
-    "MeasureExcludedGeographicalAreaFactory",
-    "MeasureFactory",
-    "MeasurementFactory",
-    "MeasureTypeFactory",
-    "QuotaAssociationFactory",
-    "QuotaBlockingFactory",
-    "QuotaDefinitionFactory",
-    "QuotaEventFactory",
-    "QuotaOrderNumberFactory",
-    "QuotaOrderNumberOriginExclusionFactory",
-    "QuotaOrderNumberOriginFactory",
-    "QuotaSuspensionFactory",
-    "ReplacementFactory",
-    "SuspensionFactory",
-    "TerminationFactory",
-]
 FACTORIES = [
     factory
     for factory in factories.TrackedModelMixin.__subclasses__()
-    if factory.__name__ not in EXCLUDE_MULTI_TRANSACTION_FACTORIES
+    if factory.__name__
 ]