MAGETWO-87151: [EngCom Team] Batch 7. Forwardports to 2.3-develop #1289

Author: Oleksii Korshenko

app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php

@@ -119,7 +119,9 @@ private function mergeCategoryLinks($newCategoryPositions, $oldCategoryPositions
 
             if ($key === false) {
                 $result[] = $newCategoryPosition;
-            } elseif ($oldCategoryPositions[$key]['position'] != $newCategoryPosition['position']) {
+            } elseif (isset($oldCategoryPositions[$key])
+                && $oldCategoryPositions[$key]['position'] != $newCategoryPosition['position']
+            ) {
                 $result[] = $newCategoryPositions[$key];
                 unset($oldCategoryPositions[$key]);
             }

app/code/Magento/Catalog/Model/ResourceModel/Config.php

@@ -149,8 +149,7 @@ public function getAttributesUsedForSortBy()
             ['main_table' => $this->getTable('eav_attribute')]
         )->join(
             ['additional_table' => $this->getTable('catalog_eav_attribute')],
-            'main_table.attribute_id = additional_table.attribute_id',
-            []
+            'main_table.attribute_id = additional_table.attribute_id'
         )->joinLeft(
             ['al' => $this->getTable('eav_attribute_label')],
             'al.attribute_id = main_table.attribute_id AND al.store_id = ' . $this->getStoreId(),

app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php

@@ -197,6 +197,21 @@ public function getCategoryDataProvider()
                 ],
                 [], //affected category_ids
             ],
+            [
+                [3], //model category_ids
+                [
+                    ['category_id' => 3, 'position' => 20],
+                    ['category_id' => 4, 'position' => 30],
+                ], // dto category links
+                [
+                    ['category_id' => 3, 'position' => 10],
+                ],
+                [
+                    ['category_id' => 3, 'position' => 20],
+                    ['category_id' => 4, 'position' => 30],
+                ],
+                [3, 4], //affected category_ids
+            ],
         ];
     }
 

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/ConfigTest.php

@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Unit\Model\ResourceModel;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Test for Magento\Catalog\Model\ResourceModel\Config
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Config
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resource;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eavConfig;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->resource = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
+        $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->eavConfig = $this->createMock(\Magento\Eav\Model\Config::class);
+
+        $this->model = $objectManager->getObject(
+            \Magento\Catalog\Model\ResourceModel\Config::class,
+            [
+                'resource' => $this->resource,
+                'storeManager' => $this->storeManager,
+                'eavConfig' => $this->eavConfig,
+            ]
+        );
+
+        parent::setUp();
+    }
+
+    public function testGetAttributesUsedForSortBy()
+    {
+        $expression = 'someExpression';
+        $storeId = 1;
+        $entityTypeId = 4;
+
+        $connectionMock = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
+        $entityTypeMock = $this->createMock(\Magento\Eav\Model\Entity\Type::class);
+
+        $this->resource->expects($this->atLeastOnce())->method('getConnection')->willReturn($connectionMock);
+
+        $connectionMock->expects($this->once())->method('getCheckSql')
+            ->with('al.value IS NULL', 'main_table.frontend_label', 'al.value')
+            ->willReturn($expression);
+        $connectionMock->expects($this->atLeastOnce())->method('select')->willReturn($selectMock);
+
+        $this->resource->expects($this->exactly(3))->method('getTableName')->withConsecutive(
+            ['eav_attribute'],
+            ['catalog_eav_attribute'],
+            ['eav_attribute_label']
+        )->willReturnOnConsecutiveCalls('eav_attribute', 'catalog_eav_attribute', 'eav_attribute_label');
+
+        $this->storeManager->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $storeMock->expects($this->once())->method('getId')->willReturn($storeId);
+
+        $this->eavConfig->expects($this->once())->method('getEntityType')->willReturn($entityTypeMock);
+        $entityTypeMock->expects($this->once())->method('getId')->willReturn($entityTypeId);
+
+        $selectMock->expects($this->once())->method('from')
+            ->with(['main_table' => 'eav_attribute'])->willReturn($selectMock);
+        $selectMock->expects($this->once())->method('join')->with(
+            ['additional_table' => 'catalog_eav_attribute'],
+            'main_table.attribute_id = additional_table.attribute_id'
+        )->willReturn($selectMock);
+        $selectMock->expects($this->once())->method('joinLeft')
+            ->with(
+                ['al' => 'eav_attribute_label'],
+                'al.attribute_id = main_table.attribute_id AND al.store_id = ' . $storeId,
+                ['store_label' => $expression]
+            )->willReturn($selectMock);
+        $selectMock->expects($this->exactly(2))->method('where')->withConsecutive(
+            ['main_table.entity_type_id = ?', $entityTypeId],
+            ['additional_table.used_for_sort_by = ?', 1]
+        )->willReturn($selectMock);
+
+        $connectionMock->expects($this->once())->method('fetchAll')->with($selectMock);
+
+        $this->model->getAttributesUsedForSortBy();
+    }
+}

app/code/Magento/CatalogInventory/Observer/AddStockItemsObserver.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogInventory\Observer;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+
+/**
+ * Add Stock items to product collection.
+ */
+class AddStockItemsObserver implements ObserverInterface
+{
+    /**
+     * @var StockItemCriteriaInterfaceFactory
+     */
+    private $criteriaInterfaceFactory;
+
+    /**
+     * @var StockItemRepositoryInterface
+     */
+    private $stockItemRepository;
+
+    /**
+     * @var StockConfigurationInterface
+     */
+    private $stockConfiguration;
+
+    /**
+     * AddStockItemsObserver constructor.
+     *
+     * @param StockItemCriteriaInterfaceFactory $criteriaInterfaceFactory
+     * @param StockItemRepositoryInterface $stockItemRepository
+     * @param StockConfigurationInterface $stockConfiguration
+     */
+    public function __construct(
+        StockItemCriteriaInterfaceFactory $criteriaInterfaceFactory,
+        StockItemRepositoryInterface $stockItemRepository,
+        StockConfigurationInterface $stockConfiguration
+    ) {
+        $this->criteriaInterfaceFactory = $criteriaInterfaceFactory;
+        $this->stockItemRepository = $stockItemRepository;
+        $this->stockConfiguration = $stockConfiguration;
+    }
+
+    /**
+     * Add stock items to products in collection.
+     *
+     * @param Observer $observer
+     * @return void
+     */
+    public function execute(Observer $observer)
+    {
+        /** @var Collection $productCollection */
+        $productCollection = $observer->getData('collection');
+        $productIds = array_keys($productCollection->getItems());
+        $criteria = $this->criteriaInterfaceFactory->create();
+        $criteria->setProductsFilter($productIds);
+        $criteria->setScopeFilter($this->stockConfiguration->getDefaultScopeId());
+        $stockItemCollection = $this->stockItemRepository->getList($criteria);
+        foreach ($stockItemCollection->getItems() as $item) {
+            /** @var Product $product */
+            $product = $productCollection->getItemById($item->getProductId());
+            $productExtension = $product->getExtensionAttributes();
+            $productExtension->setStockItem($item);
+            $product->setExtensionAttributes($productExtension);
+        }
+    }
+}

app/code/Magento/CatalogInventory/Test/Unit/Observer/AddStockItemsObserverTest.php

@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogInventory\Test\Unit\Observer;
+
+use Magento\Catalog\Api\Data\ProductExtensionInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\CatalogInventory\Api\Data\StockItemCollectionInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Api\StockItemCriteriaInterface;
+use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
+use Magento\CatalogInventory\Observer\AddStockItemsObserver;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+class AddStockItemsObserverTest extends TestCase
+{
+    /**
+     * Test subject.
+     *
+     * @var AddStockItemsObserver
+     */
+    private $subject;
+    /**
+     * @var StockItemCriteriaInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $criteriaInterfaceFactoryMock;
+
+    /**
+     * @var StockItemRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockItemRepositoryMock;
+
+    /**
+     * @var StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockConfigurationMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->criteriaInterfaceFactoryMock = $this->getMockBuilder(StockItemCriteriaInterfaceFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->stockItemRepositoryMock = $this->getMockBuilder(StockItemRepositoryInterface::class)
+            ->setMethods(['getList'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->stockConfigurationMock = $this->getMockBuilder(StockConfigurationInterface::class)
+            ->setMethods(['getDefaultScopeId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->subject = $objectManager->getObject(
+            AddStockItemsObserver::class,
+            [
+                'criteriaInterfaceFactory' => $this->criteriaInterfaceFactoryMock,
+                'stockItemRepository' => $this->stockItemRepositoryMock,
+                'stockConfiguration' => $this->stockConfigurationMock
+            ]
+        );
+    }
+
+    /**
+     * Test AddStockItemsObserver::execute() add stock item to product as extension attribute.
+     */
+    public function testExecute()
+    {
+        $productId = 1;
+        $defaultScopeId = 0;
+
+        $criteria = $this->getMockBuilder(StockItemCriteriaInterface::class)
+            ->setMethods(['setProductsFilter', 'setScopeFilter'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $criteria->expects(self::once())
+            ->method('setProductsFilter')
+            ->with(self::identicalTo([$productId]))
+            ->willReturn(true);
+        $criteria->expects(self::once())
+            ->method('setScopeFilter')
+            ->with(self::identicalTo($defaultScopeId))
+            ->willReturn(true);
+
+        $this->criteriaInterfaceFactoryMock->expects(self::once())
+            ->method('create')
+            ->willReturn($criteria);
+        $stockItemCollection = $this->getMockBuilder(StockItemCollectionInterface::class)
+            ->setMethods(['getItems'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $stockItem = $this->getMockBuilder(StockItemInterface::class)
+            ->setMethods(['getProductId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $stockItem->expects(self::once())
+            ->method('getProductId')
+            ->willReturn($productId);
+
+        $stockItemCollection->expects(self::once())
+            ->method('getItems')
+            ->willReturn([$stockItem]);
+
+        $this->stockItemRepositoryMock->expects(self::once())
+            ->method('getList')
+            ->with(self::identicalTo($criteria))
+            ->willReturn($stockItemCollection);
+
+        $this->stockConfigurationMock->expects(self::once())
+            ->method('getDefaultScopeId')
+            ->willReturn($defaultScopeId);
+
+        $productExtension = $this->getMockBuilder(ProductExtensionInterface::class)
+            ->setMethods(['setStockItem'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $productExtension->expects(self::once())
+            ->method('setStockItem')
+            ->with(self::identicalTo($stockItem));
+
+        $product = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $product->expects(self::once())
+            ->method('getExtensionAttributes')
+            ->willReturn($productExtension);
+        $product->expects(self::once())
+            ->method('setExtensionAttributes')
+            ->with(self::identicalTo($productExtension))
+            ->willReturnSelf();
+
+        /** @var ProductCollection|\PHPUnit_Framework_MockObject_MockObject $productCollection */
+        $productCollection = $this->getMockBuilder(ProductCollection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productCollection->expects(self::once())
+            ->method('getItems')
+            ->willReturn([$productId => $product]);
+        $productCollection->expects(self::once())
+            ->method('getItemById')
+            ->with(self::identicalTo($productId))
+            ->willReturn($product);
+
+        /** @var Observer|\PHPUnit_Framework_MockObject_MockObject $observer */
+        $observer = $this->getMockBuilder(Observer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $observer->expects(self::once())
+            ->method('getData')
+            ->with('collection')
+            ->willReturn($productCollection);
+
+        $this->subject->execute($observer);
+    }
+}