magento-engcom#88: Refactoring for readability.

pogster · Jul 5, 2018 · 98f74ef · 98f74ef
1 parent 0832e29
commit 98f74ef
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -593,12 +593,16 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                 if (in_array($attributeCode, $this->_ignoredAttributes)) {
                     continue;
                 }
-                if ($attributeParams['is_required']
-                    && ((!isset($rowData[$attributeCode]) && !$this->_getCustomerId($email, $website))
-                    || (isset($rowData[$attributeCode]) && '' === trim($rowData[$attributeCode])))) {
+
+                $isFieldRequired = $attributeParams['is_required'];
+                $isFieldNotSetAndCustomerDoesNotExist = !isset($rowData[$attributeCode]) && !$this->_getCustomerId($email, $website);
+                $isFieldSetAndTrimmedValueIsEmpty = isset($rowData[$attributeCode]) && '' === trim($rowData[$attributeCode]);
+
+                if ($isFieldRequired && ($isFieldNotSetAndCustomerDoesNotExist || $isFieldSetAndTrimmedValueIsEmpty)) {
                     $this->addRowError(self::ERROR_VALUE_IS_REQUIRED, $rowNumber, $attributeCode);
                     continue;
                 }
+
                 if (isset($rowData[$attributeCode]) && strlen($rowData[$attributeCode])) {
                     $this->isAttributeValid(
                         $attributeCode,