MSI-1542: Provide MSI support for Shipment Web API endpoint

Author: IvanPletnyov

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

@@ -42,7 +42,7 @@ class ShipmentDocumentFactory
     private $hydratorPool;
 
     /**
-     * @var ExtensionAttributesProcessor|null
+     * @var ExtensionAttributesProcessor
      */
     private $extensionAttributesProcessor;
 
@@ -68,8 +68,6 @@ public function __construct(
     }
 
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     *
      * @param OrderInterface $order
      * @param ShipmentItemCreationInterface[] $items
      * @param ShipmentTrackCreationInterface[] $tracks

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

@@ -7,11 +7,11 @@
 
 namespace Magento\Sales\Model\Order\ShipmentDocumentFactory;
 
-use Magento\Framework\Api\SimpleDataObjectConverter;
 use Magento\Framework\Reflection\ExtensionAttributesProcessor as AttributesProcessor;
 use Magento\Sales\Api\Data\ShipmentCreationArgumentsExtensionInterface;
 use Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface;
 use Magento\Sales\Api\Data\ShipmentExtensionFactory;
+use Magento\Sales\Api\Data\ShipmentExtensionInterface;
 use Magento\Sales\Api\Data\ShipmentInterface;
 
 /**
@@ -53,24 +53,25 @@ public function execute(
         if (null === $arguments) {
             return;
         }
-
-        $shipmentExtensionAttributes = $shipment->getExtensionAttributes();
-        if (null === $shipmentExtensionAttributes) {
-            $shipmentExtensionAttributes = $this->shipmentExtensionFactory->create();
+        $shipmentExtensionAttributes = [];
+        if (null !== $shipment->getExtensionAttributes()) {
+            $shipmentExtensionAttributes = $this->extensionAttributesProcessor->buildOutputDataArray(
+                $shipment->getExtensionAttributes(),
+                ShipmentExtensionInterface::class
+            );
+        }
+        $argumentsExtensionAttributes = [];
+        if (null !== $arguments->getExtensionAttributes()) {
+            $argumentsExtensionAttributes = $this->extensionAttributesProcessor->buildOutputDataArray(
+                $arguments->getExtensionAttributes(),
+                ShipmentCreationArgumentsExtensionInterface::class
+            );
         }
 
-        $attributes = $arguments->getExtensionAttributes();
-        $extensionAttributes = $this->extensionAttributesProcessor->buildOutputDataArray(
-            $attributes,
-            ShipmentCreationArgumentsExtensionInterface::class
-        );
-
-        foreach ($extensionAttributes as $code => $value) {
-            $setMethod = 'set' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($code);
+        $mergedExtensionAttributes = $this->shipmentExtensionFactory->create([
+            'data' => array_merge($shipmentExtensionAttributes, $argumentsExtensionAttributes)
+        ]);
 
-            if (method_exists($shipmentExtensionAttributes, $setMethod)) {
-                $shipmentExtensionAttributes->$setMethod($value);
-            }
-        }
+        $shipment->setExtensionAttributes($mergedExtensionAttributes);
     }
 }

app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactory/ExtensionAttributesProcessorTest.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order;
+
+use Magento\Sales\Api\Data\ShipmentCreationArgumentsExtensionInterfaceFactory;
+use Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface;
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide tests for shipment document factory.
+ */
+class ShipmentDocumentFactoryTest extends TestCase
+{
+    /**
+     * @var Order
+     */
+    private $order;
+
+    /**
+     * @var ShipmentDocumentFactory
+     */
+    private $shipmentDocumentFactory;
+
+    /**
+     * @var ShipmentCreationArgumentsInterface
+     */
+    private $shipmentCreationArgumentsInterface;
+
+    /**
+     * @var ShipmentCreationArgumentsExtensionInterfaceFactory
+     */
+    private $shipmentCreationArgumentsExtensionInterfaceFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+
+        $this->order = $objectManager->create(Order::class);
+        $this->shipmentDocumentFactory = $objectManager->create(ShipmentDocumentFactory::class);
+        $this->shipmentCreationArgumentsInterface = $objectManager
+            ->create(ShipmentCreationArgumentsInterface::class);
+        $this->shipmentCreationArgumentsExtensionInterfaceFactory = $objectManager
+            ->create(ShipmentCreationArgumentsExtensionInterfaceFactory::class);
+    }
+
+    /**
+     * Create shipment with shipment creation arguments.
+     *
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     */
+    public function testCreate(): void
+    {
+        $order = $this->order->loadByIncrementId('100000001');
+        $argumentsExtensionAttributes = $this->shipmentCreationArgumentsExtensionInterfaceFactory->create([
+            'data' => ['test_attribute_value' => 'test_value']
+        ]);
+        $this->shipmentCreationArgumentsInterface->setExtensionAttributes($argumentsExtensionAttributes);
+        $shipment = $this->shipmentDocumentFactory->create(
+            $order,
+            [],
+            [],
+            null,
+            false,
+            [],
+            $this->shipmentCreationArgumentsInterface
+        );
+        $shipmentExtensionAttributes = $shipment->getExtensionAttributes();
+        self::assertEquals('test_value', $shipmentExtensionAttributes->getTestAttributeValue());
+    }
+}

dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentDocumentFactoryTest.php

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
+    <extension_attributes for="Magento\Sales\Api\Data\ShipmentInterface">
+        <attribute code="test_attribute_value" type="string"/>
+    </extension_attributes>
+    <extension_attributes for="Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface">
+        <attribute code="test_attribute_value" type="string"/>
+    </extension_attributes>
+</config>