ENGCOM-7681: #28564: Handle empty masked quote id return case #28714

Author: cpartica

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

@@ -7,66 +7,32 @@
 
 namespace Magento\QuoteGraphQl\Model\Resolver;
 
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\QuoteGraphQl\Model\Cart\CreateEmptyCartForCustomer;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-use Magento\Quote\Api\CartManagementInterface;
-use Magento\Quote\Model\QuoteIdMaskFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResourceModel;
+use Magento\Quote\Model\Cart\CustomerCartResolver;
 
 /**
  * Get cart for the customer
  */
 class CustomerCart implements ResolverInterface
 {
     /**
-     * @var CreateEmptyCartForCustomer
+     * @var CustomerCartResolver
      */
-    private $createEmptyCartForCustomer;
+    private $customerCartResolver;
 
     /**
-     * @var CartManagementInterface
-     */
-    private $cartManagement;
-
-    /**
-     * @var QuoteIdMaskFactory
-     */
-    private $quoteIdMaskFactory;
-
-    /**
-     * @var QuoteIdMaskResourceModel
-     */
-    private $quoteIdMaskResourceModel;
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedQuoteId;
-
-    /**
-     * @param CreateEmptyCartForCustomer $createEmptyCartForCustomer
-     * @param CartManagementInterface $cartManagement
-     * @param QuoteIdMaskFactory $quoteIdMaskFactory
-     * @param QuoteIdMaskResourceModel $quoteIdMaskResourceModel
-     * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
+     * CustomerCart constructor.
+     *
+     * @param CustomerCartResolver $customerCartResolver
      */
     public function __construct(
-        CreateEmptyCartForCustomer $createEmptyCartForCustomer,
-        CartManagementInterface $cartManagement,
-        QuoteIdMaskFactory $quoteIdMaskFactory,
-        QuoteIdMaskResourceModel $quoteIdMaskResourceModel,
-        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
+        CustomerCartResolver $customerCartResolver
     ) {
-        $this->createEmptyCartForCustomer = $createEmptyCartForCustomer;
-        $this->cartManagement = $cartManagement;
-        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
-        $this->quoteIdMaskResourceModel = $quoteIdMaskResourceModel;
-         $this->quoteIdToMaskedQuoteId = $quoteIdToMaskedQuoteId;
+        $this->customerCartResolver = $customerCartResolver;
     }
 
     /**
@@ -76,22 +42,17 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
     {
         $currentUserId = $context->getUserId();
 
-        /** @var ContextInterface $context */
+        /**
+         * @var ContextInterface $context
+         */
         if (false === $context->getExtensionAttributes()->getIsCustomer()) {
             throw new GraphQlAuthorizationException(__('The request is allowed for logged in customer'));
         }
-        try {
-            $cart = $this->cartManagement->getCartForCustomer($currentUserId);
-        } catch (NoSuchEntityException $e) {
-            $this->createEmptyCartForCustomer->execute($currentUserId, null);
-            $cart =  $this->cartManagement->getCartForCustomer($currentUserId);
-        }
 
-        $maskedId = $this->quoteIdToMaskedQuoteId->execute((int) $cart->getId());
-        if (empty($maskedId)) {
-            $quoteIdMask = $this->quoteIdMaskFactory->create();
-            $quoteIdMask->setQuoteId((int) $cart->getId());
-            $this->quoteIdMaskResourceModel->save($quoteIdMask);
+        try {
+            $cart = $this->customerCartResolver->resolve($currentUserId);
+        } catch (\Exception $e) {
+            $cart = null;
         }
 
         return [