#22869 - defaulting customer storeId fix - backport

Author: Wirson

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

@@ -214,7 +214,9 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
 
         $storeId = $customerModel->getStoreId();
         if ($storeId === null) {
-            $customerModel->setStoreId($this->storeManager->getStore()->getId());
+            $customerModel->setStoreId(
+                $prevCustomerData->getStoreId() ?? $this->storeManager->getStore()->getId()
+            );
         }
 
         $this->populateCustomerWithSecureData($customerModel, $passwordHash);

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

@@ -224,7 +224,9 @@ public function testSave()
                 'getId'
             ]
         );
-        $customerModel = $this->createPartialMock(\Magento\Customer\Model\Customer::class, [
+        $customerModel = $this->createPartialMock(
+            \Magento\Customer\Model\Customer::class,
+            [
                 'getId',
                 'setId',
                 'setStoreId',
@@ -239,7 +241,8 @@ public function testSave()
                 'setFirstFailure',
                 'setLockExpires',
                 'save',
-            ]);
+            ]
+        );
 
         $origCustomer = $this->customer;
 
@@ -362,16 +365,20 @@ public function testSave()
 
         $customerModel->expects($this->once())
             ->method('setRpToken')
-            ->willReturnMap([
-                ['rpToken', $customerModel],
-                [null, $customerModel],
-            ]);
+            ->willReturnMap(
+                [
+                    ['rpToken', $customerModel],
+                    [null, $customerModel],
+                ]
+            );
         $customerModel->expects($this->once())
             ->method('setRpTokenCreatedAt')
-            ->willReturnMap([
-                ['rpTokenCreatedAt', $customerModel],
-                [null, $customerModel],
-            ]);
+            ->willReturnMap(
+                [
+                    ['rpTokenCreatedAt', $customerModel],
+                    [null, $customerModel],
+                ]
+            );
 
         $customerModel->expects($this->once())
             ->method('setPasswordHash')
@@ -432,14 +439,17 @@ public function testSaveWithPasswordHash()
         $storeId = 2;
         $passwordHash = 'ukfa4sdfa56s5df02asdf4rt';
 
-        $customerSecureData = $this->createPartialMock(\Magento\Customer\Model\Data\CustomerSecure::class, [
+        $customerSecureData = $this->createPartialMock(
+            \Magento\Customer\Model\Data\CustomerSecure::class,
+            [
                 'getRpToken',
                 'getRpTokenCreatedAt',
                 'getPasswordHash',
                 'getFailuresNum',
                 'getFirstFailure',
                 'getLockExpires',
-            ]);
+            ]
+        );
         $region = $this->getMockForAbstractClass(
             \Magento\Customer\Api\Data\RegionInterface::class,
             [],
@@ -481,7 +491,9 @@ public function testSaveWithPasswordHash()
             ->method('__toArray')
             ->willReturn(['default_billing', 'default_shipping']);
 
-        $customerModel = $this->createPartialMock(\Magento\Customer\Model\Customer::class, [
+        $customerModel = $this->createPartialMock(
+            \Magento\Customer\Model\Customer::class,
+            [
                 'getId',
                 'setId',
                 'setStoreId',
@@ -493,7 +505,8 @@ public function testSaveWithPasswordHash()
                 'getDataModel',
                 'setPasswordHash',
                 'save',
-            ]);
+            ]
+        );
         $customerAttributesMetaData = $this->getMockForAbstractClass(
             \Magento\Framework\Api\CustomAttributesDataInterface::class,
             [],
@@ -521,7 +534,6 @@ public function testSaveWithPasswordHash()
         $this->customerRegistry->expects($this->atLeastOnce())
             ->method('remove')
             ->with($customerId);
-
         $this->customerRegistry->expects($this->once())
             ->method('retrieveSecureData')
             ->with($customerId)
@@ -544,7 +556,6 @@ public function testSaveWithPasswordHash()
         $customerSecureData->expects($this->once())
             ->method('getLockExpires')
             ->willReturn('lockExpires');
-
         $this->customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);