Merge remote-tracking branch 'origin/MC-21814-cart' into pr-2.3.4

Author: danielrenaud

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

@@ -15,6 +15,9 @@
 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;
 
 /**
  * Get cart for the customer
@@ -31,16 +34,39 @@ class CustomerCart implements ResolverInterface
      */
     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
      */
     public function __construct(
         CreateEmptyCartForCustomer $createEmptyCartForCustomer,
-        CartManagementInterface $cartManagement
+        CartManagementInterface $cartManagement,
+        QuoteIdMaskFactory $quoteIdMaskFactory,
+        QuoteIdMaskResourceModel $quoteIdMaskResourceModel,
+        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
     ) {
         $this->createEmptyCartForCustomer = $createEmptyCartForCustomer;
         $this->cartManagement = $cartManagement;
+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
+        $this->quoteIdMaskResourceModel = $quoteIdMaskResourceModel;
+         $this->quoteIdToMaskedQuoteId = $quoteIdToMaskedQuoteId;
     }
 
     /**
@@ -61,6 +87,13 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             $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);
+        }
+
         return [
             'model' => $cart
         ];

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

@@ -54,6 +54,7 @@ public function testGetActiveCustomerCart()
         $this->assertNotEmpty($response['customerCart']['items']);
         $this->assertEquals(2, $response['customerCart']['total_quantity']);
         $this->assertArrayHasKey('id', $response['customerCart']);
+        $this->assertNotEmpty($response['customerCart']['id']);
         $this->assertEquals($maskedQuoteId, $response['customerCart']['id']);
         $this->assertEquals(
             $quantity,
@@ -62,6 +63,26 @@ public function testGetActiveCustomerCart()
         );
     }
 
+    /**
+     * Query for an existing customer cart with no masked quote id
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart_without_maskedQuoteId.php
+     */
+    public function testGetLoggedInCustomerCartWithoutMaskedQuoteId()
+    {
+        $customerCartQuery = $this->getCustomerCartQuery();
+        $response = $this->graphQlQuery($customerCartQuery, [], '', $this->getHeaderMap());
+        $this->assertArrayHasKey('customerCart', $response);
+        $this->assertArrayHasKey('items', $response['customerCart']);
+        $this->assertEmpty($response['customerCart']['items']);
+        $this->assertEquals(0, $response['customerCart']['total_quantity']);
+        $this->assertArrayHasKey('id', $response['customerCart']);
+        $this->assertNotEmpty($response['customerCart']['id']);
+        $this->assertNotNull($response['customerCart']['id']);
+    }
+
     /**
      * Query for customer cart for a user with no existing active cart
      *
@@ -76,6 +97,7 @@ public function testGetNewCustomerCart()
         $this->assertArrayHasKey('customerCart', $response);
         $this->assertArrayHasKey('id', $response['customerCart']);
         $this->assertNotNull($response['customerCart']['id']);
+        $this->assertNotEmpty($response['customerCart']['id']);
         $this->assertEmpty($response['customerCart']['items']);
         $this->assertEquals(0, $response['customerCart']['total_quantity']);
     }
@@ -106,6 +128,7 @@ public function testGetCustomerCartAfterTokenRevoked()
         $this->assertArrayHasKey('customerCart', $response);
         $this->assertArrayHasKey('id', $response['customerCart']);
         $this->assertNotNull($response['customerCart']['id']);
+        $this->assertNotEmpty($response['customerCart']['id']);
         $this->revokeCustomerToken();
         $customerCartQuery = $this->getCustomerCartQuery();
         $this->expectExceptionMessage(

dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_without_maskedQuoteId.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CartManagementInterface $cartManagement */
+$cartManagement = Bootstrap::getObjectManager()->get(CartManagementInterface::class);
+/** @var CartRepositoryInterface $cartRepository */
+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
+/** @var QuoteIdMaskFactory $quoteIdMaskFactory */
+$quoteIdMaskFactory = Bootstrap::getObjectManager()->get(QuoteIdMaskFactory::class);
+
+$cartId = $cartManagement->createEmptyCartForCustomer(1);
+$cart = $cartRepository->get($cartId);
+$cartRepository->save($cart);