From 8b51315687fe2891ed731ef821c0719a6d995765 Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Wed, 23 Oct 2019 15:50:26 -0500
Subject: [PATCH] magento/graphql-ce#890: [Checkout] Replace usage of
 CartItemQuantity with CartItemInterface

---
 .../QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php  | 9 ++++++---
 .../Quote/Guest/GetAvailableShippingMethodsTest.php      | 5 ++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
index 27dd1959cb5d7..86e00bfe42c81 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
@@ -68,10 +68,13 @@ public function execute(QuoteAddress $address): array
             } else {
                 $itemId = $addressItem->getQuoteItemId();
             }
-
+            $productData = $addressItem->getProduct()->getData();
+            $productData['model'] = $addressItem->getProduct();
             $addressItemsData[] = [
-                'cart_item_id' => $itemId,
-                'quantity' => $addressItem->getQty()
+                'id' => $itemId,
+                'quantity' => $addressItem->getQty(),
+                'product' => $productData,
+                'model' => $addressItem,
             ];
         }
         $addressData['cart_items'] = $addressItemsData;
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
index 0d64d73965d2b..f076c0aaa4678 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
@@ -137,8 +137,11 @@ private function getQuery(string $maskedQuoteId): string
   cart (cart_id: "{$maskedQuoteId}") {
     shipping_addresses {
       cart_items {
-        cart_item_id
+        id
         quantity
+        product {
+          sku
+        }
       }
       available_shipping_methods {
         amount {