Merge remote-tracking branch 'github-magento/MAGETWO-91540' into EPAM-PR-7

Author: nikshostko

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -20,6 +20,7 @@
 use Magento\Framework\DB\Adapter\ConnectionException;
 use Magento\Framework\DB\Adapter\DeadlockException;
 use Magento\Framework\DB\Adapter\LockWaitException;
+use Magento\Framework\EntityManager\Operation\Read\ReadExtensions;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\LocalizedException;
@@ -154,6 +155,11 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
      */
     private $serializer;
 
+    /**
+     * @var ReadExtensions
+     */
+    private $readExtensions;
+
     /**
      * ProductRepository constructor.
      * @param ProductFactory $productFactory
@@ -179,6 +185,7 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
      * @param CollectionProcessorInterface $collectionProcessor [optional]
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param int $cacheLimit [optional]
+     * @param ReadExtensions|null $readExtensions
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -205,7 +212,8 @@ public function __construct(
         \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor,
         CollectionProcessorInterface $collectionProcessor = null,
         \Magento\Framework\Serialize\Serializer\Json $serializer = null,
-        $cacheLimit = 1000
+        $cacheLimit = 1000,
+        ReadExtensions $readExtensions = null
     ) {
         $this->productFactory = $productFactory;
         $this->collectionFactory = $collectionFactory;
@@ -228,6 +236,8 @@ public function __construct(
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
         $this->cacheLimit = (int)$cacheLimit;
+        $this->readExtensions = $readExtensions ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(ReadExtensions::class);
     }
 
     /**
@@ -668,6 +678,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         $collection->load();
 
         $collection->addCategoryIds();
+        $this->addExtensionAttributes($collection);
         $searchResult = $this->searchResultsFactory->create();
         $searchResult->setSearchCriteria($searchCriteria);
         $searchResult->setItems($collection->getItems());
@@ -678,7 +689,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
                 $this->getCacheKey(
                     [
                         false,
-                        $product->hasData(\Magento\Catalog\Model\Product::STORE_ID) ? $product->getStoreId() : null
+                        $product->getStoreId()
                     ]
                 ),
                 $product
@@ -688,6 +699,20 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         return $searchResult;
     }
 
+    /**
+     * Add extension attributes to loaded items.
+     *
+     * @param Collection $collection
+     * @return Collection
+     */
+    private function addExtensionAttributes(Collection $collection) : Collection
+    {
+        foreach ($collection->getItems() as $item) {
+            $this->readExtensions->execute($item);
+        }
+        return $collection;
+    }
+
     /**
      * Helper function that adds a FilterGroup to the collection.
      *

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -28,6 +28,7 @@
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\DB\Adapter\ConnectionException;
+use Magento\Framework\EntityManager\Operation\Read\ReadExtensions;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -179,6 +180,11 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
      */
     private $cacheLimit = 2;
 
+    /**
+     * @var ReadExtensions|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $readExtensionsMock;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -292,6 +298,8 @@ function ($value) {
                     }
                 )
             );
+        $this->readExtensionsMock = $this->getMockBuilder(ReadExtensions::class)
+            ->disableOriginalConstructor()->getMock();
 
         $this->model = $this->objectManager->getObject(
             ProductRepository::class,
@@ -315,7 +323,8 @@ function ($value) {
                 'mediaGalleryProcessor' => $this->mediaGalleryProcessor,
                 'collectionProcessor' => $this->collectionProcessor,
                 'serializer' => $this->serializerMock,
-                'cacheLimit' => $this->cacheLimit
+                'cacheLimit' => $this->cacheLimit,
+                'readExtensions' => $this->readExtensionsMock,
             ]
         );
     }
@@ -768,6 +777,8 @@ public function testGetList()
         $collectionMock->expects($this->once())->method('load');
         $collectionMock->expects($this->once())->method('addCategoryIds');
         $collectionMock->expects($this->atLeastOnce())->method('getItems')->willReturn([$this->product]);
+        $this->readExtensionsMock->expects($this->once())->method('execute')->with($this->product);
+        $collectionMock->expects($this->atLeastOnce())->method('getItems')->willReturn([$this->product]);
         $collectionMock->expects($this->once())->method('getSize')->willReturn(128);
         $searchResultsMock = $this->createMock(\Magento\Catalog\Api\Data\ProductSearchResultsInterface::class);
         $searchResultsMock->expects($this->once())->method('setSearchCriteria')->with($searchCriteriaMock);

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php

@@ -8,9 +8,9 @@
 namespace Magento\Catalog\Api;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\Downloadable\Model\Link;
 use Magento\Store\Model\Store;
-use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\Store\Model\Website;
 use Magento\Store\Model\WebsiteRepository;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -20,8 +20,8 @@
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SortOrder;
 use Magento\Framework\Api\SortOrderBuilder;
-use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
 
 /**
  * @magentoAppIsolation enabled
@@ -815,6 +815,7 @@ public function testGetList()
         $this->assertTrue(count($response['items']) > 0);
 
         $this->assertNotNull($response['items'][0]['sku']);
+        $this->assertNotNull($response['items'][0][ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]['website_ids']);
         $this->assertEquals('simple', $response['items'][0]['sku']);
 
         $index = null;
@@ -912,6 +913,7 @@ public function testGetListWithFilteringByWebsite()
         $this->assertTrue(count($response['items']) == 1);
         $this->assertTrue(isset($response['items'][0]['sku']));
         $this->assertEquals('simple-2', $response['items'][0]['sku']);
+        $this->assertNotNull($response['items'][0][ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]['website_ids']);
     }
 
     /**
@@ -1058,6 +1060,9 @@ public function testGetListWithMultipleFilterGroupsAndSortingAndPagination()
         $this->assertEquals(3, $searchResult['total_count']);
         $this->assertEquals(1, count($searchResult['items']));
         $this->assertEquals('search_product_4', $searchResult['items'][0][ProductInterface::SKU]);
+        $this->assertNotNull(
+            $searchResult['items'][0][ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]['website_ids']
+        );
     }
 
     /**

dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php

@@ -5,6 +5,7 @@
  */
 
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
+use Magento\Catalog\Api\Data\ProductExtensionInterfaceFactory;
 
 \Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize();
 
@@ -19,10 +20,15 @@
 $tierPriceFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory::class);
 /** @var  $tpExtensionAttributes */
 $tpExtensionAttributesFactory = $objectManager->get(ProductTierPriceExtensionFactory::class);
+/** @var  $productExtensionAttributes */
+$productExtensionAttributesFactory = $objectManager->get(ProductExtensionInterfaceFactory::class);
 
 $adminWebsite = $objectManager->get(\Magento\Store\Api\WebsiteRepositoryInterface::class)->get('admin');
 $tierPriceExtensionAttributes1 = $tpExtensionAttributesFactory->create()
     ->setWebsiteId($adminWebsite->getId());
+$productExtensionAttributesWebsiteIds = $productExtensionAttributesFactory->create(
+    ['website_ids' => $adminWebsite->getId()]
+);
 
 $tierPrices[] = $tierPriceFactory->create(
     [
@@ -82,6 +88,7 @@
     ->setTaxClassId(0)
     ->setTierPrices($tierPrices)
     ->setDescription('Description with <b>html tag</b>')
+    ->setExtensionAttributes($productExtensionAttributesWebsiteIds)
     ->setMetaTitle('meta title')
     ->setMetaKeyword('meta keyword')
     ->setMetaDescription('meta description')