MAGETWO-69857: Issue with importing customer address

Author: OlgaVasyltsun

app/code/Magento/CustomerImportExport/Model/Import/Address.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Store\Model\Store;
+use Magento\ImportExport\Model\Import;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -21,7 +22,7 @@ class Address extends AbstractCustomer
     /**#@+
      * Attribute collection name
      */
-    const ATTRIBUTE_COLLECTION_NAME = 'Magento\Customer\Model\ResourceModel\Address\Attribute\Collection';
+    const ATTRIBUTE_COLLECTION_NAME = \Magento\Customer\Model\ResourceModel\Address\Attribute\Collection::class;
 
     /**#@-*/
 
@@ -625,6 +626,15 @@ protected function _prepareDataForUpdate(array $rowData)
                 } elseif ('datetime' == $attributeParams['type']) {
                     $value = (new \DateTime())->setTimestamp(strtotime($rowData[$attributeAlias]));
                     $value = $value->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
+                } elseif ('multiselect' == $attributeParams['type']) {
+                    $separator = isset($this->_parameters[Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR]) ?
+                        $this->_parameters[Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR] :
+                        Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR;
+                    $value = str_replace(
+                        $separator,
+                        Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
+                        $rowData[$attributeAlias]
+                    );
                 } else {
                     $value = $rowData[$attributeAlias];
                 }
@@ -839,7 +849,16 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                             continue;
                         }
                         if (isset($rowData[$attributeCode]) && strlen($rowData[$attributeCode])) {
-                            $this->isAttributeValid($attributeCode, $attributeParams, $rowData, $rowNumber);
+                            $multiSeparator = isset($this->_parameters[Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR]) ?
+                                $this->_parameters[Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR] :
+                                Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR;
+                            $this->isAttributeValid(
+                                $attributeCode,
+                                $attributeParams,
+                                $rowData,
+                                $rowNumber,
+                                $multiSeparator
+                            );
                         } elseif ($attributeParams['is_required'] && (!isset(
                             $this->_addresses[$customerId]
                         ) || !in_array(

app/code/Magento/ImportExport/Model/Import/AbstractEntity.php

@@ -8,6 +8,7 @@
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 use Magento\Framework\App\ResourceConnection;
+use Magento\ImportExport\Model\Import;
 
 /**
  * Import entity abstract model
@@ -638,11 +639,17 @@ public function getMasterAttributeCode()
      * @param array $attributeParams Attribute params
      * @param array $rowData Row data
      * @param int $rowNumber
+     * @param string $multiSeparator
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function isAttributeValid($attributeCode, array $attributeParams, array $rowData, $rowNumber)
-    {
+    public function isAttributeValid(
+        $attributeCode,
+        array $attributeParams,
+        array $rowData,
+        $rowNumber,
+        $multiSeparator = Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
+    ) {
         $message = '';
         switch ($attributeParams['type']) {
             case 'varchar':
@@ -657,7 +664,13 @@ public function isAttributeValid($attributeCode, array $attributeParams, array $
                 break;
             case 'select':
             case 'multiselect':
-                $valid = isset($attributeParams['options'][strtolower($rowData[$attributeCode])]);
+                $valid = true;
+                foreach (explode($multiSeparator, strtolower($rowData[$attributeCode])) as $value) {
+                    $valid = isset($attributeParams['options'][$value]);
+                    if (!$valid) {
+                        break;
+                    }
+                }
                 $message = self::ERROR_INVALID_ATTRIBUTE_OPTION;
                 break;
             case 'int':

app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php

@@ -16,7 +16,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
     /**
      * Attribute collection name
      */
-    const ATTRIBUTE_COLLECTION_NAME = 'Magento\Framework\Data\Collection';
+    const ATTRIBUTE_COLLECTION_NAME = \Magento\Framework\Data\Collection::class;
 
     /**
      * Store manager
@@ -222,9 +222,14 @@ public function getAttributeOptions(
                 foreach ($attribute->getSource()->getAllOptions(false) as $option) {
                     $value = is_array($option['value']) ? $option['value'] : [$option];
                     foreach ($value as $innerOption) {
+                        // skip ' -- Please Select -- ' option
                         if (strlen($innerOption['value'])) {
-                            // skip ' -- Please Select -- ' option
-                            $options[strtolower($innerOption[$index])] = $innerOption['value'];
+                            if ($attribute->isStatic()) {
+                                $options[strtolower($innerOption[$index])] = $innerOption['value'];
+                            } else {
+                                // Non-static attributes flip keys an values
+                                $options[$innerOption['value']] = $innerOption[$index];
+                            }
                         }
                     }
                 }