ACP2E-2166: Magento is slow for customers with large address books

- improvements

Author: aplapana

app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php

@@ -8,6 +8,7 @@
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Helper\Address as AddressHelper;
+use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\Session;
 use Magento\Directory\Helper\Data as DirectoryHelper;
 use Magento\Directory\Model\AllowedCountries;
@@ -78,7 +79,7 @@ class AttributeMerger
     private $customerRepository;
 
     /**
-     * @var CustomerInterface
+     * @var Customer
      */
     private $customer;
 
@@ -380,13 +381,13 @@ protected function getDefaultValue($attributeCode): ?string
      *
      * @throws NoSuchEntityException
      * @throws LocalizedException
-     * @return CustomerInterface|null
+     * @return Customer|null
      */
-    protected function getCustomer(): ?CustomerInterface
+    protected function getCustomer(): ?Customer
     {
         if (!$this->customer) {
             if ($this->customerSession->isLoggedIn()) {
-                $this->customer = $this->customerRepository->getById($this->customerSession->getCustomerId());
+                $this->customerSession->getCustomer();
             } else {
                 return null;
             }

app/code/Magento/Checkout/Controller/Action.php

@@ -60,7 +60,7 @@ public function __construct(
     protected function _preDispatchValidateCustomer($redirect = true, $addErrors = true)
     {
         try {
-            $customer = $this->customerRepository->getById($this->_customerSession->getCustomerId());
+            $customer = $this->_customerSession->getCustomerData();
         } catch (NoSuchEntityException $e) {
             return true;
         }

app/code/Magento/Checkout/Model/DefaultConfigProvider.php

@@ -775,6 +775,6 @@ private function getQuoteAddressData(): array
      */
     private function getCustomer(): CustomerInterface
     {
-        return $this->customerRepository->getById($this->customerSession->getCustomerId());
+        return $this->customerSession->getCustomerData();
     }
 }

app/code/Magento/Checkout/Model/Session.php

@@ -312,7 +312,7 @@ public function getQuote()
             if ($this->_customer) {
                 $quote->setCustomer($this->_customer);
             } elseif ($this->_customerSession->isLoggedIn()) {
-                $quote->setCustomer($this->customerRepository->getById($this->_customerSession->getCustomerId()));
+                $quote->setCustomer($this->_customerSession->getCustomerData());
             }
 
             $quote->setStore($this->_storeManager->getStore());

app/code/Magento/Checkout/Model/Type/Onepage.php

@@ -344,7 +344,7 @@ public function initCheckout()
          * want to load the correct customer information by assigning to address
          * instead of just loading from sales/quote_address
          */
-        $customer = $customerSession->getCustomerDataObject();
+        $customer = $customerSession->getCustomerData();
         if ($customer) {
             $quote->assignCustomer($customer);
         }

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

@@ -342,21 +342,21 @@ public function _construct()
     public function getDataModel()
     {
         $customerData = $this->getData();
-        $addressesData = [];
-        /** @var \Magento\Customer\Model\Address $address */
-        foreach ($this->getAddresses() as $address) {
-            if (!isset($this->storedAddress[$address->getId()])) {
-                $this->storedAddress[$address->getId()] = $address->getDataModel();
+        if (!$this->storedAddress) {
+            /** @var \Magento\Customer\Model\Address $address */
+            foreach ($this->getAddresses() as $address) {
+                if (!isset($this->storedAddress[$address->getId()])) {
+                    $this->storedAddress[$address->getId()] = $address->getDataModel();
+                }
             }
-            $addressesData[] = $this->storedAddress[$address->getId()];
         }
         $customerDataObject = $this->customerDataFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $customerDataObject,
             $customerData,
             \Magento\Customer\Api\Data\CustomerInterface::class
         );
-        $customerDataObject->setAddresses($addressesData)
+        $customerDataObject->setAddresses(array_values($this->storedAddress))
             ->setId($this->getId());
         return $customerDataObject;
     }

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

@@ -13,6 +13,7 @@
 use Magento\Customer\Model\Config\Share;
 use Magento\Customer\Model\ResourceModel\Customer as ResourceCustomer;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Session\Generic;
 
 /**
@@ -107,6 +108,11 @@ class Session extends \Magento\Framework\Session\SessionManager
      */
     private $accountConfirmation;
 
+    /**
+     * @var CustomerRegistry
+     */
+    private $customerRegistry;
+
     /**
      * Session constructor.
      *
@@ -132,6 +138,7 @@ class Session extends \Magento\Framework\Session\SessionManager
      * @param GroupManagementInterface $groupManagement
      * @param \Magento\Framework\App\Response\Http $response
      * @param AccountConfirmation $accountConfirmation
+     * @param CustomerRegistry $customerRegistry
      * @throws \Magento\Framework\Exception\SessionException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -157,7 +164,8 @@ public function __construct(
         CustomerRepositoryInterface $customerRepository,
         GroupManagementInterface $groupManagement,
         \Magento\Framework\App\Response\Http $response,
-        AccountConfirmation $accountConfirmation = null
+        AccountConfirmation $accountConfirmation = null,
+        CustomerRegistry $customerRegistry = null
     ) {
         $this->_coreUrl = $coreUrl;
         $this->_customerUrl = $customerUrl;
@@ -173,6 +181,8 @@ public function __construct(
         $this->response = $response;
         $this->accountConfirmation = $accountConfirmation ?: ObjectManager::getInstance()
             ->get(AccountConfirmation::class);
+        $this->customerRegistry = $customerRegistry ?: ObjectManager::getInstance()
+            ->get(CustomerRegistry::class);
         parent::__construct(
             $request,
             $sidResolver,
@@ -299,14 +309,15 @@ public function setCustomer(Customer $customerModel)
      *
      * @return Customer
      * use getCustomerId() instead
+     * @throws NoSuchEntityException
      */
     public function getCustomer()
     {
         if ($this->_customerModel === null) {
             $this->_customerModel = $this->_customerFactory->create();
 
             if ($this->getCustomerId()) {
-                $this->_customerResource->load($this->_customerModel, $this->getCustomerId());
+                $this->_customerModel = $this->customerRegistry->retrieve($this->getCustomerId());
             }
         }
 
@@ -385,8 +396,8 @@ public function getCustomerGroupId()
         if ($this->storage->getData('customer_group_id')) {
             return $this->storage->getData('customer_group_id');
         }
-        if ($this->getCustomerData()) {
-            $customerGroupId = $this->getCustomerData()->getGroupId();
+        if ($this->getCustomer()) {
+            $customerGroupId = $this->getCustomer()->getGroupId();
             $this->setCustomerGroupId($customerGroupId);
             return $customerGroupId;
         }
@@ -431,7 +442,7 @@ public function checkCustomerId($customerId)
         }
 
         try {
-            $this->customerRepository->getById($customerId);
+            $this->customerRegistry->retrieve($customerId);
             $this->_isCustomerIdChecked = $customerId;
             return true;
         } catch (\Exception $e) {