fix index creation with type

- type name without timestamp

Author: Spamercz

src/Commands/InitializeIndexes.php

@@ -65,8 +65,13 @@ protected function execute(
 			}
 
 			if ($forcedDelete) {
-				$this->delete->execute($settings->indexName());
-				$output->writeln('Index ' . $settings->indexName() . ' deleted.');
+				try {
+					$this->delete->execute($settings->indexName());
+					$output->writeln('Index ' . $settings->indexName() . ' deleted.');
+
+				} catch (\Spameri\Elastic\Exception\ElasticSearch $exception) {
+					// May be non existing index exception
+				}
 			}
 
 			try {

src/Model/CreateIndex.php

@@ -39,7 +39,7 @@ public function execute(string $index): void
 			$indexName = $index . '-'
 				. $this->dateTimeProvider->provide()->format(\Spameri\Elastic\Entity\Property\DateTime::INDEX_FORMAT);
 
-			$this->create->execute($indexName, []);
+			$this->create->execute($indexName, [], $index);
 			$this->addAlias->execute($index, $indexName);
 		}
 	}

src/Model/Indices/Create.php

@@ -26,9 +26,18 @@ public function __construct(
 	 */
 	public function execute(
 		string $index,
-		array $parameters
+		array $parameters,
+		?string $type = NULL
 	): array
 	{
+		if ($type === NULL) {
+			$type = $index;
+		}
+
+		if ($this->versionProvider->provide() >= \Spameri\ElasticQuery\Response\Result\Version::ELASTIC_VERSION_ID_7) {
+			$type = NULL;
+		}
+
 		if (
 			isset($parameters['mappings']['properties'])
 			&& $this->versionProvider->provide() <= \Spameri\ElasticQuery\Response\Result\Version::ELASTIC_VERSION_ID_7
@@ -38,7 +47,7 @@ public function execute(
 				$parameters['mappings']['properties'][$fieldName] = $field;
 			}
 			$parameters['mappings'] = [
-				$index => $parameters['mappings'],
+				$type => $parameters['mappings'],
 			];
 		}
 

src/Model/InitializeIndex.php

@@ -42,7 +42,7 @@ public function execute(\Spameri\Elastic\Settings\IndexConfigInterface $indexCon
 				$indexAlias . '-'
 				. $this->dateTimeProvider->provide()->format(\Spameri\Elastic\Entity\Property\DateTime::INDEX_FORMAT);
 
-			$this->create->execute($indexName, $indexConfig->provide()->toArray());
+			$this->create->execute($indexName, $indexConfig->provide()->toArray(), $indexAlias);
 			$this->addAlias->execute($indexAlias, $indexName);
 		}
 	}

tests/SpameriTests/Elastic/Model/Indices/CreateTest.php

@@ -24,7 +24,11 @@ public function testProcess(): void
 			$this->container->getByType(\Spameri\Elastic\Model\VersionProvider::class)
 		);
 
-		$create->execute(\SpameriTests\Elastic\Config::INDEX_CREATE, $videoMapping->provide()->toArray());
+		$create->execute(
+			\SpameriTests\Elastic\Config::INDEX_CREATE,
+			$videoMapping->provide()->toArray(),
+			\SpameriTests\Elastic\Config::INDEX_CREATE
+		);
 		$response = $getMapping->execute(\SpameriTests\Elastic\Config::INDEX_CREATE);
 
 		if ($versionProvider->provide() <= \Spameri\ElasticQuery\Response\Result\Version::ELASTIC_VERSION_ID_7) {