MAGETWO-83426: [Performance] Customer Import check data does not complete

Author: Oleksandr Gorkun

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

@@ -484,12 +484,15 @@ public function prepareCustomerData(\Traversable $rows)
         parent::prepareCustomerData($rows);
         $ids = [];
         foreach ($rows as $customerData) {
-            $email = isset($customerData[static::COLUMN_EMAIL])
-                ? $customerData[static::COLUMN_EMAIL] : null;
-            $websiteId = isset($customerData[static::COLUMN_WEBSITE])
-                ? $this->getWebsiteId($customerData[static::COLUMN_WEBSITE])
-                : false;
-            if ($email && $websiteId !== false) {
+            if (isset($customerData[static::COLUMN_EMAIL])
+                && $email = $customerData[static::COLUMN_EMAIL]
+                && isset($customerData[static::COLUMN_WEBSITE])
+                && (
+                    $websiteId = $this->getWebsiteId(
+                        $customerData[static::COLUMN_WEBSITE]
+                    )
+                ) !== false
+            ) {
                 $id = $this->getCustomerStorage()
                     ->getCustomerId($email, $websiteId);
                 if ($id) {

app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php

@@ -355,7 +355,6 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
             'attributes' => [],
             'defaults' => [],
         ];
-
         // entity adapter mock
         $modelMock = $this->getMock(
             'Magento\CustomerImportExport\Model\Import\Address',
@@ -377,11 +376,10 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
             true,
             true
         );
-
+        //Adding behaviours
         $availableBehaviors = new \ReflectionProperty($modelMock, '_availableBehaviors');
         $availableBehaviors->setAccessible(true);
         $availableBehaviors->setValue($modelMock, $this->_availableBehaviors);
-
         // mock to imitate data source model
         $dataSourceMock = $this->getMock(
             'Magento\ImportExport\Model\ResourceModel\Import\Data',
@@ -402,39 +400,33 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
         );
         $dataSourceModel->setAccessible(true);
         $dataSourceModel->setValue($modelMock, $dataSourceMock);
-
         // mock expects for entity adapter
         $modelMock->expects($this->any())->method('validateRow')->will($this->returnValue(true));
         $modelMock->expects($this->any())
             ->method('getErrorAggregator')
             ->will($this->returnValue($this->errorAggregator));
-
         $modelMock->expects($this->any())->method('_prepareDataForUpdate')->will($this->returnValue($updateResult));
-
         $modelMock->expects(
             $this->any()
         )->method(
             '_saveAddressEntities'
         )->will(
             $this->returnCallback([$this, 'validateSaveAddressEntities'])
         );
-
         $modelMock->expects($this->any())->method('_saveAddressAttributes')->will($this->returnValue($modelMock));
-
         $modelMock->expects($this->any())->method('_saveCustomerDefaults')->will($this->returnValue($modelMock));
-
         $modelMock->expects(
             $this->any()
         )->method(
             '_deleteAddressEntities'
         )->will(
             $this->returnCallback([$this, 'validateDeleteAddressEntities'])
         );
-
         $modelMock->expects($this->any())->method('_mergeEntityAttributes')->will($this->returnValue([]));
         $modelMock->expects($this->any())
             ->method('getCustomerStorage')
             ->willReturn($this->_createCustomerStorageMock());
+
         return $modelMock;
     }