From a8ee55551ecf13eaeefc665de14145f94bc757aa Mon Sep 17 00:00:00 2001
From: carstenpfeifer <c.pfeifer@gruenspar.de>
Date: Sun, 17 Jun 2018 13:08:10 +0200
Subject: [PATCH 1/3] magento-engcom/import-export-improvements#30: Do required
 attribute check before attribute validation. Add check if the required
 attribute is not empty after trimming.

---
 .../CustomerImportExport/Model/Import/Customer.php        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
index e5cc543db6aac..3d4c40fbbed8d 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -593,6 +593,12 @@ 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])))) {
+                    $this->addRowError(self::ERROR_VALUE_IS_REQUIRED, $rowNumber, $attributeCode);
+                    continue;
+                }
                 if (isset($rowData[$attributeCode]) && strlen($rowData[$attributeCode])) {
                     $this->isAttributeValid(
                         $attributeCode,
@@ -603,8 +609,6 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                             ? $this->_parameters[Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR]
                             : Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
                     );
-                } elseif ($attributeParams['is_required'] && !$this->_getCustomerId($email, $website)) {
-                    $this->addRowError(self::ERROR_VALUE_IS_REQUIRED, $rowNumber, $attributeCode);
                 }
             }
         }

From 0832e295c57f4140faf6101db73589f620d33896 Mon Sep 17 00:00:00 2001
From: carstenpfeifer <carsten.pfeifer2@gmail.com>
Date: Sat, 30 Jun 2018 20:42:15 +0200
Subject: [PATCH 2/3] magento-engcom/import-export-improvements#30: Extend
 isErrorAlreadyAdded check to also check column name so several columns in the
 same row may throw the same error and they can be distinguished.

---
 .../Import/ErrorProcessing/ProcessingErrorAggregator.php   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
index 079b2e60c4785..7f49e2022c410 100644
--- a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
+++ b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
@@ -77,7 +77,7 @@ public function addError(
         $errorMessage = null,
         $errorDescription = null
     ) {
-        if ($this->isErrorAlreadyAdded($rowNumber, $errorCode)) {
+        if ($this->isErrorAlreadyAdded($rowNumber, $errorCode, $columnName)) {
             return $this;
         }
         $this->processErrorStatistics($errorLevel);
@@ -333,13 +333,14 @@ public function clear()
     /**
      * @param int $rowNum
      * @param string $errorCode
+     * @param string $columnName
      * @return bool
      */
-    protected function isErrorAlreadyAdded($rowNum, $errorCode)
+    protected function isErrorAlreadyAdded($rowNum, $errorCode, $columnName = null)
     {
         $errors = $this->getErrorsByCode([$errorCode]);
         foreach ($errors as $error) {
-            if ($rowNum == $error->getRowNumber()) {
+            if ($rowNum == $error->getRowNumber() && $columnName == $error->getColumnName()) {
                 return true;
             }
         }

From b4ce314d6228206551dd8d5bd128b2ebbf9ec0a5 Mon Sep 17 00:00:00 2001
From: carstenpfeifer <carsten.pfeifer2@gmail.com>
Date: Thu, 5 Jul 2018 21:46:04 +0200
Subject: [PATCH 3/3] magento-engcom/import-export-improvements#30: Refactoring
 for readability.

---
 .../CustomerImportExport/Model/Import/Customer.php   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
index 3d4c40fbbed8d..ab940c9e84533 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -593,12 +593,18 @@ 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,