ACP2E-2301: Customers and Addresses (single file) Import fails

Author: Anujnehra

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

@@ -534,9 +534,6 @@ protected function _importData()
             $deleteRowIds = [];
 
             foreach ($bunch as $rowNumber => $rowData) {
-                if (!isset($rowData['_website'])) {
-                    continue;
-                }
                 // check row data
                 if ($this->_isOptionalAddressEmpty($rowData) || !$this->validateRow($rowData, $rowNumber)) {
                     continue;

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

@@ -519,9 +519,6 @@ protected function _importData()
             $attributesToSave = [];
 
             foreach ($bunch as $rowNumber => $rowData) {
-                if (!isset($rowData['_website'])) {
-                    continue;
-                }
                 if (!$this->validateRow($rowData, $rowNumber)) {
                     continue;
                 }

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

@@ -278,6 +278,10 @@ protected function _initAddressAttributes()
      */
     protected function _importData()
     {
+        if ($this->getIds()) {
+            $this->_customerEntity->setIds($this->getIds());
+            $this->_addressEntity->setCustomerAttributes($this->_customerAttributes)->setIds($this->getIds());
+        }
         $result = $this->_customerEntity->importData();
         $this->countItemsCreated += $this->_customerEntity->getCreatedItemsCount();
         $this->countItemsUpdated += $this->_customerEntity->getUpdatedItemsCount();

app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/CustomerComposite/Data.php

@@ -80,8 +80,8 @@ public function getNextUniqueBunch($ids = null)
     protected function _prepareRow(array $rowData)
     {
         $entityCustomer = CustomerComposite::COMPONENT_ENTITY_CUSTOMER;
-        if ((isset($rowData['_scope'])) && $this->_entityType == $entityCustomer) {
-            if ($rowData['_scope'] == CustomerComposite::SCOPE_DEFAULT) {
+        if ($this->_entityType == $entityCustomer) {
+            if ((isset($rowData['_scope'])) && $rowData['_scope'] == CustomerComposite::SCOPE_DEFAULT) {
                 return $rowData;
             } else {
                 return null;

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

@@ -41,7 +41,6 @@
 use Magento\Store\Model\StoreManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use ReflectionException;
 
 /**
  * Tests Magento\CustomerImportExport\Model\Import\Address.
@@ -150,16 +149,6 @@ class AddressTest extends TestCase
      */
     private $countryWithWebsites;
 
-    /**
-     * @var \stdClass|MockObject
-     */
-    private $dataSourceModel;
-
-    /**
-     * @var \stdClass|MockObject
-     */
-    private $connection;
-
     /**
      * Init entity adapter model
      */
@@ -204,14 +193,10 @@ protected function tearDown(): void
      */
     protected function _getModelDependencies()
     {
-        $this->dataSourceModel = $this->getMockBuilder(\stdClass::class)
-            ->addMethods(['getNextBunch', 'getNextUniqueBunch', 'getIterator', 'rewind'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->connection = $this->getMockBuilder(\stdClass::class)
-            ->addMethods(['insertMultiple'])
+        $dataSourceModel = $this->getMockBuilder(\stdClass::class)->addMethods(['getNextBunch'])
             ->disableOriginalConstructor()
             ->getMock();
+        $connection = $this->createMock(\stdClass::class);
         $attributeCollection = $this->_createAttrCollectionMock();
         $customerStorage = $this->_createCustomerStorageMock();
         $customerEntity = $this->_createCustomerEntityMock();
@@ -230,8 +215,8 @@ protected function _getModelDependencies()
         }
 
         $data = [
-            'data_source_model' => $this->dataSourceModel,
-            'connection' => $this->connection,
+            'data_source_model' => $dataSourceModel,
+            'connection' => $connection,
             'page_size' => 1,
             'max_data_size' => 1,
             'bunch_size' => 1,
@@ -586,63 +571,4 @@ public function validateDeleteAddressEntities(array $deleteRowIds)
         $this->assertContains($this->_customBehaviour['delete_id'], $deleteRowIds);
         return $this->_model;
     }
-
-    /**
-     * @return void
-     * @throws ReflectionException
-     */
-    public function testImportData(): void
-    {
-        $this->dataSourceModel->expects($this->any())
-            ->method('getNextUniqueBunch')
-            ->willReturnOnConsecutiveCalls(
-                ['_email' => 'jondoe@example.com'],
-                ['_website' => 'base'],
-                ['_store'=> 'admin'],
-                ['_entity_id' => 'abc'],
-                null,
-                ['_email' => 'jondoe@example.com'],
-                ['_store' => 'admin'],
-                ['_entity_id' => 'abc']
-            );
-        $this->dataSourceModel->method('getIterator')->willReturnSelf();
-        $this->setProtectedProperty($this->_model, '_websiteCodeToId', [
-            'base' => 1,
-        ]);
-        $method = $this->setMethodAccessible('_importData');
-        $this->connection->method('insertMultiple')->willReturnSelf();
-        $result = $method->invokeArgs($this->_model, []);
-        $this->assertTrue($result);
-    }
-
-    /**
-     * Invoke any method of class.
-     *
-     * @param string $method
-     *
-     * @return mixed
-     * @throws ReflectionException
-     */
-    private function setMethodAccessible(string $method): mixed
-    {
-        $class = new \ReflectionClass(Address::class);
-        return $class->getMethod($method);
-    }
-
-    /**
-     * Sets a protected property on a given object via reflection
-     *
-     * @param $object - instance in which protected value is being modified
-     * @param $property - property on instance being modified
-     * @param $value - new value of the property being modified
-     *
-     * @return void
-     * @throws ReflectionException
-     */
-    private function setProtectedProperty($object, $property, $value): void
-    {
-        $reflection = new \ReflectionClass($object);
-        $reflection_property = $reflection->getProperty($property);
-        $reflection_property->setValue($object, $value);
-    }
 }

app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/CustomerComposite/DataTest.php

@@ -218,37 +218,6 @@ public function getNextBunchDataProvider()
                     ]
                 ),
                 '$expectedData' => [],
-            ],
-            'customer entity default no _scope' => [
-                '$entityType' => CustomerComposite::COMPONENT_ENTITY_CUSTOMER,
-                '$bunchData' => json_encode(
-                    [
-                        [
-                            Address::COLUMN_WEBSITE => 'website1',
-                            Address::COLUMN_EMAIL => 'email1',
-                            Address::COLUMN_ADDRESS_ID => null,
-                            CustomerComposite::COLUMN_DEFAULT_BILLING => 'value',
-                            CustomerComposite::COLUMN_DEFAULT_SHIPPING => 'value',
-                            'customer_attribute1' => 'value',
-                            'customer_attribute2' => 'value',
-                            CustomerComposite::COLUMN_ADDRESS_PREFIX . 'attribute1' => 'value',
-                            CustomerComposite::COLUMN_ADDRESS_PREFIX . 'attribute2' => 'value',
-                        ],
-                    ]
-                ),
-                '$expectedData' => [
-                    0 => [
-                        Address::COLUMN_WEBSITE => 'website1',
-                        Address::COLUMN_EMAIL => 'email1',
-                        Address::COLUMN_ADDRESS_ID => null,
-                        CustomerComposite::COLUMN_DEFAULT_BILLING => 'value',
-                        CustomerComposite::COLUMN_DEFAULT_SHIPPING => 'value',
-                        'customer_attribute1' => 'value',
-                        'customer_attribute2' => 'value',
-                        'attribute1' => 'value',
-                        'attribute2' => 'value',
-                    ],
-                ],
             ]
         ];
     }