re-commit PR from pull-request #269

app/code/Magento/InventoryApi/Test/_files/products.php

@@ -17,6 +17,8 @@
 use Magento\InventoryCatalog\Api\DefaultStockProviderInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
+const PRODUCT_COUNT = 4;
+
 $objectManager = Bootstrap::getObjectManager();
 /** @var ProductInterfaceFactory $productFactory */
 $productFactory = $objectManager->get(ProductInterfaceFactory::class);
@@ -39,10 +41,15 @@
         'qty' => 0,
         'is_in_stock' => false,
         'manage_stock' => true
+    ],
+    'SKU-4' => [
+        'qty' => 10,
+        'is_in_stock' => true,
+        'manage_stock' => true
     ]
 ];
 
-for ($i = 1; $i <= 3; $i++) {
+for ($i = 1; $i <= PRODUCT_COUNT; $i++) {
     $product = $productFactory->create();
     $product->setTypeId(Type::TYPE_SIMPLE)
         ->setAttributeSetId(4)
@@ -53,26 +60,3 @@
         ->setStatus(Status::STATUS_ENABLED);
     $productRepository->save($product);
 }
-
-/** @var Manager $moduleManager */
-$moduleManager = Bootstrap::getObjectManager()->get(Manager::class);
-// soft dependency in tests because we don't have possibility replace fixture from different modules
-if ($moduleManager->isEnabled('Magento_InventoryCatalog')) {
-    /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-    $searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
-    /** @var DefaultStockProviderInterface $defaultStockProvider */
-    $defaultStockProvider = $objectManager->get(DefaultStockProviderInterface::class);
-    /** @var SourceItemRepositoryInterface $sourceItemRepository */
-    $sourceItemRepository = $objectManager->get(SourceItemRepositoryInterface::class);
-    /** @var SourceItemsDeleteInterface $sourceItemsDelete */
-    $sourceItemsDelete = $objectManager->get(SourceItemsDeleteInterface::class);
-
-    $searchCriteria = $searchCriteriaBuilder
-        ->addFilter(SourceItemInterface::SKU, ['SKU-1', 'SKU-2', 'SKU-3'], 'in')
-        ->addFilter(SourceItemInterface::SOURCE_ID, $defaultStockProvider->getId())
-        ->create();
-    $sourceItems = $sourceItemRepository->getList($searchCriteria)->getItems();
-    if (count($sourceItems)) {
-        $sourceItemsDelete->execute($sourceItems);
-    }
-}

app/code/Magento/InventoryApi/Test/_files/products_rollback.php

@@ -27,7 +27,7 @@
 $searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
 $searchCriteria = $searchCriteriaBuilder->addFilter(
     ProductInterface::SKU,
-    ['SKU-1', 'SKU-2', 'SKU-3'],
+    ['SKU-1', 'SKU-2', 'SKU-3', 'SKU-4'],
     'in'
 )->create();
 $products = $productRepository->getList($searchCriteria)->getItems();
@@ -47,8 +47,11 @@
         $criteria->setProductsFilter($product->getId());
 
         $result = $stockStatusRepository->getList($criteria);
-        $stockStatus = current($result->getItems());
-        $stockStatusRepository->delete($stockStatus);
+        if ($result->getTotalCount()) {
+            $stockStatus = current($result->getItems());
+            $stockStatusRepository->delete($stockStatus);
+        }
+
 
         $productRepository->delete($product);
     }

app/code/Magento/InventoryApi/Test/_files/source_items.php

@@ -65,6 +65,12 @@
         SourceItemInterface::QUANTITY => 6,
         SourceItemInterface::STATUS => SourceItemInterface::STATUS_OUT_OF_STOCK,
     ],
+    [
+        SourceItemInterface::SOURCE_ID => 1, // Default Source
+        SourceItemInterface::SKU => 'SKU-4',
+        SourceItemInterface::QUANTITY => 10,
+        SourceItemInterface::STATUS => SourceItemInterface::STATUS_IN_STOCK,
+    ],
 ];
 
 $sourceItems = [];

app/code/Magento/InventoryApi/Test/_files/source_items_rollback.php

@@ -6,6 +6,7 @@
 declare(strict_types=1);
 
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\InventoryApi\Api\Data\SourceItemInterface;
 use Magento\InventoryApi\Api\SourceItemRepositoryInterface;
 use Magento\InventoryApi\Api\SourceItemsDeleteInterface;
@@ -20,7 +21,7 @@
 
 $searchCriteria = $searchCriteriaBuilder->addFilter(
     SourceItemInterface::SKU,
-    ['SKU-1', 'SKU-2', 'SKU-3'],
+    ['SKU-1', 'SKU-2', 'SKU-3', 'SKU-4'],
     'in'
 )->create();
 $sourceItems = $sourceItemRepository->getList($searchCriteria)->getItems();
@@ -30,5 +31,10 @@
  * In that case there is "if" which checks that SKU1, SKU2 and SKU3 still exists in database.
  */
 if (!empty($sourceItems)) {
-    $sourceItemsDelete->execute($sourceItems);
+    try{
+        $sourceItemsDelete->execute($sourceItems);
+    } catch (NoSuchEntityException $e) {
+
+    }
+
 }

app/code/Magento/InventoryCatalog/Model/UpdateLegacyStockItemByDefaultSourceItem.php

@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryCatalog\Model;
+
+use Magento\Catalog\Model\ProductIdLocatorInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\InventoryApi\Api\Data\SourceItemInterface;
+use Magento\InventoryCatalog\Api\DefaultSourceProviderInterface;
+use Magento\InventoryCatalog\Api\DefaultStockProviderInterface;
+
+/**
+ * Legacy update cataloginventory_stock_item by plain MySql query.
+ * Use for skip save by \Magento\CatalogInventory\Model\ResourceModel\Stock\Item::save
+ */
+class UpdateLegacyStockItemByDefaultSourceItem
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var DefaultSourceProviderInterface
+     */
+    private $defaultSourceProvider;
+
+    /**
+     * @var ProductIdLocatorInterface
+     */
+    private $productIdLocator;
+    /**
+     * @var DefaultStockProviderInterface
+     */
+    private $defaultStockProvider;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     * @param DefaultSourceProviderInterface $defaultSourceProvider
+     * @param DefaultStockProviderInterface $defaultStockProvider
+     * @param ProductIdLocatorInterface $productIdLocator
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        DefaultSourceProviderInterface $defaultSourceProvider,
+        DefaultStockProviderInterface $defaultStockProvider,
+        ProductIdLocatorInterface $productIdLocator
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->defaultSourceProvider = $defaultSourceProvider;
+        $this->defaultStockProvider = $defaultStockProvider;
+        $this->productIdLocator = $productIdLocator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute(SourceItemInterface $sourceItem)
+    {
+        if ($sourceItem->getSourceId() != $this->defaultSourceProvider->getId()) {
+            return;
+        }
+
+        $productIds = $this->productIdLocator->retrieveProductIdsBySkus([$sourceItem->getSku()]);
+        $productId = isset($productIds[$sourceItem->getSku()]) ? key($productIds[$sourceItem->getSku()]) : false;
+
+        if ($productId) {
+            $connection = $this->resourceConnection->getConnection();
+            $connection->update(
+                $this->resourceConnection->getTableName('cataloginventory_stock_item'),
+                [
+                    StockItemInterface::QTY => $sourceItem->getQuantity(),
+                ],
+                [
+                    StockItemInterface::STOCK_ID . ' = ?' => $this->defaultStockProvider->getId(),
+                    StockItemInterface::PRODUCT_ID . ' = ?' => $productId,
+                    'website_id = ?' => 0
+                ]
+            );
+        }
+    }
+}

app/code/Magento/InventoryCatalog/Model/UpdateLegacyStockStatusByDefaultSourceItem.php

@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryCatalog\Model;
+
+use Magento\Catalog\Model\ProductIdLocatorInterface;
+use Magento\CatalogInventory\Api\Data\StockStatusInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\InventoryApi\Api\Data\SourceItemInterface;
+use Magento\InventoryCatalog\Api\DefaultSourceProviderInterface;
+use Magento\InventoryCatalog\Api\DefaultStockProviderInterface;
+
+/**
+ * Legacy update cataloginventory_stock_status by plain MySql query.
+ * Use for skip save by \Magento\CatalogInventory\Model\ResourceModel\Stock\Item::save
+ */
+class UpdateLegacyStockStatusByDefaultSourceItem
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var DefaultSourceProviderInterface
+     */
+    private $defaultSourceProvider;
+
+    /**
+     * @var ProductIdLocatorInterface
+     */
+    private $productIdLocator;
+    /**
+     * @var DefaultStockProviderInterface
+     */
+    private $defaultStockProvider;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     * @param DefaultSourceProviderInterface $defaultSourceProvider
+     * @param DefaultStockProviderInterface $defaultStockProvider
+     * @param ProductIdLocatorInterface $productIdLocator
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        DefaultSourceProviderInterface $defaultSourceProvider,
+        DefaultStockProviderInterface $defaultStockProvider,
+        ProductIdLocatorInterface $productIdLocator
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->defaultSourceProvider = $defaultSourceProvider;
+        $this->defaultStockProvider = $defaultStockProvider;
+        $this->productIdLocator = $productIdLocator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute(SourceItemInterface $sourceItem)
+    {
+        if ($sourceItem->getSourceId() != $this->defaultSourceProvider->getId()) {
+            return;
+        }
+
+        $productIds = $this->productIdLocator->retrieveProductIdsBySkus([$sourceItem->getSku()]);
+        $productId = isset($productIds[$sourceItem->getSku()]) ? key($productIds[$sourceItem->getSku()]) : false;
+
+        if ($productId) {
+            $connection = $this->resourceConnection->getConnection();
+            $connection->update(
+                $this->resourceConnection->getTableName('cataloginventory_stock_status'),
+                [
+                    StockStatusInterface::QTY => $sourceItem->getQuantity(),
+                    StockStatusInterface::STOCK_STATUS => $sourceItem->getStatus()
+                ],
+                [
+                    StockStatusInterface::STOCK_ID . ' = ?' => $this->defaultStockProvider->getId(),
+                    StockStatusInterface::PRODUCT_ID . ' = ?' => $productId,
+                    'website_id = ?' => 0
+                ]
+            );
+        }
+    }
+}