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

Author: Oleksandr Gorkun

app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php

@@ -208,28 +208,24 @@ public function prepareCustomers(array $customersToFind)
                 || !array_key_exists($websiteId, $this->_customerIds[$email])
             ) {
                 //Only looking for customers we don't already have ID for.
+                //We need unique identifiers.
                 $uniqueKey = $email .'_' .$websiteId;
                 $identifiers[$uniqueKey] = [
                     'email' => $email,
                     'website_id' => $websiteId
                 ];
+                //Recording that we've searched for a customer.
+                if (!array_key_exists($email, $this->_customerIds)) {
+                    $this->_customerIds[$email] = [];
+                }
+                $this->_customerIds[$email][$websiteId] = null;
             }
         }
         if (!$identifiers) {
             return;
         }
+
         //Loading customers data.
         $this->loadCustomersData($identifiers);
-
-        //Adding customers that don't exist.
-        foreach ($identifiers as $customerIdentity) {
-            $email = $customerIdentity['email'];
-            $websiteId = $customerIdentity['website_id'];
-            if (!array_key_exists($email, $this->_customerIds)
-                || !array_key_exists($websiteId, $this->_customerIds[$email])
-            ) {
-                $this->_customerIds[$email][$websiteId] = null;
-            }
-        }
     }
 }

app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/Customer/StorageTest.php

@@ -5,12 +5,13 @@
  */
 namespace Magento\CustomerImportExport\Test\Unit\Model\ResourceModel\Import\Customer;
 
-use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\Storage;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
+use Magento\Customer\Model\ResourceModel\Customer\Collection;
 use Magento\Framework\DataObject;
-use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\DB\Select;
 use Magento\ImportExport\Model\ResourceModel\CollectionByPagesIteratorFactory;
+use Magento\ImportExport\Model\ResourceModel\CollectionByPagesIterator;
 
 class StorageTest extends \PHPUnit_Framework_TestCase
 {
@@ -20,23 +21,59 @@ class StorageTest extends \PHPUnit_Framework_TestCase
     private $_model;
 
     /**
-     * @var CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CollectionByPagesIterator|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $customerRepositoryMock;
+    private $iteratorMock;
+
+    /**
+     * @var Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $collectionMock;
 
     protected function setUp()
     {
+        $this->iteratorMock = $this->getMockBuilder(
+            CollectionByPagesIterator::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var \PHPUnit_Framework_MockObject_MockObject|CollectionByPagesIteratorFactory $iteratorFactoryMock */
+        $iteratorFactoryMock = $this->getMockBuilder(
+            CollectionByPagesIteratorFactory::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+        $iteratorFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->iteratorMock);
+        $this->collectionMock = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject $collectionFactoryMock */
+        $collectionFactoryMock = $this->getMockBuilder(
+            CollectionFactory::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+        $collectionFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->collectionMock);
+        /** @var \PHPUnit_Framework_MockObject_MockObject $selectMock */
+        $selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $selectMock->expects($this->any())
+            ->method('getPart')
+            ->with(Select::FROM)
+            ->willReturn(['e' => []]);
+        $this->collectionMock->expects($this->any())
+            ->method('getSelect')
+            ->willReturn($selectMock);
+
         $this->_model = new Storage(
-            $this->getMockBuilder(CollectionFactory::class)
-                ->disableOriginalConstructor()
-                ->getMock(),
-            $this->getMockBuilder(CollectionByPagesIteratorFactory::class)
-                ->disableOriginalConstructor()
-                ->getMock(),
-            [],
-            $this->customerRepositoryMock = $this->getMockBuilder(CustomerRepositoryInterface::class)
-                ->disableOriginalConstructor()
-                ->getMock()
+            $collectionFactoryMock,
+            $iteratorFactoryMock,
+            []
         );
     }
 
@@ -53,20 +90,26 @@ public function testGetCustomerId()
         $nonExistingEmail = 'test1@magento.com';
         $nonExistingWebsiteId = 2;
 
-        /** @var \PHPUnit_Framework_MockObject_MockObject $customerMock */
-        $customerMock = new DataObject([
-            'id' => $existingId,
-            'email' => $existingEmail,
-            'website_id' => $existingWebsiteId
-        ]);
-        $this->customerRepositoryMock->expects($this->at(0))
-            ->method('get')
-            ->with($existingEmail, $existingWebsiteId)
-            ->willReturn($customerMock);
-        $this->customerRepositoryMock->expects($this->at(1))
-            ->method('get')
-            ->with($nonExistingEmail, $nonExistingWebsiteId)
-            ->willThrowException(new NoSuchEntityException());
+        $this->iteratorMock->expects($this->at(0))
+            ->method('iterate')
+            ->willReturnCallback(
+                function (...$args) use (
+                    $existingId,
+                    $existingEmail,
+                    $existingWebsiteId
+                ) {
+                    /** @var callable $callable */
+                    foreach ($args[2] as $callable) {
+                        $callable(
+                            new DataObject([
+                                'id' => $existingId,
+                                'email' => $existingEmail,
+                                'website_id' => $existingWebsiteId,
+                            ])
+                        );
+                    }
+                }
+            );
 
         $this->assertEquals(
             $existingId,
@@ -78,17 +121,5 @@ public function testGetCustomerId()
                 $nonExistingWebsiteId
             )
         );
-        //Checking one more time to see whether the repo will be used once
-        //again.
-        $this->assertEquals(
-            $existingId,
-            $this->_model->getCustomerId($existingEmail, $existingWebsiteId)
-        );
-        $this->assertFalse(
-            $this->_model->getCustomerId(
-                $nonExistingEmail,
-                $nonExistingWebsiteId
-            )
-        );
     }
 }