ACP2E-2737: Duplicate customers being created with same email address using import

Author: o-dubovyk

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

@@ -6,6 +6,8 @@
 
 namespace Magento\CustomerImportExport\Model\Import;
 
+use Magento\Customer\Model\Config\Share;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Validator\EmailAddress;
 use Magento\Framework\Validator\ValidateException;
 use Magento\Framework\Validator\ValidatorChain;
@@ -87,6 +89,11 @@ abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entit
      */
     protected $masterAttributeCode = '_email';
 
+    /**
+     * @var Share
+     */
+    private $configShare;
+
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -99,6 +106,7 @@ abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entit
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\StorageFactory $storageFactory
      * @param array $data
+     * @param Share|null $configShare
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -112,7 +120,8 @@ public function __construct(
         \Magento\ImportExport\Model\Export\Factory $collectionFactory,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\StorageFactory $storageFactory,
-        array $data = []
+        array $data = [],
+        ?Share $configShare = null
     ) {
         $this->_storageFactory = $storageFactory;
         parent::__construct(
@@ -127,7 +136,7 @@ public function __construct(
             $eavConfig,
             $data
         );
-
+        $this->configShare = $configShare ?? ObjectManager::getInstance()->get(Share::class);
         $this->addMessageTemplate(self::ERROR_WEBSITE_IS_EMPTY, __('Please specify a website.'));
         $this->addMessageTemplate(
             self::ERROR_EMAIL_IS_EMPTY,
@@ -174,6 +183,11 @@ protected function _initCustomers(array $data)
     protected function _getCustomerId($email, $websiteCode)
     {
         $email = strtolower(trim($email));
+
+        if ($this->configShare->isGlobalScope()) {
+            return $this->_customerStorage->getCustomerIdByEmail($email);
+        }
+
         if (isset($this->_websiteCodeToId[$websiteCode])) {
             $websiteId = $this->_websiteCodeToId[$websiteCode];
             return $this->_customerStorage->getCustomerId($email, $websiteId);

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

@@ -6,6 +6,7 @@
 
 namespace Magento\CustomerImportExport\Model\Import;
 
+use Magento\Customer\Model\Config\Share;
 use Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryWithWebsites as CountryWithWebsitesSource;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\App\ObjectManager;
@@ -252,6 +253,11 @@ class Address extends AbstractCustomer
      */
     private $indexerProcessor;
 
+    /**
+     * @var Share
+     */
+    private $configShare;
+
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -272,7 +278,8 @@ class Address extends AbstractCustomer
      * @param array $data
      * @param CountryWithWebsitesSource|null $countryWithWebsites
      * @param AddressStorage|null $addressStorage
-     * @param Processor $indexerProcessor
+     * @param Processor|null $indexerProcessor
+     * @param Share|null $configShare
      *
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -297,7 +304,8 @@ public function __construct(
         array $data = [],
         ?CountryWithWebsitesSource $countryWithWebsites = null,
         ?AddressStorage $addressStorage = null,
-        ?Processor $indexerProcessor = null
+        ?Processor $indexerProcessor = null,
+        ?Share $configShare = null
     ) {
         $this->_customerFactory = $customerFactory;
         $this->_addressFactory = $addressFactory;
@@ -325,7 +333,8 @@ public function __construct(
             $collectionFactory,
             $eavConfig,
             $storageFactory,
-            $data
+            $data,
+            $configShare
         );
 
         $this->_entityTable = isset(
@@ -351,6 +360,7 @@ public function __construct(
         $this->indexerProcessor = $indexerProcessor
             ?: ObjectManager::getInstance()->get(Processor::class);
 
+        $this->configShare = $configShare ?? ObjectManager::getInstance()->get(Share::class);
         $this->_initAttributes();
         $this->_initCountryRegions();
     }

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

@@ -5,6 +5,7 @@
  */
 namespace Magento\CustomerImportExport\Model\ResourceModel\Import\Customer;
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\ResourceModel\Customer\Collection as CustomerCollection;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory as CustomerCollectionFactory;
 use Magento\Framework\DataObject;
@@ -29,6 +30,11 @@ class Storage
      */
     protected $_customerIds = [];
 
+    /**
+     * @var array
+     */
+    private $customerIdsByEmail = [];
+
     /**
      * Number of items to fetch from db in one query
      *
@@ -60,19 +66,27 @@ class Storage
      */
     private $customerStoreIds = [];
 
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
     /**
      * @param CustomerCollectionFactory $collectionFactory
+     * @param CustomerRepositoryInterface $customerRepository
      * @param array $data
      */
     public function __construct(
         CustomerCollectionFactory $collectionFactory,
+        CustomerRepositoryInterface $customerRepository,
         array $data = []
     ) {
         $this->_customerCollection = isset(
             $data['customer_collection']
         ) ? $data['customer_collection'] : $collectionFactory->create();
         $this->_pageSize = isset($data['page_size']) ? (int) $data['page_size'] : 0;
         $this->customerCollectionFactory = $collectionFactory;
+        $this->customerRepository = $customerRepository;
     }
 
     /**
@@ -130,7 +144,8 @@ public function addCustomerByArray(array $customer): Storage
     /**
      * Add customer to array
      *
-     * @deprecated 100.3.0 @see addCustomerByArray
+     * @deprecated 100.3.0
+     * @see addCustomerByArray
      * @param DataObject $customer
      * @return $this
      */
@@ -164,6 +179,25 @@ public function getCustomerId(string $email, int $websiteId)
         return false;
     }
 
+    /**
+     * Find customer ID by email.
+     *
+     * @param string $email
+     * @return bool|int
+     */
+    public function getCustomerIdByEmail(string $email)
+    {
+        if (!isset($this->customerIdsByEmail[$email])) {
+            try {
+                $this->customerIdsByEmail[$email] = $this->customerRepository->get($email)->getId();
+            } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+                $this->customerIdsByEmail[$email] = false;
+            }
+        }
+
+        return $this->customerIdsByEmail[$email];
+    }
+
     /**
      * Get previously loaded customer id.
      *

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

@@ -9,6 +9,7 @@
 
 use Magento\Customer\Model\Address\Validator\Postcode;
 use Magento\Customer\Model\AddressFactory;
+use Magento\Customer\Model\Config\Share;
 use Magento\Customer\Model\CustomerFactory;
 use Magento\Customer\Model\Indexer\Processor;
 use Magento\Customer\Model\ResourceModel\Address\Attribute as AddressAttribute;
@@ -149,6 +150,11 @@ class AddressTest extends TestCase
      */
     private $countryWithWebsites;
 
+    /**
+     * @var Share|MockObject
+     */
+    private $configShare;
+
     /**
      * Init entity adapter model
      */
@@ -171,6 +177,7 @@ protected function setUp(): void
 
             ->method('getAllOptions')
             ->willReturn([]);
+        $this->configShare = $this->createMock(Share::class);
         $this->_model = $this->_getModelMock();
         $this->errorAggregator = $this->createPartialMock(
             ProcessingErrorAggregator::class,
@@ -387,7 +394,8 @@ protected function _getModelMock()
             $this->_getModelDependencies(),
             $this->countryWithWebsites,
             $this->createMock(\Magento\CustomerImportExport\Model\ResourceModel\Import\Address\Storage::class),
-            $this->createMock(Processor::class)
+            $this->createMock(Processor::class),
+            $this->configShare
         );
 
         $property = new \ReflectionProperty($modelMock, '_availableBehaviors');
@@ -446,6 +454,10 @@ public function testValidateRowForUpdate(array $rowData, array $errors, $isValid
     {
         $this->_model->setParameters(['behavior' => Import::BEHAVIOR_ADD_UPDATE]);
 
+        $this->configShare->expects($this->once())
+            ->method('isGlobalScope')
+            ->willReturn(false);
+
         if ($isValid) {
             $this->assertTrue($this->_model->validateRow($rowData, 0));
         } else {