MAGETWO-69373: Customer with unique attribute can't be saved #7844 #9712

Author: ishakhsuvarov

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

@@ -44,6 +44,11 @@ protected function _validateCustomer($response)
                 $data,
                 \Magento\Customer\Api\Data\CustomerInterface::class
             );
+            $submittedData = $this->getRequest()->getParam('customer');
+            if (isset($submittedData['entity_id'])) {
+                $entity_id = $submittedData['entity_id'];
+                $customer->setId($entity_id);
+            }
             $errors = $this->customerAccountManagement->validate($customer)->getMessages();
         } catch (\Magento\Framework\Validator\Exception $exception) {
             /* @var $error Error */

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

@@ -101,7 +101,7 @@ protected function setUp()
             false,
             true,
             true,
-            ['getPost']
+            ['getPost', 'getParam']
         );
         $this->response = $this->getMockForAbstractClass(
             \Magento\Framework\App\ResponseInterface::class,
@@ -169,6 +169,17 @@ public function testExecute()
                 '_template_' => null,
                 'address_index' => null
             ]);
+        $customerEntityId = 2;
+        $this->request->expects($this->once())
+            ->method('getParam')
+            ->with('customer')
+            ->willReturn([
+                'entity_id' => $customerEntityId
+            ]);
+
+        $this->customer->expects($this->once())
+            ->method('setId')
+            ->with($customerEntityId);
 
         $this->form->expects($this->once())->method('setInvisibleIgnored');
         $this->form->expects($this->atLeastOnce())->method('extractData')->willReturn([]);
@@ -273,4 +284,47 @@ public function testExecuteWithException()
 
         $this->controller->execute();
     }
+
+    public function testExecuteWithNewCustomerAndNoEntityId()
+    {
+        $this->request->expects($this->once())
+            ->method('getPost')
+            ->willReturn([
+                '_template_' => null,
+                'address_index' => null
+            ]);
+        $this->request->expects($this->once())
+            ->method('getParam')
+            ->with('customer')
+            ->willReturn([]);
+
+        $this->customer->expects($this->never())
+            ->method('setId');
+
+        $this->form->expects($this->once())->method('setInvisibleIgnored');
+        $this->form->expects($this->atLeastOnce())->method('extractData')->willReturn([]);
+
+        $error = $this->getMock(\Magento\Framework\Message\Error::class, [], [], '', false);
+        $this->form->expects($this->once())
+            ->method('validateData')
+            ->willReturn([$error]);
+
+        $validationResult = $this->getMockForAbstractClass(
+            \Magento\Customer\Api\Data\ValidationResultsInterface::class,
+            [],
+            '',
+            false,
+            true,
+            true
+        );
+        $validationResult->expects($this->once())
+            ->method('getMessages')
+            ->willReturn(['Error message']);
+
+        $this->customerAccountManagement->expects($this->once())
+            ->method('validate')
+            ->willReturn($validationResult);
+
+        $this->controller->execute();
+    }
 }