Refactor / better Quote getting

coddin-web · Apr 6, 2022 · 390d3ee · 390d3ee
1 parent 22d4b8c
commit 390d3ee
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 18 deletions.
diff --git a/src/Service/CustomerQuote.php b/src/Service/CustomerQuote.php
@@ -54,28 +54,33 @@ public function getQuote(): CartInterface
             try {
                 // User is logged in and has a filled cart
                 $quote = $this->checkoutSession->getQuote();
-                $quoteId = $quote->getEntityId();
             } catch (NoSuchEntityException | LocalizedException $e) {
-                // User is logged in but has an empty cart
+                // User is logged in but has an empty cart or
+                // something went wrong when trying to get the customer cart
                 $quoteId = $this->cartManagement->createEmptyCartForCustomer($this->customerSession->getCustomerId());
+                $quote = $this->quoteRepository->get($quoteId);
             }
         } else {
             try {
-                // User is not logged in and has a filled cart
+                // User is not logged in and has a filled or empty cart
                 $quote = $this->checkoutSession->getQuote();
-                $quoteId = $quote->getEntityId();
             } catch (NoSuchEntityException | LocalizedException $e) {
-                // User is not logged in and has an empty cart
+                // User is not logged in and has an empty cart or
+                // something went wrong when trying to get the guest cart
                 $cartApiId = $this->guestCartManagement->createEmptyCart();
                 $quoteId = $this->maskedQuoteIdToQuoteId->execute($cartApiId);
-                $this->checkoutSession->setQuoteId($quoteId);
+                $quote = $this->quoteRepository->get($quoteId);
             }
         }
 
-        if ($quote === null) {
-            $quote = $this->quoteRepository->get($quoteId);
+        // Always return a fully loaded Quote
+        if ($quote->getId() === null) {
+            $this->quoteRepository->save($quote);
+            $quote = $this->quoteRepository->get($quote->getId());
         }
 
+        $this->checkoutSession->setQuoteId($quote->getId());
+
         return $quote;
     }
 

diff --git a/src/Test/Unit/Service/CustomerQuoteTest.php b/src/Test/Unit/Service/CustomerQuoteTest.php
@@ -68,19 +68,24 @@ public function testGetQuoteGuestWithoutExistingCart(): void
             ->with('maskedID1234')
             ->willReturn(123);
 
-        $this->checkoutSession
-            ->expects(self::once())
-            ->method('setQuoteId')
-            ->with(123);
-
         $quoteMock = $this->createQuote();
 
+        $quoteMock
+            ->expects(self::exactly(2))
+            ->method('getId')
+            ->willReturn(123, 123);
+
         $this->quoteRepository
             ->expects(self::once())
             ->method('get')
             ->with(123)
             ->willReturn($quoteMock);
 
+        $this->checkoutSession
+            ->expects(self::once())
+            ->method('setQuoteId')
+            ->with(123);
+
         $quote = $customerQuote->getQuote();
 
         self::assertEquals($quoteMock, $quote);
@@ -100,8 +105,8 @@ public function testGetQuoteGuestWithExistingCart(): void
 
         $quoteMock = $this->createQuote();
         $quoteMock
-            ->expects(self::once())
-            ->method('getEntityId')
+            ->expects(self::exactly(2))
+            ->method('getId')
             ->willReturn(1);
 
         $this->checkoutSession
@@ -144,6 +149,11 @@ public function testGetQuoteCustomerWithoutExistingCart(): void
 
         $quoteMock = $this->createQuote();
 
+        $quoteMock
+            ->expects(self::exactly(2))
+            ->method('getId')
+            ->willReturn(123, 123);
+
         $this->quoteRepository
             ->expects(self::once())
             ->method('get')
@@ -169,8 +179,8 @@ public function testGetQuoteCustomerWithExistingCart(): void
 
         $quoteMock = $this->createQuote();
         $quoteMock
-            ->expects(self::once())
-            ->method('getEntityId')
+            ->expects(self::exactly(2))
+            ->method('getId')
             ->willReturn(1);
 
         $this->checkoutSession

diff --git a/src/registration.php b/src/registration.php
@@ -1,10 +1,10 @@
 <?php
 
+// @codeCoverageIgnoreStart
 declare(strict_types=1);
 
 use Magento\Framework\Component\ComponentRegistrar;
 
-// @codeCoverageIgnoreStart
 ComponentRegistrar::register(
     ComponentRegistrar::MODULE,
     'Coddin_CartBridge',