OCT-169: apply same fix to connection error index

akeneo · Nov 9, 2022 · 6592223 · 6592223
1 parent fa8516e
commit 6592223
Show file tree

Hide file tree

Showing 3 changed files with 114 additions and 3 deletions.
diff --git a/upgrades/.php_cd.php b/upgrades/.php_cd.php
@@ -41,6 +41,7 @@
             'Symfony\Component\Console\Input\ArrayInput',
             'Symfony\Component\Console\Output\BufferedOutput',
             'Symfony\Component\DependencyInjection\ParameterBag\ParameterBag',
+            'Symfony\Component\Yaml\Yaml',
             'Webmozart\Assert\Assert',
         ]
     )->in('Pim\Upgrade\Schema'),

diff --git a/...ades/schema/Version_7_0_20221027152057_add_id_field_to_connection_error_index_mapping.php b/...ades/schema/Version_7_0_20221027152057_add_id_field_to_connection_error_index_mapping.php
@@ -9,6 +9,7 @@
 use Elasticsearch\ClientBuilder;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Yaml\Yaml;
 use Webmozart\Assert\Assert;
 
 /**
@@ -33,6 +34,11 @@ public function up(Schema $schema) : void
             throw new \RuntimeException('Unable to retrieve existing mapping.');
         }
 
+        if ('text' === (current($existingMapping)['mappings']['properties']['id']['type'] ?? '')) {
+            $this->reindexWhenThereIsAlreadyAnId();
+            return;
+        }
+
         $client->putMapping([
             'index' => $connectionErrorIndexName,
             'body' => [
@@ -43,6 +49,79 @@ public function up(Schema $schema) : void
         ]);
     }
 
+    private function reindexWhenThereIsAlreadyAnId(): void
+    {
+        $builder = $this->container->get('akeneo_elasticsearch.client_builder');
+        $builder->setHosts([$this->container->getParameter('index_hosts')]);
+        /** @var \Elasticsearch\Client $client */
+        $client = $builder->build();
+        $alias = $this->container->getParameter('connection_error_index_name');
+        $copy = sprintf('%s_copy', $alias);
+        $indice = array_keys($client->indices()->getAlias(['name' => $alias]))[0];
+
+        $mapping = $this->getMappingConfiguration();
+
+        $client->indices()->create([
+            'index' => $copy,
+            'body' => $mapping,
+        ]);
+
+        $client->reindex([
+            'refresh' => true,
+            'body' => [
+                'source' => [
+                    'index' => $indice,
+                ],
+                'dest' => [
+                    'index' => $copy,
+                ],
+            ],
+        ]);
+
+        $client->indices()->putAlias([
+            'name' => $alias,
+            'index' => $copy,
+        ]);
+
+        $client->indices()->delete([
+            'index' => $indice,
+        ]);
+
+        $client->indices()->create([
+            'index' => $indice,
+            'body' => $mapping,
+        ]);
+
+        $client->reindex([
+            'refresh' => true,
+            'body' => [
+                'source' => [
+                    'index' => $copy,
+                ],
+                'dest' => [
+                    'index' => $indice,
+                ],
+            ],
+        ]);
+
+        $client->indices()->putAlias([
+            'name' => $alias,
+            'index' => $indice,
+        ]);
+
+        $client->indices()->delete([
+            'index' => $copy,
+        ]);
+    }
+
+    private function getMappingConfiguration(): array
+    {
+        $ceDir = $this->container->getParameter('pim_ce_dev_src_folder_location');
+        $path = "{$ceDir}/src/Akeneo/Connectivity/Connection/back/Infrastructure/Symfony/Resources/elasticsearch/connection_error_mapping.yml";
+
+        return Yaml::parseFile($path);
+    }
+
     public function down(Schema $schema) : void
     {
         $this->throwIrreversibleMigrationException();

diff --git a/...Version_7_0_20221027152057_add_id_field_to_connection_error_index_mapping_Integration.php b/...Version_7_0_20221027152057_add_id_field_to_connection_error_index_mapping_Integration.php
@@ -37,10 +37,8 @@ protected function setUp(): void
         $this->connectionErrorClient = $this->get('akeneo_connectivity.client.connection_error');
     }
 
-    /** @test */
-    public function it_adds_the_entity_updated_property_to_the_mapping(): void
+    public function test_it_adds_the_id_property_to_the_mapping(): void
     {
-
         $this->recreateConnectionErrorIndexWithoutIdInTheMapping();
         $properties = $this->getMappingProperties();
         self::assertArrayNotHasKey('id', $properties);
@@ -52,6 +50,39 @@ public function it_adds_the_entity_updated_property_to_the_mapping(): void
         self::assertSame(['type' => 'keyword'], $properties['id']);
     }
 
+    public function test_it_changes_the_id_property_from_text_to_keyword(): void
+    {
+        $this->recreateConnectionErrorIndexWithoutIdInTheMapping();
+        self::assertArrayNotHasKey('id', $this->getMappingProperties());
+
+        $this->nativeClient->index([
+            'index' => self::getContainer()->getParameter('connection_error_index_name'),
+            'body' => [
+                'id' => 'aa63292c-a06c-4c50-afb9-c98c97dc8a13',
+                'connection_code' => 'foo',
+                'content' => [],
+                'error_datetime' => '2021-01-03T02:30:00+01:00',
+            ],
+        ]);
+        $this->nativeClient->indices()->refresh();
+        self::assertSame('text', $this->getMappingProperties()['id']['type']);
+
+        $this->reExecuteMigration(self::MIGRATION_LABEL);
+
+        $properties = $this->getMappingProperties();
+        self::assertSame('keyword', $properties['id']['type']);
+
+        $documents = $this->nativeClient->search([
+            'index' => self::getContainer()->getParameter('connection_error_index_name'),
+        ]);
+        self::assertSame([
+            'id' => 'aa63292c-a06c-4c50-afb9-c98c97dc8a13',
+            'connection_code' => 'foo',
+            'content' => [],
+            'error_datetime' => '2021-01-03T02:30:00+01:00',
+        ], $documents['hits']['hits'][0][('_source')]);
+    }
+
     private function recreateConnectionErrorIndexWithoutIdInTheMapping(): void
     {
         $configFiles = $this->getParameter('elasticsearch_index_configuration_files');