Merge branch '1.1-develop' into MC-35306

Author: Stanislav Idolov

InventoryAdminUi/Test/Mftf/Test/StorefrontCreateOrderAllQuantityConfigurableProductCustomStock.xml

@@ -93,7 +93,10 @@
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckoutPage"/>
         <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickOnNextButton"/>
         <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <magentoCLI command="queue:consumers:start inventory.reservations.updateSalabilityStatus" stepKey="startSalabilityUpdate" />
+        <wait time="60" stepKey="waitForSalabilityUpdate"/>
+        <magentoCLI command="cache:flush" stepKey="cleanCache"/>
+        <wait time="30" stepKey="waitAfterCacheFlushed"/>
         <!--Verify, configurable product has 'out of stock' status.-->
         <amOnPage url="{{StorefrontProductPage.url($configurableProduct.custom_attributes[url_key]$)}}" stepKey="navigateToConfigurablePDP"/>
         <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="{{SourceStatusOutOfStock.value}}" stepKey="verifyProductStatus"/>

InventoryAdminUi/Test/Mftf/Test/StorefrontLoggedInCustomerCreateOrderAllOptionQuantityConfigurableProductCustomStock.xml

@@ -117,7 +117,12 @@
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckoutPage"/>
         <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickOnNextButton"/>
         <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        <magentoCLI command="queue:consumers:start inventory.reservations.updateSalabilityStatus" stepKey="startSalabilityUpdate" />
+        <wait time="60" stepKey="waitForSalabilityUpdate"/>
+        <magentoCLI command="cache:flush" stepKey="cleanCache"/>
+        <wait time="30" stepKey="waitAfterCacheFlushed"/>
+
         <!-- Assert out of stock option is absent on product page -->
         <amOnPage url="{{StorefrontProductPage.url($$configurableProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToConfigurablePDP"/>
         <waitForPageLoad stepKey="waitForConfigurablePDP"/>

InventoryCache/Plugin/InventoryIndexer/Queue/Reservation/UpdateSalabilityStatus/CacheFlush.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryCache\Plugin\InventoryIndexer\Queue\Reservation\UpdateSalabilityStatus;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\InventoryCache\Model\FlushCacheByProductIds;
+use Magento\InventoryCatalogApi\Model\GetProductIdsBySkusInterface;
+use Magento\InventoryIndexer\Model\Queue\UpdateIndexSalabilityStatus;
+
+/**
+ * Clean cache for corresponding products after stock status update.
+ */
+class CacheFlush
+{
+    /**
+     * @var FlushCacheByProductIds
+     */
+    private $flushCacheByIds;
+
+    /**
+     * @var GetProductIdsBySkusInterface
+     */
+    private $getProductIdsBySkus;
+
+    /**
+     * @param FlushCacheByProductIds $flushCacheByIds
+     * @param GetProductIdsBySkusInterface $getProductIdsBySkus
+     */
+    public function __construct(
+        FlushCacheByProductIds $flushCacheByIds,
+        GetProductIdsBySkusInterface $getProductIdsBySkus
+    ) {
+        $this->flushCacheByIds = $flushCacheByIds;
+        $this->getProductIdsBySkus = $getProductIdsBySkus;
+    }
+
+    /**
+     * Flush cache after reindex.
+     *
+     * @param UpdateIndexSalabilityStatus $subject
+     * @param array $skusAffected
+     *
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterExecute(UpdateIndexSalabilityStatus $subject, array $skusAffected)
+    {
+        if ($skus = array_keys($skusAffected)) {
+            try {
+                $this->flushCacheByIds->execute($this->getProductIdsBySkus->execute($skus));
+            } catch (NoSuchEntityException $e) { // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
+                // Do nothing.
+            }
+        }
+
+        return $skusAffected;
+    }
+}

InventoryCache/etc/di.xml

@@ -22,4 +22,7 @@
             <argument name="productCacheTag" xsi:type="const">Magento\Catalog\Model\Product::CACHE_TAG</argument>
         </arguments>
     </type>
+    <type name="Magento\InventoryIndexer\Model\Queue\UpdateIndexSalabilityStatus">
+        <plugin name="invalidate_products_cache" type="Magento\InventoryCache\Plugin\InventoryIndexer\Queue\Reservation\UpdateSalabilityStatus\CacheFlush" />
+    </type>
 </config>

InventoryCatalog/Test/Mftf/Data/QueueConsumerData.xml

@@ -20,4 +20,8 @@
         <data key="consumerName">inventory.reservations.cleanup</data>
         <data key="messageLimit">10</data>
     </entity>
+    <entity name="AdminInventoryReservationsSalableStatusData">
+        <data key="consumerName">inventory.reservations.updateSalabilityStatus</data>
+        <data key="messageLimit">10</data>
+    </entity>
 </entities>

InventoryIndexer/Model/IsProductSalable.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryIndexer\Model;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\InventorySalesApi\Api\IsProductSalableInterface;
+use Magento\InventorySalesApi\Model\GetStockItemDataInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Lightweight implementation for Storefront application.
+ */
+class IsProductSalable implements IsProductSalableInterface
+{
+    /**
+     * @var GetStockItemDataInterface
+     */
+    private $getStockItemData;
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param GetStockItemDataInterface $getStockItemData
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        GetStockItemDataInterface $getStockItemData,
+        LoggerInterface $logger
+    ) {
+        $this->getStockItemData = $getStockItemData;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(string $sku, int $stockId): bool
+    {
+        try {
+            $stockItem = $this->getStockItemData->execute($sku, $stockId);
+            $isSalable = (bool)($stockItem[GetStockItemDataInterface::IS_SALABLE] ?? false);
+        } catch (LocalizedException $exception) {
+            $this->logger->warning(
+                sprintf(
+                    'Unable to fetch stock #%s data for SKU %s. Reason: %s',
+                    $stockId,
+                    $sku,
+                    $exception->getMessage()
+                )
+            );
+            $isSalable = false;
+        }
+
+        return $isSalable;
+    }
+}

InventoryIndexer/Model/Queue/ReservationData.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryIndexer\Model\Queue;
+
+/**
+ * Data object for reservations queue request.
+ */
+class ReservationData
+{
+    /**
+     * @var string[]
+     */
+    private $skus;
+
+    /**
+     * @var int
+     */
+    private $stockId;
+
+    /**
+     * @param string[] $skus
+     * @param int $stock
+     */
+    public function __construct(array $skus, int $stock)
+    {
+        $this->skus = $skus;
+        $this->stockId = $stock;
+    }
+
+    /**
+     * Retrieve products SKUs to process.
+     *
+     * @return string[]
+     */
+    public function getSkus(): array
+    {
+        return $this->skus;
+    }
+
+    /**
+     * Retrieve stock id.
+     *
+     * @return int
+     */
+    public function getStock(): int
+    {
+        return $this->stockId;
+    }
+}

InventoryIndexer/Model/Queue/UpdateIndexSalabilityStatus.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryIndexer\Model\Queue;
+
+use Magento\Framework\Exception\StateException;
+use Magento\InventoryCatalogApi\Api\DefaultStockProviderInterface;
+use Magento\InventoryIndexer\Model\Queue\UpdateIndexSalabilityStatus\IndexProcessor;
+
+/**
+ * Recalculates index items salability status.
+ */
+class UpdateIndexSalabilityStatus
+{
+    /**
+     * @var DefaultStockProviderInterface
+     */
+    private $defaultStockProvider;
+
+    /**
+     * @var IndexProcessor
+     */
+    private $indexProcessor;
+
+    /**
+     * @param DefaultStockProviderInterface $defaultStockProvider
+     * @param IndexProcessor $indexProcessor
+     */
+    public function __construct(
+        DefaultStockProviderInterface $defaultStockProvider,
+        IndexProcessor $indexProcessor
+    ) {
+        $this->defaultStockProvider = $defaultStockProvider;
+        $this->indexProcessor = $indexProcessor;
+    }
+
+    /**
+     * Reindex items salability statuses.
+     *
+     * @param ReservationData $reservationData
+     *
+     * @return bool[] - ['sku' => bool]: list of SKUs with salability status changed.
+     * @throws StateException
+     */
+    public function execute(ReservationData $reservationData): array
+    {
+        $stockId = $reservationData->getStock();
+        $dataForUpdate = [];
+        if ($stockId !== $this->defaultStockProvider->getId() && $reservationData->getSkus()) {
+            $dataForUpdate = $this->indexProcessor->execute($reservationData, $stockId);
+        }
+
+        return $dataForUpdate;
+    }
+}