#36636 - prevent ShippingAssignmentBuilder and ShippingBuilder from loading order when not needed.

Author: Nuranto

app/code/Magento/Sales/Model/Order/ShippingAssignmentBuilder.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Sales\Model\Order;
 
+use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\ShippingAssignmentInterface;
 use Magento\Sales\Api\Data\ShippingAssignmentInterfaceFactory;
 use Magento\Sales\Model\OrderFactory;
@@ -31,9 +32,9 @@ class ShippingAssignmentBuilder
     private $shippingBuilderFactory;
 
     /**
-     * @var int|null
+     * @var OrderInterface
      */
-    private $orderId = null;
+    private $order;
 
     /**
      * ShippingAssignment constructor.
@@ -58,15 +59,24 @@ public function __construct(
      */
     public function setOrderId($orderId)
     {
-        $this->orderId = $orderId;
+        $this->order = $this->orderFactory->create()->load($orderId);
     }
 
     /**
-     * @return int|null
+     * @param OrderInterface $order
+     * @return void
+     */
+    public function setOrder(OrderInterface $order)
+    {
+        $this->order = $order;
+    }
+
+    /**
+     * @return OrderInterface
      */
-    private function getOrderId()
+    private function getOrder()
     {
-        return $this->orderId;
+        return $this->order;
     }
 
     /**
@@ -75,13 +85,12 @@ private function getOrderId()
     public function create()
     {
         $shippingAssignments = null;
-        if ($this->getOrderId()) {
-            $order = $this->orderFactory->create()->load($this->getOrderId());
+        if ($order = $this->getOrder()) {
             /** @var ShippingAssignmentInterface $shippingAssignment */
             $shippingAssignment =  $this->shippingAssignmentFactory->create();
 
             $shipping = $this->shippingBuilderFactory->create();
-            $shipping->setOrderId($this->getOrderId());
+            $shipping->setOrder($order);
             $shippingAssignment->setShipping($shipping->create());
             $shippingAssignment->setItems($order->getItems());
             $shippingAssignment->setStockId($order->getStockId());

app/code/Magento/Sales/Model/Order/ShippingBuilder.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Sales\Model\Order;
 
+use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\ShippingInterface;
 use Magento\Sales\Api\Data\ShippingInterfaceFactory;
 use Magento\Sales\Api\Data\TotalInterface;
@@ -19,12 +20,7 @@
 class ShippingBuilder
 {
     /**
-     * @var int|null
-     */
-    private $orderId = null;
-
-    /**
-     * @var Order
+     * @var OrderInterface
      */
     private $order;
 
@@ -66,7 +62,16 @@ public function __construct(
      */
     public function setOrderId($orderId)
     {
-        $this->orderId = $orderId;
+        $this->order = $this->orderFactory->create()->load($orderId);
+    }
+
+    /**
+     * @param OrderInterface $order
+     * @return void
+     */
+    public function setOrder(OrderInterface $order)
+    {
+        $this->order = $order;
     }
 
     /**
@@ -75,30 +80,20 @@ public function setOrderId($orderId)
     public function create()
     {
         $shipping = null;
-        if ($this->getOrderId()) {
-            $this->order = $this->orderFactory->create()->load($this->getOrderId());
-            if ($this->order->getEntityId()) {
-                /** @var ShippingInterface $shipping */
-                $shipping = $this->shippingFactory->create();
-                $shippingAddress = $this->order->getShippingAddress();
-                if ($shippingAddress) {
-                    $shipping->setAddress($shippingAddress);
-                }
-                $shipping->setMethod($this->order->getShippingMethod());
-                $shipping->setTotal($this->getTotal());
+        $order = $this->getOrder();
+        if ($order && $order->getEntityId()) {
+            /** @var ShippingInterface $shipping */
+            $shipping = $this->shippingFactory->create();
+            $shippingAddress = $order->getShippingAddress();
+            if ($shippingAddress) {
+                $shipping->setAddress($shippingAddress);
             }
+            $shipping->setMethod($order->getShippingMethod());
+            $shipping->setTotal($this->getTotal());
         }
         return $shipping;
     }
 
-    /**
-     * @return int|null
-     */
-    private function getOrderId()
-    {
-        return $this->orderId;
-    }
-
     /**
      * @return TotalInterface
      */

app/code/Magento/Sales/Model/OrderRepository.php

@@ -302,7 +302,7 @@ private function setShippingAssignments(OrderInterface $order)
         }
         /** @var ShippingAssignmentInterface $shippingAssignment */
         $shippingAssignments = $this->getShippingAssignmentBuilderDependency();
-        $shippingAssignments->setOrderId($order->getEntityId());
+        $shippingAssignments->setOrder($order);
         $extensionAttributes->setShippingAssignments($shippingAssignments->create());
         $order->setExtensionAttributes($extensionAttributes);
     }