GraphQL-363: Always return cart id null after add product

Author: naydav

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

@@ -81,7 +81,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         $this->addProductsToCart->execute($cart, $cartItems);
         $cartData = $this->extractDataFromCart->execute($cart);
-        $cartData["cart_id"] = $cartHash;
 
         return [
             'cart' => $cartData,

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

@@ -54,14 +54,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $currentUserId = $context->getUserId();
         $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId);
 
-        $data = array_merge(
-            [
-                'cart_id' => $maskedCartId,
-                'model' => $cart
-            ],
-            $this->extractDataFromCart->execute($cart)
-        );
-
+        $data = $this->extractDataFromCart->execute($cart);
+        $data['model'] = $cart;
         return $data;
     }
 }

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

@@ -8,7 +8,7 @@
 namespace Magento\GraphQl\Quote;
 
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -19,124 +19,103 @@
  */
 class GetCartTest extends GraphQlAbstract
 {
-    /**
-     * @var CustomerTokenServiceInterface
-     */
-    private $customerTokenService;
-
     /**
      * @var QuoteResource
      */
     private $quoteResource;
 
     /**
-     * @var Quote
+     * @var QuoteFactory
      */
-    private $quote;
+    private $quoteFactory;
 
     /**
      * @var QuoteIdToMaskedQuoteIdInterface
      */
     private $quoteIdToMaskedId;
 
     /**
-     * @inheritdoc
+     * @var CustomerTokenServiceInterface
      */
+    private $customerTokenService;
+
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->create(QuoteResource::class);
-        $this->quote = $objectManager->create(Quote::class);
-        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      */
-    public function testGetOwnCartForRegisteredCustomer()
+    public function testGetCartForGuest()
     {
-        $reservedOrderId = 'test_order_item_with_items';
-        $this->quoteResource->load(
-            $this->quote,
-            $reservedOrderId,
-            'reserved_order_id'
-        );
-
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareGetCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $query = $this->getCartQuery($maskedQuoteId);
 
-        $response = $this->sendRequestWithToken($query);
+        $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('cart', $response);
-        self::assertNotEmpty($response['cart']['items']);
-        self::assertNotEmpty($response['cart']['shipping_addresses']);
+        self::assertEquals($maskedQuoteId, $response['cart']['cart_id']);
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
      */
-    public function testGetCartFromAnotherCustomer()
+    public function testGetCartByRegisteredCustomer()
     {
-        $reservedOrderId = 'test_order_item_with_items';
-        $this->quoteResource->load(
-            $this->quote,
-            $reservedOrderId,
-            'reserved_order_id'
-        );
-
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareGetCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
+        $query = $this->getCartQuery($maskedQuoteId);
 
-        self::expectExceptionMessage("The current user cannot perform operations on cart \"$maskedQuoteId\"");
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
-        $this->graphQlQuery($query);
+        self::assertArrayHasKey('cart', $response);
+        self::assertEquals($maskedQuoteId, $response['cart']['cart_id']);
+        self::assertNotEmpty($response['cart']['items']);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
      */
-    public function testGetCartForGuest()
+    public function testGetCartOfAnotherCustomerByGuest()
     {
-        $reservedOrderId = 'test_order_1';
-        $this->quoteResource->load(
-            $this->quote,
-            $reservedOrderId,
-            'reserved_order_id'
-        );
-
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareGetCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
+        $query = $this->getCartQuery($maskedQuoteId);
 
-        $response = $this->graphQlQuery($query);
-
-        self::assertArrayHasKey('cart', $response);
+        self:$this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
+        );
+        $this->graphQlQuery($query);
     }
 
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
     public function testGetNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = $this->prepareGetCartQuery($maskedQuoteId);
-
-        self::expectExceptionMessage("Could not find a cart with ID \"$maskedQuoteId\"");
+        $query = $this->getCartQuery($maskedQuoteId);
 
         $this->graphQlQuery($query);
     }
 
     /**
-     * Generates query for setting the specified shipping method on cart
-     *
      * @param string $maskedQuoteId
      * @return string
      */
-    private function prepareGetCartQuery(
+    private function getCartQuery(
         string $maskedQuoteId
     ) : string {
         return <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {
+    cart_id
     applied_coupon {
-    	  code
+        code
     }
     items {
       id
@@ -147,23 +126,30 @@ private function prepareGetCartQuery(
     }
   }
 }
-
 QUERY;
     }
 
     /**
-     * Sends a GraphQL request with using a bearer token
-     *
-     * @param string $query
-     * @return array
-     * @throws \Magento\Framework\Exception\AuthenticationException
+     * @param string $reversedQuoteId
+     * @return string
      */
-    private function sendRequestWithToken(string $query): array
+    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
     {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
 
-        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
 
-        return $this->graphQlQuery($query, [], '', $headerMap);
+    /**
+     * @param string $username
+     * @param string $password
+     * @return array
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
     }
 }