fix cross matching on an aggregate or entity property

formal-php · Oct 31, 2024 · cdaebd6 · cdaebd6
1 parent bade44f
commit cdaebd6
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [Unreleased]
+
+### Fixed
+
+- Cross matching on an aggregate or entity property.
+
 ## 3.4.1 - 2024-10-26
 
 ### Changed

diff --git a/properties/CrossAggregateMatching.php b/properties/CrossAggregateMatching.php
@@ -126,6 +126,35 @@ static function() use ($repository, $child1, $child2, $parent1, $parent2) {
 
         $assert->count(0, $found);
 
+        // this allows to check the cross match on aggregate properties
+        $found = $repository
+            ->matching(Comparator\Property::of(
+                'id',
+                Sign::in,
+                $repository->matching(
+                    Comparator\Property::of('id', Sign::equality, $child1->id())->or(
+                        Comparator\Property::of('id', Sign::equality, $parent2->id()),
+                    ),
+                ),
+            ))
+            ->map(static fn($user) => $user->id()->toString())
+            ->toList();
+
+        $assert
+            ->expected($child1->id()->toString())
+            ->in($found);
+        $assert
+            ->expected($parent2->id()->toString())
+            ->in($found);
+        $assert
+            ->expected($child2->id()->toString())
+            ->not()
+            ->in($found);
+        $assert
+            ->expected($parent1->id()->toString())
+            ->not()
+            ->in($found);
+
         return $manager;
     }
 }
diff --git a/src/Adapter/SQL/MainTable.php b/src/Adapter/SQL/MainTable.php
@@ -13,6 +13,7 @@
     Specification\Child,
     Specification\Just,
     Specification\Has,
+    Specification\CrossMatch,
 };
 use Formal\AccessLayer\{
     Table,
@@ -27,6 +28,7 @@
 use Innmind\Specification\{
     Specification,
     Not,
+    Comparator,
     Composite,
     Operator,
     Sign,
@@ -404,6 +406,14 @@ private function where(Specification $specification): Specification
             );
         }
 
+        if ($specification instanceof CrossMatch) {
+            return Comparator\Property::of(
+                'entity.'.$specification->property(),
+                $specification->sign(),
+                $specification->value(),
+            );
+        }
+
         if (!($specification instanceof Property)) {
             $class = $specification::class;
 
@@ -446,6 +456,18 @@ private function whereEntity(Entity $specification): Specification
             };
         }
 
+        if ($underlying instanceof CrossMatch) {
+            return Comparator\Property::of(
+                \sprintf(
+                    '%s.%s',
+                    $specification->entity(),
+                    $underlying->property(),
+                ),
+                $underlying->sign(),
+                $underlying->value(),
+            );
+        }
+
         if (!($underlying instanceof Property)) {
             $class = $underlying::class;