Merge branch 'ACP2E-2155' of https://github.com/magento-l3/magento2ce into PR-10122023

Author: chittima

app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/AddConfigurableProductsToCart.php

@@ -13,6 +13,8 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\QuoteGraphQl\Model\Cart\AddProductsToCart;
 use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+use Magento\Quote\Model\QuoteMutexInterface;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 
 /**
  * Add configurable products to cart GraphQl resolver
@@ -30,16 +32,24 @@ class AddConfigurableProductsToCart implements ResolverInterface
      */
     private $addProductsToCart;
 
+    /**
+     * @var QuoteMutexInterface
+     */
+    private $quoteMutex;
+
     /**
      * @param GetCartForUser $getCartForUser
      * @param AddProductsToCart $addProductsToCart
+     * @param QuoteMutexInterface $quoteMutex
      */
     public function __construct(
         GetCartForUser $getCartForUser,
-        AddProductsToCart $addProductsToCart
+        AddProductsToCart $addProductsToCart,
+        QuoteMutexInterface $quoteMutex
     ) {
         $this->getCartForUser = $getCartForUser;
         $this->addProductsToCart = $addProductsToCart;
+        $this->quoteMutex = $quoteMutex;
     }
 
     /**
@@ -50,15 +60,33 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
             throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
         }
-        $maskedCartId = $args['input']['cart_id'];
 
         if (!isset($args['input']['cart_items']) || empty($args['input']['cart_items'])
             || !is_array($args['input']['cart_items'])
         ) {
             throw new GraphQlInputException(__('Required parameter "cart_items" is missing'));
         }
-        $cartItems = $args['input']['cart_items'];
 
+        return $this->quoteMutex->execute(
+            [$args['input']['cart_id']],
+            \Closure::fromCallable([$this, 'run']),
+            [$context, $args]
+        );
+    }
+
+    /**
+     * Run the resolver.
+     *
+     * @param ContextInterface $context
+     * @param array|null $args
+     * @return array[]
+     * @throws GraphQlInputException
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+     */
+    public function run($context, array $args): array
+    {
+        $cartItems = $args['input']['cart_items'];
+        $maskedCartId = $args['input']['cart_id'];
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         $this->addProductsToCart->execute($cart, $cartItems);

app/code/Magento/ConfigurableProductGraphQl/Test/Unit/Model/Resolver/AddConfigurableProductsToCartTest.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProductGraphQl\Test\Unit\Model\Resolver;
+
+use Magento\ConfigurableProductGraphQl\Model\Resolver\AddConfigurableProductsToCart;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\GraphQl\Model\Query\ContextInterface;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Quote\Model\QuoteMutexInterface;
+use Magento\QuoteGraphQl\Model\Cart\AddProductsToCart;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for AddConfigurableProductsToCart
+ */
+class AddConfigurableProductsToCartTest extends TestCase
+{
+    /**
+     * @var GetCartForUser|MockObject
+     */
+    private $getCartForUser;
+
+    /**
+     * @var AddProductsToCart|MockObject
+     */
+    private $addProductsToCart;
+
+    /**
+     * @var QuoteMutexInterface|MockObject
+     */
+    private $quoteMutex;
+
+    /**
+     * @var AddConfigurableProductsToCart
+     */
+    private $resolver;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->getCartForUser = $this->createMock(GetCartForUser::class);
+        $this->addProductsToCart = $this->createMock(AddProductsToCart::class);
+        $this->quoteMutex = $this->createMock(QuoteMutexInterface::class);
+
+        $this->resolver = new AddConfigurableProductsToCart(
+            $this->getCartForUser,
+            $this->addProductsToCart,
+            $this->quoteMutex
+        );
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function testResolve()
+    {
+        $maskedId = 'maskedId';
+        $args = ['input' => ['cart_id' => $maskedId, 'cart_items' => ['item1', 'item2']]];
+        $field = $this->createMock(Field::class);
+        $context = $this->createMock(ContextInterface::class);
+        $info = $this->createMock(ResolveInfo::class);
+        $this->quoteMutex->expects($this->once())
+            ->method('execute')
+            ->willReturnCallback(function ($maskedIds, $callable, $actualArgs) use ($maskedId, $args, $context) {
+                $this->assertEquals([$maskedId], $maskedIds);
+                $this->assertTrue(is_callable($callable));
+                $this->assertEquals([$context, $args], $actualArgs);
+            });
+        $this->resolver->resolve($field, $context, $info, null, $args);
+    }
+}