Merge branch '2.4-develop' into GL_PR_Arrows_August_07_2023

Author: magento-devops-queue-mgr-svc

app/code/Magento/Quote/Model/QuoteManagement.php

@@ -55,7 +55,7 @@ class QuoteManagement implements CartManagementInterface, ResetAfterRequestInter
 {
     private const LOCK_PREFIX = 'PLACE_ORDER_';
 
-    private const LOCK_TIMEOUT = 10;
+    private const LOCK_TIMEOUT = 0;
 
     /**
      * @var EventManager
@@ -615,13 +615,12 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
         );
 
         $lockedName = self::LOCK_PREFIX . $quote->getId();
-        if ($this->lockManager->isLocked($lockedName)) {
+        if (!$this->lockManager->lock($lockedName, self::LOCK_TIMEOUT)) {
             throw new LocalizedException(__(
                 'A server error stopped your order from being placed. Please try to place your order again.'
             ));
         }
         try {
-            $this->lockManager->lock($lockedName, self::LOCK_TIMEOUT);
             $order = $this->orderManagement->place($order);
             $quote->setIsActive(false);
             $this->eventManager->dispatch(
@@ -632,7 +631,6 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
                 ]
             );
             $this->quoteRepository->save($quote);
-            $this->lockManager->unlock($lockedName);
         } catch (\Exception $e) {
             $this->lockManager->unlock($lockedName);
             $this->rollbackAddresses($quote, $order, $e);

app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php

@@ -837,7 +837,7 @@ public function testSubmit(): void
                     ['order' => $order, 'quote' => $quote]
                 ]
             );
-        $this->lockManagerMock->method('isLocked')->willReturn(false);
+        $this->lockManagerMock->method('lock')->willReturn(true);
         $this->quoteRepositoryMock->expects($this->once())->method('save')->with($quote);
         $this->assertEquals($order, $this->model->submit($quote, $orderData));
     }
@@ -1378,6 +1378,7 @@ public function testSubmitForCustomer(): void
                     ['order' => $order, 'quote' => $quote]
                 ]
             );
+        $this->lockManagerMock->method('lock')->willReturn(true);
         $this->quoteRepositoryMock->expects($this->once())->method('save')->with($quote);
         $this->assertEquals($order, $this->model->submit($quote, $orderData));
     }
@@ -1501,7 +1502,7 @@ public function testSubmitWithLockException(): void
                     ['order' => $order, 'quote' => $quote]
                 ]
             );
-        $this->lockManagerMock->method('isLocked')->willReturn(true);
+        $this->lockManagerMock->method('lock')->willReturn(false);
 
         $this->expectExceptionMessage(
             'A server error stopped your order from being placed. Please try to place your order again.'

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

@@ -7,7 +7,6 @@
 
 namespace Magento\QuoteGraphQl\Model\Resolver;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -17,7 +16,6 @@
 use Magento\QuoteGraphQl\Model\Cart\GetCartForCheckout;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\QuoteGraphQl\Model\Cart\PlaceOrder as PlaceOrderModel;
-use Magento\QuoteGraphQl\Model\Cart\PlaceOrderMutexInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 
 /**
@@ -45,30 +43,22 @@ class PlaceOrder implements ResolverInterface
      */
     private $errorMessageFormatter;
 
-    /**
-     * @var PlaceOrderMutexInterface
-     */
-    private $placeOrderMutex;
-
     /**
      * @param GetCartForCheckout $getCartForCheckout
      * @param PlaceOrderModel $placeOrder
      * @param OrderRepositoryInterface $orderRepository
      * @param AggregateExceptionMessageFormatter $errorMessageFormatter
-     * @param PlaceOrderMutexInterface|null $placeOrderMutex
      */
     public function __construct(
         GetCartForCheckout $getCartForCheckout,
         PlaceOrderModel $placeOrder,
         OrderRepositoryInterface $orderRepository,
-        AggregateExceptionMessageFormatter $errorMessageFormatter,
-        ?PlaceOrderMutexInterface $placeOrderMutex = null
+        AggregateExceptionMessageFormatter $errorMessageFormatter
     ) {
         $this->getCartForCheckout = $getCartForCheckout;
         $this->placeOrder = $placeOrder;
         $this->orderRepository = $orderRepository;
         $this->errorMessageFormatter = $errorMessageFormatter;
-        $this->placeOrderMutex = $placeOrderMutex ?: ObjectManager::getInstance()->get(PlaceOrderMutexInterface::class);
     }
 
     /**
@@ -80,25 +70,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
         }
 
-        return $this->placeOrderMutex->execute(
-            $args['input']['cart_id'],
-            \Closure::fromCallable([$this, 'run']),
-            [$field, $context, $info, $args]
-        );
-    }
-
-    /**
-     * Run the resolver.
-     *
-     * @param Field $field
-     * @param ContextInterface $context
-     * @param ResolveInfo $info
-     * @param array|null $args
-     * @return array[]
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     */
-    private function run(Field $field, ContextInterface $context, ResolveInfo $info, ?array $args): array
-    {
         $maskedCartId = $args['input']['cart_id'];
         $userId = (int)$context->getUserId();
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();

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

@@ -9,7 +9,6 @@
     <preference for="Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValueInterface" type="Magento\QuoteGraphQl\Model\CartItem\DataProvider\CustomizableOptionValue\Composite" />
     <preference for="Magento\QuoteGraphQl\Model\CartItem\DataProvider\Processor\ItemDataProcessorInterface" type="Magento\QuoteGraphQl\Model\CartItem\DataProvider\Processor\ItemDataCompositeProcessor" />
     <preference for="Magento\QuoteGraphQl\Model\CartItem\PrecursorInterface" type="Magento\QuoteGraphQl\Model\CartItem\PrecursorComposite" />
-    <preference for="Magento\QuoteGraphQl\Model\Cart\PlaceOrderMutexInterface" type="Magento\QuoteGraphQl\Model\Cart\PlaceOrderMutex" />
     <type name="Magento\QuoteGraphQl\Model\Resolver\CartItemTypeResolver">
         <arguments>
             <argument name="supportedTypes" xsi:type="array">