GraphQL-57: Curate address data on customerDataProvider

Author: pfantini

app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php

@@ -64,16 +64,18 @@ public function __construct(
      *
      * @param array $address
      * @param AddressInterface $addressObject
-     * @return null
+     * @return array
      */
     private function curateAddressDefaultValues(array $address, AddressInterface $addressObject) : array
     {
         $customerModel = $this->customerFactory->create();
         $this->customerResourceModel->load($customerModel, $addressObject->getCustomerId());
         $address[CustomerInterface::DEFAULT_BILLING] =
-            ($addressObject->getId() == $customerModel->getDefaultBillingAddress()->getId()) ? true : false;
+            ($customerModel->getDefaultBillingAddress()
+                && $addressObject->getId() == $customerModel->getDefaultBillingAddress()->getId()) ? true : false;
         $address[CustomerInterface::DEFAULT_SHIPPING] =
-            ($addressObject->getId() == $customerModel->getDefaultShippingAddress()->getId()) ? true : false;
+            ($customerModel->getDefaultShippingAddress()
+                && $addressObject->getId() == $customerModel->getDefaultShippingAddress()->getId()) ? true : false;
         return $address;
     }
 

app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/CustomerDataProvider.php

@@ -67,6 +67,25 @@ public function getCustomerById(int $customerId) : array
         return $this->processCustomer($customerObject);
     }
 
+    /**
+     * Curate default shipping and default billing keys
+     *
+     * @param array $arrayAddress
+     * @return array
+     */
+    private function curateAddressData(array $arrayAddress) : array
+    {
+        foreach ($arrayAddress as $key => $address) {
+            if (!isset($address['default_shipping'])) {
+                $arrayAddress[$key]['default_shipping'] = false;
+            }
+            if (!isset($address['default_billing'])) {
+                $arrayAddress[$key]['default_billing'] = false;
+            }
+        }
+        return $arrayAddress;
+    }
+
     /**
      * Transform single customer data from object to in array format
      *
@@ -80,6 +99,7 @@ private function processCustomer(CustomerInterface $customerObject) : array
             CustomerRepositoryInterface::class,
             'get'
         );
+        $customer['addresses'] = $this->curateAddressData($customer['addresses']);
         if (isset($customer['extension_attributes'])) {
             $customer = array_merge($customer, $customer['extension_attributes']);
         }