Create index if not exists while trying to reindex its mapping (#199)

(cherry picked from commit 50eedd2)

Author: markus-moser

src/MessageHandler/UpdateClassMappingHandler.php

@@ -18,9 +18,7 @@
 
 use Exception;
 use Pimcore\Bundle\GenericDataIndexBundle\Message\UpdateClassMappingMessage;
-use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\SearchIndexServiceInterface;
 use Pimcore\Bundle\GenericDataIndexBundle\Service\SearchIndex\IndexQueue\EnqueueServiceInterface;
-use Pimcore\Bundle\GenericDataIndexBundle\Service\SearchIndex\IndexService\ElementTypeAdapter\DataObjectTypeAdapter;
 use Pimcore\Bundle\GenericDataIndexBundle\Service\SearchIndex\IndexService\IndexHandler\DataObjectIndexHandler;
 use Pimcore\Bundle\GenericDataIndexBundle\Service\SettingsStoreServiceInterface;
 use Pimcore\Bundle\GenericDataIndexBundle\Traits\LoggerAwareTrait;
@@ -36,9 +34,7 @@ final class UpdateClassMappingHandler
 
     public function __construct(
         private readonly DataObjectIndexHandler $dataObjectMappingHandler,
-        private readonly DataObjectTypeAdapter $dataObjectTypeAdapter,
         private readonly EnqueueServiceInterface $enqueueService,
-        private readonly SearchIndexServiceInterface $searchIndexService,
         private readonly SettingsStoreServiceInterface $settingsStoreService,
     ) {
     }
@@ -59,20 +55,11 @@ public function __invoke(UpdateClassMappingMessage $message): void
             return;
         }
 
-        $alias = $this->dataObjectTypeAdapter->getAliasIndexName($classDefinition);
-        if (!$this->searchIndexService->existsAlias($alias)) {
-            $this->dataObjectMappingHandler
-                ->updateMapping(
-                    context: $classDefinition,
-                    mappingProperties: $mappingProperties
-                );
-        } else {
-            $this->dataObjectMappingHandler
-                ->reindexMapping(
-                    context: $classDefinition,
-                    mappingProperties: $mappingProperties
-                );
-        }
+        $this->dataObjectMappingHandler
+            ->reindexMapping(
+                context: $classDefinition,
+                mappingProperties: $mappingProperties
+            );
 
         $this->settingsStoreService->storeClassMapping(
             classDefinitionId: $classDefinition->getId(),

src/Service/SearchIndex/IndexService/IndexHandler/AbstractIndexHandler.php

@@ -65,10 +65,21 @@ public function reindexMapping(
         ?ClassDefinition $context = null,
         ?array $mappingProperties = null
     ): void {
-        $this->searchIndexService->reindex(
-            $this->getAliasIndexName($context),
-            $mappingProperties ?: $this->extractMappingProperties($context)
-        );
+        $alias = $this->getAliasIndexName($context);
+        $mappingProperties = $mappingProperties ?: $this->extractMappingProperties($context);
+
+        if (!$this->searchIndexService->existsAlias($alias)) {
+            $this->updateMapping(
+                context: $context,
+                mappingProperties: $mappingProperties
+            );
+        } else {
+            $this->searchIndexService->reindex(
+                $alias,
+                $mappingProperties
+            );
+        }
+
         $this->createGlobalIndexAliases($context);
     }