ACP2E-3774: Concurrent Calls to Reorder GraphQL API - Same Products Added to Different Rows

Author: o-dubovyk

app/code/Magento/SalesGraphQl/Model/Resolver/Reorder.php

@@ -87,7 +87,7 @@ public function resolve(
             );
         }
 
-        $lockName = implode('_', [$currentUserId, $storeId, $orderNumber]);
+        $lockName = hash('sha256', $orderNumber);
         if ($this->lockManager->lock(self::LOCK_PREFIX . $lockName, self::LOCK_TIMEOUT)) {
             try {
                 $reorderOutput = $this->reorder->execute($orderNumber, $storeId);
@@ -96,7 +96,7 @@ public function resolve(
             }
         } else {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('The reorder is locked for processing. The concurrent request has been aborted.')
+                __('Sorry, there has been an error processing your request. Please try again later.')
             );
         }
 

app/code/Magento/SalesGraphQl/Test/Unit/Model/Resolver/ReorderTest.php

@@ -9,9 +9,11 @@
 
 use Magento\Framework\Lock\LockManagerInterface;
 use Magento\GraphQl\Model\Query\Context;
-use Magento\GraphQl\Model\Query\ContextExtension;
+use Magento\GraphQl\Model\Query\ContextExtensionInterface;
+use Magento\Sales\Model\Order;
 use Magento\Sales\Model\OrderFactory;
 use Magento\Sales\Model\Reorder\Reorder;
+use Magento\Store\Api\Data\StoreInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Magento\SalesGraphQl\Model\Resolver\Reorder as Subject;
@@ -26,7 +28,7 @@ class ReorderTest extends TestCase
     private $subject;
 
     /**
-     * @var ContextExtension|MockObject
+     * @var ContextExtensionInterface|MockObject
      */
     private $extensionAttributesMock;
 
@@ -73,12 +75,14 @@ public function testResolve(): void
         $args = ['orderNumber' => '00000010'];
         $value = [];
 
-        $this->extensionAttributesMock = $this->createMock(ContextExtension::class);
+        $this->extensionAttributesMock = $this->getMockBuilder(ContextExtensionInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
         $this->extensionAttributesMock->expects($this->once())
             ->method('getIsCustomer')
             ->willReturn(true);
 
-        $store = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
+        $store = $this->createMock(StoreInterface::class);
         $store->expects($this->once())
             ->method('getId')
             ->willReturn(1);
@@ -94,7 +98,7 @@ public function testResolve(): void
             ->method('getUserId')
             ->willReturn($contextCustomerId);
 
-        $order = $this->createMock(\Magento\Sales\Model\Order::class);
+        $order = $this->createMock(Order::class);
         $order->expects($this->once())
             ->method('loadByIncrementIdAndStoreId')
             ->willReturnSelf();