Merge remote-tracking branch 'origin/MC-24466' into 2.4-develop-pr13

Author: serhii-balko

app/code/Magento/Quote/Model/Quote/Item/CartItemPersister.php

@@ -6,14 +6,17 @@
 
 namespace Magento\Quote\Model\Quote\Item;
 
-use Magento\Quote\Api\Data\CartInterface;
-use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Api\Data\CartItemInterface;
 
+/**
+ * Cart item save handler
+ */
 class CartItemPersister
 {
     /**
@@ -39,6 +42,8 @@ public function __construct(
     }
 
     /**
+     * Save cart item into cart
+     *
      * @param CartInterface $quote
      * @param CartItemInterface $item
      * @return CartItemInterface
@@ -73,12 +78,13 @@ public function save(CartInterface $quote, CartItemInterface $item)
                     $item = $quote->updateItem($itemId, $buyRequestData);
                 } else {
                     if ($item->getQty() !== $currentItem->getQty()) {
+                        $currentItem->clearMessage();
                         $currentItem->setQty($qty);
                         /**
                          * Qty validation errors are stored as items message
                          * @see \Magento\CatalogInventory\Model\Quote\Item\QuantityValidator::validate
                          */
-                        if (!empty($currentItem->getMessage())) {
+                        if (!empty($currentItem->getMessage()) && $currentItem->getHasError()) {
                             throw new LocalizedException(__($currentItem->getMessage()));
                         }
                     }

dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartItemRepositoryTest.php

@@ -6,6 +6,8 @@
  */
 namespace Magento\Quote\Api;
 
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\CatalogInventory\Model\Stock;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 class GuestCartItemRepositoryTest extends WebapiAbstract
@@ -167,9 +169,13 @@ public function testRemoveItem()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @param array $stockData
+     * @param string|null $errorMessage
+     * @dataProvider updateItemDataProvider
      */
-    public function testUpdateItem()
+    public function testUpdateItem(array $stockData, string $errorMessage = null)
     {
+        $this->updateStockData('simple_one', $stockData);
         /** @var \Magento\Quote\Model\Quote  $quote */
         $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class);
         $quote->load('test_order_item_with_items', 'reserved_order_id');
@@ -215,6 +221,9 @@ public function testUpdateItem()
                 ],
             ];
         }
+        if ($errorMessage) {
+            $this->expectExceptionMessage($errorMessage);
+        }
         $this->_webApiCall($serviceInfo, $requestData);
         $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class);
         $quote->load('test_order_item_with_items', 'reserved_order_id');
@@ -223,4 +232,66 @@ public function testUpdateItem()
         $this->assertEquals(5, $item->getQty());
         $this->assertEquals($itemId, $item->getItemId());
     }
+
+    /**
+     * @return array
+     */
+    public function updateItemDataProvider(): array
+    {
+        return [
+            [
+                []
+            ],
+            [
+                [
+                    'qty' => 0,
+                    'is_in_stock' => 1,
+                    'use_config_manage_stock' => 0,
+                    'manage_stock' => 1,
+                    'use_config_backorders' => 0,
+                    'backorders' => Stock::BACKORDERS_YES_NOTIFY,
+                ]
+            ],
+            [
+                [
+                    'qty' => 0,
+                    'is_in_stock' => 1,
+                    'use_config_manage_stock' => 0,
+                    'manage_stock' => 1,
+                    'use_config_backorders' => 0,
+                    'backorders' => Stock::BACKORDERS_NO,
+                ],
+                'This product is out of stock.'
+            ],
+            [
+                [
+                    'qty' => 2,
+                    'is_in_stock' => 1,
+                    'use_config_manage_stock' => 0,
+                    'manage_stock' => 1,
+                    'use_config_backorders' => 0,
+                    'backorders' => Stock::BACKORDERS_NO,
+                ],
+                'The requested qty is not available'
+            ]
+        ];
+    }
+
+    /**
+     * Update product stock
+     *
+     * @param string $sku
+     * @param array $stockData
+     * @return void
+     */
+    private function updateStockData(string $sku, array $stockData): void
+    {
+        if ($stockData) {
+            /** @var $stockRegistry StockRegistryInterface */
+            $stockRegistry = $this->objectManager->create(StockRegistryInterface::class);
+            $stockItem = $stockRegistry->getStockItemBySku($sku);
+            $stockItem->addData($stockData);
+            $stockRegistry->updateStockItemBySku($sku, $stockItem);
+        }
+    }
 }