collection: implement fetch pairs support for embeddables

nextras · Feb 23, 2020 · 6a7877a · 6a7877a
1 parent c0e0cca
commit 6a7877a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/src/Collection/Helpers/FetchPairsHelper.php b/src/Collection/Helpers/FetchPairsHelper.php
@@ -9,6 +9,7 @@
 namespace Nextras\Orm\Collection\Helpers;
 
 use Nextras\Dbal\Utils\DateTimeImmutable;
+use Nextras\Orm\Entity\Embeddable\IEmbeddable;
 use Nextras\Orm\Entity\IEntity;
 use Nextras\Orm\InvalidArgumentException;
 use Nextras\Orm\InvalidStateException;
@@ -66,8 +67,8 @@ private static function getProperty(IEntity $row, array $chain)
 		$lastPropertyName = "";
 		do {
 			$propertyName = array_shift($chain);
-			if (!$result instanceof IEntity) {
-				throw new InvalidStateException("Part '$lastPropertyName' of the chain expression does not select IEntity value.");
+			if (!$result instanceof IEntity && !$result instanceof IEmbeddable) {
+				throw new InvalidStateException("Part '$lastPropertyName' of the chain expression does not select an IEntity or IEmbeddable.");
 			}
 			$lastPropertyName = $propertyName;
 			$result = $result->getValue($propertyName);

diff --git a/tests/cases/unit/Collection/FetchPairsHelperTest.phpt b/tests/cases/unit/Collection/FetchPairsHelperTest.phpt
@@ -13,7 +13,9 @@ use Nextras\Orm\InvalidArgumentException;
 use Nextras\Orm\InvalidStateException;
 use NextrasTests\Orm\Author;
 use NextrasTests\Orm\Book;
+use NextrasTests\Orm\Currency;
 use NextrasTests\Orm\Ean;
+use NextrasTests\Orm\Money;
 use NextrasTests\Orm\TestCase;
 use Tester\Assert;
 
@@ -82,7 +84,7 @@ class FetchPairsHelperTest extends TestCase
 	}
 
 
-	public function testNester()
+	public function testNested()
 	{
 		$data = new ArrayIterator([
 			$one = $this->e(
@@ -167,6 +169,25 @@ class FetchPairsHelperTest extends TestCase
 	}
 
 
+	public function testEmbeddable()
+	{
+		$data = new ArrayIterator([
+			$this->e(
+				Book::class,
+				['price' => new Money(100, Currency::CZK())]
+			),
+			$this->e(
+				Book::class,
+				['price' => new Money(200, Currency::CZK())]
+			),
+		]);
+		Assert::same(
+			[100, 200],
+			FetchPairsHelper::process($data, null, 'price->cents')
+		);
+	}
+
+
 	public function testUnsupportedHasMany()
 	{
 		Assert::throws(function () {
@@ -183,7 +204,7 @@ class FetchPairsHelperTest extends TestCase
 				),
 			]);
 			FetchPairsHelper::process($data, null, 'books->id');
-		}, InvalidStateException::class, "Part 'books' of the chain expression does not select IEntity value.");
+		}, InvalidStateException::class, "Part 'books' of the chain expression does not select an IEntity or IEmbeddable.");
 	}