Merge pull request #3810 from magento-engcom/graphql-develop-prs

[EngCom] Public Pull Requests - GraphQL

Author: naydav

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

@@ -41,6 +41,7 @@ public function execute(QuoteAddress $address): array
         $addressData['model'] = $address;
 
         $addressData = array_merge($addressData, [
+            'address_id' => $address->getId(),
             'country' => [
                 'code' => $address->getCountryId(),
                 'label' => $address->getCountry()

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

@@ -93,6 +93,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
             );
         }
         if (null === $customerAddressId) {
+            $addressInput['country_id'] = $addressInput['country_code'] ?? '';
             $billingAddress = $this->addressModel->addData($addressInput);
         } else {
             $this->checkCustomerAccount->execute($context->getUserId(), $context->getUserType());

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

@@ -87,6 +87,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
             );
         }
         if (null === $customerAddressId) {
+            $addressInput['country_id'] = $addressInput['country_code'] ?? '';
             $shippingAddress = $this->addressModel->addData($addressInput);
         } else {
             $this->checkCustomerAccount->execute($context->getUserId(), $context->getUserType());

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

@@ -72,10 +72,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         if (!$shippingMethod['cart_address_id']) {
             throw new GraphQlInputException(__('Required parameter "cart_address_id" is missing'));
         }
-        if (!$shippingMethod['shipping_carrier_code']) {
+        if (!$shippingMethod['carrier_code']) {
             throw new GraphQlInputException(__('Required parameter "shipping_carrier_code" is missing'));
         }
-        if (!$shippingMethod['shipping_method_code']) {
+        if (!$shippingMethod['method_code']) {
             throw new GraphQlInputException(__('Required parameter "shipping_method_code" is missing'));
         }
 
@@ -85,8 +85,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $this->setShippingMethodOnCart->execute(
             $cart,
             $shippingMethod['cart_address_id'],
-            $shippingMethod['shipping_carrier_code'],
-            $shippingMethod['shipping_method_code']
+            $shippingMethod['carrier_code'],
+            $shippingMethod['method_code']
         );
 
         return [

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

@@ -128,6 +128,7 @@ type Cart {
 }
 
 type CartAddress {
+    address_id: Int
     firstname: String
     lastname: String
     company: String

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

@@ -88,6 +88,10 @@ public function testSetNewBillingAddressByGuest()
         city
         postcode
         telephone
+        country {
+          code
+          label
+        }
       }
     }
   }
@@ -140,6 +144,10 @@ public function testSetNewBillingAddressWithUseForShippingParameterByGuest()
         city
         postcode
         telephone
+        country {
+          code
+          label
+        }
       }
       shipping_addresses {
         firstname
@@ -149,6 +157,10 @@ public function testSetNewBillingAddressWithUseForShippingParameterByGuest()
         city
         postcode
         telephone
+        country {
+          code
+          label
+        }
       }
     }
   }
@@ -234,6 +246,10 @@ public function testSetNewBillingAddressByRegisteredCustomer()
         city
         postcode
         telephone
+        country {
+          code
+          label
+        }
       }
     }
   }
@@ -413,7 +429,8 @@ private function assertNewAddressFields(array $billingAddressResponse): void
             ['response_field' => 'street', 'expected_value' => [0 => 'test street 1', 1 => 'test street 2']],
             ['response_field' => 'city', 'expected_value' => 'test city'],
             ['response_field' => 'postcode', 'expected_value' => '887766'],
-            ['response_field' => 'telephone', 'expected_value' => '88776655']
+            ['response_field' => 'telephone', 'expected_value' => '88776655'],
+            ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
         ];
 
         $this->assertResponseFields($billingAddressResponse, $assertionMap);

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

@@ -90,6 +90,10 @@ public function testSetNewShippingAddressByGuest()
         city
         postcode
         telephone
+        country {
+          code
+          label
+        }
       }
     }
   }
@@ -176,6 +180,10 @@ public function testSetNewShippingAddressByRegisteredCustomer()
         city
         postcode
         telephone
+        country {
+          label
+          code
+        }
       }
     }
   }
@@ -462,7 +470,8 @@ private function assertNewShippingAddressFields(array $shippingAddressResponse):
             ['response_field' => 'street', 'expected_value' => [0 => 'test street 1', 1 => 'test street 2']],
             ['response_field' => 'city', 'expected_value' => 'test city'],
             ['response_field' => 'postcode', 'expected_value' => '887766'],
-            ['response_field' => 'telephone', 'expected_value' => '88776655']
+            ['response_field' => 'telephone', 'expected_value' => '88776655'],
+            ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
         ];
 
         $this->assertResponseFields($shippingAddressResponse, $assertionMap);