Merge remote-tracking branch 'l3/ACP2E-203' into PR_L3_22_04_2022

Author: veloraven

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

@@ -219,6 +219,8 @@ public function save(CustomerInterface $customer, $passwordHash = null)
         $customer->setAddresses($origAddresses);
         /** @var CustomerModel $customerModel */
         $customerModel = $this->customerFactory->create(['data' => $customerData]);
+        $this->populateWithOrigData($customerModel, $prevCustomerDataArr);
+
         //Model's actual ID field maybe different than "id" so "id" field from $customerData may be ignored.
         $customerModel->setId($customer->getId());
         $storeId = $customerModel->getStoreId();
@@ -295,6 +297,21 @@ public function save(CustomerInterface $customer, $passwordHash = null)
         return $savedCustomer;
     }
 
+    /**
+     * Populate customer model with previous data
+     *
+     * @param CustomerModel $customerModel
+     * @param ?array $prevCustomerDataArr
+     */
+    private function populateWithOrigData(CustomerModel $customerModel, ?array $prevCustomerDataArr)
+    {
+        if (!empty($prevCustomerDataArr)) {
+            foreach ($prevCustomerDataArr as $field => $value) {
+                $customerModel->setOrigData($field, $value);
+            }
+        }
+    }
+
     /**
      * Delete addresses by ids
      *

app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php

@@ -232,10 +232,10 @@ public function testSave(): void
                 'setFailuresNum',
                 'setFirstFailure',
                 'setLockExpires',
-                'setGroupId'
+                'setGroupId',
             ]
         )
-            ->onlyMethods(['getId', 'setId', 'getAttributeSetId', 'getDataModel', 'save'])
+            ->onlyMethods(['getId', 'setId', 'getAttributeSetId', 'getDataModel', 'save', 'setOrigData'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -275,10 +275,13 @@ public function testSave(): void
             ->willReturn($customerId);
         $this->customer
             ->method('__toArray')
-            ->willReturnOnConsecutiveCalls(['group_id' => 1], []);
-        $customerModel->expects($this->once())
-            ->method('setGroupId')
-            ->with(1);
+            ->willReturnOnConsecutiveCalls(['firstname' => 'firstname', 'group_id' => 1], []);
+        $customerModel->expects($this->exactly(2))
+            ->method('setOrigData')
+            ->withConsecutive(
+                ['firstname', 'firstname'],
+                ['group_id', 1]
+            );
         $this->customerRegistry->expects($this->atLeastOnce())
             ->method('retrieve')
             ->with($customerId)