🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #16169: [Backport] #8035 join extension attributes not added to orders (by @Scarraban)


Fixed GitHub Issues:
 - #8035: Join extension attributes are not added to Order results (REST api) (reported by @sterfpaul) has been fixed in #16169 by @Scarraban in 2.1-develop branch
   Related commits:
     1. 032c82d
     2. 27bdf61

Author: Stanislav Idolov

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

@@ -5,6 +5,7 @@
  */
 namespace Magento\Sales\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Sales\Model\ResourceModel\Order as Resource;
 use Magento\Sales\Model\ResourceModel\Metadata;
 use Magento\Sales\Model\Order\ShippingAssignmentBuilder;
@@ -16,6 +17,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Api\SortOrder;
+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 
 /**
  * Repository class for @see OrderInterface
@@ -43,6 +45,11 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
      */
     private $shippingAssignmentBuilder;
 
+    /**
+     * @var JoinProcessorInterface
+     */
+    private $joinProcessor;
+
     /**
      * OrderInterface[]
      *
@@ -55,13 +62,17 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
      *
      * @param Metadata $metadata
      * @param SearchResultFactory $searchResultFactory
+     * @param JoinProcessorInterface|null $joinProcessor
      */
     public function __construct(
         Metadata $metadata,
-        SearchResultFactory $searchResultFactory
+        SearchResultFactory $searchResultFactory,
+        JoinProcessorInterface $joinProcessor = null
     ) {
         $this->metadata = $metadata;
         $this->searchResultFactory = $searchResultFactory;
+        $this->joinProcessor = $joinProcessor
+         ?: ObjectManager::getInstance()->get(JoinProcessorInterface::class);
     }
 
     /**
@@ -116,6 +127,7 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
             );
         }
 
+        $this->joinProcessor->process($searchResult);
         $searchResult->setSearchCriteria($searchCriteria);
         $searchResult->setCurPage($searchCriteria->getCurrentPage());
         $searchResult->setPageSize($searchCriteria->getPageSize());
@@ -186,7 +198,7 @@ private function setShippingAssignments(OrderInterface $order)
 
     /**
      * Get the new OrderExtensionFactory for application code
-     * 
+     *
      * @return OrderExtensionFactory
      * @deprecated
      */

dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/etc/extension_attributes.xml

@@ -31,4 +31,16 @@
             </join>
         </attribute>
     </extension_attributes>
+    <extension_attributes for="Magento\Sales\Api\Data\OrderInterface">
+      <attribute code="orderApiTestAttribute" type="Magento\User\Api\Data\UserInterface">
+        <join reference_table="admin_user"
+              join_on_field="store_id"
+              reference_field="user_id"
+                >
+            <field>firstname</field>
+            <field>lastname</field>
+            <field>email</field>
+        </join>
+      </attribute>
+    </extension_attributes>
 </config>

dev/tests/api-functional/testsuite/Magento/Webapi/JoinDirectivesTest.php

@@ -122,6 +122,48 @@ public function testAutoGeneratedGetList()
         $this->assertEquals($expectedExtensionAttributes['email'], $testAttribute['email']);
     }
 
+    /**
+     * Test get list of orders with extension attributes
+     *
+     * @magentoApiDataFixture Magento/Sales/_files/order.php
+     */
+    public function testGetOrderList()
+    {
+        $filter = $this->filterBuilder
+                  ->setField('increment_id')
+                  ->setValue('100000001')
+                  ->setConditionType('eq')
+                  ->create();
+        $this->searchBuilder->addFilters([$filter]);
+        $searchData = $this->searchBuilder->create()->__toArray();
+
+        $requestData = ['searchCriteria' => $searchData];
+        $restResourcePath = '/V1/orders/';
+        $soapService = 'salesOrderRepositoryV1';
+        $expectedExtensionAttributes = $this->getExpectedExtensionAttributes();
+
+        $serviceInfo = [
+            'rest'  => [
+                'resourcePath'  => $restResourcePath . '?' . http_build_query($requestData),
+                'httpMethod'    => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ],
+            'soap'  => [
+                'service'   => $soapService,
+                'operation' => $soapService . 'GetList',
+            ],
+        ];
+        $searchResult = $this->_webApiCall($serviceInfo, $requestData);
+
+        $this->assertArrayHasKey('items', $searchResult);
+        $itemData = array_pop($searchResult['items']);
+        $this->assertArrayHasKey('extension_attributes', $itemData);
+        $this->assertArrayHasKey('order_api_test_attribute', $itemData['extension_attributes']);
+        $testAttribute = $itemData['extension_attributes']['order_api_test_attribute'];
+        $this->assertEquals($expectedExtensionAttributes['firstname'], $testAttribute['first_name']);
+        $this->assertEquals($expectedExtensionAttributes['lastname'], $testAttribute['last_name']);
+        $this->assertEquals($expectedExtensionAttributes['email'], $testAttribute['email']);
+    }
+
     /**
      * Retrieve the admin user's information.
      *