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

Author: Oleksandr Gorkun

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

@@ -186,12 +186,16 @@ public function prepareCustomerData(\Traversable $rows)
     {
         $customersPresent = [];
         foreach ($rows as $rowData) {
-            $customersPresent[] = [
-                'email' => $rowData[static::COLUMN_EMAIL],
-                'website_id' => $this->getWebsiteId(
-                    $rowData[static::COLUMN_WEBSITE]
-                )
-            ];
+            $email = isset($rowData[static::COLUMN_EMAIL])
+                ? $rowData[static::COLUMN_EMAIL] : null;
+            $websiteId = isset($rowData[static::COLUMN_WEBSITE])
+                ? $this->getWebsiteId($rowData[static::COLUMN_WEBSITE]) : false;
+            if ($email && $websiteId !== false) {
+                $customersPresent[] = [
+                    'email' => $email,
+                    'website_id' => $websiteId
+                ];
+            }
         }
         $this->getCustomerStorage()->prepareCustomers($customersPresent);
     }

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

@@ -484,13 +484,17 @@ public function prepareCustomerData(\Traversable $rows)
         parent::prepareCustomerData($rows);
         $ids = [];
         foreach ($rows as $customerData) {
-            $id = $this->getCustomerStorage()
-                ->getCustomerId(
-                    $customerData[static::COLUMN_EMAIL],
-                    $this->getWebsiteId($customerData[static::COLUMN_WEBSITE])
-                );
-            if ($id) {
-                $ids[] = $id;
+            $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) {
+                $id = $this->getCustomerStorage()
+                    ->getCustomerId($email, $websiteId);
+                if ($id) {
+                    $ids[] = $id;
+                }
             }
         }
 
@@ -955,7 +959,9 @@ protected function _validateRowForDelete(array $rowData, $rowNumber)
             } else {
                 if (!strlen($addressId)) {
                     $this->addRowError(self::ERROR_ADDRESS_ID_IS_EMPTY, $rowNumber);
-                } elseif (!in_array($addressId, $this->_addresses[$customerId])) {
+                } elseif (!in_array($customerId, $this->_addresses)
+                    || !in_array($addressId, $this->_addresses[$customerId])
+                ) {
                     $this->addRowError(self::ERROR_ADDRESS_NOT_FOUND, $rowNumber);
                 }
             }

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

@@ -272,6 +272,7 @@ function ($email, $websiteId) {
                     return false;
                 }
             );
+        $customerStorage->expects($this->any())->method('prepareCustomers');
 
         return $customerStorage;
     }
@@ -366,7 +367,9 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
                 '_saveCustomerDefaults',
                 '_deleteAddressEntities',
                 '_mergeEntityAttributes',
-                'getErrorAggregator'
+                'getErrorAggregator',
+                'getCustomerStorage',
+                'prepareCustomerData'
             ],
             [],
             '',
@@ -382,13 +385,16 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
         // mock to imitate data source model
         $dataSourceMock = $this->getMock(
             'Magento\ImportExport\Model\ResourceModel\Import\Data',
-            ['getNextBunch', '__wakeup'],
+            ['getNextBunch', '__wakeup', 'getIterator'],
             [],
             '',
             false
         );
         $dataSourceMock->expects($this->at(0))->method('getNextBunch')->will($this->returnValue($customBehaviorRows));
         $dataSourceMock->expects($this->at(1))->method('getNextBunch')->will($this->returnValue(null));
+        $dataSourceMock->expects($this->any())
+            ->method('getIterator')
+            ->willReturn($this->getMockForAbstractClass(\Iterator::class));
 
         $dataSourceModel = new \ReflectionProperty(
             'Magento\CustomerImportExport\Model\Import\Address',
@@ -426,7 +432,9 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
         );
 
         $modelMock->expects($this->any())->method('_mergeEntityAttributes')->will($this->returnValue([]));
-
+        $modelMock->expects($this->any())
+            ->method('getCustomerStorage')
+            ->willReturn($this->_createCustomerStorageMock());
         return $modelMock;
     }
 

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

@@ -12,6 +12,7 @@
 namespace Magento\CustomerImportExport\Test\Unit\Model\Import;
 
 use Magento\CustomerImportExport\Model\Import\Customer;
+use Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\Storage;
 
 class CustomerTest extends \PHPUnit_Framework_TestCase
 {
@@ -92,6 +93,7 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
                     '_saveCustomerAttributes',
                     '_deleteCustomerEntities',
                     'getErrorAggregator',
+                    'getCustomerStorage'
                 ])
             ->getMock();
 
@@ -157,6 +159,14 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour()
         $modelMock->expects($this->any())
             ->method('getErrorAggregator')
             ->will($this->returnValue($errorAggregator));
+        /** @var \PHPUnit_Framework_MockObject_MockObject $storageMock */
+        $storageMock = $this->getMockBuilder(Storage::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $storageMock->expects($this->any())->method('prepareCustomers');
+        $modelMock->expects($this->any())
+            ->method('getCustomerStorage')
+            ->willReturn($storageMock);
 
         return $modelMock;
     }