ENGCOM-6151: Merge guest quote to customer quote 24808 #24862

 - Merge Pull Request #24862 from ivan-koliadynskyy/magento2:merge-guest-quote-to-customer-quote-24808
 - Merged commits:
   1. 2a6dc66
   2. dc460c8
   3. 9f77a81
   4. 6ff21a6
   5. d0e2ced
   6. b6f0bb3
   7. fe12c41
   8. e5095fb
   9. daede85
   10. 08fb9ae
   11. 8b08a51

Author: magento-engcom-team

app/code/Magento/Quote/Api/CartManagementInterface.php

@@ -52,6 +52,9 @@ public function getCartForCustomer($customerId);
      * @param int $customerId The customer ID.
      * @param int $storeId
      * @return boolean
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\StateException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function assignCustomer($cartId, $customerId, $storeId);
 

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

@@ -298,22 +298,28 @@ public function assignCustomer($cartId, $customerId, $storeId)
             );
         }
         try {
-            $this->quoteRepository->getForCustomer($customerId);
-            throw new StateException(
-                __("The customer can't be assigned to the cart because the customer already has an active cart.")
-            );
+            $customerActiveQuote = $this->quoteRepository->getForCustomer($customerId);
+
+            $quote->merge($customerActiveQuote);
+            $customerActiveQuote->setIsActive(0);
+            $this->quoteRepository->save($customerActiveQuote);
+
         // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
         }
 
         $quote->setCustomer($customer);
         $quote->setCustomerIsGuest(0);
+        $quote->setIsActive(1);
+
         /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'quote_id');
         if ($quoteIdMask->getId()) {
             $quoteIdMask->delete();
         }
+
         $this->quoteRepository->save($quote);
+
         return true;
     }
 

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

@@ -7,11 +7,13 @@
 
 namespace Magento\Quote\Test\Unit\Model;
 
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Customer;
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
 
 use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
 use Magento\Quote\Model\CustomerManagement;
+use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\Sales\Api\Data\OrderAddressInterface;
 
@@ -199,7 +201,7 @@ protected function setUp()
         );
 
         $this->quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
+            Quote::class,
             [
                 'assignCustomer',
                 'collectTotals',
@@ -275,7 +277,7 @@ public function testCreateEmptyCartAnonymous()
         $storeId = 345;
         $quoteId = 2311;
 
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $quoteMock = $this->createMock(Quote::class);
         $quoteAddress = $this->createPartialMock(
             \Magento\Quote\Model\Quote\Address::class,
             ['setCollectShippingRates']
@@ -306,14 +308,14 @@ public function testCreateEmptyCartForCustomer()
         $quoteId = 2311;
         $userId = 567;
 
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $quoteMock = $this->createMock(Quote::class);
 
         $this->quoteRepositoryMock
             ->expects($this->once())
             ->method('getActiveForCustomer')
             ->with($userId)
-            ->willThrowException(new NoSuchEntityException());
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException());
+        $customer = $this->getMockBuilder(CustomerInterface::class)
             ->setMethods(['getDefaultBilling'])->disableOriginalConstructor()->getMockForAbstractClass();
         $quoteAddress = $this->createPartialMock(
             \Magento\Quote\Model\Quote\Address::class,
@@ -342,14 +344,14 @@ public function testCreateEmptyCartForCustomerReturnExistsQuote()
         $storeId = 345;
         $userId = 567;
 
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $quoteMock = $this->createMock(Quote::class);
 
         $this->quoteRepositoryMock
             ->expects($this->once())
             ->method('getActiveForCustomer')
             ->with($userId)->willReturn($quoteMock);
 
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+        $customer = $this->getMockBuilder(CustomerInterface::class)
             ->setMethods(['getDefaultBilling'])->disableOriginalConstructor()->getMockForAbstractClass();
         $quoteAddress = $this->createPartialMock(
             \Magento\Quote\Model\Quote\Address::class,
@@ -379,8 +381,8 @@ public function testAssignCustomerFromAnotherStore()
         $customerId = 455;
         $storeId = 5;
 
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $quoteMock = $this->createMock(Quote::class);
+        $customerMock = $this->createMock(CustomerInterface::class);
 
         $this->quoteRepositoryMock
             ->expects($this->once())
@@ -395,7 +397,7 @@ public function testAssignCustomerFromAnotherStore()
             ->willReturn($customerMock);
 
         $customerModelMock = $this->createPartialMock(
-            \Magento\Customer\Model\Customer::class,
+            Customer::class,
             ['load', 'getSharedStoreIds']
         );
         $this->customerFactoryMock->expects($this->once())->method('create')->willReturn($customerModelMock);
@@ -424,10 +426,10 @@ public function testAssignCustomerToNonanonymousCart()
         $storeId = 5;
 
         $quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
+            Quote::class,
             ['getCustomerId', 'setCustomer', 'setCustomerIsGuest']
         );
-        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $customerMock = $this->createMock(CustomerInterface::class);
 
         $this->quoteRepositoryMock
             ->expects($this->once())
@@ -442,7 +444,7 @@ public function testAssignCustomerToNonanonymousCart()
             ->willReturn($customerMock);
 
         $customerModelMock = $this->createPartialMock(
-            \Magento\Customer\Model\Customer::class,
+            Customer::class,
             ['load', 'getSharedStoreIds']
         );
         $this->customerFactoryMock->expects($this->once())->method('create')->willReturn($customerModelMock);
@@ -463,7 +465,7 @@ public function testAssignCustomerToNonanonymousCart()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\StateException
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testAssignCustomerNoSuchCustomer()
     {
@@ -472,10 +474,51 @@ public function testAssignCustomerNoSuchCustomer()
         $storeId = 5;
 
         $quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
+            Quote::class,
             ['getCustomerId', 'setCustomer', 'setCustomerIsGuest']
         );
-        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+
+        $this->quoteRepositoryMock
+            ->expects($this->once())
+            ->method('getActive')
+            ->with($cartId)
+            ->willReturn($quoteMock);
+
+        $this->customerRepositoryMock
+            ->expects($this->once())
+            ->method('getById')
+            ->with($customerId)
+            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException());
+
+        $this->expectExceptionMessage(
+            "No such entity."
+        );
+
+        $this->model->assignCustomer($cartId, $customerId, $storeId);
+    }
+
+    public function testAssignCustomerWithActiveCart()
+    {
+        $cartId = 220;
+        $customerId = 455;
+        $storeId = 5;
+
+        $this->getPropertyValue($this->model, 'quoteIdMaskFactory')
+            ->expects($this->once())
+            ->method('create')
+            ->willReturn($this->quoteIdMock);
+
+        $quoteMock = $this->createPartialMock(
+            Quote::class,
+            ['getCustomerId', 'setCustomer', 'setCustomerIsGuest', 'setIsActive', 'getIsActive', 'merge']
+        );
+
+        $activeQuoteMock = $this->createPartialMock(
+            Quote::class,
+            ['getCustomerId', 'setCustomer', 'setCustomerIsGuest', 'setIsActive', 'getIsActive', 'merge']
+        );
+
+        $customerMock = $this->createMock(CustomerInterface::class);
 
         $this->quoteRepositoryMock
             ->expects($this->once())
@@ -490,7 +533,7 @@ public function testAssignCustomerNoSuchCustomer()
             ->willReturn($customerMock);
 
         $customerModelMock = $this->createPartialMock(
-            \Magento\Customer\Model\Customer::class,
+            Customer::class,
             ['load', 'getSharedStoreIds']
         );
         $this->customerFactoryMock->expects($this->once())->method('create')->willReturn($customerModelMock);
@@ -506,17 +549,26 @@ public function testAssignCustomerNoSuchCustomer()
             ->willReturn([$storeId, 'some store value']);
 
         $quoteMock->expects($this->once())->method('getCustomerId')->willReturn(null);
-
         $this->quoteRepositoryMock
             ->expects($this->once())
             ->method('getForCustomer')
-            ->with($customerId);
+            ->with($customerId)
+            ->willReturn($activeQuoteMock);
 
-        $this->model->assignCustomer($cartId, $customerId, $storeId);
+        $quoteMock->expects($this->once())->method('merge')->with($activeQuoteMock)->willReturnSelf();
+        $activeQuoteMock->expects($this->once())->method('setIsActive')->with(0);
+        $this->quoteRepositoryMock->expects($this->atLeastOnce())->method('save')->with($activeQuoteMock);
 
-        $this->expectExceptionMessage(
-            "The customer can't be assigned to the cart because the customer already has an active cart."
-        );
+        $quoteMock->expects($this->once())->method('setCustomer')->with($customerMock);
+        $quoteMock->expects($this->once())->method('setCustomerIsGuest')->with(0);
+        $quoteMock->expects($this->once())->method('setIsActive')->with(1);
+
+        $this->quoteIdMock->expects($this->once())->method('load')->with($cartId, 'quote_id')->willReturnSelf();
+        $this->quoteIdMock->expects($this->once())->method('getId')->willReturn(10);
+        $this->quoteIdMock->expects($this->once())->method('delete');
+        $this->quoteRepositoryMock->expects($this->atLeastOnce())->method('save')->with($quoteMock);
+
+        $this->model->assignCustomer($cartId, $customerId, $storeId);
     }
 
     public function testAssignCustomer()
@@ -529,15 +581,13 @@ public function testAssignCustomer()
             ->expects($this->once())
             ->method('create')
             ->willReturn($this->quoteIdMock);
-        $this->quoteIdMock->expects($this->once())->method('load')->with($cartId, 'quote_id')->willReturnSelf();
-        $this->quoteIdMock->expects($this->once())->method('getId')->willReturn(10);
-        $this->quoteIdMock->expects($this->once())->method('delete');
+
         $quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
-            ['getCustomerId', 'setCustomer', 'setCustomerIsGuest']
+            Quote::class,
+            ['getCustomerId', 'setCustomer', 'setCustomerIsGuest', 'setIsActive', 'getIsActive', 'merge']
         );
-        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
 
+        $customerMock = $this->createMock(CustomerInterface::class);
         $this->quoteRepositoryMock
             ->expects($this->once())
             ->method('getActive')
@@ -551,10 +601,12 @@ public function testAssignCustomer()
             ->willReturn($customerMock);
 
         $customerModelMock = $this->createPartialMock(
-            \Magento\Customer\Model\Customer::class,
+            Customer::class,
             ['load', 'getSharedStoreIds']
         );
+
         $this->customerFactoryMock->expects($this->once())->method('create')->willReturn($customerModelMock);
+
         $customerModelMock
             ->expects($this->once())
             ->method('load')
@@ -572,11 +624,17 @@ public function testAssignCustomer()
             ->expects($this->once())
             ->method('getForCustomer')
             ->with($customerId)
-            ->willThrowException(new NoSuchEntityException());
+            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException());
+
+        $quoteMock->expects($this->never())->method('merge');
 
         $quoteMock->expects($this->once())->method('setCustomer')->with($customerMock);
         $quoteMock->expects($this->once())->method('setCustomerIsGuest')->with(0);
+        $quoteMock->expects($this->once())->method('setIsActive')->with(1);
 
+        $this->quoteIdMock->expects($this->once())->method('load')->with($cartId, 'quote_id')->willReturnSelf();
+        $this->quoteIdMock->expects($this->once())->method('getId')->willReturn(10);
+        $this->quoteIdMock->expects($this->once())->method('delete');
         $this->quoteRepositoryMock->expects($this->once())->method('save')->with($quoteMock);
 
         $this->model->assignCustomer($cartId, $customerId, $storeId);
@@ -881,7 +939,7 @@ protected function getQuote(
         \Magento\Quote\Model\Quote\Address $shippingAddress = null
     ) {
         $quote = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
+            Quote::class,
             [
                 'setIsActive',
                 'getCustomerEmail',
@@ -928,7 +986,7 @@ protected function getQuote(
             ->willReturn($payment);
 
         $customer = $this->createPartialMock(
-            \Magento\Customer\Model\Customer::class,
+            Customer::class,
             ['getDefaultBilling', 'getId']
         );
         $quote->expects($this->any())->method('getCustomerId')->willReturn($customerId);
@@ -1016,12 +1074,12 @@ protected function prepareOrderFactory(
     }
 
     /**
-     * @throws NoSuchEntityException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testGetCartForCustomer()
     {
         $customerId = 100;
-        $cartMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $cartMock = $this->createMock(Quote::class);
         $this->quoteRepositoryMock->expects($this->once())
             ->method('getActiveForCustomer')
             ->with($customerId)

dev/tests/api-functional/testsuite/Magento/Quote/Api/CartManagementTest.php

@@ -310,21 +310,20 @@ public function testAssignCustomerThrowsExceptionIfCartIsAssignedToDifferentStor
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
      * @magentoApiDataFixture Magento/Sales/_files/quote.php
-     * @expectedException \Exception
      */
-    public function testAssignCustomerThrowsExceptionIfCustomerAlreadyHasActiveCart()
+    public function testAssignCustomerCartMerged()
     {
         /** @var $customer \Magento\Customer\Model\Customer */
         $customer = $this->objectManager->create(\Magento\Customer\Model\Customer::class)->load(1);
         // Customer has a quote with reserved order ID test_order_1 (see fixture)
         /** @var $customerQuote \Magento\Quote\Model\Quote */
         $customerQuote = $this->objectManager->create(\Magento\Quote\Model\Quote::class)
-            ->load('test_order_1', 'reserved_order_id');
-        $customerQuote->setIsActive(1)->save();
+            ->load('test_order_item_with_items', 'reserved_order_id');
         /** @var $quote \Magento\Quote\Model\Quote */
         $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class)->load('test01', 'reserved_order_id');
+        $expectedQuoteItemsQty = $customerQuote->getItemsQty() + $quote->getItemsQty();
 
         $cartId = $quote->getId();
         $customerId = $customer->getId();
@@ -346,11 +345,13 @@ public function testAssignCustomerThrowsExceptionIfCustomerAlreadyHasActiveCart(
             'customerId' => $customerId,
             'storeId' => 1,
         ];
-        $this->_webApiCall($serviceInfo, $requestData);
+        $this->assertTrue($this->_webApiCall($serviceInfo, $requestData));
 
-        $this->expectExceptionMessage(
-            "The customer can't be assigned to the cart because the customer already has an active cart."
-        );
+        $mergedQuote = $this->objectManager
+            ->create(\Magento\Quote\Model\Quote::class)
+            ->load('test01', 'reserved_order_id');
+
+        $this->assertEquals($expectedQuoteItemsQty, $mergedQuote->getItemsQty());
     }
 
     /**