ACP2E-3165: [Cloud] Getting error while checking the data in import data using CSV

 - Fixed the CR comments.

Author: devarul

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

@@ -184,10 +184,6 @@ protected function _getCustomerId($email, $websiteCode)
     {
         $email = strtolower(trim($email));
 
-        if ($this->configShare->isGlobalScope() && $this->_customerStorage->getCustomerIdByEmail($email)) {
-            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/ResourceModel/Import/Customer/Storage.php

@@ -5,7 +5,8 @@
  */
 namespace Magento\CustomerImportExport\Model\ResourceModel\Import\Customer;
 
-use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Config\Share;
+use Magento\Framework\App\ObjectManager;
 use Magento\Customer\Model\ResourceModel\Customer\Collection as CustomerCollection;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory as CustomerCollectionFactory;
 use Magento\Framework\DataObject;
@@ -30,11 +31,6 @@ class Storage
      */
     protected $_customerIds = [];
 
-    /**
-     * @var array
-     */
-    private $customerIdsByEmail = [];
-
     /**
      * Number of items to fetch from db in one query
      *
@@ -67,26 +63,26 @@ class Storage
     private $customerStoreIds = [];
 
     /**
-     * @var CustomerRepositoryInterface
+     * @var Share
      */
-    private $customerRepository;
+    private $configShare;
 
     /**
      * @param CustomerCollectionFactory $collectionFactory
-     * @param CustomerRepositoryInterface $customerRepository
      * @param array $data
+     * @param Share|null $configShare
      */
     public function __construct(
         CustomerCollectionFactory $collectionFactory,
-        CustomerRepositoryInterface $customerRepository,
-        array $data = []
+        array $data = [],
+        ?Share $configShare = null
     ) {
         $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;
+        $this->configShare = $configShare ?? ObjectManager::getInstance()->get(Share::class);
     }
 
     /**
@@ -134,9 +130,14 @@ public function addCustomerByArray(array $customer): Storage
         if (!isset($this->customerStoreIds[$email])) {
             $this->customerStoreIds[$email] = [];
         }
-        $websiteId = (int) $customer['website_id'];
-        $this->_customerIds[$email][$websiteId] = (int) $customer['entity_id'];
-        $this->customerStoreIds[$email][$websiteId] = $customer['store_id'] ?? null;
+        if ($this->configShare->isGlobalScope()) {
+            $this->_customerIds[$email] = (int) $customer['entity_id'];
+            $this->customerStoreIds[$email]= $customer['store_id'] ?? null;
+        } else {
+            $websiteId = (int) $customer['website_id'];
+            $this->_customerIds[$email][$websiteId] = (int) $customer['entity_id'];
+            $this->customerStoreIds[$email][$websiteId] = $customer['store_id'] ?? null;
+        }
 
         return $this;
     }
@@ -172,30 +173,15 @@ public function getCustomerId(string $email, int $websiteId)
         $email = mb_strtolower($email);
         $this->loadCustomerData($email, $websiteId);
 
-        if (isset($this->_customerIds[$email][$websiteId])) {
-            return $this->_customerIds[$email][$websiteId];
+        if ($this->configShare->isGlobalScope() && isset($this->_customerIds[$email])) {
+            return $this->_customerIds[$email];
         }
 
-        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;
-            }
+        if (!$this->configShare->isGlobalScope() && isset($this->_customerIds[$email][$websiteId])) {
+            return $this->_customerIds[$email][$websiteId];
         }
 
-        return $this->customerIdsByEmail[$email];
+        return false;
     }
 
     /**
@@ -254,8 +240,13 @@ public function prepareCustomers(array $customersToFind): void
                     $this->_customerIds[$email] = [];
                     $this->customerStoreIds[$email] = [];
                 }
-                $this->_customerIds[$email][$websiteId] = null;
-                $this->customerStoreIds[$email][$websiteId] = null;
+                if ($this->configShare->isGlobalScope()) {
+                    $this->_customerIds[$email] = null;
+                    $this->customerStoreIds[$email] = null;
+                } else {
+                    $this->_customerIds[$email][$websiteId] = null;
+                    $this->customerStoreIds[$email][$websiteId] = null;
+                }
             }
         }
         if (!$identifiers) {
@@ -289,7 +280,11 @@ private function loadCustomerData(string $email, int $websiteId): void
      */
     private function isLoadedCustomerData(string $email, int $websiteId): bool
     {
-        return array_key_exists($email, $this->_customerIds)
-            && array_key_exists($websiteId, $this->_customerIds[$email]);
+        if ($this->configShare->isGlobalScope()) {
+            return array_key_exists($email, $this->_customerIds);
+        } else {
+            return array_key_exists($email, $this->_customerIds)
+                && array_key_exists($websiteId, $this->_customerIds[$email]);
+        }
     }
 }

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

@@ -471,33 +471,6 @@ public function testValidateRowForUpdate(array $rowData, array $errors, $isValid
         }
     }
 
-    /**
-     * @dataProvider validateRowForUpdateDataProvider
-     *
-     * @param array $rowData
-     * @param array $errors
-     * @param boolean $isValid
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function testValidateRowForUpdateGlobalCustomer(array $rowData, array $errors, $isValid = false)
-    {
-        $this->_model->setParameters(['behavior' => Import::BEHAVIOR_ADD_UPDATE]);
-
-        $this->configShare->expects($this->once())
-            ->method('isGlobalScope')
-            ->willReturn(true);
-
-        $this->customerStorage->expects($this->exactly(2))
-            ->method('getCustomerIdByEmail')
-            ->willReturn(1);
-
-        if ($isValid) {
-            $this->assertTrue($this->_model->validateRow($rowData, 0));
-        } else {
-            $this->assertFalse($this->_model->validateRow($rowData, 0));
-        }
-    }
-
     /**
      * Test Address::validateRow()
      * with 2 rows with identical PKs in case when add/update behavior is performed