Merge remote-tracking branch 'remotes/github/MAGETWO-91513' into EPAM-PR-23

Author: VeronikaYarats

app/code/Magento/Customer/Model/AccountManagement.php

@@ -1384,6 +1384,7 @@ public function changeResetPasswordLinkToken($customer, $passwordLinkToken)
             $customerSecure->setRpTokenCreatedAt(
                 $this->dateTimeFactory->create()->format(DateTime::DATETIME_PHP_FORMAT)
             );
+            $this->setIgnoreValidationFlag($customer);
             $this->customerRepository->save($customer);
         }
         return true;
@@ -1537,4 +1538,15 @@ private function destroyCustomerSessions($customerId)
             $this->saveHandler->destroy($sessionId);
         }
     }
+
+    /**
+     * Set ignore_validation_flag for reset password flow to skip unnecessary address and customer validation
+     *
+     * @param Customer $customer
+     * @return void
+     */
+    private function setIgnoreValidationFlag($customer)
+    {
+        $customer->setData('ignore_validation_flag', true);
+    }
 }

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

@@ -151,7 +151,9 @@ protected function _beforeSave(\Magento\Framework\DataObject $customer)
             $customer->setConfirmation(null);
         }
 
-        $this->_validate($customer);
+        if (!$customer->getData('ignore_validation_flag')) {
+            $this->_validate($customer);
+        }
 
         return $this;
     }

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

@@ -23,41 +23,43 @@ public function processRelation(\Magento\Framework\Model\AbstractModel $customer
         $defaultBillingId = $customer->getData('default_billing');
         $defaultShippingId = $customer->getData('default_shipping');
 
-        /** @var \Magento\Customer\Model\Address $address */
-        foreach ($customer->getAddresses() as $address) {
-            if ($address->getData('_deleted')) {
-                if ($address->getId() == $defaultBillingId) {
-                    $customer->setData('default_billing', null);
-                }
+        if (!$customer->getData('ignore_validation_flag')) {
+            /** @var \Magento\Customer\Model\Address $address */
+            foreach ($customer->getAddresses() as $address) {
+                if ($address->getData('_deleted')) {
+                    if ($address->getId() == $defaultBillingId) {
+                        $customer->setData('default_billing', null);
+                    }
 
-                if ($address->getId() == $defaultShippingId) {
-                    $customer->setData('default_shipping', null);
-                }
+                    if ($address->getId() == $defaultShippingId) {
+                        $customer->setData('default_shipping', null);
+                    }
 
-                $removedAddressId = $address->getId();
-                $address->delete();
+                    $removedAddressId = $address->getId();
+                    $address->delete();
 
-                // Remove deleted address from customer address collection
-                $customer->getAddressesCollection()->removeItemByKey($removedAddressId);
-            } else {
-                $address->setParentId(
-                    $customer->getId()
-                )->setStoreId(
-                    $customer->getStoreId()
-                )->setIsCustomerSaveTransaction(
-                    true
-                )->save();
+                    // Remove deleted address from customer address collection
+                    $customer->getAddressesCollection()->removeItemByKey($removedAddressId);
+                } else {
+                    $address->setParentId(
+                        $customer->getId()
+                    )->setStoreId(
+                        $customer->getStoreId()
+                    )->setIsCustomerSaveTransaction(
+                        true
+                    )->save();
 
-                if (($address->getIsPrimaryBilling() ||
-                        $address->getIsDefaultBilling()) && $address->getId() != $defaultBillingId
-                ) {
-                    $customer->setData('default_billing', $address->getId());
-                }
+                    if (($address->getIsPrimaryBilling() ||
+                            $address->getIsDefaultBilling()) && $address->getId() != $defaultBillingId
+                    ) {
+                        $customer->setData('default_billing', $address->getId());
+                    }
 
-                if (($address->getIsPrimaryShipping() ||
-                        $address->getIsDefaultShipping()) && $address->getId() != $defaultShippingId
-                ) {
-                    $customer->setData('default_shipping', $address->getId());
+                    if (($address->getIsPrimaryShipping() ||
+                            $address->getIsDefaultShipping()) && $address->getId() != $defaultShippingId
+                    ) {
+                        $customer->setData('default_shipping', $address->getId());
+                    }
                 }
             }
         }

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

@@ -222,6 +222,7 @@ public function save(CustomerInterface $customer, $passwordHash = null)
         ) {
             $customerModel->setDefaultShipping($prevCustomerDataArr['default_shipping']);
         }
+        $this->setValidationFlag($customerArr, $customerModel);
         $customerModel->save();
         $this->customerRegistry->push($customerModel);
         $customerId = $customerModel->getId();
@@ -231,7 +232,7 @@ public function save(CustomerInterface $customer, $passwordHash = null)
         ) {
             $customer->setAddresses($delegatedNewOperation->getCustomer()->getAddresses());
         }
-        if ($customer->getAddresses() !== null) {
+        if ($customer->getAddresses() !== null && !$customerModel->getData('ignore_validation_flag')) {
             if ($customer->getId()) {
                 $existingAddresses = $this->getById($customer->getId())->getAddresses();
                 $getIdFunc = function ($address) {
@@ -396,4 +397,18 @@ protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collecti
             $collection->addFieldToFilter($fields);
         }
     }
+
+    /**
+     * Set ignore_validation_flag to skip model validation
+     *
+     * @param array $customerArray
+     * @param Customer $customerModel
+     * @return void
+     */
+    private function setValidationFlag($customerArray, $customerModel)
+    {
+        if (isset($customerArray['ignore_validation_flag'])) {
+            $customerModel->setData('ignore_validation_flag', true);
+        }
+    }
 }