Adapt composite product salability status after reservation was placed.

InventoryAdminUi/Test/Mftf/Test/StorefrontCreateOrderAllQuantityConfigurableProductCustomStockTest.xml

@@ -93,7 +93,7 @@
         <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="updateSalability"/>
         <!--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/StorefrontLoggedInCustomerCreateOrderAllOptionQuantityConfigurableProductCustomStockTest.xml

@@ -119,9 +119,8 @@
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckoutPage"/>
         <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickOnNextButton"/>
         <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
-
-        <!-- So far `default` Cron Group contains inventory update -->
-        <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+        <magentoCLI command="queue:consumers:start inventory.reservations.updateSalabilityStatus" stepKey="updateSalability"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
         <!-- Assert out of stock option is absent on product page -->
         <amOnPage url="{{StorefrontProductPage.url($$configurableProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToConfigurablePDP"/>
         <waitForPageLoad stepKey="waitForConfigurablePDP"/>

InventoryBundleProduct/etc/di.xml

@@ -26,7 +26,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\CatalogInventory\Helper\Stock">
-        <plugin name="adapt_assign_stock_status_to_bundle_product" type="Magento\InventoryBundleProduct\Plugin\CatalogInventory\Helper\Stock\AdaptAssignStatusToProductPlugin"/>
-    </type>
 </config>

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

@@ -12,6 +12,9 @@
     <type name="Magento\InventoryIndexer\Indexer\SourceItem\SourceItemIndexer">
         <plugin name="invalidate_products_cache" type="Magento\InventoryCache\Plugin\InventoryIndexer\Indexer\Source\SourceItemIndexer\CacheFlush"/>
     </type>
+    <type name="Magento\InventoryIndexer\Model\Queue\UpdateIndexSalabilityStatus">
+        <plugin name="invalidate_products_cache" type="Magento\InventoryCache\Plugin\InventoryIndexer\Queue\Reservation\UpdateSalabilityStatus\CacheFlush" />
+    </type>
     <type name="Magento\InventoryCache\Model\ResourceModel\GetProductIdsByStockIds">
         <arguments>
             <argument name="productTableName" xsi:type="string">catalog_product_entity</argument>

InventoryCatalog/Model/IsProductSalable.php

@@ -0,0 +1,73 @@
+<?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\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\InventorySalesApi\Api\AreProductsSalableInterface;
+
+/**
+ * Get salable product status service.
+ */
+class IsProductSalable
+{
+    /**
+     * @var GetStockIdForCurrentWebsite
+     */
+    private $getStockIdForCurrentWebsite;
+
+    /**
+     * @var AreProductsSalableInterface
+     */
+    private $areProductsSalable;
+
+    /**
+     * @var array
+     */
+    private $productStatusCache;
+
+    /**
+     * @param GetStockIdForCurrentWebsite $getStockIdForCurrentWebsite
+     * @param AreProductsSalableInterface $areProductsSalable
+     */
+    public function __construct(
+        GetStockIdForCurrentWebsite $getStockIdForCurrentWebsite,
+        AreProductsSalableInterface $areProductsSalable
+    ) {
+        $this->getStockIdForCurrentWebsite = $getStockIdForCurrentWebsite;
+        $this->areProductsSalable = $areProductsSalable;
+    }
+
+    /**
+     * Verify product salable status.
+     *
+     * @param Product $product
+     * @return bool
+     */
+    public function execute(Product $product): bool
+    {
+        if (null === $product->getSku() || (int)$product->getStatus() === Status::STATUS_DISABLED) {
+            return false;
+        }
+        if ($product->getData('is_salable') !== null) {
+            return (bool)$product->getData('is_salable');
+        }
+        $stockId = $this->getStockIdForCurrentWebsite->execute();
+        if (isset($this->productStatusCache[$stockId][$product->getSku()])) {
+            return $this->productStatusCache[$stockId][$product->getSku()];
+        }
+
+        $stockId = $this->getStockIdForCurrentWebsite->execute();
+        $result = current($this->areProductsSalable->execute([$product->getSku()], $stockId));
+        $salabilityStatus = $result->isSalable();
+        $this->productStatusCache[$stockId][$product->getSku()] = $salabilityStatus;
+
+        return $salabilityStatus;
+    }
+}

InventoryCatalog/Plugin/Catalog/Model/Type/Simple/IsSalablePlugin.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryCatalog\Plugin\Catalog\Model\Type\Simple;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type\Simple;
+use Magento\InventoryCatalog\Model\IsProductSalable;
+
+/**
+ * Apply the inventory is-salable result to the according method of the product type model.
+ */
+class IsSalablePlugin
+{
+    /**
+     * @var IsProductSalable
+     */
+    private $isProductSalable;
+
+    /**
+     * @param IsProductSalable $isProductSalable
+     */
+    public function __construct(
+        IsProductSalable $isProductSalable
+    ) {
+        $this->isProductSalable = $isProductSalable;
+    }
+
+    /**
+     * Fetches is salable status from multi-stock.
+     *
+     * @param Simple $subject
+     * @param \Closure $proceed
+     * @param Product $product
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundIsSalable(Simple $subject, \Closure $proceed, Product $product): bool
+    {
+        return $this->isProductSalable->execute($product);
+    }
+}

InventoryCatalog/Plugin/Catalog/Model/Type/Virtual/IsSalablePlugin.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryCatalog\Plugin\Catalog\Model\Type\Virtual;
+
+use Magento\Catalog\Model\Product;
+use Magento\InventoryCatalog\Model\IsProductSalable;
+
+/**
+ * Apply the inventory is-salable result to the according method of the product type model.
+ */
+class IsSalablePlugin
+{
+    /**
+     * @var IsProductSalable
+     */
+    private $isProductSalable;
+
+    /**
+     * @param IsProductSalable $isProductSalable
+     */
+    public function __construct(
+        IsProductSalable $isProductSalable
+    ) {
+        $this->isProductSalable = $isProductSalable;
+    }
+
+    /**
+     * Fetches is salable status from multi-stock.
+     *
+     * @param Product\Type\Virtual $subject
+     * @param \Closure $proceed
+     * @param Product $product
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundIsSalable(Product\Type\Virtual $subject, \Closure $proceed, Product $product): bool
+    {
+        return $this->isProductSalable->execute($product);
+    }
+}