Merge pull request #391 from norkunas/update-settings-before-import

Update index settings before document import

Author: norkunas

src/Command/MeilisearchImportCommand.php

@@ -114,6 +114,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
             $output->writeln('<info>Importing for index '.$entityClassName.'</info>');
 
+            if ($updateSettings) {
+                $this->settingsUpdater->update($index['prefixed_name'], $responseTimeout, $prefix ? $prefix.$index['prefixed_name'] : null);
+            }
+
             $page = max(0, (int) $input->getOption('skip-batches'));
 
             if ($page > 0) {
@@ -155,10 +159,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             } while (\count($entities) >= $batchSize);
 
             $manager->clear();
-
-            if ($updateSettings) {
-                $this->settingsUpdater->update($index['prefixed_name'], $responseTimeout, $prefix ? $prefix.$index['prefixed_name'] : null);
-            }
         }
 
         if ($swapIndices) {

tests/Integration/Command/MeilisearchImportCommandTest.php

@@ -206,15 +206,17 @@ public function testSearchImportAggregator(): void
         $commandTester = new CommandTester($command);
         $return = $commandTester->execute(['--indices' => $this->index->getUid()]);
 
-        $this->assertSame('Importing for index Meilisearch\Bundle\Tests\Entity\Post
-Indexed a batch of 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__posts index (6 indexed since start)
-Indexed a batch of 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__aggregated index (6 indexed since start)
+        $this->assertSame(<<<'EOD'
+Importing for index Meilisearch\Bundle\Tests\Entity\Post
 Setting "stopWords" updated of "sf_phpunit__posts".
 Setting "filterableAttributes" updated of "sf_phpunit__posts".
 Setting "searchCutoffMs" updated of "sf_phpunit__posts".
 Setting "typoTolerance" updated of "sf_phpunit__posts".
+Indexed a batch of 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__posts index (6 indexed since start)
+Indexed a batch of 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__aggregated index (6 indexed since start)
 Done!
-', $commandTester->getDisplay());
+
+EOD, $commandTester->getDisplay());
 
         $this->assertSame(0, $return);
     }
@@ -262,12 +264,12 @@ public function testImportingIndexNameWithAndWithoutPrefix(): void
 
         $this->assertSame(<<<'EOD'
 Importing for index Meilisearch\Bundle\Tests\Entity\Post
-Indexed a batch of 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__posts index (6 indexed since start)
-Indexed a batch of 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__aggregated index (6 indexed since start)
 Setting "stopWords" updated of "sf_phpunit__posts".
 Setting "filterableAttributes" updated of "sf_phpunit__posts".
 Setting "searchCutoffMs" updated of "sf_phpunit__posts".
 Setting "typoTolerance" updated of "sf_phpunit__posts".
+Indexed a batch of 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__posts index (6 indexed since start)
+Indexed a batch of 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__aggregated index (6 indexed since start)
 Done!
 
 EOD, $commandTester->getDisplay());
@@ -291,12 +293,12 @@ public function testImportingIndexNameWithAndWithoutPrefix(): void
         $output = $commandTester->getDisplay();
         $this->assertSame(<<<'EOD'
 Importing for index Meilisearch\Bundle\Tests\Entity\Post
-Indexed a batch of 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__posts index (6 indexed since start)
-Indexed a batch of 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__aggregated index (6 indexed since start)
 Setting "stopWords" updated of "sf_phpunit__posts".
 Setting "filterableAttributes" updated of "sf_phpunit__posts".
 Setting "searchCutoffMs" updated of "sf_phpunit__posts".
 Setting "typoTolerance" updated of "sf_phpunit__posts".
+Indexed a batch of 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__posts index (6 indexed since start)
+Indexed a batch of 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__aggregated index (6 indexed since start)
 Done!
 
 EOD, $commandTester->getDisplay());
@@ -393,11 +395,11 @@ public function testImportWithDynamicSettings(): void
 
         $this->assertSame(<<<'EOD'
 Importing for index Meilisearch\Bundle\Tests\Entity\DynamicSettings
-Indexed a batch of 6 / 6 Meilisearch\Bundle\Tests\Entity\DynamicSettings entities into sf_phpunit__dynamic_settings index (6 indexed since start)
 Setting "filterableAttributes" updated of "sf_phpunit__dynamic_settings".
 Setting "searchableAttributes" updated of "sf_phpunit__dynamic_settings".
 Setting "stopWords" updated of "sf_phpunit__dynamic_settings".
 Setting "synonyms" updated of "sf_phpunit__dynamic_settings".
+Indexed a batch of 6 / 6 Meilisearch\Bundle\Tests\Entity\DynamicSettings entities into sf_phpunit__dynamic_settings index (6 indexed since start)
 Done!
 
 EOD, $importOutput);
@@ -432,14 +434,14 @@ public function testImportUpdatesSettingsOnce(): void
 
         $this->assertSame(<<<'EOD'
 Importing for index Meilisearch\Bundle\Tests\Entity\Post
-Indexed a batch of 2 / 2 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__posts index (2 indexed since start)
-Indexed a batch of 2 / 2 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__aggregated index (2 indexed since start)
-Indexed a batch of 2 / 2 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__posts index (4 indexed since start)
-Indexed a batch of 2 / 2 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__aggregated index (4 indexed since start)
 Setting "stopWords" updated of "sf_phpunit__posts".
 Setting "filterableAttributes" updated of "sf_phpunit__posts".
 Setting "searchCutoffMs" updated of "sf_phpunit__posts".
 Setting "typoTolerance" updated of "sf_phpunit__posts".
+Indexed a batch of 2 / 2 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__posts index (2 indexed since start)
+Indexed a batch of 2 / 2 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__aggregated index (2 indexed since start)
+Indexed a batch of 2 / 2 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__posts index (4 indexed since start)
+Indexed a batch of 2 / 2 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__aggregated index (4 indexed since start)
 Done!
 
 EOD, $importOutput);