GraphQL-641: Schema Inconsistency of "cartItems" declaration

naydav · naydav · commit fd1248a27f2d · 2019-05-01T15:47:48.000-05:00
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -41,7 +41,7 @@ type ConfigurableProductOptionsValues @doc(description: "ConfigurableProductOpti
 
 input AddConfigurableProductsToCartInput {
     cart_id: String!
-    cartItems: [ConfigurableProductCartItemInput!]!
+    cart_items: [ConfigurableProductCartItemInput!]!
 }
 
 type AddConfigurableProductsToCartOutput {
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/SelectedShippingMethod.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/SelectedShippingMethod.php
@@ -46,19 +46,29 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         /** @var Address $address */
         $address = $value['model'];
         $rates = $address->getAllShippingRates();
+        $carrierTitle = null;
+        $methodTitle = null;
 
         if (count($rates) > 0) {
             list($carrierCode, $methodCode) = explode('_', $address->getShippingMethod(), 2);
+
             /** @var Rate $rate */
-            $rate = current($rates);
+            foreach ($rates as $rate) {
+                if ($rate->getCode() == $address->getShippingMethod()) {
+                    $carrierTitle = $rate->getCarrierTitle();
+                    $methodTitle = $rate->getMethodTitle();
+                    break;
+                }
+            }
+
             /** @var Currency $currency */
             $currency = $this->storeManager->getStore()->getBaseCurrency();
 
             $data = [
                 'carrier_code' => $carrierCode,
                 'method_code' => $methodCode,
-                'carrier_title' => $rate->getCarrierTitle(),
-                'method_title' => $rate->getMethodTitle(),
+                'carrier_title' => $carrierTitle,
+                'method_title' => $methodTitle,
                 'amount' => [
                     'value' => $address->getShippingAmount(),
                     'currency' => $address->getQuote()->getQuoteCurrencyCode(),
@@ -72,8 +82,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             $data = [
                 'carrier_code' => null,
                 'method_code' => null,
-                'carrier_title' => null,
-                'method_title' => null,
+                'carrier_title' => $carrierTitle,
+                'method_title' => $methodTitle,
                 'amount' => null,
                 'base_amount' => null,
             ];
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -27,7 +27,7 @@ input createEmptyCartInput {
 
 input AddSimpleProductsToCartInput {
     cart_id: String!
-    cartItems: [SimpleProductCartItemInput!]!
+    cart_items: [SimpleProductCartItemInput!]!
 }
 
 input SimpleProductCartItemInput {
@@ -37,7 +37,7 @@ input SimpleProductCartItemInput {
 
 input AddVirtualProductsToCartInput {
     cart_id: String!
-    cartItems: [VirtualProductCartItemInput!]!
+    cart_items: [VirtualProductCartItemInput!]!
 }
 
 input VirtualProductCartItemInput {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
@@ -112,7 +112,7 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity) :
   addSimpleProductsToCart(
     input: {
       cart_id: "{$maskedQuoteId}", 
-      cartItems: [
+      cart_items: [
         {
           data: {
             quantity: $quantity
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
@@ -93,7 +93,7 @@ private function getQuery(string $maskedQuoteId, string $variantSku, int $quanti
   addConfigurableProductsToCart(
     input: {
       cart_id: "{$maskedQuoteId}"
-      cartItems: [
+      cart_items: [
         {
           variant_sku: "{$variantSku}"
           data: {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Quote/Guest/CartCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Quote/Guest/CartCacheTest.php
@@ -79,7 +79,7 @@ private function addSimpleProductToCart(string $maskedCartId, int $qty, string $
         addSimpleProductsToCart(
           input: {
             cart_id: "{$maskedCartId}"
-            cartItems: [
+            cart_items: [
               {
                 data: {
                   qty: $qty
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php
@@ -106,7 +106,7 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity, s
   addSimpleProductsToCart(
     input: {
       cart_id: "{$maskedQuoteId}", 
-      cartItems: [
+      cart_items: [
         {
           data: {
             quantity: $quantity
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php
@@ -106,7 +106,7 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity, s
   addVirtualProductsToCart(
     input: {
       cart_id: "{$maskedQuoteId}", 
-      cartItems: [
+      cart_items: [
         {
           data: {
             quantity: $quantity
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php
@@ -139,7 +139,7 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity):
 mutation {
   addSimpleProductsToCart(input: {
     cart_id: "{$maskedQuoteId}", 
-    cartItems: [
+    cart_items: [
       {
         data: {
           quantity: {$quantity}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php
@@ -139,7 +139,7 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity):
 mutation {
   addVirtualProductsToCart(input: {
     cart_id: "{$maskedQuoteId}", 
-    cartItems: [
+    cart_items: [
       {
         data: {
           quantity: {$quantity}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php
@@ -212,7 +212,7 @@ private function addProductToCart(string $cartId, float $qty, string $sku): void
   addSimpleProductsToCart(
     input: {
       cart_id: "{$cartId}"
-      cartItems: [
+      cart_items: [
         {
           data: {
             quantity: {$qty}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
@@ -112,7 +112,7 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity):
   addSimpleProductsToCart(
     input: {
       cart_id: "{$maskedQuoteId}"
-      cartItems: [
+      cart_items: [
         {
           data: {
             quantity: $quantity
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddVirtualProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddVirtualProductToCartTest.php
@@ -113,7 +113,7 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity):
   addVirtualProductsToCart(
     input: {
       cart_id: "{$maskedQuoteId}"
-      cartItems: [
+      cart_items: [
         {
           data: {
             quantity: {$quantity}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CheckoutEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CheckoutEndToEndTest.php
@@ -172,7 +172,7 @@ private function addProductToCart(string $cartId, float $quantity, string $sku):
   addSimpleProductsToCart(
     input: {
       cart_id: "{$cartId}"
-      cartItems: [
+      cart_items: [
         {
           data: {
             quantity: {$quantity}

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ type ConfigurableProductOptionsValues @doc(description: "ConfigurableProductOpti`
`41`	`41`
`42`	`42`	`input AddConfigurableProductsToCartInput {`
`43`	`43`	`cart_id: String!`
`44`		`- cartItems: [ConfigurableProductCartItemInput!]!`
	`44`	`+ cart_items: [ConfigurableProductCartItemInput!]!`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`type AddConfigurableProductsToCartOutput {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ input createEmptyCartInput {`
`27`	`27`
`28`	`28`	`input AddSimpleProductsToCartInput {`
`29`	`29`	`cart_id: String!`
`30`		`- cartItems: [SimpleProductCartItemInput!]!`
	`30`	`+ cart_items: [SimpleProductCartItemInput!]!`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`input SimpleProductCartItemInput {`
`@@ -37,7 +37,7 @@ input SimpleProductCartItemInput {`
`37`	`37`
`38`	`38`	`input AddVirtualProductsToCartInput {`
`39`	`39`	`cart_id: String!`
`40`		`- cartItems: [VirtualProductCartItemInput!]!`
	`40`	`+ cart_items: [VirtualProductCartItemInput!]!`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`input VirtualProductCartItemInput {`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity) :`
`112`	`112`	`addSimpleProductsToCart(`
`113`	`113`	`input: {`
`114`	`114`	`cart_id: "{$maskedQuoteId}",`
`115`		`- cartItems: [`
	`115`	`+ cart_items: [`
`116`	`116`	`{`
`117`	`117`	`data: {`
`118`	`118`	`quantity: $quantity`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ private function getQuery(string $maskedQuoteId, string $variantSku, int $quanti`
`93`	`93`	`addConfigurableProductsToCart(`
`94`	`94`	`input: {`
`95`	`95`	`cart_id: "{$maskedQuoteId}"`
`96`		`- cartItems: [`
	`96`	`+ cart_items: [`
`97`	`97`	`{`
`98`	`98`	`variant_sku: "{$variantSku}"`
`99`	`99`	`data: {`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ private function addSimpleProductToCart(string $maskedCartId, int $qty, string $`
`79`	`79`	`addSimpleProductsToCart(`
`80`	`80`	`input: {`
`81`	`81`	`cart_id: "{$maskedCartId}"`
`82`		`- cartItems: [`
	`82`	`+ cart_items: [`
`83`	`83`	`{`
`84`	`84`	`data: {`
`85`	`85`	`qty: $qty`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity, s`
`106`	`106`	`addSimpleProductsToCart(`
`107`	`107`	`input: {`
`108`	`108`	`cart_id: "{$maskedQuoteId}",`
`109`		`- cartItems: [`
	`109`	`+ cart_items: [`
`110`	`110`	`{`
`111`	`111`	`data: {`
`112`	`112`	`quantity: $quantity`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity):`
`139`	`139`	`mutation {`
`140`	`140`	`addSimpleProductsToCart(input: {`
`141`	`141`	`cart_id: "{$maskedQuoteId}",`
`142`		`- cartItems: [`
	`142`	`+ cart_items: [`
`143`	`143`	`{`
`144`	`144`	`data: {`
`145`	`145`	`quantity: {$quantity}`