ElasticQuery version 0.3 brings Result objects

- Implemented result object to fetching services
- Removed ResultCollection in favor of said Result objects
- IEntityFactory now accepts single class \Spameri\ElasticQuery\Response\Result\Hit
- ResultMapper is in core places transforming array results to objects so return types changes from array to ResultSingle and ResultSearch
- IService has new method aggregate and is implemented in BaseService

Author: Spamercz

composer.json

@@ -32,7 +32,7 @@
 	  	"php": ">=7.1",
 	  	"nette/di": "v2.4.14",
 	  	"nette/security": "v2.4.3",
-		"spameri/elastic-query": "v0.2.0",
+		"spameri/elastic-query": "v0.3.0",
 		"elasticsearch/elasticsearch": "^6.0",
         "kdyby/console": "v2.7.1",
         "kdyby/datetime-provider": "v1.0.0",

composer.lock

@@ -7,7 +7,7 @@ interface IEntityFactory
 {
 
 	public function create(
-		\Spameri\Elastic\Entity\Collection\ResultCollection $collection
+		\Spameri\ElasticQuery\Response\Result\Hit $hit
 	) : \Generator;
 
 }

src/Entity/Collection/ResultCollection.php

@@ -10,20 +10,26 @@ class Aggregate
 	 * @var \Spameri\Elastic\ClientProvider
 	 */
 	private $clientProvider;
+	/**
+	 * @var \Spameri\ElasticQuery\Response\ResultMapper
+	 */
+	private $resultMapper;
 
 
 	public function __construct(
 		\Spameri\Elastic\ClientProvider $clientProvider
+		, \Spameri\ElasticQuery\Response\ResultMapper $resultMapper
 	)
 	{
 		$this->clientProvider = $clientProvider;
+		$this->resultMapper = $resultMapper;
 	}
 
 
 	public function execute(
 		\Spameri\ElasticQuery\ElasticQuery $elasticQuery,
 		string $index
-	) : array
+	) : \Spameri\ElasticQuery\Response\ResultSearch
 	{
 		try {
 			$result = $this->clientProvider->client()->search(
@@ -42,7 +48,7 @@ public function execute(
 			throw new \Spameri\Elastic\Exception\ElasticSearch($exception->getMessage());
 		}
 
-		return $result;
+		return $this->resultMapper->mapSearchResults($result);
 	}
 
 }

src/Factory/IEntityFactory.php

@@ -55,6 +55,10 @@ abstract class BaseService implements IService
 	 * @var \Spameri\Elastic\Factory\ICollectionFactory
 	 */
 	private $collectionFactory;
+	/**
+	 * @var \Spameri\Elastic\Model\Aggregate
+	 */
+	private $aggregate;
 
 
 	public function __construct(
@@ -68,6 +72,7 @@ public function __construct(
 		, GetBy $getBy
 		, GetAllBy $getAllBy
 		, Delete $delete
+		, Aggregate $aggregate
 	)
 	{
 		$this->client = $client->client();
@@ -80,9 +85,14 @@ public function __construct(
 		$this->entityProperties = $entityProperties;
 		$this->entityFactory = $entityFactory;
 		$this->collectionFactory = $collectionFactory;
+		$this->aggregate = $aggregate;
 	}
 
 
+	/**
+	 * @throws \Spameri\Elastic\Exception\ElasticSearch
+	 * @throws \Spameri\Elastic\Exception\DocumentInsertFailed
+	 */
 	public function insert(
 		\Spameri\Elastic\Entity\IElasticEntity $entity
 	) : string
@@ -99,42 +109,44 @@ public function get(
 	) : \Spameri\Elastic\Entity\IElasticEntity
 	{
 		try {
-			$data = $this->get->execute($id, $this->index);
+			$singleResult = $this->get->execute($id, $this->index);
 
-			if ($data) {
-				$resultCollection = new \Spameri\Elastic\Entity\Collection\ResultCollection($data);
+		} catch (\Spameri\Elastic\Exception\ElasticSearch $exception) {
+			\Tracy\Debugger::log($exception->getMessage(), \Tracy\ILogger::CRITICAL);
+
+			throw $exception;
+		}
 
-				return $this->entityFactory->create($resultCollection)->current();
-			}
-		} catch (\Spameri\Elastic\Exception\DocumentNotFound $exception) {
-			\Tracy\Debugger::log($exception->getMessage(), \Tracy\ILogger::ERROR);
+		if ( ! $singleResult->stats()->found()) {
+			throw new \Spameri\Elastic\Exception\DocumentNotFound(' with id ' . $id->value());
 		}
-		throw new \Spameri\Elastic\Exception\DocumentNotFound(' with id ' . $id->value());
+
+		return $this->entityFactory->create($singleResult->hit())->current();
 	}
 
 
 	/**
 	 * @throws \Spameri\Elastic\Exception\DocumentNotFound
+	 * @throws \Spameri\Elastic\Exception\ElasticSearch
 	 */
 	public function getBy(
 		\Spameri\ElasticQuery\ElasticQuery $elasticQuery
 	) : \Spameri\Elastic\Entity\IElasticEntity
 	{
 		try {
-			$data = $this->getBy->execute($elasticQuery, $this->index);
-
-			if ($data) {
-				$resultCollection = new \Spameri\Elastic\Entity\Collection\ResultCollection($data);
+			$resultSearch = $this->getBy->execute($elasticQuery, $this->index);
 
-				return $this->entityFactory->create($resultCollection)->current();
-			}
-		} catch (\Elasticsearch\Common\Exceptions\ElasticsearchException $exception) {
+		} catch (\Spameri\Elastic\Exception\ElasticSearch $exception) {
 			\Tracy\Debugger::log($exception->getMessage(), \Tracy\ILogger::CRITICAL);
-		} catch (\Spameri\Elastic\Exception\DocumentNotFound $exception) {
-			\Tracy\Debugger::log($exception->getMessage(), \Tracy\ILogger::ERROR);
+
+			throw $exception;
+		}
+
+		if ($resultSearch->stats()->total() === 0) {
+			throw new \Spameri\Elastic\Exception\DocumentNotFound($this->index, $elasticQuery);
 		}
 
-		throw new \Spameri\Elastic\Exception\DocumentNotFound($this->index, $elasticQuery);
+		return $this->entityFactory->create($resultSearch->hits()->getIterator()->current())->current();
 	}
 
 
@@ -146,53 +158,51 @@ public function getAllBy(
 	) : \Spameri\Elastic\Entity\IElasticEntityCollection
 	{
 		try {
-			$documents = $this->getAllBy->execute($elasticQuery, $this->index);
-
-			if ($documents) {
-				$resultCollection = new \Spameri\Elastic\Entity\Collection\ResultCollection($documents);
-				$result = $this->collectionFactory->create(
-					$this,
-					[],
-					... $this->entityFactory->create($resultCollection)
-				);
-			} else {
-				$result = $this->collectionFactory->create(
-					$this
-				);
-			}
-		} catch (\Elasticsearch\Common\Exceptions\ElasticsearchException $exception) {
+			$resultSearch = $this->getAllBy->execute($elasticQuery, $this->index);
+
+		} catch (\Spameri\Elastic\Exception\ElasticSearch $exception) {
 			\Tracy\Debugger::log($exception->getMessage(), \Tracy\ILogger::CRITICAL);
 
+			throw $exception;
+		}
+
+		if ($resultSearch->stats()->total() === 0) {
 			throw new \Spameri\Elastic\Exception\DocumentNotFound($this->index, $elasticQuery);
 		}
 
-		return $result;
+		$entities = [];
+		foreach ($resultSearch->hits() as $hit) {
+			$entities[] = $this->entityFactory->create($hit)->current();
+		}
+
+		return $this->collectionFactory->create(
+			$this,
+			[],
+			... $entities
+		);
 	}
 
 
 	public function delete(
 		\Spameri\Elastic\Entity\Property\IElasticId $id
 	) : bool
 	{
-		return $this->delete->execute($id, $this->index);
+		try {
+			return $this->delete->execute($id, $this->index);
+
+		} catch (\Spameri\Elastic\Exception\ElasticSearch $exception) {
+			\Tracy\Debugger::log($exception->getMessage(), \Tracy\ILogger::CRITICAL);
+
+			throw $exception;
+		}
 	}
 
 
 	public function aggregate(
 		\Spameri\ElasticQuery\ElasticQuery $elasticQuery
-	) : array
+	) : \Spameri\ElasticQuery\Response\ResultSearch
 	{
-		return $this->client->search(
-			(
-			new \Spameri\ElasticQuery\Document(
-				$this->index,
-				new \Spameri\ElasticQuery\Document\Body\Plain(
-					$elasticQuery->toArray()
-				),
-				$this->index
-			)
-			)->toArray()
-		);
+		return $this->aggregate->execute($elasticQuery, $this->index);
 	}
 
 }

src/Model/Aggregate.php

@@ -20,29 +20,42 @@ public function __construct(
 	}
 
 
+	/**
+	 * @throws \Spameri\Elastic\Exception\ElasticSearch
+	 */
 	public function execute(
 		\Spameri\Elastic\Entity\Property\IElasticId $id
 		, string $index
 	) : bool
 	{
-		$response = $this->clientProvider->client()->delete(
-			(
+		try {
+			$response = $this->clientProvider->client()->delete(
+				(
 				new \Spameri\ElasticQuery\Document(
 					$index,
 					NULL,
 					$index,
 					$id->value()
 				)
-			)
-			->toArray()
-		);
-
-		$this->clientProvider->client()->indices()->refresh(
-			(
-			new \Spameri\ElasticQuery\Document($index)
-			)
-				->toArray()
-		);
+				)
+					->toArray()
+			);
+
+		} catch (\Elasticsearch\Common\Exceptions\ElasticsearchException $exception) {
+			throw new \Spameri\Elastic\Exception\ElasticSearch($exception->getMessage());
+		}
+
+		try {
+			$this->clientProvider->client()->indices()->refresh(
+				(
+				new \Spameri\ElasticQuery\Document($index)
+				)
+					->toArray()
+			);
+
+		} catch (\Elasticsearch\Common\Exceptions\ElasticsearchException $exception) {
+			throw new \Spameri\Elastic\Exception\ElasticSearch($exception->getMessage());
+		}
 
 		return $response['result'] === 'deleted';
 	}