Merge remote-tracking branch 'origin/MC-32153' into 2.4-develop-pr16

serhii-balko · serhii-balko · commit 119013280143 · 2020-03-12T14:59:14.000+02:00
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -13,6 +13,7 @@
 use Magento\Store\Model\Store;
 use Magento\CustomerImportExport\Model\ResourceModel\Import\Address\Storage as AddressStorage;
 use Magento\ImportExport\Model\Import\AbstractSource;
+use Magento\Customer\Model\Indexer\Processor;
 
 /**
  * Customer address import
@@ -254,6 +255,11 @@ class Address extends AbstractCustomer
      */
     private $addressStorage;
 
+    /**
+     * @var Processor
+     */
+    private $indexerProcessor;
+
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -274,6 +280,7 @@ class Address extends AbstractCustomer
      * @param array $data
      * @param CountryWithWebsitesSource|null $countryWithWebsites
      * @param AddressStorage|null $addressStorage
+     * @param Processor $indexerProcessor
      *
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -296,8 +303,9 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime $dateTime,
         \Magento\Customer\Model\Address\Validator\Postcode $postcodeValidator,
         array $data = [],
-        CountryWithWebsitesSource $countryWithWebsites = null,
-        AddressStorage $addressStorage = null
+        ?CountryWithWebsitesSource $countryWithWebsites = null,
+        ?AddressStorage $addressStorage = null,
+        ?Processor $indexerProcessor = null
     ) {
         $this->_customerFactory = $customerFactory;
         $this->_addressFactory = $addressFactory;
@@ -348,6 +356,9 @@ public function __construct(
         $this->addressStorage = $addressStorage
             ?: ObjectManager::getInstance()->get(AddressStorage::class);
 
+        $this->indexerProcessor = $indexerProcessor
+            ?: ObjectManager::getInstance()->get(Processor::class);
+
         $this->_initAttributes();
         $this->_initCountryRegions();
     }
@@ -562,6 +573,7 @@ protected function _importData()
 
             $this->_deleteAddressEntities($deleteRowIds);
         }
+        $this->indexerProcessor->markIndexerAsInvalid();
         return true;
     }
 
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php
@@ -298,9 +298,6 @@ protected function _createCustomerEntityMock()
     public function getWebsites($withDefault = false)
     {
         $websites = [];
-        if (!$withDefault) {
-            unset($websites[0]);
-        }
         foreach ($this->_websites as $id => $code) {
             if (!$withDefault && $id == \Magento\Store\Model\Store::DEFAULT_STORE_ID) {
                 continue;
@@ -330,97 +327,6 @@ public function iterate(\Magento\Framework\Data\Collection $collection, $pageSiz
         }
     }
 
-    /**
-     * Create mock for custom behavior test
-     *
-     * @return Address|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function _getModelMockForTestImportDataWithCustomBehaviour()
-    {
-        // input data
-        $customBehaviorRows = [
-            [
-                AbstractEntity::COLUMN_ACTION => 'update',
-                Address::COLUMN_ADDRESS_ID => $this->_customBehaviour['update_id'],
-            ],
-            [
-                AbstractEntity::COLUMN_ACTION => AbstractEntity::COLUMN_ACTION_VALUE_DELETE,
-                Address::COLUMN_ADDRESS_ID => $this->_customBehaviour['delete_id']
-            ],
-        ];
-        $updateResult = [
-            'entity_row_new' => [],
-            'entity_row_update' => $this->_customBehaviour['update_id'],
-            'attributes' => [],
-            'defaults' => [],
-        ];
-        // entity adapter mock
-        $modelMock = $this->createPartialMock(
-            \Magento\CustomerImportExport\Model\Import\Address::class,
-            [
-                'validateRow',
-                '_prepareDataForUpdate',
-                '_saveAddressEntities',
-                '_saveAddressAttributes',
-                '_saveCustomerDefaults',
-                '_deleteAddressEntities',
-                '_mergeEntityAttributes',
-                'getErrorAggregator',
-                'getCustomerStorage',
-                'prepareCustomerData',
-            ]
-        );
-        //Adding behaviours
-        $availableBehaviors = new \ReflectionProperty($modelMock, '_availableBehaviors');
-        $availableBehaviors->setAccessible(true);
-        $availableBehaviors->setValue($modelMock, $this->_availableBehaviors);
-        // mock to imitate data source model
-        $dataSourceMock = $this->createPartialMock(
-            \Magento\ImportExport\Model\ResourceModel\Import\Data::class,
-            ['getNextBunch', '__wakeup', 'getIterator']
-        );
-        $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::class,
-            '_dataSourceModel'
-        );
-        $dataSourceModel->setAccessible(true);
-        $dataSourceModel->setValue($modelMock, $dataSourceMock);
-        // mock expects for entity adapter
-        $modelMock->expects($this->any())->method('validateRow')->will($this->returnValue(true));
-        $modelMock->expects($this->any())
-            ->method('getErrorAggregator')
-            ->will($this->returnValue($this->errorAggregator));
-        $modelMock->expects($this->any())->method('_prepareDataForUpdate')->will($this->returnValue($updateResult));
-        $modelMock->expects(
-            $this->any()
-        )->method(
-            '_saveAddressEntities'
-        )->will(
-            $this->returnCallback([$this, 'validateSaveAddressEntities'])
-        );
-        $modelMock->expects($this->any())->method('_saveAddressAttributes')->will($this->returnValue($modelMock));
-        $modelMock->expects($this->any())->method('_saveCustomerDefaults')->will($this->returnValue($modelMock));
-        $modelMock->expects(
-            $this->any()
-        )->method(
-            '_deleteAddressEntities'
-        )->will(
-            $this->returnCallback([$this, 'validateDeleteAddressEntities'])
-        );
-        $modelMock->expects($this->any())->method('_mergeEntityAttributes')->will($this->returnValue([]));
-        $modelMock->expects($this->any())
-            ->method('getCustomerStorage')
-            ->willReturn($this->_createCustomerStorageMock());
-
-        return $modelMock;
-    }
-
     /**
      * Create mock for customer address model class
      *
@@ -449,7 +355,9 @@ protected function _getModelMock()
             new \Magento\Framework\Stdlib\DateTime(),
             $this->createMock(\Magento\Customer\Model\Address\Validator\Postcode::class),
             $this->_getModelDependencies(),
-            $this->countryWithWebsites
+            $this->countryWithWebsites,
+            $this->createMock(\Magento\CustomerImportExport\Model\ResourceModel\Import\Address\Storage::class),
+            $this->createMock(\Magento\Customer\Model\Indexer\Processor::class)
         );
 
         $property = new \ReflectionProperty($modelMock, '_availableBehaviors');
@@ -606,20 +514,6 @@ public function testGetDefaultAddressAttributeMapping()
         );
     }
 
-    /**
-     * Test if correct methods are invoked according to different custom behaviours
-     *
-     * @covers \Magento\CustomerImportExport\Model\Import\Address::_importData
-     */
-    public function testImportDataWithCustomBehaviour()
-    {
-        $this->_model = $this->_getModelMockForTestImportDataWithCustomBehaviour();
-        $this->_model->setParameters(['behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_CUSTOM]);
-
-        // validation in validateSaveAddressEntities and validateDeleteAddressEntities
-        $this->_model->importData();
-    }
-
     /**
      * Validation method for _saveAddressEntities (callback for _saveAddressEntities)
      *
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php
@@ -14,6 +14,7 @@
 use Magento\ImportExport\Model\Import as ImportModel;
 use Magento\ImportExport\Model\Import\Adapter as ImportAdapter;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Indexer\StateInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -84,6 +85,11 @@ class AddressTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Customer\Model\ResourceModel\Customer */
     protected $customerResource;
 
+    /**
+     * @var \Magento\Customer\Model\Indexer\Processor
+     */
+    private $indexerProcessor;
+
     /**
      * Init new instance of address entity adapter
      */
@@ -96,6 +102,9 @@ protected function setUp()
         $this->_entityAdapter = Bootstrap::getObjectManager()->create(
             $this->_testClassName
         );
+        $this->indexerProcessor = Bootstrap::getObjectManager()->create(
+            \Magento\Customer\Model\Indexer\Processor::class
+        );
     }
 
     /**
@@ -353,6 +362,7 @@ public function testImportDataAddUpdate()
         $requiredAttributes[] = $keyAttribute;
         foreach (['update', 'remove'] as $action) {
             foreach ($this->_updateData[$action] as $attributes) {
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $requiredAttributes = array_merge($requiredAttributes, array_keys($attributes));
             }
         }
@@ -494,4 +504,29 @@ public function testDifferentOptions(): void
         $imported = $this->_entityAdapter->importData();
         $this->assertTrue($imported, 'Must be successfully imported');
     }
+
+    /**
+     * Test customer indexer gets invalidated after import when Update on Schedule mode is set
+     *
+     * @magentoDbIsolation enabled
+     */
+    public function testCustomerIndexer(): void
+    {
+        $file = __DIR__ . '/_files/address_import_update.csv';
+        $filesystem = Bootstrap::getObjectManager()->create(Filesystem::class);
+        $directoryWrite = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = new \Magento\ImportExport\Model\Import\Source\Csv($file, $directoryWrite);
+        $this->_entityAdapter
+            ->setParameters(['behavior' => ImportModel::BEHAVIOR_ADD_UPDATE])
+            ->setSource($source)
+            ->validateData()
+            ->hasToBeTerminated();
+        $this->indexerProcessor->getIndexer()->reindexAll();
+        $statusBeforeImport = $this->indexerProcessor->getIndexer()->getStatus();
+        $this->indexerProcessor->getIndexer()->setScheduled(true);
+        $this->_entityAdapter->importData();
+        $statusAfterImport = $this->indexerProcessor->getIndexer()->getStatus();
+        $this->assertEquals(StateInterface::STATUS_VALID, $statusBeforeImport);
+        $this->assertEquals(StateInterface::STATUS_INVALID, $statusAfterImport);
+    }
 }
