Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3128' into Tier4-Kings-PR-07-24-2024

Author: glo23503

app/code/Magento/QuoteGraphQl/Model/Resolver/MaskedCartId.php

@@ -95,11 +95,7 @@ private function getQuoteMaskId(int $quoteId): string
      */
     private function ensureQuoteMaskExist(int $quoteId): string
     {
-        try {
-            $maskedId = $this->quoteIdToMaskedQuoteId->execute($quoteId);
-        } catch (NoSuchEntityException $e) {
-            $maskedId = '';
-        }
+        $maskedId = $this->quoteIdToMaskedQuoteId->execute($quoteId);
         if ($maskedId === '') {
             $quoteIdMask = $this->quoteIdMaskFactory->create();
             $quoteIdMask->setQuoteId($quoteId);

app/code/Magento/QuoteGraphQl/Test/Unit/Model/Resolver/MaskedCartIdTest.php

@@ -8,6 +8,7 @@
 namespace Magento\QuoteGraphQl\Test\Unit\Model\Resolver;
 
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\GraphQl\Model\Query\Context;
@@ -16,7 +17,6 @@
 use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResourceModel;
-use Magento\QuoteGraphQl\Model\Resolver\Cart;
 use Magento\QuoteGraphQl\Model\Resolver\MaskedCartId;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -134,4 +134,32 @@ public function testResolve(): void
             ->with($this->quoteIdMask);
         $this->maskedCartId->resolve($this->fieldMock, $this->contextMock, $this->resolveInfoMock, $this->valueMock);
     }
+
+    /**
+     * @return void
+     * @throws \Exception
+     */
+    public function testResolveForExceptionWhenQuoteNotExists(): void
+    {
+        $this->expectExceptionMessage('Current user does not have an active cart.');
+        $this->valueMock = ['model' => $this->quoteMock];
+        $cartId = 0;
+        $this->quoteIdToMaskedQuoteId->method('execute')->with($cartId)->willThrowException(
+            new NoSuchEntityException(
+                __(
+                    'No such entity with %fieldName = %fieldValue',
+                    [
+                        'fieldName' => 'quoteId',
+                        'fieldValue' => $cartId
+                    ]
+                )
+            )
+        );
+        $this->maskedCartId->resolve(
+            $this->fieldMock,
+            $this->contextMock,
+            $this->resolveInfoMock,
+            $this->valueMock
+        );
+    }
 }