[refactor] PO receive fix (#10174)

* Enhance 'count_queries' helper

* Add threshold

* Update typing

* Better rendering

* Improve StockItem

- Make model operations more efficient

* improve with_mixin

- Cache config map against the session cache

* Refactor receive_line_item

- Pass multiple line items in simultaneously
- DB query optimization
- Use bulk_create and bulk_update operations

* Remove extraneous save call

* Fix for unit tests

* Fix return type

* Fix serializer return type

* Refactor part pricing updates

* UI tweaks

* Use bulk_create

* Refactor API and endpoints

* Bump API version

* Fix unit tests

* Fix playwright tests

* Remove debug msg

* Fix for table filter hover

* Adjust unit test

Author: SchrodingersGat

src/backend/InvenTree/InvenTree/api_version.py

@@ -1,11 +1,15 @@
 """InvenTree API version information."""
 
 # InvenTree API version
-INVENTREE_API_VERSION = 384
+INVENTREE_API_VERSION = 385
 
 """Increment this API version number whenever there is a significant change to the API that any clients need to know about."""
 
 INVENTREE_API_TEXT = """
+v385 -> 2025-08-15 : https://github.com/inventree/InvenTree/pull/10174
+    - Adjust return type of PurchaseOrderReceive API serializer
+    - Now returns list of of the created stock items when receiving
+
 v384 -> 2025-08-08 : https://github.com/inventree/InvenTree/pull/9969
     - Bump allauth
 

src/backend/InvenTree/InvenTree/models.py

@@ -2,6 +2,7 @@
 
 from datetime import datetime
 from string import Formatter
+from typing import Optional
 
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
@@ -1154,12 +1155,16 @@ def barcode(self) -> str:
         return self.format_barcode()
 
     @classmethod
-    def lookup_barcode(cls, barcode_hash):
+    def lookup_barcode(cls, barcode_hash: str) -> models.Model:
         """Check if a model instance exists with the specified third-party barcode hash."""
         return cls.objects.filter(barcode_hash=barcode_hash).first()
 
     def assign_barcode(
-        self, barcode_hash=None, barcode_data=None, raise_error=True, save=True
+        self,
+        barcode_hash: Optional[str] = None,
+        barcode_data: Optional[str] = None,
+        raise_error: bool = True,
+        save: bool = True,
     ):
         """Assign an external (third-party) barcode to this object."""
         # Must provide either barcode_hash or barcode_data

src/backend/InvenTree/InvenTree/unit_test.py

@@ -28,29 +28,40 @@
 
 @contextmanager
 def count_queries(
-    msg: Optional[str] = None, log_to_file: bool = False, using: str = 'default'
+    msg: Optional[str] = None,
+    log_to_file: bool = False,
+    using: str = 'default',
+    threshold: int = 10,
 ):  # pragma: no cover
     """Helper function to count the number of queries executed.
 
     Arguments:
         msg: Optional message to print after counting queries
         log_to_file: If True, log the queries to a file (default = False)
         using: The database connection to use (default = 'default')
+        threshold: Minimum number of queries to log (default = 10)
     """
+    t1 = time.time()
+
     with CaptureQueriesContext(connections[using]) as context:
         yield
 
+    dt = time.time() - t1
+
     n = len(context.captured_queries)
 
     if log_to_file:
         with open('queries.txt', 'w', encoding='utf-8') as f:
             for q in context.captured_queries:
                 f.write(str(q['sql']) + '\n\n')
 
-    if msg:
-        print(f'{msg}: Executed {n} queries')
-    else:
-        print(f'Executed {n} queries')
+    output = f'Executed {n} queries in {dt:.4f}s'
+
+    if threshold and n >= threshold:
+        if msg:
+            print(f'{msg}: {output}')
+        else:
+            print(output)
 
 
 def addUserPermission(user: User, app_name: str, model_name: str, perm: str) -> None:

src/backend/InvenTree/build/models.py

@@ -6,7 +6,7 @@
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
 from django.db import models, transaction
-from django.db.models import F, Q, Sum
+from django.db.models import F, Q, QuerySet, Sum
 from django.db.models.functions import Coalesce
 from django.db.models.signals import post_save
 from django.dispatch.dispatcher import receiver
@@ -870,7 +870,7 @@ def deallocate_stock(self, build_line=None, output=None):
         allocations.delete()
 
     @transaction.atomic
-    def create_build_output(self, quantity, **kwargs) -> list[stock.models.StockItem]:
+    def create_build_output(self, quantity, **kwargs) -> QuerySet:
         """Create a new build output against this BuildOrder.
 
         Arguments:
@@ -883,7 +883,7 @@ def create_build_output(self, quantity, **kwargs) -> list[stock.models.StockItem
             auto_allocate: Automatically allocate stock with matching serial numbers
 
         Returns:
-            A list of the created output (StockItem) objects.
+            A QuerySet of the created output (StockItem) objects.
         """
         trackable_parts = self.part.get_trackable_parts()
 

src/backend/InvenTree/order/api.py

@@ -15,7 +15,7 @@
 from django_filters import rest_framework as rest_filters
 from django_ical.views import ICalFeed
 from drf_spectacular.types import OpenApiTypes
-from drf_spectacular.utils import extend_schema_field
+from drf_spectacular.utils import extend_schema, extend_schema_field
 from rest_framework import status
 from rest_framework.response import Response
 
@@ -24,6 +24,7 @@
 import common.settings
 import company.models
 import stock.models as stock_models
+import stock.serializers as stock_serializers
 from data_exporter.mixins import DataExportViewMixin
 from generic.states.api import StatusView
 from InvenTree.api import BulkUpdateMixin, ListCreateDestroyAPIView, MetadataView
@@ -472,6 +473,7 @@ class PurchaseOrderIssue(PurchaseOrderContextMixin, CreateAPI):
     serializer_class = serializers.PurchaseOrderIssueSerializer
 
 
+@extend_schema(responses={201: stock_serializers.StockItemSerializer(many=True)})
 class PurchaseOrderReceive(PurchaseOrderContextMixin, CreateAPI):
     """API endpoint to receive stock items against a PurchaseOrder.
 
@@ -489,9 +491,18 @@ class PurchaseOrderReceive(PurchaseOrderContextMixin, CreateAPI):
     """
 
     queryset = models.PurchaseOrderLineItem.objects.none()
-
     serializer_class = serializers.PurchaseOrderReceiveSerializer
 
+    def create(self, request, *args, **kwargs):
+        """Override the create method to handle stock item creation."""
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        items = serializer.save()
+        queryset = stock_serializers.StockItemSerializer.annotate_queryset(items)
+        response = stock_serializers.StockItemSerializer(queryset, many=True)
+
+        return Response(response.data, status=status.HTTP_201_CREATED)
+
 
 class PurchaseOrderLineItemFilter(LineItemFilter):
     """Custom filters for the PurchaseOrderLineItemList endpoint."""