MC-42652: GraphQL - Expected behavior of add product to cart when SKU already exists

Author: Oleksandr Iegorov

app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php

@@ -59,12 +59,16 @@ public function __construct(
     public function execute(Quote $cart, array $cartItems): void
     {
         $lockName = 'cart_processing_lock_' . $cart->getId();
+        $needToRefreshCache = false;
         while ($this->lockManager->isLocked($lockName)) {
             // wait till other process working with the same cart complete
-            usleep(rand (300, 600));
+            usleep(rand(100, 600));
+            $needToRefreshCache = true;
+        }
+        $this->lockManager->lock($lockName, 1);
+        if ($needToRefreshCache) {
+            $this->refreshCartCache($cart);
         }
-        $this->lockManager->lock($lockName);
-        $this->refreshCartCache($cart);
         foreach ($cartItems as $cartItemData) {
             $this->addProductToCart->execute($cart, $cartItemData);
         }

app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php

@@ -9,14 +9,8 @@
 
 use Exception;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\Product;
-use Magento\Framework\DataObject;
-use Magento\Quote\Model\Quote\Item;
-use Magento\Catalog\Model\Product\Type\AbstractType;
 use Magento\Framework\Model\Context;
 use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\Phrase;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
@@ -90,13 +84,6 @@ public function execute(Quote $cart, array $cartItemData): void
 
         try {
             $result = $cart->addProduct($product, $this->buyRequestBuilder->build($cartItemData));
-            /*
-            $result = $this->addProductToCartWithConcurrency(
-                $cart,
-                $product,
-                $this->buyRequestBuilder->build($cartItemData)
-            );
-            */
         } catch (Exception $e) {
             throw new GraphQlInputException(
                 __(
@@ -134,89 +121,4 @@ private function extractSku(array $cartItemData): string
         }
         return (string)$cartItemData['data']['sku'];
     }
-
-    /**
-     * @param Quote $cart
-     * @param Product $product
-     * @param DataObject $request
-     * @return Item
-     * @throws LocalizedException
-     */
-    private function addProductToCartWithConcurrency(Quote $cart, Product $product, DataObject $request) : Item
-    {
-        if (!$product->isSalable()) {
-            throw new LocalizedException(
-                __('Product that you are trying to add is not available.')
-            );
-        }
-        $cartCandidates = $product->getTypeInstance()->prepareForCartAdvanced(
-            $request,
-            $product,
-            AbstractType::PROCESS_MODE_FULL
-        );
-        if (is_string($cartCandidates) || $cartCandidates instanceof Phrase) {
-            throw new LocalizedException((string)$cartCandidates);
-        }
-        if (!is_array($cartCandidates)) {
-            $cartCandidates = [$cartCandidates];
-        }
-        $parentItem = null;
-        $errors = [];
-        $items = [];
-        foreach ($cartCandidates as $candidate) {
-            $stickWithinParent = $candidate->getParentProductId() ? $parentItem : null;
-            $candidate->setStickWithinParent($stickWithinParent);
-            $item = null;
-            $itemsCollection = $cart->getItemsCollection(false);
-
-            foreach ($itemsCollection as $item) {
-                if (!$item->isDeleted() && $item->representProduct($product)) {
-                    break;
-                }
-            }
-
-            if (!$item) {
-                $item = $this->itemProcessor->init($candidate, $request);
-                $item->setQuote($cart);
-                $item->setOptions($candidate->getCustomOptions());
-                $item->setProduct($candidate);
-                $cart->addItem($item);
-            }
-            $items[] = $item;
-
-            if (!$parentItem) {
-                $parentItem = $item;
-            }
-            if ($parentItem && $candidate->getParentProductId() && !$item->getParentItem()) {
-                $item->setParentItem($parentItem);
-            }
-
-            $this->itemProcessor->prepare($item, $request, $candidate);
-
-            if ($item->getHasError()) {
-                $cart->deleteItem($item);
-                foreach ($item->getMessage(false) as $message) {
-                    if (!in_array($message, $errors)) {
-                        $errors[] = $message;
-                    }
-                }
-                break;
-            }
-
-            $itemsToUpdate = [];
-            foreach ($cart->getItems() as $itemToUpdate) {
-                if ($itemToUpdate->getItemId() === $item->getItemId()) {
-                    $itemsToUpdate[] = $item;
-                } else {
-                    $itemsToUpdate[] = $itemToUpdate;
-                }
-            }
-            $cart->setItems($itemsToUpdate);
-        }
-        if (!empty($errors)) {
-            throw new LocalizedException(__(implode("\n", $errors)));
-        }
-        $this->eventManager->dispatch('sales_quote_product_add_after', ['items' => $items]);
-        return $parentItem;
-    }
 }