Adapt composite product salability status after reservation was placed.

Inventory/Test/Integration/GetSourceCodesBySkusTest.php

@@ -11,6 +11,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * @magentoDbIsolation disabled
+ */
 class GetSourceCodesBySkusTest extends TestCase
 {
     /**

InventoryAdminUi/Test/Mftf/Test/AdminManageStockInConfigurationTurnedOffForDownloadableProductTest.xml

@@ -23,7 +23,7 @@
             <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
             <!--Create test data.-->
             <createData entity="FullSource1" stepKey="source"/>
-            <createData entity="BasicMsiStock1" stepKey="stock"/>
+            <createData entity="BasicMsiStockWithMainWebsite1" stepKey="stock"/>
             <createData entity="SourceStockLinked1" stepKey="stockSourceLink">
                 <requiredEntity createDataKey="stock"/>
                 <requiredEntity createDataKey="source"/>
@@ -76,7 +76,7 @@
 
         <!--Verify product is not visible on storefront.-->
         <actionGroup ref="AssertStorefrontProductAbsentOnCategoryPageActionGroup" stepKey="verifyProductNotVisibleOnStorefront">
-            <argument name="categoryUrlKey" value="$category.url_key$"/>
+            <argument name="categoryUrlKey" value="$category.custom_attributes[url_key]$"/>
             <argument name="productName" value="$product.name$"/>
         </actionGroup>
         <!-- Turn off Manage Stock-->

InventoryAdvancedCheckout/Plugin/Model/AreProductsSalablePlugin.php

@@ -8,75 +8,46 @@
 namespace Magento\InventoryAdvancedCheckout\Plugin\Model;
 
 use Magento\AdvancedCheckout\Model\AreProductsSalableForRequestedQtyInterface;
-use Magento\AdvancedCheckout\Model\Data\IsProductsSalableForRequestedQtyResult;
+use Magento\AdvancedCheckout\Model\Data\IsProductsSalableForRequestedQtyResultFactory;
+use Magento\AdvancedCheckout\Model\Data\ProductQuantity;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\ObjectManagerInterface;
-use Magento\InventoryCatalogApi\Api\DefaultStockProviderInterface;
-use Magento\InventorySalesApi\Api\AreProductsSalableInterface;
-use Magento\InventorySalesApi\Api\Data\SalesChannelInterface;
-use Magento\InventorySalesApi\Api\StockResolverInterface;
-use Magento\Store\Api\WebsiteRepositoryInterface;
 
 /**
  * Provides multi-sourcing capabilities for Advanced Checkout Order By SKU feature.
  */
 class AreProductsSalablePlugin
 {
     /**
-     * @var AreProductsSalableInterface
+     * @var ProductRepositoryInterface
      */
-    private $areProductsSalable;
+    private $productRepository;
 
     /**
-     * @var StockResolverInterface
+     * @var IsProductsSalableForRequestedQtyResultFactory
      */
-    private $stockResolver;
+    private $isProductsSalableForRequestedQtyResultFactory;
 
     /**
-     * @var WebsiteRepositoryInterface
-     */
-    private $websiteRepository;
-
-    /**
-     * @var DefaultStockProviderInterface
-     */
-    private $defaultStockProvider;
-
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @param AreProductsSalableInterface $areProductsSalable
-     * @param StockResolverInterface $stockResolver
-     * @param WebsiteRepositoryInterface $websiteRepository
-     * @param DefaultStockProviderInterface $defaultStockProvider
-     * @param ObjectManagerInterface $objectManager
+     * @param ProductRepositoryInterface $productRepository
+     * @param IsProductsSalableForRequestedQtyResultFactory $isProductsSalableForRequestedQtyResultFactory
      */
     public function __construct(
-        AreProductsSalableInterface $areProductsSalable,
-        StockResolverInterface $stockResolver,
-        WebsiteRepositoryInterface $websiteRepository,
-        DefaultStockProviderInterface $defaultStockProvider,
-        ObjectManagerInterface $objectManager
+        ProductRepositoryInterface $productRepository,
+        IsProductsSalableForRequestedQtyResultFactory $isProductsSalableForRequestedQtyResultFactory
     ) {
-        $this->areProductsSalable = $areProductsSalable;
-        $this->stockResolver = $stockResolver;
-        $this->websiteRepository = $websiteRepository;
-        $this->defaultStockProvider = $defaultStockProvider;
-        $this->objectManager = $objectManager;
+        $this->productRepository = $productRepository;
+        $this->isProductsSalableForRequestedQtyResultFactory = $isProductsSalableForRequestedQtyResultFactory;
     }
 
     /**
-     * Get is product out of stock for given Product id in a given Website id in MSI context.
+     * Get products salable status for given sku requests.
      *
      * @param AreProductsSalableForRequestedQtyInterface $subject
      * @param callable $proceed
-     * @param \Magento\AdvancedCheckout\Model\Data\ProductQuantity[] $productQuantities
+     * @param ProductQuantity[] $productQuantities
      * @param int $websiteId
      * @return array
-     * @throws NoSuchEntityException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundExecute(
@@ -85,22 +56,18 @@ public function aroundExecute(
         array $productQuantities,
         int $websiteId
     ): array {
-        $website = $this->websiteRepository->getById($websiteId);
-        $stock = $this->stockResolver->execute(SalesChannelInterface::TYPE_WEBSITE, $website->getCode());
-        if ($this->defaultStockProvider->getId() === $stock->getStockId()) {
-            return $proceed($productQuantities, $websiteId);
-        }
-
-        $skus = [];
-        foreach ($productQuantities as $productQuantity) {
-            $skus[] = $productQuantity->getSku();
-        }
         $result = [];
-        foreach ($this->areProductsSalable->execute($skus, $stock->getStockId()) as $productStock) {
-            $result[] = $this->objectManager->create(
-                IsProductsSalableForRequestedQtyResult::class,
-                ['sku' => $productStock->getSku(), 'isSalable' => $productStock->isSalable()]
-            );
+        foreach ($productQuantities as $productQuantity) {
+            try {
+                $product = $this->productRepository->get($productQuantity->getSku());
+                $result[] = $this->isProductsSalableForRequestedQtyResultFactory->create(
+                    ['sku' => $product->getSku(), 'isSalable' => $product->isSalable()]
+                );
+            } catch (NoSuchEntityException $e) {
+                $result[] = $this->isProductsSalableForRequestedQtyResultFactory->create(
+                    ['sku' => $productQuantity->getSku(), 'isSalable' => false]
+                );
+            }
         }
 
         return $result;

InventoryAdvancedCheckout/composer.json

@@ -4,9 +4,7 @@
     "require": {
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
-        "magento/module-store": "*",
-        "magento/module-inventory-catalog-api": "*",
-        "magento/module-inventory-sales-api": "*"
+        "magento/module-catalog": "*"
     },
     "suggest": {
         "magento/module-advanced-checkout": "*"

InventoryBundleProduct/Model/GetBundleProductStockStatus.php

@@ -24,7 +24,7 @@
 class GetBundleProductStockStatus
 {
     /**
-     * @var GetProductSelection
+     * @var GetProductSelections
      */
     private $getProductSelection;
 
@@ -44,13 +44,13 @@ class GetBundleProductStockStatus
     private $getStockItemConfiguration;
 
     /**
-     * @param GetProductSelection $getProductSelection
+     * @param GetProductSelections $getProductSelection
      * @param AreProductsSalableForRequestedQtyInterface $areProductsSalableForRequestedQty
      * @param IsProductSalableForRequestedQtyRequestInterfaceFactory $isProductSalableForRequestedQtyRequestFactory
      * @param GetStockItemConfigurationInterface $getStockItemConfiguration
      */
     public function __construct(
-        GetProductSelection $getProductSelection,
+        GetProductSelections $getProductSelection,
         AreProductsSalableForRequestedQtyInterface $areProductsSalableForRequestedQty,
         IsProductSalableForRequestedQtyRequestInterfaceFactory $isProductSalableForRequestedQtyRequestFactory,
         GetStockItemConfigurationInterface $getStockItemConfiguration

InventoryBundleProduct/Model/GetProductSelection.php → InventoryBundleProduct/Model/GetProductSelections.php

@@ -15,9 +15,9 @@
 use Magento\Framework\EntityManager\MetadataPool;
 
 /**
- * Retrieve bundle product selection service.
+ * Retrieve bundle product selections service.
  */
-class GetProductSelection
+class GetProductSelections
 {
     /**
      * @var CollectionFactory
@@ -65,7 +65,6 @@ public function execute(ProductInterface $product, OptionInterface $option): Col
         $selectionsCollection->setFlag('product_children', true);
         $selectionsCollection->addFilterByRequiredOptions();
         $selectionsCollection->setOptionIdsFilter([$option->getId()]);
-
         $this->selectionCollectionFilterApplier->apply(
             $selectionsCollection,
             'parent_product_id',

InventoryBundleProduct/Model/IsBundleProductSalable.php

@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryBundleProduct\Model;
+
+use Magento\Bundle\Api\Data\OptionInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\InventoryConfigurationApi\Api\GetStockItemConfigurationInterface;
+use Magento\InventoryConfigurationApi\Exception\SkuIsNotAssignedToStockException;
+use Magento\InventorySalesApi\Api\AreProductsSalableForRequestedQtyInterface;
+use Magento\InventorySalesApi\Api\Data\IsProductSalableForRequestedQtyRequestInterfaceFactory;
+use Magento\InventorySalesApi\Api\Data\IsProductSalableForRequestedQtyResultInterface;
+
+/**
+ * Get bundle product salable status considering bundle product selections service.
+ */
+class IsBundleProductSalable
+{
+    /**
+     * @var GetProductSelections
+     */
+    private $getProductSelection;
+
+    /**
+     * @var AreProductsSalableForRequestedQtyInterface
+     */
+    private $areProductsSalableForRequestedQty;
+
+    /**
+     * @var IsProductSalableForRequestedQtyRequestInterfaceFactory
+     */
+    private $isProductSalableForRequestedQtyRequestFactory;
+
+    /**
+     * @var GetStockItemConfigurationInterface
+     */
+    private $getStockItemConfiguration;
+
+    /**
+     * @param GetProductSelections $getProductSelection
+     * @param AreProductsSalableForRequestedQtyInterface $areProductsSalableForRequestedQty
+     * @param IsProductSalableForRequestedQtyRequestInterfaceFactory $isProductSalableForRequestedQtyRequestFactory
+     * @param GetStockItemConfigurationInterface $getStockItemConfiguration
+     */
+    public function __construct(
+        GetProductSelections $getProductSelection,
+        AreProductsSalableForRequestedQtyInterface $areProductsSalableForRequestedQty,
+        IsProductSalableForRequestedQtyRequestInterfaceFactory $isProductSalableForRequestedQtyRequestFactory,
+        GetStockItemConfigurationInterface $getStockItemConfiguration
+    ) {
+        $this->getProductSelection = $getProductSelection;
+        $this->areProductsSalableForRequestedQty = $areProductsSalableForRequestedQty;
+        $this->isProductSalableForRequestedQtyRequestFactory = $isProductSalableForRequestedQtyRequestFactory;
+        $this->getStockItemConfiguration = $getStockItemConfiguration;
+    }
+
+    /**
+     * Provides bundle product stock status.
+     *
+     * @param ProductInterface $product
+     * @param OptionInterface[] $bundleOptions
+     * @param int $stockId
+     * @return bool
+     * @throws LocalizedException
+     * @throws SkuIsNotAssignedToStockException
+     */
+    public function execute(ProductInterface $product, array $bundleOptions, int $stockId): bool
+    {
+        $isSalable = false;
+        foreach ($bundleOptions as $option) {
+            $hasSalable = false;
+            $results = $this->getAreSalableSelections($product, $option, $stockId);
+            foreach ($results as $result) {
+                if ($result->isSalable()) {
+                    $hasSalable = true;
+                    break;
+                }
+            }
+            if ($hasSalable) {
+                $isSalable = true;
+            }
+
+            if (!$hasSalable && $option->getRequired()) {
+                $isSalable = false;
+                break;
+            }
+        }
+
+        return $isSalable;
+    }
+
+    /**
+     * Get are bundle product selections salable.
+     *
+     * @param ProductInterface $product
+     * @param OptionInterface $option
+     * @param int $stockId
+     * @return IsProductSalableForRequestedQtyResultInterface[]
+     * @throws LocalizedException
+     * @throws SkuIsNotAssignedToStockException
+     */
+    private function getAreSalableSelections(ProductInterface $product, OptionInterface $option, int $stockId): array
+    {
+        $bundleSelections = $this->getProductSelection->execute($product, $option);
+        $skuRequests = [];
+        foreach ($bundleSelections->getItems() as $selection) {
+            $skuRequests[] = $this->isProductSalableForRequestedQtyRequestFactory->create(
+                [
+                    'sku' => (string)$selection->getSku(),
+                    'qty' => $this->getRequestedQty($selection, $stockId),
+                ]
+            );
+        }
+
+        return $this->areProductsSalableForRequestedQty->execute($skuRequests, $stockId);
+    }
+
+    /**
+     * Get bundle product selection qty.
+     *
+     * @param Product $product
+     * @param int $stockId
+     * @return float
+     * @throws LocalizedException
+     * @throws SkuIsNotAssignedToStockException
+     */
+    private function getRequestedQty(Product $product, int $stockId): float
+    {
+        if ((int)$product->getSelectionCanChangeQty()) {
+            $stockItemConfiguration = $this->getStockItemConfiguration->execute((string)$product->getSku(), $stockId);
+            return $stockItemConfiguration->getMinSaleQty();
+        }
+
+        return (float)$product->getSelectionQty();
+    }
+}