Updated logic to match a new schema

Author: rogyar

app/code/Magento/QuoteGraphQl/Model/Cart/Address/AddressDataProvider.php

@@ -36,27 +36,45 @@ public function __construct(
     }
 
     /**
-     * Collect and return information about shipping and billing addresses
+     * Collect and return information about shipping addresses
      *
      * @param CartInterface $cart
      * @return array
      */
-    public function getCartAddresses(CartInterface $cart): array
+    public function getShippingAddresses(CartInterface $cart): array
     {
         $addressData = [];
         $shippingAddress = $cart->getShippingAddress();
-        $billingAddress = $cart->getBillingAddress();
 
         if ($shippingAddress) {
             $shippingData = $this->dataObjectConverter->toFlatArray($shippingAddress, [], AddressInterface::class);
-            $shippingData['address_type'] = 'SHIPPING';
-            $addressData[] = array_merge($shippingData, $this->extractAddressData($shippingAddress));
+            $shippingMethodData = explode('_', $shippingAddress->getShippingMethod());
+            $shippingData['selected_shipping_method'] = [
+                'carrier_code' => $shippingMethodData[0],
+                'method_code' => $shippingMethodData[1],
+                'label' => $shippingAddress->getShippingDescription(),
+                'free_shipping' => $shippingAddress->getFreeShipping()
+            ];
+            $addressData['shipping_addresses'] = array_merge($shippingData, $this->extractAddressData($shippingAddress));
         }
 
+        return $addressData;
+    }
+
+    /**
+     * Collect and return information about billing address
+     *
+     * @param CartInterface $cart
+     * @return array
+     */
+    public function getBillingAddress(CartInterface $cart): array
+    {
+        $addressData = [];
+        $billingAddress = $cart->getBillingAddress();
+
         if ($billingAddress) {
             $billingData = $this->dataObjectConverter->toFlatArray($billingAddress, [], AddressInterface::class);
-            $billingData['address_type'] = 'BILLING';
-            $addressData[] = array_merge($billingData, $this->extractAddressData($billingAddress));
+            $addressData['billing_address'] = array_merge($billingData, $this->extractAddressData($billingAddress));
         }
 
         return $addressData;
@@ -81,11 +99,6 @@ private function extractAddressData(QuoteAddress $address): array
                 'label' => $address->getRegion()
             ],
             'street' => $address->getStreet(),
-            'selected_shipping_method' => [
-                'code' => $address->getShippingMethod(),
-                'label' => $address->getShippingDescription(),
-                'free_shipping' => $address->getFreeShipping(),
-            ],
             'items_weight' => $address->getWeight(),
             'customer_notes' => $address->getCustomerNotes()
         ];

app/code/Magento/QuoteGraphQl/Model/Resolver/CartAddresses.php renamed to app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php

@@ -16,7 +16,7 @@
 /**
  * @inheritdoc
  */
-class CartAddresses implements ResolverInterface
+class BillingAddress implements ResolverInterface
 {
     /**
      * @var AddressDataProvider
@@ -43,6 +43,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         $cart = $value['model'];
 
-        return $this->addressDataProvider->getCartAddresses($cart);
+        return $this->addressDataProvider->getBillingAddress($cart);
     }
 }

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

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\QuoteGraphQl\Model\Cart\Address\AddressDataProvider;
+
+/**
+ * @inheritdoc
+ */
+class ShippingAddresses implements ResolverInterface
+{
+    /**
+     * @var AddressDataProvider
+     */
+    private $addressDataProvider;
+
+    /**
+     * @param AddressDataProvider $addressDataProvider
+     */
+    public function __construct(
+        AddressDataProvider $addressDataProvider
+    ) {
+        $this->addressDataProvider = $addressDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        $cart = $value['model'];
+
+        return $this->addressDataProvider->getShippingAddresses($cart);
+    }
+}

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

@@ -101,7 +101,8 @@ type Cart {
     cart_id: String
     items: [CartItemInterface]
     applied_coupon: AppliedCoupon
-    addresses: [CartAddress]! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartAddresses")
+    shipping_addresses: [CartAddress] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddresses")
+    billing_address: CartAddress @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\BillingAddress")
 }
 
 type CartAddress {
@@ -115,7 +116,6 @@ type CartAddress {
     postcode: String
     country: CartAddressCountry
     telephone: String
-    address_type: AdressTypeEnum
     selected_shipping_method: CheckoutShippingMethod
     available_shipping_methods: [CheckoutShippingMethod]
     items_weight: Float
@@ -139,10 +139,10 @@ type CartAddressCountry {
 }
 
 type CheckoutShippingMethod {
-    code: String
+    carrier_code: String
+    method_code: String
     label: String
     free_shipping: Boolean!
-    error_message: String
     # TODO: Add more complex structure for shipping rates
 }
 

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

@@ -79,12 +79,11 @@ public function testSetShippingMethodOnCart()
         self::assertArrayHasKey('setShippingMethodsOnCart', $response);
         self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
         self::assertEquals($maskedQuoteId, $response['setShippingMethodsOnCart']['cart']['cart_id']);
-        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['addresses'];
-        self::assertCount(2, $addressesInformation);
+        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
+        self::assertCount(1, $addressesInformation);
+        self::assertEquals($addressesInformation[0]['selected_shipping_method']['carrier_code'], $shippingCarrierCode);
         self::assertEquals(
-            $addressesInformation[0]['selected_shipping_method']['code'],
-            $shippingCarrierCode . '_' . $shippingMethodCode
-        );
+            $addressesInformation[0]['selected_shipping_method']['method_code'], $shippingMethodCode);
     }
 
     /**
@@ -211,19 +210,21 @@ private function prepareMutationQuery(
   setShippingMethodsOnCart(input: 
     {
       cart_id: "$maskedQuoteId", 
-      shipping_methods: [
-        {
-          shipping_method_code: "$shippingMethodCode"
-          shipping_carrier_code: "$shippingCarrierCode"
-          cart_address_id: $shippingAddressId
+      shipping_addresses: [{
+        cart_address_id: $shippingAddressId
+        shipping_method: {
+          method_code: "$shippingMethodCode"
+          carrier_code: "$shippingCarrierCode"
         }
-      ]}) {
+      }]
+      }) {
     
     cart {
       cart_id,
-      addresses {
+      shipping_addresses {
         selected_shipping_method {
-          code
+          carrier_code
+          method_code
           label
         }
       }