AC-13512 - admin customer module improvements

Author: Deepak Tiwari

app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php

@@ -190,8 +190,6 @@ protected function _extractCustomerData()
         $customerData = [];
         if ($this->getRequest()->getPost('customer')) {
             $additionalAttributes = [
-                CustomerInterface::DEFAULT_BILLING,
-                CustomerInterface::DEFAULT_SHIPPING,
                 'confirmation',
                 'sendemail_store_id',
                 'extension_attributes',

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

@@ -206,17 +206,17 @@ public function save(CustomerInterface $customer, $passwordHash = null)
         /** @var NewOperation|null $delegatedNewOperation */
         $delegatedNewOperation = !$customer->getId() ? $this->delegatedStorage->consumeNewOperation() : null;
         $prevCustomerData = $prevCustomerDataArr = null;
-        if ($customer->getDefaultBilling()) {
-            $this->validateDefaultAddress($customer, CustomerInterface::DEFAULT_BILLING);
-        }
-        if ($customer->getDefaultShipping()) {
-            $this->validateDefaultAddress($customer, CustomerInterface::DEFAULT_SHIPPING);
-        }
         if ($customer->getId()) {
             $prevCustomerData = $this->getById($customer->getId());
             $prevCustomerDataArr = $this->prepareCustomerData($prevCustomerData->__toArray());
             $customer->setCreatedAt($prevCustomerData->getCreatedAt());
         }
+        if ($customer->getDefaultBilling()) {
+            $this->validateDefaultAddress($customer, $prevCustomerData, CustomerInterface::DEFAULT_BILLING);
+        }
+        if ($customer->getDefaultShipping()) {
+            $this->validateDefaultAddress($customer, $prevCustomerData, CustomerInterface::DEFAULT_SHIPPING);
+        }
         /** @var $customer \Magento\Customer\Model\Data\Customer */
         $customerArr = $customer->__toArray();
         $customer = $this->imageProcessor->save(
@@ -569,28 +569,24 @@ private function prepareCustomerData(array $customerData): array
      * To validate default address
      *
      * @param CustomerInterface $customer
+     * @param CustomerInterface|null $prevCustomerData
      * @param string $defaultAddressType
      * @return void
      * @throws InputException
      */
     private function validateDefaultAddress(
         CustomerInterface $customer,
+        ?CustomerInterface $prevCustomerData,
         string $defaultAddressType
     ): void {
         $defaultAddressId = $defaultAddressType === CustomerInterface::DEFAULT_BILLING ?
             (int) $customer->getDefaultBilling() : (int) $customer->getDefaultShipping();
-
-        if ($customer->getAddresses()) {
-            foreach ($customer->getAddresses() as $address) {
-                $addressArray = $address->__toArray();
-                $addressId = (int) $address->getId();
-                if (!empty($addressArray[$defaultAddressType])
-                    || empty($addressId)
-                    || $defaultAddressId === $addressId) {
+        if ($prevCustomerData && $prevCustomerData->getAddresses()) {
+            foreach ($prevCustomerData->getAddresses() as $address) {
+                if ($defaultAddressId === (int) $address->getId()) {
                     return;
                 }
             }
-
             throw new InputException(
                 __(
                     'The %fieldName value is invalid. Set the correct value and try again.',

dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/SaveTest.php

@@ -385,7 +385,7 @@ public function testExistingCustomerChangeEmail(): void
                 'sendemail_store_id' => '1',
                 'sendemail' => '1',
                 CustomerData::CREATED_AT => '2000-01-01 00:00:00',
-                CustomerData::DEFAULT_SHIPPING => '_item1',
+                CustomerData::DEFAULT_SHIPPING => '1',
                 CustomerData::DEFAULT_BILLING => '1'
             ]
         ];