fix: use current() instead of approved_up_to_transaction() in codebase

commodities/models/dc.py

@@ -852,10 +852,10 @@ def _get_snapshot_commodities(
         that match the latest_version goods.
         """
         item_ids = {c.item_id for c in self.commodities if c.obj}
-        goods = GoodsNomenclature.objects.current().filter(
+        goods = GoodsNomenclature.objects.filter(
             item_id__in=item_ids,
             valid_between__contains=snapshot_date,
-        )
+        ).current()
 
         latest_versions = get_latest_versions(goods)
         pks = {good.pk for good in latest_versions}

common/models/tracked_qs.py

@@ -47,7 +47,7 @@ def latest_approved(self) -> TrackedModelQuerySet:
             update_type=UpdateType.DELETE,
         )
 
-    def current(self) -> TrackedModelQuerySet:
+    def current(self, transaction=None) -> TrackedModelQuerySet:
         """
         Returns a queryset of approved versions of the model up to the globally
         defined current transaction (see ``common.models.utils`` for details of
@@ -64,9 +64,12 @@ def current(self) -> TrackedModelQuerySet:
         (see ``set_current_transaction()`` and ``override_current_transaction()``
         in ``common.models.utils``).
         """
-        return self.approved_up_to_transaction(
-            LazyTransaction(get_value=get_current_transaction),
-        )
+        if transaction:
+            return self.approved_up_to_transaction(transaction)
+        else:
+            return self.approved_up_to_transaction(
+                LazyTransaction(get_value=get_current_transaction),
+            )
 
     def approved_up_to_transaction(self, transaction=None) -> TrackedModelQuerySet:
         """This function is called using the current() function instead of directly calling it on model queries.

common/querysets.py

@@ -66,7 +66,7 @@ def not_current(self, asof_transaction=None) -> QuerySet:
         :param transaction Transaction: The transaction to limit versions to.
         :rtype QuerySet:
         """
-        current = self.current()
+        current = self.current(transaction=asof_transaction)
 
         return self.difference(current)
 

footnotes/views.py

@@ -44,7 +44,6 @@ class FootnoteViewSet(viewsets.ReadOnlyModelViewSet):
     ]
 
     def get_queryset(self):
-        tx = WorkBasket.get_current_transaction(self.request)
         return (
             models.Footnote.objects.current()
             .select_related("footnote_type")
@@ -67,7 +66,6 @@ class FootnoteMixin:
     model: Type[TrackedModel] = models.Footnote
 
     def get_queryset(self):
-        tx = WorkBasket.get_current_transaction(self.request)
         return models.Footnote.objects.current().select_related(
             "footnote_type",
         )
@@ -77,7 +75,6 @@ class FootnoteDescriptionMixin:
     model: Type[TrackedModel] = models.FootnoteDescription
 
     def get_queryset(self):
-        tx = WorkBasket.get_current_transaction(self.request)
         return models.FootnoteDescription.objects.current()
 
 

geo_areas/forms.py

@@ -328,7 +328,6 @@ def clean(self):
             )
 
         if membership and action == GeoMembershipAction.DELETE:
-            tx = WorkBasket.get_current_transaction(self.request)
             if membership.member_used_in_measure_exclusion():
                 self.add_error(
                     "membership",

geo_areas/tests/test_views.py

@@ -444,7 +444,7 @@ def test_geo_area_edit_create_view(
         area_code=AreaCode.REGION,
         area_id="TR",
         valid_between=date_ranges.no_end,
-        transaction=session_workbasket.new_transaction(),
+        transaction__workbasket=session_workbasket,
     )
 
     data_changes = {**date_post_data("end_date", date_ranges.normal.upper)}

geo_areas/views.py

@@ -56,15 +56,13 @@ class GeoAreaMixin:
     model: Type[TrackedModel] = GeographicalArea
 
     def get_queryset(self):
-        tx = WorkBasket.get_current_transaction(self.request)
         return GeographicalArea.objects.current()
 
 
 class GeoAreaDescriptionMixin:
     model: Type[TrackedModel] = GeographicalAreaDescription
 
     def get_queryset(self):
-        tx = WorkBasket.get_current_transaction(self.request)
         return GeographicalAreaDescription.objects.current()
 
 

measures/business_rules.py

@@ -212,11 +212,11 @@ def validate(self, measure):
 
         goods = (
             type(measure.goods_nomenclature)
-            .objects.current()
-            .filter(
+            .objects.filter(
                 sid=measure.goods_nomenclature.sid,
                 valid_between__overlap=measure.effective_valid_between,
             )
+            .current()
         )
 
         explosion_level = measure.measure_type.measure_explosion_level

measures/forms.py

@@ -520,8 +520,6 @@ def __init__(self, *args, **kwargs):
         self.request = kwargs.pop("request", None)
         super().__init__(*args, **kwargs)
 
-        tx = WorkBasket.get_current_transaction(self.request)
-
         self.initial["duty_sentence"] = self.instance.duty_sentence
         self.request.session[
             f"instance_duty_sentence_{self.instance.sid}"

measures/models.py

@@ -656,14 +656,14 @@ def auto_value_fields(cls):
 
     def has_components(self, transaction):
         return (
-            MeasureComponent.objects.current()
+            MeasureComponent.objects.current(transaction=transaction)
             .filter(component_measure__sid=self.sid)
             .exists()
         )
 
     def has_condition_components(self, transaction):
         return (
-            MeasureConditionComponent.objects.current()
+            MeasureConditionComponent.objects.current(transaction=transaction)
             .filter(condition__dependent_measure__sid=self.sid)
             .exists()
         )

measures/querysets.py

@@ -94,7 +94,9 @@ def duty_sentence(
 
         # Components with the greatest transaction_id that is less than
         # or equal to component_parent's transaction_id, are considered 'current'.
-        component_qs = component_parent.components.current()
+        component_qs = component_parent.components.current(
+            transaction=component_parent.transaction
+        )
         if not component_qs:
             return ""
         latest_transaction_id = component_qs.aggregate(

measures/tests/factories.py

@@ -31,11 +31,19 @@ class Meta:
     measure_type_description = factory.SelfAttribute("measure.measure_type.description")
     duty_sentence = factory.sequence(lambda n: f"{n}.00%")
     origin_description = factory.LazyAttribute(
-        lambda m: m.measure.geographical_area.descriptions.current().last().description,
+        lambda m: m.measure.geographical_area.descriptions.current(
+            transaction=m.measure.geographical_area.transaction
+        )
+        .last()
+        .description,
     )
     excluded_origin_descriptions = factory.LazyAttribute(
         lambda m: random.choice(MeasureSheetRow.separators).join(
-            e.excluded_geographical_area.descriptions.current().last().description
+            e.excluded_geographical_area.descriptions.current(
+                transaction=e.excluded_geographical_area
+            )
+            .last()
+            .description
             for e in m.measure.exclusions.all()
         ),
     )

measures/tests/test_views.py

@@ -539,7 +539,6 @@ def test_measure_update_duty_sentence(
     assert response.status_code == 302
 
     if update_data:
-        tx = Transaction.objects.last()
         measure = Measure.objects.current().get(
             sid=measure_form.instance.sid,
         )
@@ -700,7 +699,6 @@ def test_measure_update_create_conditions(
     assert response.status_code == 302
     assert response.url == reverse("measure-ui-confirm-update", args=(measure.sid,))
 
-    tx = Transaction.objects.last()
     updated_measure = Measure.objects.current().get(
         sid=measure.sid,
     )
@@ -756,7 +754,6 @@ def test_measure_update_edit_conditions(
     client.force_login(valid_user)
     client.post(url, data=measure_edit_conditions_data)
     transaction_count = Transaction.objects.count()
-    tx = Transaction.objects.last()
     measure_with_condition = Measure.objects.current().get(
         sid=measure.sid,
     )
@@ -771,7 +768,6 @@ def test_measure_update_edit_conditions(
         f"{MEASURE_CONDITIONS_FORMSET_PREFIX}-0-applicable_duty"
     ] = "10 GBP / 100 kg"
     client.post(url, data=measure_edit_conditions_data)
-    tx = Transaction.objects.last()
     updated_measure = Measure.objects.current().get(
         sid=measure.sid,
     )
@@ -877,7 +873,6 @@ def test_measure_update_remove_conditions(
     # We expect one transaction for the measure update and condition deletion
     assert Transaction.objects.count() == transaction_count + 1
 
-    tx = Transaction.objects.last()
     updated_measure = Measure.objects.current().get(
         sid=measure.sid,
     )

measures/views.py

@@ -75,7 +75,6 @@ class MeasureTypeViewSet(viewsets.ReadOnlyModelViewSet):
     filter_backends = [MeasureTypeFilterBackend]
 
     def get_queryset(self):
-        tx = WorkBasket.get_current_transaction(self.request)
         return MeasureType.objects.current().order_by(
             "description",
         )
@@ -85,7 +84,6 @@ class MeasureMixin:
     model: Type[TrackedModel] = Measure
 
     def get_queryset(self):
-        tx = WorkBasket.get_current_transaction(self.request)
 
         return Measure.objects.current()
 
@@ -1061,7 +1059,6 @@ def get_form_kwargs(self, step):
 
     def get_form(self, step=None, data=None, files=None):
         form = super().get_form(step, data, files)
-        tx = WorkBasket.get_current_transaction(self.request)
         forms = [form]
         if hasattr(form, "forms"):
             forms = form.forms
@@ -1103,7 +1100,6 @@ def get_form_kwargs(self):
 
     def get_form(self, form_class=None):
         form = super().get_form(form_class=form_class)
-        tx = WorkBasket.get_current_transaction(self.request)
 
         if hasattr(form, "field"):
             for field in form.fields.values():

quotas/business_rules.py

@@ -51,7 +51,7 @@ class ON2(BusinessRule):
     def validate(self, order_number):
         if (
             type(order_number)
-            .objects.current()
+            .objects.current(transaction=order_number.transaction)
             .filter(
                 order_number=order_number.order_number,
                 valid_between__overlap=order_number.valid_between,
@@ -70,7 +70,12 @@ def validate(self, order_number):
         order_number_versions = order_number.get_versions()
         origin_exists = False
         for order_number_version in order_number_versions:
-            if order_number_version.origins.current().count() > 0:
+            if (
+                order_number_version.origins.current(
+                    transaction=order_number.transaction
+                ).count()
+                > 0
+            ):
                 origin_exists = True
                 break
 
@@ -85,7 +90,7 @@ class ON5(BusinessRule):
     def validate(self, origin):
         if (
             type(origin)
-            .objects.current()
+            .objects.current(transaction=origin.transaction)
             .filter(
                 order_number__sid=origin.order_number.sid,
                 geographical_area__sid=origin.geographical_area.sid,
@@ -179,7 +184,9 @@ def validate(self, order_number_origin):
         check that there are no measures linked to the origin .
         """
 
-        measures = measures_models.Measure.objects.current()
+        measures = measures_models.Measure.objects.current(
+            transaction=order_number_origin.transaction
+        )
 
         if not measures.exists():
             return
@@ -317,7 +324,7 @@ class OverlappingQuotaDefinition(BusinessRule):
     def validate(self, quota_definition):
         potential_quota_definition_matches = (
             type(quota_definition)
-            .objects.current()
+            .objects.current(transaction=quota_definition.transaction)
             .filter(
                 order_number=quota_definition.order_number,
                 valid_between__overlap=quota_definition.valid_between,
@@ -347,7 +354,9 @@ def validate(self, quota_definition):
         if quota_definition.valid_between.lower < datetime.date.today():
             return True
 
-        if quota_definition.sub_quota_associations.current().exists():
+        if quota_definition.sub_quota_associations.current(
+            transaction=self.transaction
+        ).exists():
             return True
 
         if quota_definition.volume != quota_definition.initial_volume:
@@ -458,7 +467,9 @@ class QA6(BusinessRule):
 
     def validate(self, association):
         if (
-            association.main_quota.sub_quota_associations.current()
+            association.main_quota.sub_quota_associations.current(
+                transaction=association.transaction
+            )
             .values(
                 "sub_quota_relation_type",
             )