New command

- Type to new index `spameri:elastic:move-type`
- Moves documents from type to new index
- Use when you need to split old index with multiple types

New command
- Dump index `spameri:elastic:dump-index` dumps all data from index to specified file
- Handy for moving documents to another index
- Or for backing purposes

Added type support to ElasticSearch services for working with old indexes which has multiple types.
Search returns ResultSearch object.

New Indices services
- Close, Open for clean in objects closing and opening indexes
- Create to create empty index with no settings
- Get to get all settings and mappings for index
- GetMapping for getting mapping for specific index or index and type
- PutMapping for putting mapping for specific index or index and type. And you can specify dynamic option of index

 Please bare in mind that types will be deprecated in ES and are added here only to provide backward compatibility.

Author: Spamercz

composer.json

@@ -34,7 +34,7 @@
 		"kdyby/console": "^2.7.1",
 		"kdyby/datetime-provider": "v1.0.0",
 		"kdyby/monolog": "^1.3.2",
-		"tracy/tracy": "^2.5.3"
+		"tracy/tracy": "^2.6.0"
 	},
 	"require-dev": {
 		"spameri/coding-standard": "dev-master",

src/Commands/DumpIndex.php

@@ -22,7 +22,7 @@ public function __construct(
 
 
 	/**
-	 * @example spameri:elastic:move-type oldIndex productType newIndex newIndexAlias -c
+	 * @example spameri:elastic:dump-index index elasticDump.dump
 	 */
 	protected function configure() : void
 	{

src/Commands/RestoreIndex.php

@@ -0,0 +1,59 @@
+<?php declare(strict_types = 1);
+
+namespace Spameri\Elastic\Commands;
+
+
+class RestoreIndex extends \Symfony\Component\Console\Command\Command
+{
+
+	/**
+	 * @var \Spameri\Elastic\Model\RestoreIndex
+	 */
+	private $restoreIndex;
+
+
+	public function __construct(
+		\Spameri\Elastic\Model\RestoreIndex $migrate
+	)
+	{
+		parent::__construct(NULL);
+		$this->restoreIndex = $migrate;
+	}
+
+
+	/**
+	 * @example spameri:elastic:restore-index
+	 */
+	protected function configure() : void
+	{
+		$this
+			->setName('spameri:elastic:restore-index')
+			->setDescription('Restores data from provided dump file.')
+			->addArgument('filename', \Symfony\Component\Console\Input\InputArgument::REQUIRED)
+			->addArgument(
+				'step',
+				\Symfony\Component\Console\Input\InputArgument::OPTIONAL,
+				'Number of documents per one bulk index',
+				500
+			)
+		;
+	}
+
+
+	protected function execute(
+		\Symfony\Component\Console\Input\InputInterface $input
+		, \Symfony\Component\Console\Output\OutputInterface $output
+	)
+	{
+		$output->writeln('Starting');
+
+		$index = $input->getArgument('index');
+		$step = (int) $input->getArgument('step');
+
+		$this->restoreIndex->setOutput($output);
+		$this->restoreIndex->execute($index, $step);
+
+		$output->writeln('Done');
+	}
+
+}

src/Config/Elastic.neon

@@ -26,6 +26,9 @@ services:
 	search:
 		class: Spameri\Elastic\Model\Search
 
+	scroll:
+		class: Spameri\Elastic\Model\Scroll
+
 	delete:
 		class: Spameri\Elastic\Model\Delete
 
@@ -57,7 +60,7 @@ services:
 		class: Spameri\Elastic\Model\Mapping
 
 	userProvider:
-	 	class: Spameri\Elastic\Model\UserProvider
+	 	class: Spameri\Elastic\Model\NetteUserProvider
 
 	neonSettingsProvider:
 		class: Spameri\Elastic\Settings\NeonSettingsProvider(%host%, %port%)
@@ -86,41 +89,69 @@ services:
 	migrate:
 		class: Spameri\Elastic\Model\TypeToNewIndex\Migrate
 
+	modelDumpIndex:
+		class: \Spameri\Elastic\Model\DumpIndex
+
+	modelRestoreIndex:
+		class: \Spameri\Elastic\Model\RestoreIndex
+
 #	###
 #	Commands
 #	###
 
 	createIndex:
 		class: Spameri\Elastic\Commands\CreateIndex(%entities%)
-		tags: [kdyby.console.command]
+		tags:
+			- kdyby.console.command
+			- console.command
 
 	updateMapping:
 		class: Spameri\Elastic\Commands\UpdateMapping(%entities%)
-		tags: [kdyby.console.command]
+		tags:
+			- kdyby.console.command
+			- console.command
 
 	deleteIndex:
 		class: Spameri\Elastic\Commands\DeleteIndex
-		tags: [kdyby.console.command]
+		tags:
+			- kdyby.console.command
+			- console.command
 
 	addAlias:
 		class: Spameri\Elastic\Commands\AddAlias
-		tags: [kdyby.console.command]
+		tags:
+			- kdyby.console.command
+			- console.command
 
 	removeAlias:
 		class: Spameri\Elastic\Commands\RemoveAlias
-		tags: [kdyby.console.command]
+		tags:
+			- kdyby.console.command
+			- console.command
 
 	validateMappingCommand:
 		class: Spameri\Elastic\Commands\ValidateMapping
-		tags: [kdyby.console.command]
+		tags:
+			- kdyby.console.command
+			- console.command
 
 	typeToNewIndex:
 		class: Spameri\Elastic\Commands\TypeToNewIndex
-		tags: [kdyby.console.command]
+		tags:
+			- kdyby.console.command
+			- console.command
 
 	dumpIndex:
 		class: Spameri\Elastic\Commands\DumpIndex
-		tags: [kdyby.console.command]
+		tags:
+			- kdyby.console.command
+			- console.command
+
+	restoreIndex:
+		class: Spameri\Elastic\Commands\RestoreIndex
+		tags:
+			- kdyby.console.command
+			- console.command
 
 #	###
 #	Spameri/ElasticQuery
@@ -138,8 +169,8 @@ services:
 	 	setup:
 	 		- setLogger(@elasticSearch.elasticPanelLogger)
 
-	constantProvider:
-		class: Kdyby\DateTimeProvider\Provider\ConstantProvider(@elasticSearch.dateTime)
+	dateTimeProvider:
+		class: Spameri\Elastic\Provider\DateTimeProvider(@elasticSearch.dateTime)
 
 	dateTime:
 		class: \DateTimeImmutable

src/DI/ElasticSearch30Extension.php

@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1);
+
+namespace Spameri\Elastic\DI;
+
+
+class ElasticSearch30Extension extends \Nette\DI\CompilerExtension
+{
+
+
+}

src/DI/ElasticSearchExtension.php

@@ -106,6 +106,14 @@ public function loadConfiguration() : void
 
 		$services = $this->toggleDebugBar($config, $services);
 
+		if ( ! class_exists(\Symfony\Component\Console\Command\Command::class)) {
+			$services = $this->removeCommandDefinitions($services);
+		}
+
+		if ( ! \class_exists(\Nette\Security\User::class)) {
+			unset($services['services']['userProvider']);
+		}
+
 		$this->setConfigOptions($services, $config);
 
 		$this->compiler->parseServices(
@@ -175,4 +183,23 @@ public function toggleDebugBar(
 		return $services;
 	}
 
+
+	public function removeCommandDefinitions(
+		array $services
+	): array
+	{
+		$iterableServices = $services['services'];
+		foreach ($iterableServices as $serviceKey => $serviceArray) {
+			if (isset($serviceArray['tags'])) {
+				foreach ($serviceArray['tags'] as $tag) {
+					if ($tag === 'kdyby.console.command') {
+						unset($services[$serviceKey]);
+					}
+				}
+			}
+		}
+
+		return $services;
+	}
+
 }

src/Diagnostics/PanelLogger.php

@@ -25,10 +25,10 @@ class PanelLogger implements \Psr\Log\LoggerInterface
 
 
 	public function __construct(
-		\Psr\Log\LoggerInterface $logger = NULL
+		\Psr\Log\LoggerInterface $logger
 	)
 	{
-		$this->logger = $logger ?: new \Psr\Log\NullLogger;
+		$this->logger = $logger;
 	}
 
 

src/Entity/Property/DateTime.php

@@ -7,6 +7,7 @@ class DateTime extends \Nette\Utils\DateTime implements \Spameri\Elastic\Entity\
 {
 
 	public const FORMAT = 'Y-m-d\TH:i:s';
+	public const INDEX_FORMAT = 'Y-m-d_H-i-s';
 
 
 	public function format($format = NULL)

src/Exception/ScrollNotInitialized.php

@@ -0,0 +1,9 @@
+<?php declare(strict_types = 1);
+
+namespace Spameri\Elastic\Exception;
+
+
+class ScrollNotInitialized extends \Spameri\Elastic\Exception\ElasticSearchException
+{
+
+}

src/Mapper/ElasticMapper.php

@@ -12,18 +12,18 @@ class ElasticMapper
 	private $clientProvider;
 
 	/**
-	 * @var \Kdyby\DateTimeProvider\Provider\ConstantProvider
+	 * @var \Spameri\Elastic\Provider\DateTimeProvider
 	 */
-	private $constantProvider;
+	private $dateTimeProvider;
 
 
 	public function __construct(
 		\Spameri\Elastic\ClientProvider $clientProvider
-		, \Kdyby\DateTimeProvider\Provider\ConstantProvider $constantProvider
+		, \Spameri\Elastic\Provider\DateTimeProvider $dateTimeProvider
 	)
 	{
 		$this->clientProvider = $clientProvider;
-		$this->constantProvider = $constantProvider;
+		$this->dateTimeProvider = $dateTimeProvider;
 	}
 
 
@@ -74,7 +74,7 @@ public function createIndex(array $entity) : void
 				throw new \Spameri\Elastic\Exception\IndexAlreadyExists($entity['index']);
 
 			} catch (\Elasticsearch\Common\Exceptions\Missing404Exception $exception) {
-				$indexName = $entity['index'] . '-' . $this->constantProvider->getDateTime()->format('Y-m-d_H-i-s');
+				$indexName = $entity['index'] . '-' . $this->dateTimeProvider->provide()->format(\Spameri\Elastic\Entity\Property\DateTime::INDEX_FORMAT);
 				$this->clientProvider->client()->indices()->create(
 					(
 					new \Spameri\ElasticQuery\Document(