Merge remote-tracking branch 'origin/MAGETWO-98013' into 2.3-develop-pr17

Author: serhii-balko

app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityAndStockStatusFieldToCollection.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Ui\DataProvider\Product;
+
+use Magento\Framework\Data\Collection;
+use Magento\Ui\DataProvider\AddFieldToCollectionInterface;
+
+/**
+ * Add quantity_and_stock_status field to collection
+ */
+class AddQuantityAndStockStatusFieldToCollection implements AddFieldToCollectionInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function addField(Collection $collection, $field, $alias = null)
+    {
+        $collection->joinField(
+            'quantity_and_stock_status',
+            'cataloginventory_stock_item',
+            'is_in_stock',
+            'product_id=entity_id',
+            '{{table}}.stock_id=1',
+            'left'
+        );
+    }
+}

app/code/Magento/CatalogInventory/etc/adminhtml/di.xml

@@ -23,6 +23,7 @@
         <arguments>
             <argument name="addFieldStrategies" xsi:type="array">
                 <item name="qty" xsi:type="object">Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityFieldToCollection</item>
+                <item name="quantity_and_stock_status" xsi:type="object">Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityAndStockStatusFieldToCollection</item>
             </argument>
             <argument name="addFilterStrategies" xsi:type="array">
                 <item name="qty" xsi:type="object">Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityFilterToCollection</item>

dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/QuantityAndStockStatusTest.php

@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Ui\DataProvider\Product;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogInventory\Model\Stock\StockItemRepository;
+use Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityAndStockStatusFieldToCollection;
+use PHPUnit\Framework\TestCase;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\CatalogInventory\Api\StockItemCriteriaInterface;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+
+/**
+ * Quantity and stock status test
+ */
+class QuantityAndStockStatusTest extends TestCase
+{
+    /**
+     * @var string
+     */
+    private static $quantityAndStockStatus = 'quantity_and_stock_status';
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * Test product stock status in the products grid column
+     *
+     * @magentoDataFixture Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid.php
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     */
+    public function testProductStockStatus()
+    {
+        /** @var StockItemRepository $stockItemRepository */
+        $stockItemRepository = $this->objectManager->create(StockItemRepository::class);
+
+        /** @var StockRegistryInterface $stockRegistry */
+        $stockRegistry = $this->objectManager->create(StockRegistryInterface::class);
+
+        $stockItem = $stockRegistry->getStockItemBySku('simple');
+        $stockItem->setIsInStock(false);
+        $stockItemRepository->save($stockItem);
+        $savedStockStatus = (int)$stockItem->getIsInStock();
+
+        $dataProvider = $this->objectManager->create(
+            ProductDataProvider::class,
+            [
+                'name' => 'product_listing_data_source',
+                'primaryFieldName' => 'entity_id',
+                'requestFieldName' => 'id',
+                'addFieldStrategies' => [
+                    'quantity_and_stock_status' =>
+                        $this->objectManager->get(AddQuantityAndStockStatusFieldToCollection::class)
+                ]
+            ]
+        );
+
+        $dataProvider->addField(self::$quantityAndStockStatus);
+        $data = $dataProvider->getData();
+        $dataProviderStockStatus = $data['items'][0][self::$quantityAndStockStatus];
+
+        $this->assertEquals($dataProviderStockStatus, $savedStockStatus);
+    }
+}

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

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$eavSetupFactory = $objectManager->create(\Magento\Eav\Setup\EavSetupFactory::class);
+/** @var \Magento\Eav\Setup\EavSetup $eavSetup */
+$eavSetup = $eavSetupFactory->create();
+$eavSetup->updateAttribute(
+    \Magento\Catalog\Model\Product::ENTITY,
+    'quantity_and_stock_status',
+    [
+        'is_used_in_grid' => 1,
+    ]
+);

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

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$eavSetupFactory = $objectManager->create(\Magento\Eav\Setup\EavSetupFactory::class);
+/** @var \Magento\Eav\Setup\EavSetup $eavSetup */
+$eavSetup = $eavSetupFactory->create();
+$eavSetup->updateAttribute(
+    \Magento\Catalog\Model\Product::ENTITY,
+    'quantity_and_stock_status',
+    [
+        'is_used_in_grid' => 0,
+    ]
+);