universal collection for results

Author: Spamercz

src/EntityManager.php

@@ -14,6 +14,7 @@ public function __construct(
 		private \Spameri\Elastic\EventManager\DispatchEvents $dispatchEvents,
 		private \Spameri\Elastic\Model\IdentityMap $identityMap,
 		private \Spameri\Elastic\Model\ChangeSet $changeSet,
+		private \Spameri\Elastic\Factory\EntityFactory $entityFactory,
 	)
 	{
 	}
@@ -93,7 +94,7 @@ public function findBy(
 			throw $exception;
 		}
 
-		return $this->createCollection($class, $resultSearch->hits()->ids());
+		return $this->createCollection($class, $resultSearch);
 	}
 
 
@@ -121,13 +122,24 @@ public function createEmptyCollection(
 	 */
 	protected function createCollection(
 		string $class,
-		array $ids,
+		\Spameri\ElasticQuery\Response\ResultSearch $resultSearch,
 	): \Spameri\Elastic\Entity\Collection\ElasticEntityCollection
 	{
+		$entities = [];
+		foreach ($resultSearch->hits() as $hit) {
+			try {
+				$entities[] = $this->entityFactory->create($hit, $class, $this);
+
+			} catch (\Spameri\Elastic\Exception\ElasticSearch $exception) {
+				\Tracy\Debugger::log($exception->getMessage(), \Tracy\ILogger::CRITICAL);
+			}
+		}
+
 		return new \Spameri\Elastic\Entity\Collection\ElasticEntityCollection(
-			entityManager: $this,
-			entityClass: $class,
-			elasticIds: $ids,
+			$this,
+			$class,
+			$resultSearch->hits()->ids(),
+			... $entities,
 		);
 	}
 

src/Factory/EntityFactory.php

@@ -15,13 +15,15 @@ public function __construct(
 	}
 
 	/**
-	 * @return \Generator<\Spameri\Elastic\Entity\AbstractElasticEntity>
+	 * @template T
+	 * @param class-string<T> $class
+	 * @return T
 	 */
 	public function create(
 		\Spameri\ElasticQuery\Response\Result\Hit $hit,
 		string|null $class,
 		\Spameri\Elastic\EntityManager|null $entityManager,
-	): \Generator
+	): \Spameri\Elastic\Entity\AbstractElasticEntity
 	{
 		if ($class === null) {
 			throw new \InvalidArgumentException('Class must be set');
@@ -40,7 +42,7 @@ class: $class,
 			id: $hit->id(),
 		);
 		if ($entity !== null) {
-			yield $entity;
+			return $entity;
 		}
 
 		$properties = $this->resolveProperties(
@@ -57,7 +59,7 @@ class: $class,
 
 		$this->identityMap->add($entity);
 
-		yield $entity;
+		return $entity;
 	}
 
 	protected function resolveProperties(
@@ -86,6 +88,7 @@ protected function resolveProperties(
 			$propertyTypeName = $reflectionPropertyType->getName();
 			if ($reflectionPropertyType->allowsNull() && $value === null) {
 				$propertyValue = null;
+				$setNull = true;
 
 			} elseif ($property->hasDefaultValue() === true && $value === null) {
 				$propertyValue = $property->getDefaultValue();
@@ -207,11 +210,13 @@ class: $propertyTypeName,
 				$propertyValue = $value;
 			}
 
-			if (isset($propertyValue)) {
+			if (
+				isset($propertyValue) || isset($setNull)
+			) {
 				$resolvedProperties[$property->getName()] = $propertyValue;
 			}
 
-			unset($propertyValue);
+			unset($propertyValue, $setNull);
 		}
 
 		return $resolvedProperties;

src/Factory/EntityFactoryInterface.php

@@ -9,6 +9,6 @@ public function create(
 		\Spameri\ElasticQuery\Response\Result\Hit $hit,
 		string|null $class,
 		\Spameri\Elastic\EntityManager|null $entityManager,
-	): \Generator;
+	): \Spameri\Elastic\Entity\AbstractElasticEntity;
 
 }

src/Model/AbstractBaseService.php

@@ -55,7 +55,7 @@ public function get(
 			throw new \Spameri\Elastic\Exception\DocumentNotFound(' with id ' . $id->value());
 		}
 
-		return $this->entityFactory->create($singleResult->hit(), null, $this->entityManager)->current();
+		return $this->entityFactory->create($singleResult->hit(), null, $this->entityManager);
 	}
 
 
@@ -80,7 +80,7 @@ public function getBy(
 			throw new \Spameri\Elastic\Exception\DocumentNotFound($this->index, $elasticQuery);
 		}
 
-		return $this->entityFactory->create($resultSearch->hits()->getIterator()->current(), null, $this->entityManager)->current();
+		return $this->entityFactory->create($resultSearch->hits()->getIterator()->current(), null, $this->entityManager);
 	}
 
 
@@ -107,7 +107,7 @@ public function getAllBy(
 		$entities = [];
 		foreach ($resultSearch->hits() as $hit) {
 			try {
-				$entities[] = $this->entityFactory->create($hit, null, $this->entityManager)->current();
+				$entities[] = $this->entityFactory->create($hit, null, $this->entityManager);
 
 			} catch (\Spameri\Elastic\Exception\ElasticSearch $exception) {
 				\Tracy\Debugger::log($exception->getMessage(), \Tracy\ILogger::CRITICAL);

tests/SpameriTests/Elastic/Factory/EntityFactory.phpt

@@ -52,8 +52,7 @@ class EntityFactory extends \SpameriTests\Elastic\AbstractTestCase
 		);
 
 		/** @var \SpameriTests\Elastic\Data\Entity\Person $entity */
-		$entity = $entityFactory->create($hit, \SpameriTests\Elastic\Data\Entity\Person::class, $entityManager)
-			->current();
+		$entity = $entityFactory->create($hit, \SpameriTests\Elastic\Data\Entity\Person::class, $entityManager);
 
 		\Tester\Assert::same($person->id->value(), $entity->id->value());
 		\Tester\Assert::same($person->identification->imdb->value(), $entity->identification->imdb->value());