Merge branch '2.4-develop' of github.com:magento-commerce/magento2ce into platform-health

Author: sivaschenko

app/code/Magento/AwsS3/Test/Mftf/Test/AwsS3StorefrontPrintOrderGuestTest.xml

@@ -15,6 +15,9 @@
             <description value="Print Order from Guest on Frontend"/>
             <severity value="BLOCKER"/>
             <testCaseId value="MC-38689"/>
+            <skip>
+                <issueId value="MQE-2834" />
+            </skip>
             <group value="remote_storage_aws_s3"/>
         </annotations>
         <before>

app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest/CheckCheckoutSuccessPageAsRegisterCustomerTest.xml

@@ -15,6 +15,9 @@
             <description value="To be sure that other elements of Success page are shown for placed order as registered Customer."/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-16488"/>
+            <skip>
+                <issueId value="MQE-2834" />
+            </skip>
             <group value="checkout"/>
         </annotations>
 

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

@@ -8,7 +8,6 @@
 namespace Magento\QuoteGraphQl\Model\Cart;
 
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\Message\MessageInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
 
@@ -53,7 +52,6 @@ public function execute(Quote $cart, array $cartItems): void
         foreach ($cartItems as $cartItemData) {
             $this->addProductToCart->execute($cart, $cartItemData);
         }
-
         $this->cartRepository->save($cart);
     }
 }

app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php

@@ -13,6 +13,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\QuoteGraphQl\Model\Cart\AddProductsToCart;
 use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+use Magento\Framework\Lock\LockManagerInterface;
 
 /**
  * Add simple products to cart GraphQl resolver
@@ -30,16 +31,24 @@ class AddSimpleProductsToCart implements ResolverInterface
      */
     private $addProductsToCart;
 
+    /**
+     * @var LockManagerInterface
+     */
+    private $lockManager;
+
     /**
      * @param GetCartForUser $getCartForUser
      * @param AddProductsToCart $addProductsToCart
+     * @param LockManagerInterface $lockManager
      */
     public function __construct(
         GetCartForUser $getCartForUser,
-        AddProductsToCart $addProductsToCart
+        AddProductsToCart $addProductsToCart,
+        LockManagerInterface $lockManager
     ) {
         $this->getCartForUser = $getCartForUser;
         $this->addProductsToCart = $addProductsToCart;
+        $this->lockManager = $lockManager;
     }
 
     /**
@@ -58,12 +67,20 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__('Required parameter "cart_items" is missing'));
         }
         $cartItems = $args['input']['cart_items'];
-
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
+
+        $lockName = 'cart_processing_lock_' . $maskedCartId;
+        while ($this->lockManager->isLocked($lockName)) {
+            // wait till other process working with the same cart complete
+            usleep(rand(100, 600));
+        }
+        $this->lockManager->lock($lockName, 1);
+
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         $this->addProductsToCart->execute($cart, $cartItems);
-
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
+
+        $this->lockManager->unlock($lockName);
         return [
             'cart' => [
                 'model' => $cart,

app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml

@@ -16,6 +16,9 @@
             <description value="Print Order from Guest on Frontend"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-28494"/>
+            <skip>
+                <issueId value="MQE-2834" />
+            </skip>
             <group value="sales"/>
             <group value="mtf_migrated"/>
         </annotations>

app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistoryTest.xml

@@ -16,6 +16,9 @@
             <description value="Check while order printing URL with an id of not relevant order redirects to order history"/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-28543"/>
+            <skip>
+                <issueId value="MQE-2834" />
+            </skip>
             <group value="sales"/>
         </annotations>
         <before>