From 42b235827941fb1713a360edcdbeebb0a95a35d4 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Tue, 30 Oct 2018 11:45:50 +0100
Subject: [PATCH] Consolidated cart address information provider

---
 .../Resolver/Address/AddressDataProvider.php  | 42 +++++++++++++++----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Address/AddressDataProvider.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Address/AddressDataProvider.php
index d401f296cb46..80fe973c4e44 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Address/AddressDataProvider.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Address/AddressDataProvider.php
@@ -10,6 +10,7 @@
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
 
 /**
  * Class AddressDataProvider
@@ -49,22 +50,45 @@ public function getCartAddresses(CartInterface $cart): array
         if ($shippingAddress) {
             $shippingData = $this->dataObjectConverter->toFlatArray($shippingAddress, [], AddressInterface::class);
             $shippingData['address_type'] = 'SHIPPING';
-            $shippingData['selected_shipping_method'] = [
-                'code' => $shippingAddress->getShippingMethod(),
-                'label' => $shippingAddress->getShippingDescription(),
-                'free_shipping' => $shippingAddress->getFreeShipping(),
-            ];
-            $shippingData['items_weight'] = $shippingAddress->getWeight();
-            $shippingData['customer_notes'] = $shippingAddress->getCustomerNotes();
-            $addressData[] = $shippingData;
+            $addressData[] = array_merge($shippingData, $this->extractAddressData($shippingAddress));
         }
 
         if ($billingAddress) {
             $billingData = $this->dataObjectConverter->toFlatArray($billingAddress, [], AddressInterface::class);
             $billingData['address_type'] = 'BILLING';
-            $addressData[] = $billingData;
+            $addressData[] = array_merge($billingData, $this->extractAddressData($billingAddress));
         }
 
         return $addressData;
     }
+
+    /**
+     * Extract the necessary address fields from address model
+     *
+     * @param QuoteAddress $address
+     * @return array
+     */
+    private function extractAddressData(QuoteAddress $address): array
+    {
+        $addressData = [
+            'country' => [
+                'code' => $address->getCountryId(),
+                'label' => $address->getCountry()
+            ],
+            'region' => [
+                'code' => $address->getRegionCode(),
+                '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()
+        ];
+
+        return $addressData;
+    }
 }