New schema for setting shipping methods

Author: rogyar

app/code/Magento/ConfigurableProductGraphQl/etc/module.xml

@@ -12,6 +12,7 @@
             <module name="Magento_ConfigurableProduct"/>
             <module name="Magento_GraphQl"/>
             <module name="Magento_CatalogGraphQl"/>
+            <module name="Magento_QuoteGraphQl"/>
         </sequence>
     </module>
 </config>

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

@@ -40,6 +40,11 @@ public function execute(QuoteAddress $address): array
         $addressData = $this->dataObjectConverter->toFlatArray($address, [], AddressInterface::class);
         $addressData['model'] = $address;
 
+        if ($address->getShippingMethod()) {
+            list($carrierCode, $methodCode) = explode('_', $address->getShippingMethod(), 2);
+            $shippingAmount = $address->getShippingAmount();
+        }
+
         $addressData = array_merge($addressData, [
             'country' => [
                 'code' => $address->getCountryId(),
@@ -51,9 +56,10 @@ public function execute(QuoteAddress $address): array
             ],
             'street' => $address->getStreet(),
             'selected_shipping_method' => [
-                'code' => $address->getShippingMethod(),
+                'carrier_code' => $carrierCode ?? null,
+                'method_code' => $methodCode ?? null,
                 'label' => $address->getShippingDescription(),
-                'free_shipping' => $address->getFreeShipping(),
+                'amount' => $shippingAmount ?? null
             ],
             'items_weight' => $address->getWeight(),
             'customer_notes' => $address->getCustomerNotes()

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

@@ -60,11 +60,15 @@ input CartAddressInput {
 
 input SetShippingMethodsOnCartInput {
     cart_id: String!
-    shipping_methods: [ShippingMethodForAddressInput!]!
+    shipping_addresses: [ShippingMethodForAddressInput!]!
 }
 
 input ShippingMethodForAddressInput {
     cart_address_id: Int!
+    shipping_method: ShippingMethodInput!
+}
+
+input ShippingMethodInput {
     carrier_code: String!
     method_code: String!
 }
@@ -140,7 +144,10 @@ type CartAddressCountry {
 }
 
 type SelectedShippingMethod {
-    amount: Float!
+    carrier_code: String
+    method_code: String
+    label: String
+    amount: Float
 }
 
 type AvailableShippingMethod {
@@ -246,3 +253,8 @@ type CartItemSelectedOptionValuePrice {
     units: String!
     type: PriceTypeEnum!
 }
+
+input CartItemDetailsInput {
+    sku: String!
+    qty: Float!
+}