Merge remote-tracking branch 'tango/MC-37321' into MPI-2020-09-14

Author: bubasuma

app/code/Magento/Checkout/Model/Session.php

@@ -291,6 +291,7 @@ public function getQuote()
                     }
                 } else {
                     $quote->setIsCheckoutCart(true);
+                    $quote->setCustomerIsGuest(1);
                     $this->_eventManager->dispatch('checkout_quote_init', ['quote' => $quote]);
                 }
             }
@@ -382,8 +383,10 @@ public function loadCustomerQuote()
 
         if ($customerQuote->getId() && $this->getQuoteId() != $customerQuote->getId()) {
             if ($this->getQuoteId()) {
+                $quote = $this->getQuote();
+                $quote->setCustomerIsGuest(0);
                 $this->quoteRepository->save(
-                    $customerQuote->merge($this->getQuote())->collectTotals()
+                    $customerQuote->merge($quote)->collectTotals()
                 );
                 $newQuote = $this->quoteRepository->get($customerQuote->getId());
                 $this->quoteRepository->save(
@@ -402,6 +405,7 @@ public function loadCustomerQuote()
             $this->getQuote()->getBillingAddress();
             $this->getQuote()->getShippingAddress();
             $this->getQuote()->setCustomer($this->_customerSession->getCustomerDataObject())
+                ->setCustomerIsGuest(0)
                 ->setTotalsCollectedFlag(false)
                 ->collectTotals();
             $this->quoteRepository->save($this->getQuote());

app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php

@@ -139,9 +139,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             !$this->_persistentSession->isPersistent() &&
             !$this->_customerSession->isLoggedIn() &&
             $this->_checkoutSession->getQuoteId() &&
-            !$this->isRequestFromCheckoutPage($this->request) &&
             // persistent session does not expire on onepage checkout page
-            $this->isNeedToExpireSession()
+            !$this->isRequestFromCheckoutPage($this->request) &&
+            $this->getQuote()->getIsPersistent()
         ) {
             $this->_eventManager->dispatch('persistent_session_expired');
             $this->quoteManager->expire();
@@ -168,18 +168,6 @@ private function isPersistentQuoteOutdated(): bool
         return false;
     }
 
-    /**
-     * Condition checker
-     *
-     * @return bool
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    private function isNeedToExpireSession(): bool
-    {
-        return $this->getQuote()->getIsPersistent() || $this->getQuote()->getCustomerIsGuest();
-    }
-
     /**
      * Getter for Quote with micro optimization
      *

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

@@ -24,7 +24,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Class QuoteManagement
+ * Class for managing quote
  *
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -250,6 +250,7 @@ public function createEmptyCart()
 
         $quote->setBillingAddress($this->quoteAddressFactory->create());
         $quote->setShippingAddress($this->quoteAddressFactory->create());
+        $quote->setCustomerIsGuest(1);
 
         try {
             $quote->getShippingAddress()->setCollectShippingRates(true);

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php

@@ -39,6 +39,11 @@ class CreateEmptyCartTest extends GraphQlAbstract
      */
     private $quoteIdMaskFactory;
 
+    /**
+     * @var string
+     */
+    private $maskedQuoteId;
+
     protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
@@ -61,6 +66,7 @@ public function testCreateEmptyCart()
         self::assertNotNull($guestCart->getId());
         self::assertNull($guestCart->getCustomer()->getId());
         self::assertEquals('default', $guestCart->getStore()->getCode());
+        self::assertEquals('1', $guestCart->getCustomerIsGuest());
     }
 
     /**
@@ -81,6 +87,7 @@ public function testCreateEmptyCartWithNotDefaultStore()
         self::assertNotNull($guestCart->getId());
         self::assertNull($guestCart->getCustomer()->getId());
         self::assertSame('fixture_second_store', $guestCart->getStore()->getCode());
+        self::assertEquals('1', $guestCart->getCustomerIsGuest());
     }
 
     /**

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

@@ -199,6 +199,11 @@ public function testLoadCustomerQuoteCustomerWithoutQuote(): void
             $this->quote->getCustomerEmail(),
             'Precondition failed: Customer data must not be set to quote'
         );
+        self::assertEquals(
+            '1',
+            $this->quote->getCustomerIsGuest(),
+            'Precondition failed: Customer must be as guest in quote'
+        );
         $customer = $this->customerRepository->getById(1);
         $this->customerSession->setCustomerDataObject($customer);
         $this->quote = $this->checkoutSession->getQuote();
@@ -244,6 +249,17 @@ public function testGetQuoteWithProductWithTierPrice(): void
         $this->assertEquals($tierPriceValue, $quoteProduct->getTierPrice(1));
     }
 
+    /**
+     * Test covers case when quote is not yet initialized and customer is guest
+     *
+     * Expected result - quote object should be loaded with customer as guest
+     */
+    public function testGetQuoteNotInitializedGuest()
+    {
+        $quote = $this->checkoutSession->getQuote();
+        self::assertEquals('1', $quote->getCustomerIsGuest());
+    }
+
     /**
      * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoDataFixture Magento/Checkout/_files/quote_with_customer_without_address.php
@@ -288,5 +304,10 @@ private function validateCustomerDataInQuote(CartInterface $quote): void
             $quote->getCustomerFirstname(),
             'Customer first name was not set to Quote correctly.'
         );
+        self::assertEquals(
+            '0',
+            $quote->getCustomerIsGuest(),
+            'Customer should not be as guest in Quote.'
+        );
     }
 }