MAGETWO-97411: \Magento\Customer\Model\Customer::getDataModel method takes to much time to load with many addresses customer

Author: le0n4eg

app/code/Magento/Customer/Model/Address.php

@@ -172,12 +172,9 @@ public function updateData(AddressInterface $address)
     public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
     {
         if ($this->getCustomerId() || $this->getParentId()) {
-            if ($this->getCustomer()->getDefaultBillingAddress()) {
-                $defaultBillingAddressId = $this->getCustomer()->getDefaultBillingAddress()->getId();
-            }
-            if ($this->getCustomer()->getDefaultShippingAddress()) {
-                $defaultShippingAddressId = $this->getCustomer()->getDefaultShippingAddress()->getId();
-            }
+            $primaryAddresses = $this->getCustomer()->getPrimaryAddressIds();
+            $defaultBillingAddressId = $primaryAddresses['billing_address'] ?: $defaultBillingAddressId;
+            $defaultShippingAddressId = $primaryAddresses['shipping_address'] ?: $defaultShippingAddressId;
         }
         return parent::getDataModel($defaultBillingAddressId, $defaultShippingAddressId);
     }

app/code/Magento/Customer/Model/Customer.php

@@ -219,6 +219,11 @@ class Customer extends \Magento\Framework\Model\AbstractModel
      */
     private $accountConfirmation;
 
+    /**
+     * @var array
+     */
+    private $storedAddress;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -311,18 +316,21 @@ public function _construct()
     public function getDataModel()
     {
         $customerData = $this->getData();
-        $addressesData = [];
-        /** @var \Magento\Customer\Model\Address $address */
-        foreach ($this->getAddresses() as $address) {
-            $addressesData[] = $address->getDataModel();
+        if (!isset($this->storedAddress[$customerData['entity_id']])) {
+            $addressesData = [];
+            /** @var \Magento\Customer\Model\Address $address */
+            foreach ($this->getAddresses() as $address) {
+                $addressesData[] = $address->getDataModel();
+            }
+            $this->storedAddress[$customerData['entity_id']] = $addressesData;
         }
         $customerDataObject = $this->customerDataFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $customerDataObject,
             $customerData,
             \Magento\Customer\Api\Data\CustomerInterface::class
         );
-        $customerDataObject->setAddresses($addressesData)
+        $customerDataObject->setAddresses($this->storedAddress[$customerData['entity_id']])
             ->setId($this->getId());
         return $customerDataObject;
     }
@@ -676,10 +684,10 @@ public function getPrimaryAddressIds()
     {
         $ids = [];
         if ($this->getDefaultBilling()) {
-            $ids[] = $this->getDefaultBilling();
+            $ids['billing_address'] = $this->getDefaultBilling();
         }
         if ($this->getDefaultShipping()) {
-            $ids[] = $this->getDefaultShipping();
+            $ids['shipping_address'] = $this->getDefaultShipping();
         }
         return $ids;
     }