Merge pull request #866 from boxwise/improve-get-box-history-performance

Improve query performance

back/boxtribute_server/business_logic/box_transfer/shipment/fields.py

@@ -1,6 +1,7 @@
 from ariadne import ObjectType
 
 from ....authz import authorize
+from ....models.definitions.shipment import Shipment
 from ....models.definitions.shipment_detail import ShipmentDetail
 
 shipment = ObjectType("Shipment")
@@ -10,7 +11,13 @@
 @shipment.field("details")
 def resolve_shipment_details(shipment_obj, _):
     authorize(permission="shipment_detail:read")
-    return ShipmentDetail.select().where(ShipmentDetail.shipment == shipment_obj.id)
+    # Join with Shipment model, such that authorization in ShipmentDetail resolvers
+    # (detail.shipment.source_base_id) don't create additional DB queries
+    return (
+        ShipmentDetail.select(ShipmentDetail, Shipment)
+        .join(Shipment)
+        .where(ShipmentDetail.shipment == shipment_obj.id)
+    )
 
 
 @shipment.field("sourceBase")
@@ -117,15 +124,13 @@ def resolve_shipment_detail_box(detail_obj, info):
 
 
 @shipment_detail.field("sourceSize")
-def resolve_shipment_detail_source_size(detail_obj, _):
-    authorize(permission="size:read")
-    return detail_obj.source_size
+def resolve_shipment_detail_source_size(detail_obj, info):
+    return info.context["size_loader"].load(detail_obj.source_size_id)
 
 
 @shipment_detail.field("targetSize")
-def resolve_shipment_detail_target_size(detail_obj, _):
-    authorize(permission="size:read")
-    return detail_obj.target_size
+def resolve_shipment_detail_target_size(detail_obj, info):
+    return info.context["size_loader"].load(detail_obj.target_size_id)
 
 
 @shipment_detail.field("shipment")