Merge branch 'master' into l10_crowdin

inventree · Feb 3, 2025 · ed6515d · ed6515d
2 parents 3b75461 + a760d00
commit ed6515d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 30 deletions.
diff --git a/src/backend/InvenTree/part/api.py b/src/backend/InvenTree/part/api.py
@@ -1863,7 +1863,6 @@ def get_queryset(self, *args, **kwargs):
         """Return the queryset object for this endpoint."""
         queryset = super().get_queryset(*args, **kwargs)
 
-        queryset = self.get_serializer_class().setup_eager_loading(queryset)
         queryset = self.get_serializer_class().annotate_queryset(queryset)
 
         return queryset

diff --git a/src/backend/InvenTree/part/serializers.py b/src/backend/InvenTree/part/serializers.py
@@ -1696,35 +1696,6 @@ def validate_quantity(self, quantity):
 
     external_stock = serializers.FloatField(read_only=True)
 
-    @staticmethod
-    def setup_eager_loading(queryset):
-        """Prefetch against the provided queryset to speed up database access."""
-        queryset = queryset.prefetch_related('part')
-        queryset = queryset.prefetch_related('part__category')
-        queryset = queryset.prefetch_related('part__stock_items')
-
-        queryset = queryset.prefetch_related('sub_part')
-        queryset = queryset.prefetch_related('sub_part__category')
-        queryset = queryset.prefetch_related('sub_part__pricing_data')
-
-        queryset = queryset.prefetch_related(
-            'sub_part__stock_items',
-            'sub_part__stock_items__allocations',
-            'sub_part__stock_items__sales_order_allocations',
-        )
-
-        queryset = queryset.select_related(
-            'part__pricing_data', 'sub_part__pricing_data'
-        )
-
-        queryset = queryset.prefetch_related(
-            'substitutes', 'substitutes__part__stock_items'
-        )
-
-        queryset = queryset.prefetch_related('sub_part__builds')
-
-        return queryset
-
     @staticmethod
     def annotate_queryset(queryset):
         """Annotate the BomItem queryset with extra information.
@@ -1737,6 +1708,22 @@ def annotate_queryset(queryset):
         available_stock = total_stock - build_order_allocations - sales_order_allocations
         """
 
+        # Prefetch related fields
+        queryset = queryset.prefetch_related(
+            'part',
+            'part__category',
+            'part__stock_items',
+            'sub_part',
+            'sub_part__builds',
+            'sub_part__category',
+            'sub_part__pricing_data',
+            'sub_part__stock_items',
+            'sub_part__stock_items__allocations',
+            'sub_part__stock_items__sales_order_allocations',
+            'substitutes',
+            'substitutes__part__stock_items',
+        ).select_related('part__pricing_data', 'sub_part__pricing_data')
+
         # Annotate with the 'total pricing' information based on unit pricing and quantity
         queryset = queryset.annotate(
             pricing_min_total=ExpressionWrapper(