386: Adapt \Magento\CatalogInventory\Helper\Stock::addStockStatusToProducts

app/code/Magento/Inventory/Test/Integration/Stock/GetProductQuantityInStockTest.php

@@ -58,7 +58,7 @@ protected function tearDown()
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/products.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/sources.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stocks.php
-     * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stock_source_link.php
+     * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stock_source_links.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/source_items.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryIndexer/Test/_files/reindex_inventory.php
      */
@@ -71,7 +71,7 @@ public function testGetProductQuantity()
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/products.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/sources.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stocks.php
-     * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stock_source_link.php
+     * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stock_source_links.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/source_items.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryIndexer/Test/_files/reindex_inventory.php
      */

app/code/Magento/Inventory/Test/Integration/Stock/IsProductInStockTest.php

@@ -48,7 +48,7 @@ protected function setUp()
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/products.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/sources.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stocks.php
-     * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stock_source_link.php
+     * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stock_source_links.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/source_items.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryIndexer/Test/_files/reindex_inventory.php
      */
@@ -61,7 +61,7 @@ public function testProductIsInStock()
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/products.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/sources.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stocks.php
-     * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stock_source_link.php
+     * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stock_source_links.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/source_items.php
      * @magentoDataFixture ../../../../app/code/Magento/InventoryIndexer/Test/_files/reindex_inventory.php
      */

app/code/Magento/InventoryApi/Test/Api/StockSourceLink/GetAssignedSourcesForStockTest.php

@@ -24,7 +24,7 @@ class GetAssignedSourcesForStockTest extends WebapiAbstract
     /**
      * @magentoApiDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/sources.php
      * @magentoApiDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stocks.php
-     * @magentoApiDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stock_source_link.php
+     * @magentoApiDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stock_source_links.php
      */
     public function testGetAssignedSourcesForStock()
     {
@@ -51,7 +51,7 @@ public function testGetAssignedSourcesForStock()
     /**
      * @magentoApiDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/sources.php
      * @magentoApiDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stocks.php
-     * @magentoApiDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stock_source_link.php
+     * @magentoApiDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stock_source_links.php
      */
     public function testGetAssignedSourcesWithNotNumericStockId()
     {

app/code/Magento/InventoryApi/Test/Api/StockSourceLink/UnassignSourceFromStockTest.php

@@ -41,7 +41,7 @@ class UnassignSourceFromStockTest extends WebapiAbstract
      *
      * @magentoApiDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/sources.php
      * @magentoApiDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stocks.php
-     * @magentoApiDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stock_source_link.php
+     * @magentoApiDataFixture ../../../../app/code/Magento/InventoryApi/Test/_files/stock_source_links.php
      */
     public function testUnassignSourceFromStock()
     {

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

@@ -27,11 +27,6 @@
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
 $productRepository->cleanCache();
 
-/** @var IndexerInterface $indexer */
-$indexer = Bootstrap::getObjectManager()->create(IndexerInterface::class);
-$indexer->load(InventoryIndexer::INDEXER_ID);
-$indexer->reindexAll();
-
 $stockData = [
     'SKU-1' => [
         'qty' => 8.5,

app/code/Magento/InventoryCatalog/Plugin/CatalogInventory/Helper/Stock/AdaptAddStockStatusToProductsPlugin.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryCatalog\Plugin\CatalogInventory\Helper\Stock;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Collection\AbstractCollection;
+use Magento\CatalogInventory\Helper\Stock;
+use Magento\InventoryApi\Api\IsProductInStockInterface;
+use Magento\InventoryCatalog\Model\GetStockIdForCurrentWebsite;
+
+/**
+ * Adapt addStockStatusToProducts for multi stocks.
+ */
+class AdaptAddStockStatusToProductsPlugin
+{
+    /**
+     * @var GetStockIdForCurrentWebsite
+     */
+    private $getStockIdForCurrentWebsite;
+
+    /**
+     * @var IsProductInStockInterface
+     */
+    private $isProductInStock;
+
+    /**
+     * @param GetStockIdForCurrentWebsite $getStockIdForCurrentWebsite
+     * @param IsProductInStockInterface $isProductInStock
+     */
+    public function __construct(
+        GetStockIdForCurrentWebsite $getStockIdForCurrentWebsite,
+        IsProductInStockInterface $isProductInStock
+    ) {
+        $this->getStockIdForCurrentWebsite = $getStockIdForCurrentWebsite;
+        $this->isProductInStock = $isProductInStock;
+    }
+
+    /**
+     * @param Stock $subject
+     * @param callable $proceed
+     * @param AbstractCollection $productCollection
+     * @return void
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundAddStockStatusToProducts(
+        Stock $subject,
+        callable $proceed,
+        AbstractCollection $productCollection
+    ) {
+        $stockId = $this->getStockIdForCurrentWebsite->execute();
+
+        /** @var Product $product */
+        foreach ($productCollection as $product) {
+            $isSalable = (int)$this->isProductInStock->execute($product->getSku(), $stockId);
+            $product->setIsSalable($isSalable);
+        }
+    }
+}

app/code/Magento/InventoryCatalog/Plugin/CatalogInventory/Model/ResourceModel/Stock/Status/AdaptAddIsInStockFilterToCollectionToMultiStocks.php → app/code/Magento/InventoryCatalog/Plugin/CatalogInventory/Model/ResourceModel/Stock/Status/AdaptAddIsInStockFilterToCollection.php

@@ -14,27 +14,27 @@
 /**
  * Adapt adding is in stock filter to collection for multi stocks.
  */
-class AdaptAddIsInStockFilterToCollectionToMultiStocks
+class AdaptAddIsInStockFilterToCollection
 {
     /**
      * @var GetStockIdForCurrentWebsite
      */
-    private $stockIdForCurrentWebsite;
+    private $getStockIdForCurrentWebsite;
 
     /**
      * @var AddIsInStockFilterToCollection
      */
     private $adaptedAddIsInStockFilterToCollection;
 
     /**
-     * @param GetStockIdForCurrentWebsite $stockIdForCurrentWebsite
+     * @param GetStockIdForCurrentWebsite $getStockIdForCurrentWebsite
      * @param AddIsInStockFilterToCollection $adaptedAddIsInStockFilterToCollection
      */
     public function __construct(
-        GetStockIdForCurrentWebsite $stockIdForCurrentWebsite,
+        GetStockIdForCurrentWebsite $getStockIdForCurrentWebsite,
         AddIsInStockFilterToCollection $adaptedAddIsInStockFilterToCollection
     ) {
-        $this->stockIdForCurrentWebsite = $stockIdForCurrentWebsite;
+        $this->getStockIdForCurrentWebsite = $getStockIdForCurrentWebsite;
         $this->adaptedAddIsInStockFilterToCollection = $adaptedAddIsInStockFilterToCollection;
     }
 
@@ -51,7 +51,7 @@ public function aroundAddIsInStockFilterToCollection(
         callable $proceed,
         $collection
     ) {
-        $stockId = $this->stockIdForCurrentWebsite->execute();
+        $stockId = $this->getStockIdForCurrentWebsite->execute();
         $this->adaptedAddIsInStockFilterToCollection->addIsInStockFilterToCollection($collection, $stockId);
 
         return $stockStatus;

app/code/Magento/InventoryCatalog/Plugin/CatalogInventory/Model/ResourceModel/Stock/Status/AdaptAddStockDataToCollectionToMultiStocks.php → app/code/Magento/InventoryCatalog/Plugin/CatalogInventory/Model/ResourceModel/Stock/Status/AdaptAddStockDataToCollection.php

@@ -15,27 +15,27 @@
 /**
  * Adapt adding stock data to collection for multi stocks.
  */
-class AdaptAddStockDataToCollectionToMultiStocks
+class AdaptAddStockDataToCollection
 {
     /**
      * @var GetStockIdForCurrentWebsite
      */
-    private $stockIdForCurrentWebsite;
+    private $getStockIdForCurrentWebsite;
 
     /**
      * @var AddStockDataToCollection
      */
     private $addStockDataToCollection;
 
     /**
-     * @param GetStockIdForCurrentWebsite $stockIdForCurrentWebsite
+     * @param GetStockIdForCurrentWebsite $getStockIdForCurrentWebsite
      * @param AddStockDataToCollection $addStockDataToCollection
      */
     public function __construct(
-        GetStockIdForCurrentWebsite $stockIdForCurrentWebsite,
+        GetStockIdForCurrentWebsite $getStockIdForCurrentWebsite,
         AddStockDataToCollection $addStockDataToCollection
     ) {
-        $this->stockIdForCurrentWebsite = $stockIdForCurrentWebsite;
+        $this->getStockIdForCurrentWebsite = $getStockIdForCurrentWebsite;
         $this->addStockDataToCollection = $addStockDataToCollection;
     }
 
@@ -54,7 +54,7 @@ public function aroundAddStockDataToCollection(
         $collection,
         $isFilterInStock
     ) {
-        $stockId = $this->stockIdForCurrentWebsite->execute();
+        $stockId = $this->getStockIdForCurrentWebsite->execute();
         $this->addStockDataToCollection->addStockDataToCollection($collection, (bool)$isFilterInStock, $stockId);
 
         return $collection;

app/code/Magento/InventoryCatalog/Plugin/CatalogInventory/Model/ResourceModel/Stock/Status/AdaptAddStockStatusToSelectToMultiStocks.php → app/code/Magento/InventoryCatalog/Plugin/CatalogInventory/Model/ResourceModel/Stock/Status/AdaptAddStockStatusToSelect.php

@@ -18,27 +18,27 @@
 /**
  * Adapt adding stock status to select for multi stocks.
  */
-class AdaptAddStockStatusToSelectToMultiStocks
+class AdaptAddStockStatusToSelect
 {
     /**
      * @var StockResolverInterface
      */
-    private $stockResolver;
+    private $getStockIdForCurrentWebsite;
 
     /**
      * @var AddStockStatusToSelect
      */
     private $adaptedAddStockStatusToSelect;
 
     /**
-     * @param StockResolverInterface $stockResolver
+     * @param StockResolverInterface $getStockIdForCurrentWebsite
      * @param AddStockStatusToSelect $adaptedAddStockStatusToSelect
      */
     public function __construct(
-        StockResolverInterface $stockResolver,
+        StockResolverInterface $getStockIdForCurrentWebsite,
         AddStockStatusToSelect $adaptedAddStockStatusToSelect
     ) {
-        $this->stockResolver = $stockResolver;
+        $this->getStockIdForCurrentWebsite = $getStockIdForCurrentWebsite;
         $this->adaptedAddStockStatusToSelect = $adaptedAddStockStatusToSelect;
     }
 
@@ -62,7 +62,7 @@ public function aroundAddStockStatusToSelect(
             throw new LocalizedException(__('Website code is empty'));
         }
 
-        $stock = $this->stockResolver->get(SalesChannelInterface::TYPE_WEBSITE, $websiteCode);
+        $stock = $this->getStockIdForCurrentWebsite->get(SalesChannelInterface::TYPE_WEBSITE, $websiteCode);
         $stockId = (int)$stock->getStockId();
 
         $this->adaptedAddStockStatusToSelect->addStockStatusToSelect($select, $stockId);

app/code/Magento/InventoryCatalog/Test/Integration/CatalogInventory/Helper/Stock/AddStockStatusToProductsOnDefaultStockTest.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryCatalog\Test\Integration\CatalogInventory\Helper\Stock;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogInventory\Helper\Stock;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class AddStockStatusToProductsOnDefaultStockTest extends TestCase
+{
+    /**
+     * @var Stock
+     */
+    private $stockHelper;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->stockHelper = Bootstrap::getObjectManager()->get(Stock::class);
+    }
+
+    public function testAddStockStatusToProducts()
+    {
+        $productsData = [
+            'SKU-1' => 1,
+            'SKU-2' => 1,
+            'SKU-3' => 0,
+        ];
+
+        /** @var Collection $collection */
+        $collection = Bootstrap::getObjectManager()->create(Collection::class);
+        $collection->addFieldToFilter(ProductInterface::SKU, ['in' => array_keys($productsData)]);
+        $collection->load();
+
+        $this->stockHelper->addStockStatusToProducts($collection);
+
+        /** @var ProductInterface $product */
+        foreach ($collection as $product) {
+            self::assertEquals($productsData[$product->getSku()], $product->isSalable());
+        }
+    }
+}