MC-20504: Revert MC-19872

Author: Mastiuhin Olexandr

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/StockDataFilter.php

@@ -7,7 +7,6 @@
 
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\CatalogInventory\Model\Stock;
 
 /**
  * Class StockDataFilter
@@ -61,8 +60,8 @@ public function filter(array $stockData)
             $stockData['qty'] = self::MAX_QTY_VALUE;
         }
 
-        if (isset($stockData['min_qty'])) {
-            $stockData['min_qty'] = $this->purifyMinQty($stockData['min_qty'], $stockData['backorders']);
+        if (isset($stockData['min_qty']) && (int)$stockData['min_qty'] < 0) {
+            $stockData['min_qty'] = 0;
         }
 
         if (!isset($stockData['is_decimal_divided']) || $stockData['is_qty_decimal'] == 0) {
@@ -71,27 +70,4 @@ public function filter(array $stockData)
 
         return $stockData;
     }
-
-    /**
-     * Purifies min_qty.
-     *
-     * @param int $minQty
-     * @param int $backOrders
-     * @return float
-     */
-    private function purifyMinQty(int $minQty, int $backOrders): float
-    {
-        /**
-         * As described in the documentation if the Backorders Option is disabled
-         * it is recommended to set the Out Of Stock Threshold to a positive number.
-         * That's why to clarify the logic to the end user the code below prevent him to set a negative number so such
-         * a number will turn to zero.
-         * @see https://docs.magento.com/m2/ce/user_guide/catalog/inventory-backorders.html
-         */
-        if ($backOrders === Stock::BACKORDERS_NO && $minQty < 0) {
-            $minQty = 0;
-        }
-
-        return (float)$minQty;
-    }
 }

app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml

@@ -23,11 +23,13 @@
             <createData entity="SimpleProductInStockQuantityZero" stepKey="createProduct"/>
 
             <!-- Configure Magento to show out of stock products and to allow backorders -->
+            <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockEnable.path}} {{CatalogInventoryOptionsShowOutOfStockEnable.value}}" stepKey="setConfigShowOutOfStockTrue"/>
             <magentoCLI command="config:set {{CatalogInventoryItemOptionsBackordersEnable.path}} {{CatalogInventoryItemOptionsBackordersEnable.value}}" stepKey="setConfigAllowBackordersTrue"/>
         </before>
 
         <after>
             <!-- Set Magento back to default configuration -->
+            <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/>
             <magentoCLI command="config:set {{CatalogInventoryItemOptionsBackordersDisable.path}} {{CatalogInventoryItemOptionsBackordersDisable.value}}" stepKey="setConfigAllowBackordersFalse"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
         </after>

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/StockDataFilterTest.php

@@ -6,15 +6,11 @@
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Initialization;
 
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter;
-use Magento\CatalogInventory\Model\Stock;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\CatalogInventory\Model\Configuration;
-use PHPUnit\Framework\TestCase;
 
 /**
- * StockDataFilter test.
+ * Class StockDataFilterTest
  */
-class StockDataFilterTest extends TestCase
+class StockDataFilterTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -31,43 +27,35 @@ class StockDataFilterTest extends TestCase
      */
     protected $stockDataFilter;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
     protected $stockConfiguration;
 
-    /**
-     * @inheritdoc
-     */
     protected function setUp()
     {
-        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
 
-        $this->scopeConfigMock->method('getValue')
-            ->will($this->returnValue(1));
+        $this->scopeConfigMock->expects($this->any())->method('getValue')->will($this->returnValue(1));
 
         $this->stockConfiguration = $this->createPartialMock(
-            Configuration::class,
+            \Magento\CatalogInventory\Model\Configuration::class,
             ['getManageStock']
         );
 
         $this->stockDataFilter = new StockDataFilter($this->scopeConfigMock, $this->stockConfiguration);
     }
 
     /**
-     * Tests filter method.
-     *
      * @param array $inputStockData
      * @param array $outputStockData
-     * @return void
      *
      * @covers \Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter::filter
      * @dataProvider filterDataProvider
      */
     public function testFilter(array $inputStockData, array $outputStockData)
     {
         if (isset($inputStockData['use_config_manage_stock']) && $inputStockData['use_config_manage_stock'] === 1) {
-            $this->stockConfiguration->method('getManageStock')
+            $this->stockConfiguration->expects($this->once())
+                ->method('getManageStock')
                 ->will($this->returnValue($outputStockData['manage_stock']));
         }
 
@@ -105,13 +93,8 @@ public function filterDataProvider()
                 ],
             ],
             'case4' => [
-                'inputStockData' => ['min_qty' => -1, 'backorders' => Stock::BACKORDERS_NO],
-                'outputStockData' => [
-                    'min_qty' => 0,
-                    'is_decimal_divided' => 0,
-                    'use_config_manage_stock' => 0,
-                    'backorders' => Stock::BACKORDERS_NO,
-                ],
+                'inputStockData' => ['min_qty' => -1],
+                'outputStockData' => ['min_qty' => 0, 'is_decimal_divided' => 0, 'use_config_manage_stock' => 0],
             ],
             'case5' => [
                 'inputStockData' => ['is_qty_decimal' => 0],
@@ -120,25 +103,7 @@ public function filterDataProvider()
                     'is_decimal_divided' => 0,
                     'use_config_manage_stock' => 0,
                 ],
-            ],
-            'case6' => [
-                'inputStockData' => ['min_qty' => -1, 'backorders' => Stock::BACKORDERS_YES_NONOTIFY],
-                'outputStockData' => [
-                    'min_qty' => -1,
-                    'is_decimal_divided' => 0,
-                    'use_config_manage_stock' => 0,
-                    'backorders' => Stock::BACKORDERS_YES_NONOTIFY,
-                ],
-            ],
-            'case7' => [
-                'inputStockData' => ['min_qty' => -1, 'backorders' => Stock::BACKORDERS_YES_NOTIFY],
-                'outputStockData' => [
-                    'min_qty' => -1,
-                    'is_decimal_divided' => 0,
-                    'use_config_manage_stock' => 0,
-                    'backorders' => Stock::BACKORDERS_YES_NOTIFY,
-                ],
-            ],
+            ]
         ];
     }
 }

app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php

@@ -14,7 +14,6 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Stdlib\DateTime\DateTime;
-use Zend_Db_Expr;
 
 /**
  * Stock item resource model
@@ -184,12 +183,16 @@ public function updateSetOutOfStock(int $websiteId)
             'is_in_stock = ' . Stock::STOCK_IN_STOCK,
             '(use_config_manage_stock = 1 AND 1 = ' . $this->stockConfiguration->getManageStock() . ')'
             . ' OR (use_config_manage_stock = 0 AND manage_stock = 1)',
-            '(' . $this->getBackordersExpr() .' = 0 AND qty <= ' . $this->getMinQtyExpr() . ')'
-            . ' OR (' . $this->getBackordersExpr() .' != 0 AND '
-            . $this->getMinQtyExpr() . ' != 0 AND qty <= ' . $this->getMinQtyExpr() . ')',
+            '(use_config_min_qty = 1 AND qty <= ' . $this->stockConfiguration->getMinQty() . ')'
+            . ' OR (use_config_min_qty = 0 AND qty <= min_qty)',
             'product_id IN (' . $select->assemble() . ')',
         ];
-
+        $backordersWhere = '(use_config_backorders = 0 AND backorders = ' . Stock::BACKORDERS_NO . ')';
+        if (Stock::BACKORDERS_NO == $this->stockConfiguration->getBackorders()) {
+            $where[] = $backordersWhere . ' OR use_config_backorders = 1';
+        } else {
+            $where[] = $backordersWhere;
+        }
         $connection->update($this->getMainTable(), $values, $where);
 
         $this->stockIndexerProcessor->markIndexerAsInvalid();
@@ -212,8 +215,8 @@ public function updateSetInStock(int $websiteId)
         $where = [
             'website_id = ' . $websiteId,
             'stock_status_changed_auto = 1',
-            '(qty > ' . $this->getMinQtyExpr() . ')'
-            . ' OR (' . $this->getBackordersExpr() . ' != 0 AND ' . $this->getMinQtyExpr() . ' = 0)', // If infinite
+            '(use_config_min_qty = 1 AND qty > ' . $this->stockConfiguration->getMinQty() . ')'
+            . ' OR (use_config_min_qty = 0 AND qty > min_qty)',
             'product_id IN (' . $select->assemble() . ')',
         ];
         $manageStockWhere = '(use_config_manage_stock = 0 AND manage_stock = 1)';
@@ -301,12 +304,12 @@ public function getBackordersExpr(string $tableAlias = ''): \Zend_Db_Expr
     }
 
     /**
-     * Get Minimum Sale Quantity Expression.
+     * Get Minimum Sale Quantity Expression
      *
      * @param string $tableAlias
-     * @return Zend_Db_Expr
+     * @return \Zend_Db_Expr
      */
-    public function getMinSaleQtyExpr(string $tableAlias = ''): Zend_Db_Expr
+    public function getMinSaleQtyExpr(string $tableAlias = ''): \Zend_Db_Expr
     {
         if ($tableAlias) {
             $tableAlias .= '.';
@@ -320,26 +323,6 @@ public function getMinSaleQtyExpr(string $tableAlias = ''): Zend_Db_Expr
         return $itemMinSaleQty;
     }
 
-    /**
-     * Get Min Qty Expression
-     *
-     * @param string $tableAlias
-     * @return Zend_Db_Expr
-     */
-    public function getMinQtyExpr(string $tableAlias = ''): Zend_Db_Expr
-    {
-        if ($tableAlias) {
-            $tableAlias .= '.';
-        }
-        $itemBackorders = $this->getConnection()->getCheckSql(
-            $tableAlias . 'use_config_min_qty = 1',
-            $this->stockConfiguration->getMinQty(),
-            $tableAlias . 'min_qty'
-        );
-
-        return $itemBackorders;
-    }
-
     /**
      * Build select for products with types from config
      *

app/code/Magento/CatalogInventory/Model/StockStateProvider.php

@@ -72,31 +72,14 @@ public function __construct(
      */
     public function verifyStock(StockItemInterface $stockItem)
     {
-        // Manage stock, but qty is null
         if ($stockItem->getQty() === null && $stockItem->getManageStock()) {
             return false;
         }
-
-        // Backorders are not allowed and qty reached min qty
         if ($stockItem->getBackorders() == StockItemInterface::BACKORDERS_NO
             && $stockItem->getQty() <= $stockItem->getMinQty()
         ) {
             return false;
         }
-
-        $backordersAllowed = [Stock::BACKORDERS_YES_NONOTIFY, Stock::BACKORDERS_YES_NOTIFY];
-        if (in_array($stockItem->getBackorders(), $backordersAllowed)) {
-            // Infinite - let it be In stock
-            if ($stockItem->getMinQty() == 0) {
-                return true;
-            }
-
-            // qty reached min qty - let it stand Out Of Stock
-            if ($stockItem->getQty() <= $stockItem->getMinQty()) {
-                return false;
-            }
-        }
-
         return true;
     }
 
@@ -262,17 +245,15 @@ public function checkQty(StockItemInterface $stockItem, $qty)
         if (!$stockItem->getManageStock()) {
             return true;
         }
-
-        $backordersAllowed = [Stock::BACKORDERS_YES_NONOTIFY, Stock::BACKORDERS_YES_NOTIFY];
-        // Infinite check
-        if ($stockItem->getMinQty() == 0 && in_array($stockItem->getBackorders(), $backordersAllowed)) {
-            return true;
-        }
-
         if ($stockItem->getQty() - $stockItem->getMinQty() - $qty < 0) {
-            return false;
+            switch ($stockItem->getBackorders()) {
+                case \Magento\CatalogInventory\Model\Stock::BACKORDERS_YES_NONOTIFY:
+                case \Magento\CatalogInventory\Model\Stock::BACKORDERS_YES_NOTIFY:
+                    break;
+                default:
+                    return false;
+            }
         }
-
         return true;
     }
 

app/code/Magento/CatalogInventory/Model/System/Config/Backend/Minqty.php

@@ -6,36 +6,21 @@
 
 namespace Magento\CatalogInventory\Model\System\Config\Backend;
 
-use Magento\CatalogInventory\Model\Stock;
-
 /**
- * Minimum product qty backend model.
+ * Minimum product qty backend model
  */
 class Minqty extends \Magento\Framework\App\Config\Value
 {
     /**
-     * Validate minimum product qty value.
+     * Validate minimum product qty value
      *
      * @return $this
      */
     public function beforeSave()
     {
         parent::beforeSave();
-        $minQty = (float)$this->getValue();
-
-        /**
-         * As described in the documentation if the Backorders Option is disabled
-         * it is recommended to set the Out Of Stock Threshold to a positive number.
-         * That's why to clarify the logic to the end user the code below prevent him to set a negative number so such
-         * a number will turn to zero.
-         * @see https://docs.magento.com/m2/ce/user_guide/catalog/inventory-backorders.html
-         */
-        if ($this->getFieldsetDataValue("backorders") == Stock::BACKORDERS_NO && $minQty < 0) {
-            $minQty = 0;
-        }
-
+        $minQty = (int) $this->getValue() >= 0 ? (int) $this->getValue() : (int) $this->getOldValue();
         $this->setValue((string) $minQty);
-
         return $this;
     }
 }