MC-22215: Add customerCart Query and cart_id changes to schema and related resolvers

- Added customerQuery changes added from review comments

Author: avattam06

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

@@ -9,6 +9,7 @@
 
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
@@ -62,9 +63,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             }
 
         } else {
-            throw new LocalizedException(
-                __('User cannot access the cart unless loggedIn and with a valid customer token')
-            );
+                throw new GraphQlInputException(__('The request is allowed for logged in customer'));
         }
 
         return [

app/code/Magento/QuoteGraphQl/Model/Resolver/CartId.php renamed to app/code/Magento/QuoteGraphQl/Model/Resolver/MaskedCartId.php

@@ -8,7 +8,9 @@
 namespace Magento\QuoteGraphQl\Model\Resolver;
 
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Quote\Model\Quote;
@@ -19,10 +21,11 @@
 /**
  * Get cart id from the cart
  */
-class CartId implements ResolverInterface
+class MaskedCartId implements ResolverInterface
 {
     /**
      * @var QuoteIdMaskFactory
+     *
      */
     private $quoteIdMaskFactory;
 
@@ -71,20 +74,15 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
      *
      * @param int $quoteId
      * @return string
-     * @throws \Magento\Framework\Exception\AlreadyExistsException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     private function getQuoteMaskId(int $quoteId): string
     {
-        $maskedId = $this->quoteIdToMaskedQuoteId->execute($quoteId);
-        if ($maskedId === '') {
-            $quoteIdMask = $this->quoteIdMaskFactory->create();
-            $quoteIdMask->setQuoteId($quoteId);
-
-            $this->quoteIdMaskResourceModel->save($quoteIdMask);
-            $maskedId = $quoteIdMask->getMaskedId();
+        try {
+            $maskedId = $this->quoteIdToMaskedQuoteId->execute($quoteId);
+        } catch (NoSuchEntityException $exception) {
+            throw new GraphQlNoSuchEntityException(__('Cart id is not '));
         }
-
         return $maskedId;
     }
 }

app/code/Magento/QuoteGraphQl/etc/schema.graphqls

@@ -192,7 +192,7 @@ type PlaceOrderOutput {
 }
 
 type Cart {
-    cart_id: ID! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartId") @doc(description: "Cart Id of the cart")
+    cart_id: ID! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\MaskedCartId") @doc(description: "The ID of the cart. The value can be an Int or String.")
     items: [CartItemInterface] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartItems")
     applied_coupon: AppliedCoupon @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\AppliedCoupon") @doc(description:"An array of coupons that have been applied to the cart") @deprecated(reason: "Use applied_coupons instead ")
     applied_coupons: [AppliedCoupon] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\AppliedCoupons") @doc(description:"An array of `AppliedCoupon` objects. Each object contains the `code` text attribute, which specifies the coupon code")

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCustomerCartTest.php

@@ -12,9 +12,6 @@
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\Quote\Api\CartManagementInterface;
-use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Quote\Model\QuoteIdMaskFactory;
 
 /**
  * Test for getting Customer cart information
@@ -90,7 +87,7 @@ public function testGetNewCustomerCart()
      * Query for customer cart with no customer token passed
      *
      * @expectedException Exception
-     * @expectedExceptionMessage User cannot access the cart unless loggedIn and with a valid customer token
+     * @expectedExceptionMessage The request is allowed for logged in customer
      */
     public function testGetCustomerCartWithNoCustomerToken()
     {
@@ -115,7 +112,7 @@ public function testGetCustomerCartAfterTokenRevoked()
         $this->revokeCustomerToken();
         $customerCartQuery = $this->getCustomerCartQuery();
         $this->expectExceptionMessage(
-            "User cannot access the cart unless loggedIn and with a valid customer token"
+            'The request is allowed for logged in customer'
         );
         $this->graphQlQuery($customerCartQuery, [], '', $this->headers);
     }