ENGCOM-5116: #22869 - defaulting customer storeId fix #22893

 - Merge Pull Request #22893 from Wirson/magento2:22869-rest-customer-update-store-id-fix
 - Merged commits:
   1. f22ab3c
   2. f5bf174

Author: magento-engcom-team

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

@@ -209,7 +209,9 @@ public function save(CustomerInterface $customer, $passwordHash = null)
         $customerModel->setId($customer->getId());
         $storeId = $customerModel->getStoreId();
         if ($storeId === null) {
-            $customerModel->setStoreId($this->storeManager->getStore()->getId());
+            $customerModel->setStoreId(
+                $prevCustomerData ? $prevCustomerData->getStoreId() : $this->storeManager->getStore()->getId()
+            );
         }
         // Need to use attribute set or future updates can cause data loss
         if (!$customerModel->getAttributeSetId()) {
@@ -277,7 +279,6 @@ public function save(CustomerInterface $customer, $passwordHash = null)
                 'delegate_data' => $delegatedNewOperation ? $delegatedNewOperation->getAdditionalData() : [],
             ]
         );
-
         return $savedCustomer;
     }
 

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

@@ -107,7 +107,7 @@ protected function setUp()
             $this->createMock(\Magento\Customer\Model\ResourceModel\Customer::class);
         $this->customerRegistry = $this->createMock(\Magento\Customer\Model\CustomerRegistry::class);
         $this->dataObjectHelper = $this->createMock(\Magento\Framework\Api\DataObjectHelper::class);
-        $this->customerFactory  =
+        $this->customerFactory =
             $this->createPartialMock(\Magento\Customer\Model\CustomerFactory::class, ['create']);
         $this->customerSecureFactory = $this->createPartialMock(
             \Magento\Customer\Model\Data\CustomerSecureFactory::class,
@@ -193,9 +193,10 @@ protected function setUp()
     public function testSave()
     {
         $customerId = 1;
-        $storeId = 2;
 
-        $customerModel = $this->createPartialMock(\Magento\Customer\Model\Customer::class, [
+        $customerModel = $this->createPartialMock(
+            \Magento\Customer\Model\Customer::class,
+            [
                 'getId',
                 'setId',
                 'setStoreId',
@@ -210,7 +211,8 @@ public function testSave()
                 'setFirstFailure',
                 'setLockExpires',
                 'save',
-            ]);
+            ]
+        );
 
         $origCustomer = $this->customer;
 
@@ -229,14 +231,17 @@ public function testSave()
                 'setAddresses'
             ]
         );
-        $customerSecureData = $this->createPartialMock(\Magento\Customer\Model\Data\CustomerSecure::class, [
-                'getRpToken',
-                'getRpTokenCreatedAt',
-                'getPasswordHash',
-                'getFailuresNum',
-                'getFirstFailure',
-                'getLockExpires',
-            ]);
+        $customerSecureData = $this->createPartialMock(
+            \Magento\Customer\Model\Data\CustomerSecure::class,
+            [
+            'getRpToken',
+            'getRpTokenCreatedAt',
+            'getPasswordHash',
+            'getFailuresNum',
+            'getFirstFailure',
+            'getLockExpires',
+            ]
+        );
         $this->customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
@@ -268,17 +273,6 @@ public function testSave()
         $customerModel->expects($this->once())
             ->method('getStoreId')
             ->willReturn(null);
-        $store = $this->createMock(\Magento\Store\Model\Store::class);
-        $store->expects($this->once())
-            ->method('getId')
-            ->willReturn($storeId);
-        $this->storeManager
-            ->expects($this->once())
-            ->method('getStore')
-            ->willReturn($store);
-        $customerModel->expects($this->once())
-            ->method('setStoreId')
-            ->with($storeId);
         $customerModel->expects($this->once())
             ->method('setId')
             ->with($customerId);
@@ -310,16 +304,20 @@ public function testSave()
 
         $customerModel->expects($this->once())
             ->method('setRpToken')
-            ->willReturnMap([
+            ->willReturnMap(
+                [
                 ['rpToken', $customerModel],
                 [null, $customerModel],
-            ]);
+                ]
+            );
         $customerModel->expects($this->once())
             ->method('setRpTokenCreatedAt')
-            ->willReturnMap([
+            ->willReturnMap(
+                [
                 ['rpTokenCreatedAt', $customerModel],
                 [null, $customerModel],
-            ]);
+                ]
+            );
 
         $customerModel->expects($this->once())
             ->method('setPasswordHash')
@@ -371,32 +369,37 @@ public function testSave()
     public function testSaveWithPasswordHash()
     {
         $customerId = 1;
-        $storeId = 2;
         $passwordHash = 'ukfa4sdfa56s5df02asdf4rt';
 
-        $customerSecureData = $this->createPartialMock(\Magento\Customer\Model\Data\CustomerSecure::class, [
-                'getRpToken',
-                'getRpTokenCreatedAt',
-                'getPasswordHash',
-                'getFailuresNum',
-                'getFirstFailure',
-                'getLockExpires',
-            ]);
+        $customerSecureData = $this->createPartialMock(
+            \Magento\Customer\Model\Data\CustomerSecure::class,
+            [
+            'getRpToken',
+            'getRpTokenCreatedAt',
+            'getPasswordHash',
+            'getFailuresNum',
+            'getFirstFailure',
+            'getLockExpires',
+            ]
+        );
         $origCustomer = $this->customer;
 
-        $customerModel = $this->createPartialMock(\Magento\Customer\Model\Customer::class, [
-                'getId',
-                'setId',
-                'setStoreId',
-                'getStoreId',
-                'getAttributeSetId',
-                'setAttributeSetId',
-                'setRpToken',
-                'setRpTokenCreatedAt',
-                'getDataModel',
-                'setPasswordHash',
-                'save',
-            ]);
+        $customerModel = $this->createPartialMock(
+            \Magento\Customer\Model\Customer::class,
+            [
+            'getId',
+            'setId',
+            'setStoreId',
+            'getStoreId',
+            'getAttributeSetId',
+            'setAttributeSetId',
+            'setRpToken',
+            'setRpTokenCreatedAt',
+            'getDataModel',
+            'setPasswordHash',
+            'save',
+            ]
+        );
         $customerAttributesMetaData = $this->getMockForAbstractClass(
             \Magento\Framework\Api\CustomAttributesDataInterface::class,
             [],
@@ -447,7 +450,6 @@ public function testSaveWithPasswordHash()
         $customerSecureData->expects($this->once())
             ->method('getLockExpires')
             ->willReturn('lockExpires');
-
         $this->customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
@@ -477,20 +479,6 @@ public function testSaveWithPasswordHash()
             ->method('create')
             ->with(['data' => ['customerData']])
             ->willReturn($customerModel);
-        $customerModel->expects($this->once())
-            ->method('getStoreId')
-            ->willReturn(null);
-        $store = $this->createMock(\Magento\Store\Model\Store::class);
-        $store->expects($this->once())
-            ->method('getId')
-            ->willReturn($storeId);
-        $this->storeManager
-            ->expects($this->once())
-            ->method('getStore')
-            ->willReturn($store);
-        $customerModel->expects($this->once())
-            ->method('setStoreId')
-            ->with($storeId);
         $customerModel->expects($this->once())
             ->method('setId')
             ->with($customerId);