ACP2E-2791: Not able to Save Customer attribute information in Admin Edit customer section;

Author: pradeep1819

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

@@ -561,14 +561,15 @@ private function getCurrentCustomerId()
     private function setCurrentCustomerStore(): void
     {
         $originalRequestData = $this->getRequest()->getPostValue(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
-
-        $storeId = $originalRequestData['store_id'] ?? null;
-        if (!$storeId) {
-            $websiteId = $originalRequestData['website_id'] ?? null;
-            $website = $this->storeManager->getWebsite($websiteId);
-            $storeId = current($website->getStoreIds());
+        if ($originalRequestData) {
+            $storeId = $originalRequestData['store_id'] ?? null;
+            if (!$storeId) {
+                $websiteId = $originalRequestData['website_id'] ?? null;
+                $website = $this->storeManager->getWebsite($websiteId);
+                $storeId = $website ? current($website->getStoreIds()) : null;
+            }
+            $this->storeManager->setCurrentStore($storeId);
         }
-        $this->storeManager->setCurrentStore($storeId);
     }
 
     /**

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

@@ -212,13 +212,14 @@ public function execute()
     private function setCurrentCustomerStore(): void
     {
         $requestData = $this->getRequest()->getParam(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
-
-        $storeId = $requestData['store_id'] ?? null;
-        if (!$storeId) {
-            $websiteId = $requestData['website_id'] ?? null;
-            $website = $this->storeManager->getWebsite($websiteId);
-            $storeId = current($website->getStoreIds());
+        if ($requestData) {
+            $storeId = $requestData['store_id'] ?? null;
+            if (!$storeId) {
+                $websiteId = $requestData['website_id'] ?? null;
+                $website = $this->storeManager->getWebsite($websiteId);
+                $storeId = $website ? current($website->getStoreIds()) : null;
+            }
+            $this->storeManager->setCurrentStore($storeId);
         }
-        $this->storeManager->setCurrentStore($storeId);
     }
 }

app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php

@@ -287,12 +287,13 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $website = $this->createPartialMock(\Magento\Store\Model\Website::class, ['getStoreIds']);
-        $website->method('getStoreIds')
+        $website->expects($this->exactly(2))->method('getStoreIds')
             ->willReturn([1]);
         $storeManager = $this->getMockBuilder(StoreManagerInterface::class)
             ->getMockForAbstractClass();
-        $storeManager->method('getWebsite')
+        $storeManager->expects($this->exactly(2))->method('getWebsite')
             ->willReturn($website);
+        $storeManager->expects($this->exactly(2))->method('setCurrentStore')->with(1);
 
         $objectManager = new ObjectManager($this);
 
@@ -347,6 +348,7 @@ public function testExecuteWithExistentCustomer()
                 'code' => 'value',
                 'coolness' => false,
                 'disable_auto_group_change' => 'false',
+                'website_id' => 1
             ],
             'subscription_status' => [$subscriptionWebsite => $subscriptionStatus],
             'subscription_store' => [$subscriptionWebsite => $subscriptionStore],
@@ -356,12 +358,14 @@ public function testExecuteWithExistentCustomer()
             'code' => 'value',
             'coolness' => false,
             'disable_auto_group_change' => 'false',
+            'website_id' => 1
         ];
         $compactedData = [
             'entity_id' => $customerId,
             'code' => 'value',
             'coolness' => false,
             'disable_auto_group_change' => 'false',
+            'website_id' => 1,
             CustomerInterface::DEFAULT_BILLING => 2,
             CustomerInterface::DEFAULT_SHIPPING => 2
         ];
@@ -381,6 +385,7 @@ public function testExecuteWithExistentCustomer()
             'confirmation' => false,
             'sendemail_store_id' => '1',
             'id' => $customerId,
+            'website_id' => 1
         ];
 
         /** @var AttributeMetadataInterface|MockObject $customerFormMock */

app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php

@@ -20,9 +20,15 @@
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\DataObject;
 use Magento\Framework\Message\Error;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Validator\Exception;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Website;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -85,6 +91,11 @@ class ValidateTest extends TestCase
     /** @var Validate */
     protected $controller;
 
+    /**
+     * @var MockObject|StoreManagerInterface
+     */
+    private $storeManagerMock;
+
     protected function setUp(): void
     {
         if (!function_exists('libxml_set_external_entity_loader')) {
@@ -143,6 +154,10 @@ protected function setUp(): void
         );
         $this->resultJsonFactory->expects($this->once())->method('create')->willReturn($this->resultJson);
 
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
         $objectHelper = new ObjectManager($this);
         $this->controller = $objectHelper->getObject(
             Validate::class,
@@ -155,20 +170,37 @@ protected function setUp(): void
                 'customerAccountManagement' => $this->customerAccountManagement,
                 'resultJsonFactory' => $this->resultJsonFactory,
                 'dataObjectHelper' => $this->dataObjectHelper,
+                'storeManager' => $this->storeManagerMock
             ]
         );
+
     }
 
     public function testExecute()
     {
         $customerEntityId = 2;
-        $this->request->expects($this->once())
+        $this->request->expects($this->exactly(2))
             ->method('getParam')
             ->with('customer')
             ->willReturn([
-                'entity_id' => $customerEntityId
+                'entity_id' => $customerEntityId,
+                'website_id' => 1
             ]);
 
+        $storeIds = [1];
+        $websiteMock = $this->getMockBuilder(WebsiteInterface::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['getStoreIds'])
+            ->getMockForAbstractClass();
+        $websiteMock->expects($this->once())
+            ->method('getStoreIds')
+            ->willReturn($storeIds);
+        $this->storeManagerMock->expects($this->once())
+            ->method('getWebsite')
+            ->with(1)
+            ->willReturn($websiteMock);
+        $this->storeManagerMock->expects($this->once())->method('setCurrentStore')->with(1);
+
         $this->customer->expects($this->once())
             ->method('setId')
             ->with($customerEntityId);
@@ -268,7 +300,7 @@ public function testExecuteWithException()
 
     public function testExecuteWithNewCustomerAndNoEntityId()
     {
-        $this->request->expects($this->once())
+        $this->request->expects($this->exactly(2))
             ->method('getParam')
             ->with('customer')
             ->willReturn([]);