ACP2E-2055: Duplicate orders with same Quote Id at same time with few time difference

Author: viktym

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

@@ -177,25 +177,70 @@ public function getForCustomer($customerId, array $sharedStoreIds = [])
      */
     public function getActive($cartId, array $sharedStoreIds = [])
     {
+        $this->validateCachedActiveQuote((int)$cartId);
         $quote = $this->get($cartId, $sharedStoreIds);
         if (!$quote->getIsActive()) {
             throw NoSuchEntityException::singleField('cartId', $cartId);
         }
         return $quote;
     }
 
+    /**
+     * Validates if cached quote is still active.
+     *
+     * @param int $cartId
+     * @return void
+     * @throws NoSuchEntityException
+     */
+    private function validateCachedActiveQuote(int $cartId): void
+    {
+        if (isset($this->quotesById[$cartId])) {
+            $quote = $this->cartFactory->create();
+            if (is_callable([$quote, 'setSharedStoreIds'])) {
+                $quote->setSharedStoreIds(['*']);
+            }
+            $quote->loadActive($cartId);
+            if (!$quote->getIsActive()) {
+                throw NoSuchEntityException::singleField('cartId', $cartId);
+            }
+        }
+    }
+
     /**
      * @inheritdoc
      */
     public function getActiveForCustomer($customerId, array $sharedStoreIds = [])
     {
+        $this->validateCachedCustomerActiveQuote((int)$customerId);
         $quote = $this->getForCustomer($customerId, $sharedStoreIds);
         if (!$quote->getIsActive()) {
             throw NoSuchEntityException::singleField('customerId', $customerId);
         }
         return $quote;
     }
 
+    /**
+     * Validates if cached customer quote is still active.
+     *
+     * @param int $customerId
+     * @return void
+     * @throws NoSuchEntityException
+     */
+    private function validateCachedCustomerActiveQuote(int $customerId): void
+    {
+        if (isset($this->quotesByCustomerId[$customerId])) {
+            $quoteId = $this->quotesByCustomerId[$customerId]->getId();
+            $quote = $this->cartFactory->create();
+            if (is_callable([$quote, 'setSharedStoreIds'])) {
+                $quote->setSharedStoreIds(['*']);
+            }
+            $quote->loadActive($quoteId);
+            if (!$quote->getIsActive()) {
+                throw NoSuchEntityException::singleField('customerId', $customerId);
+            }
+        }
+    }
+
     /**
      * @inheritdoc
      */

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

@@ -117,6 +117,7 @@ protected function setUp(): void
                 [
                     'load',
                     'loadByIdWithoutStore',
+                    'loadActive',
                     'loadByCustomer',
                     'getIsActive',
                     'getId',
@@ -244,6 +245,7 @@ public function testGetForCustomerAfterGet(int $quoteId, int $customerQuoteId, b
                 [
                     'load',
                     'loadByIdWithoutStore',
+                    'loadActive',
                     'loadByCustomer',
                     'getIsActive',
                     'getId',
@@ -486,16 +488,21 @@ public function testGetActiveForCustomer()
         $cartId = 17;
         $customerId = 23;
 
-        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
-        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
+        $this->cartFactoryMock->method('create')->willReturn($this->quoteMock);
+        $this->storeManagerMock->method('getStore')->willReturn($this->storeMock);
         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
-        $this->quoteMock->expects($this->never())->method('setSharedStoreIds');
+        $this->quoteMock->expects($this->once())->method('setSharedStoreIds');
         $this->quoteMock->expects($this->once())
             ->method('loadByCustomer')
             ->with($customerId)
             ->willReturn($this->storeMock);
-        $this->quoteMock->expects($this->exactly(2))->method('getId')->willReturn($cartId);
-        $this->quoteMock->expects($this->exactly(2))->method('getIsActive')->willReturn(1);
+        $this->quoteMock->expects($this->once())
+            ->method('loadActive')
+            ->with($cartId)
+            ->willReturn($this->storeMock);
+
+        $this->quoteMock->method('getId')->willReturn($cartId);
+        $this->quoteMock->method('getIsActive')->willReturn(1);
 
         $this->loadHandlerMock->expects($this->once())
             ->method('load')

dev/tests/integration/testsuite/Magento/Checkout/Api/ShippingInformationManagementTest.php

@@ -26,11 +26,6 @@ class ShippingInformationManagementTest extends TestCase
      */
     private $management;
 
-    /**
-     * @var CartRepositoryInterface
-     */
-    private $cartRepo;
-
     /**
      * @var CustomerRepositoryInterface
      */
@@ -48,7 +43,6 @@ protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->management = $objectManager->get(ShippingInformationManagementInterface::class);
-        $this->cartRepo = $objectManager->get(CartRepositoryInterface::class);
         $this->customerRepo = $objectManager->get(CustomerRepositoryInterface::class);
         $this->shippingFactory = $objectManager->get(ShippingInformationInterfaceFactory::class);
     }
@@ -65,7 +59,8 @@ protected function setUp(): void
      */
     public function testDifferentAddresses(bool $swapShipping): void
     {
-        $cart = $this->cartRepo->getForCustomer(1);
+        $cartRepository = Bootstrap::getObjectManager()->create(CartRepositoryInterface::class);
+        $cart = $cartRepository->getForCustomer(1);
         $otherCustomer = $this->customerRepo->get('customer_with_addresses@test.com');
         $otherAddresses = $otherCustomer->getAddresses();
         $otherAddress = array_pop($otherAddresses);

dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php

@@ -141,6 +141,7 @@ public function testGetQuoteNotInitializedCustomerSet(): void
         $this->checkoutSession->setCustomerData($customer);
         $quote = $this->checkoutSession->getQuote();
         $this->validateCustomerDataInQuote($quote);
+        $this->quoteRepository->delete($quote);
     }
 
     /**
@@ -158,6 +159,7 @@ public function testGetQuoteNotInitializedCustomerLoggedIn(): void
         $this->customerSession->setCustomerDataObject($customer);
         $quote = $this->checkoutSession->getQuote();
         $this->validateCustomerDataInQuote($quote);
+        $this->quoteRepository->delete($quote);
     }
 
     /**