LYNX-816: GQL - quantity field in ProductInterface not return saleable qty

Author: deepak-soni1

app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/QuantityResolver.php

@@ -1,15 +1,14 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\CatalogInventoryGraphQl\Model\Resolver;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
-use Magento\CatalogInventory\Model\StockState;
 use Magento\CatalogInventory\Model\Config\Source\NotAvailableMessage;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\LocalizedException;
@@ -36,16 +35,16 @@ class QuantityResolver implements ResolverInterface
     private const CONFIG_PATH_NOT_AVAILABLE_MESSAGE = "cataloginventory/options/not_available_message";
 
     /**
+     * QuantityResolver Constructor
+     *
      * @param ProductRepositoryInterface $productRepositoryInterface
      * @param ScopeConfigInterface $scopeConfig
-     * @param StockState $stockState
      * @param ProductStock $productStock
      */
     public function __construct(
         private readonly ProductRepositoryInterface $productRepositoryInterface,
         private readonly ScopeConfigInterface $scopeConfig,
-        private readonly StockState $stockState,
-        private readonly ProductStock $productStock,
+        private readonly ProductStock $productStock
     ) {
     }
 
@@ -69,7 +68,7 @@ public function resolve(
         }
 
         if (isset($value['cart_item']) && $value['cart_item'] instanceof Item) {
-            return $this->productStock->getProductAvailableStock($value['cart_item']);
+            return $this->productStock->getSaleableQtyByCartItem($value['cart_item'], null);
         }
 
         if (!isset($value['model'])) {
@@ -82,6 +81,7 @@ public function resolve(
         if ($product->getTypeId() === self::PRODUCT_TYPE_CONFIGURABLE) {
             $product = $this->productRepositoryInterface->get($product->getSku());
         }
-        return $this->stockState->getStockQty($product->getId());
+
+        return $this->productStock->getSaleableQty($product, null);
     }
 }

app/code/Magento/QuoteGraphQl/Model/CartItem/ProductStock.php

@@ -202,10 +202,10 @@ private function getLowestStockValueOfBundleProduct(Item $cartItem): float
      * Returns the lowest stock value of bundle product
      *
      * @param Item $cartItem
-     * @param float $thresholdQty
+     * @param float|null $thresholdQty
      * @return float
      */
-    private function getLowestSaleableQtyOfBundleProduct(Item $cartItem, float $thresholdQty): float
+    private function getLowestSaleableQtyOfBundleProduct(Item $cartItem, ?float $thresholdQty): float
     {
         $bundleStock = [];
         foreach ($cartItem->getQtyOptions() as $qtyOption) {
@@ -231,7 +231,20 @@ public function getProductSaleableQty(Item $cartItem): float
         if ($thresholdQty === 0.0) {
             return $this->getProductAvailableStock($cartItem);
         }
-        
+
+        return $this->getSaleableQtyByCartItem($cartItem, $thresholdQty);
+    }
+
+    /**
+     * Returns the saleable qty value by cart item
+     *
+     * @param Item $cartItem
+     * @param float|null $thresholdQty
+     * @return float
+     * @throws NoSuchEntityException
+     */
+    public function getSaleableQtyByCartItem(Item $cartItem, ?float $thresholdQty): float
+    {
         if ($cartItem->getProductType() === self::PRODUCT_TYPE_BUNDLE) {
             return $this->getLowestSaleableQtyOfBundleProduct($cartItem, $thresholdQty);
         }
@@ -248,15 +261,18 @@ public function getProductSaleableQty(Item $cartItem): float
      * Get product saleable qty when "Catalog > Inventory > Stock Options > Only X left Threshold" is greater than 0
      *
      * @param ProductInterface $product
-     * @param float $thresholdQty
+     * @param float|null $thresholdQty
      * @return float
      */
-    private function getSaleableQty(ProductInterface $product, float $thresholdQty): float
+    public function getSaleableQty(ProductInterface $product, ?float $thresholdQty): float
     {
-        $stockItem = $this->stockRegistry->getStockItem($product->getId());
         $stockStatus = $this->stockRegistry->getStockStatus($product->getId(), $product->getStore()->getWebsiteId());
-        $stockCurrentQty = $stockStatus->getQty();
-        $stockLeft = $stockCurrentQty - $stockItem->getMinQty();
-        return ($stockCurrentQty >= 0 && $stockLeft <= $thresholdQty) ? (float)$stockCurrentQty : 0.0;
+        $stockQty = (float)$stockStatus->getQty();
+        if ($thresholdQty === null) {
+            return $stockQty;
+        }
+        $stockLeft = $stockQty - $this->stockRegistry->getStockItem($product->getId())->getMinQty();
+
+        return ($stockQty >= 0 && $stockLeft <= $thresholdQty) ? $stockQty : 0.0;
     }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/StockQuantityTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -13,6 +13,12 @@
 use Magento\Bundle\Test\Fixture\Product as BundleProductFixture;
 use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\Catalog\Test\Fixture\ProductStock as ProductStockFixture;
+use Magento\Checkout\Test\Fixture\PlaceOrder as PlaceOrderFixture;
+use Magento\Checkout\Test\Fixture\SetBillingAddress as SetBillingAddressFixture;
+use Magento\Checkout\Test\Fixture\SetDeliveryMethod as SetDeliveryMethodFixture;
+use Magento\Checkout\Test\Fixture\SetGuestEmail as SetGuestEmailFixture;
+use Magento\Checkout\Test\Fixture\SetPaymentMethod as SetPaymentMethodFixture;
+use Magento\Checkout\Test\Fixture\SetShippingAddress as SetShippingAddressFixture;
 use Magento\ConfigurableProduct\Test\Fixture\AddProductToCart as AddConfigurableProductToCartFixture;
 use Magento\ConfigurableProduct\Test\Fixture\Attribute as AttributeFixture;
 use Magento\ConfigurableProduct\Test\Fixture\Product as ConfigurableProductFixture;
@@ -141,6 +147,41 @@ public function testStockQuantityEmpty(): void
         $this->assertProductStockQuantity(null);
     }
 
+    #[
+        Config('cataloginventory/options/not_available_message', 1),
+        DataFixture(ProductFixture::class, as: 'product'),
+        DataFixture(GuestCartFixture::class, as: 'cart'),
+        DataFixture(ProductStockFixture::class, ['prod_id' => '$product.id$', 'prod_qty' => 10]),
+        DataFixture(AddProductToCart::class, ['cart_id' => '$cart.id$', 'product_id' => '$product.id$', 'qty' => 2]),
+        DataFixture(QuoteMaskFixture::class, ['cart_id' => '$cart.id$'], 'quoteIdMask'),
+        DataFixture(ProductStockFixture::class, ['prod_id' => '$product.id$', 'prod_qty' => 8])
+    ]
+    public function testSaleableQuantitySimpleProductAfterStockUpdate(): void
+    {
+        $this->assertProductStockQuantity(8);
+    }
+
+    #[
+        Config('cataloginventory/options/not_available_message', 1),
+        DataFixture(ProductFixture::class, as: 'product'),
+        DataFixture(ProductStockFixture::class, ['prod_id' => '$product.id$', 'prod_qty' => 10]),
+        DataFixture(GuestCartFixture::class, as: 'cart'),
+        DataFixture(AddProductToCart::class, ['cart_id' => '$cart.id$', 'product_id' => '$product.id$', 'qty' => 1]),
+        DataFixture(QuoteMaskFixture::class, ['cart_id' => '$cart.id$'], 'quoteIdMask'),
+        DataFixture(GuestCartFixture::class, as: 'cart2'),
+        DataFixture(AddProductToCart::class, ['cart_id' => '$cart2.id$', 'product_id' => '$product.id$', 'qty' => 5]),
+        DataFixture(SetBillingAddressFixture::class, ['cart_id' => '$cart2.id$']),
+        DataFixture(SetShippingAddressFixture::class, ['cart_id' => '$cart2.id$']),
+        DataFixture(SetGuestEmailFixture::class, ['cart_id' => '$cart2.id$']),
+        DataFixture(SetDeliveryMethodFixture::class, ['cart_id' => '$cart2.id$']),
+        DataFixture(SetPaymentMethodFixture::class, ['cart_id' => '$cart2.id$']),
+        DataFixture(PlaceOrderFixture::class, ['cart_id' => '$cart2.id$'], 'order')
+    ]
+    public function testSaleableQuantitySimpleProductAfterPlaceOrder(): void
+    {
+        $this->assertProductStockQuantity(5);
+    }
+
     /**
      * Asserts products stock quantity from cart & product query
      *