MAGETWO-72747: [Magento Cloud] - /rest/default/V1/order/<order id>/ship and configurable products - for 2.2

Author: Eric Bohanon

app/code/Magento/Sales/Model/Order/Shipment/Item/Converter.php

@@ -14,7 +14,7 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\ShipmentCommentCreationInterface;
 use Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface;
-use Magento\Sales\Model\Order\Shipment\Item\Converter;
+use Magento\Sales\Api\Data\OrderItemInterface;
 
 /**
  * Class ShipmentDocumentFactory
@@ -39,11 +39,6 @@ class ShipmentDocumentFactory
      */
     private $hydratorPool;
 
-    /**
-     * @var Converter
-     */
-    private $converter;
-
     /**
      * ShipmentDocumentFactory constructor.
      *
@@ -55,14 +50,11 @@ class ShipmentDocumentFactory
     public function __construct(
         ShipmentFactory $shipmentFactory,
         HydratorPool $hydratorPool,
-        TrackFactory $trackFactory,
-        Converter $converter = null
+        TrackFactory $trackFactory
     ) {
         $this->shipmentFactory = $shipmentFactory;
         $this->trackFactory = $trackFactory;
         $this->hydratorPool = $hydratorPool;
-        $this->converter = $converter
-            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Converter::class);
     }
 
     /**
@@ -87,13 +79,34 @@ public function create(
         array $packages = [],
         ShipmentCreationArgumentsInterface $arguments = null
     ) {
-        $shipmentItems = $this->converter->convertToQuantityArray($items, $order);
+        $shipmentItems = [];
+        if (empty($items)) {
+            /** @var OrderItemInterface $item */
+            foreach ($order->getItems() as $item) {
+                if (!$item->getIsVirtual() && !$item->getParentItem()) {
+                    $shipmentItems[$item->getItemId()] = $item->getQtyOrdered();
+                }
+            }
+        } else {
+            /** @var ShipmentItemCreationInterface $item */
+            foreach ($items as $item) {
+                    $shipmentItems[$item->getOrderItemId()] = $item->getQty();
+            }
+        }
+
         /** @var Shipment $shipment */
         $shipment = $this->shipmentFactory->create(
             $order,
             $shipmentItems
         );
-        $this->prepareTracks($shipment, $tracks);
+
+        foreach ($tracks as $track) {
+            $hydrator = $this->hydratorPool->getHydrator(
+                \Magento\Sales\Api\Data\ShipmentTrackCreationInterface::class
+            );
+            $shipment->addTrack($this->trackFactory->create(['data' => $hydrator->extract($track)]));
+        }
+
         if ($comment) {
             $shipment->addComment(
                 $comment->getComment(),
@@ -104,22 +117,4 @@ public function create(
 
         return $shipment;
     }
-
-    /**
-     * Adds tracks to the shipment.
-     *
-     * @param ShipmentInterface $shipment
-     * @param ShipmentTrackCreationInterface[] $tracks
-     * @return ShipmentInterface
-     */
-    private function prepareTracks(\Magento\Sales\Api\Data\ShipmentInterface $shipment, array $tracks)
-    {
-        foreach ($tracks as $track) {
-            $hydrator = $this->hydratorPool->getHydrator(
-                \Magento\Sales\Api\Data\ShipmentTrackCreationInterface::class
-            );
-            $shipment->addTrack($this->trackFactory->create(['data' => $hydrator->extract($track)]));
-        }
-        return $shipment;
-    }
 }

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

@@ -16,7 +16,6 @@
 use Magento\Sales\Model\Order\Shipment\TrackFactory;
 use Magento\Sales\Model\Order\Shipment\Track;
 use Magento\Framework\EntityManager\HydratorInterface;
-use Magento\Sales\Model\Order\Shipment\Item\Converter;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -73,11 +72,6 @@ class ShipmentDocumentFactoryTest extends \PHPUnit\Framework\TestCase
      */
     private $trackMock;
 
-    /**
-     * @var Converter | \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $converterMock;
-
     protected function setUp()
     {
         $this->shipmentFactoryMock = $this->getMockBuilder(ShipmentFactory::class)
@@ -118,15 +112,10 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $this->converterMock = $this->getMockBuilder(Converter::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->shipmentDocumentFactory = new ShipmentDocumentFactory(
             $this->shipmentFactoryMock,
             $this->hydratorPoolMock,
-            $this->trackFactoryMock,
-            $this->converterMock
+            $this->trackFactoryMock
         );
     }
 
@@ -139,6 +128,8 @@ public function testCreate()
         $packages = [];
         $items = [1 => 10];
 
+        $this->itemMock->expects($this->once())->method('getOrderItemId')->willReturn(1);
+        $this->itemMock->expects($this->once())->method('getQty')->willReturn(10);
         $this->shipmentFactoryMock->expects($this->once())
             ->method('create')
             ->with(
@@ -166,11 +157,6 @@ public function testCreate()
             ->with(['data' => $trackData])
             ->willReturn($this->trackMock);
 
-        $this->converterMock->expects($this->once())
-            ->method('convertToQuantityArray')
-            ->with([$this->itemMock], $this->orderMock)
-            ->willReturn($items);
-
         if ($appendComment) {
             $comment = "New comment!";
             $visibleOnFront = true;

app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php

@@ -11,10 +11,11 @@
 use Magento\Framework\Registry;
 use Magento\Sales\Api\Data\ShipmentTrackCreationInterface;
 use Magento\Sales\Api\Data\ShipmentTrackCreationInterfaceFactory;
+use Magento\Sales\Api\Data\ShipmentItemCreationInterfaceFactory;
 use Magento\Sales\Api\ShipmentRepositoryInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
-use Magento\Sales\Model\Order\Shipment\Item\Converter;
 use Magento\Sales\Model\Order\ShipmentDocumentFactory;
+use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
 
 /**
  * Class ShipmentLoader
@@ -51,11 +52,6 @@ class ShipmentLoader extends DataObject
      */
     private $orderRepository;
 
-    /**
-     * @var Converter
-     */
-    private $converter;
-
     /**
      * @var ShipmentDocumentFactory
      */
@@ -66,33 +62,38 @@ class ShipmentLoader extends DataObject
      */
     private $trackFactory;
 
+    /**
+     * @var ShipmentItemCreationInterfaceFactory
+     */
+    private $itemFactory;
+
     /**
      * @param ManagerInterface $messageManager
      * @param Registry $registry
      * @param ShipmentRepositoryInterface $shipmentRepository
      * @param OrderRepositoryInterface $orderRepository
-     * @param Converter $converter
      * @param ShipmentDocumentFactory $documentFactory
      * @param ShipmentTrackCreationInterfaceFactory $trackFactory
+     * @param ShipmentItemCreationInterfaceFactory $itemFactory
      * @param array $data
      */
     public function __construct(
         ManagerInterface $messageManager,
         Registry $registry,
         ShipmentRepositoryInterface $shipmentRepository,
         OrderRepositoryInterface $orderRepository,
-        Converter $converter,
         ShipmentDocumentFactory $documentFactory,
         ShipmentTrackCreationInterfaceFactory $trackFactory,
+        ShipmentItemCreationInterfaceFactory $itemFactory,
         array $data = []
     ) {
         $this->messageManager = $messageManager;
         $this->registry = $registry;
         $this->shipmentRepository = $shipmentRepository;
         $this->orderRepository = $orderRepository;
-        $this->converter = $converter;
         $this->documentFactory = $documentFactory;
         $this->trackFactory = $trackFactory;
+        $this->itemFactory = $itemFactory;
         parent::__construct($data);
     }
 
@@ -134,9 +135,18 @@ public function load()
                 return false;
             }
 
+            $shipmentItems = [];
+            foreach ($this->getItemQtys() as $itemId => $quantity) {
+                /** @var ShipmentItemCreationInterface $item */
+                $item = $this->itemFactory->create();
+                $item->setOrderItemId($itemId);
+                $item->setQty($quantity);
+                $shipmentItems[] = $item;
+            }
+
             $shipment = $this->documentFactory->create(
                 $order,
-                $this->converter->convertToItemCreationArray($this->getItemQtys()),
+                $shipmentItems,
                 $this->getTrackingArray()
             );
         }
@@ -180,6 +190,7 @@ private function getTrackingArray()
             $trackCreation->setCarrierCode($track['carrier_code']);
             $trackingCreation[] = $trackCreation;
         }
+
         return $trackingCreation;
     }
 }