Association: filterIn Allow direct values and entity

thomasbeaujean · Apr 29, 2024 · 6f3e4ef · 6f3e4ef
1 parent f39e348
commit 6f3e4ef
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/Resources/views/Generator/AssociationTemplate.html.twig b/src/Resources/views/Generator/AssociationTemplate.html.twig
@@ -58,7 +58,13 @@
 
             foreach ($values as $value) {
                 if ($value !== null) {
-                    $ids[] = $value->getId();
+                    // by default we use the value
+                    $id = $value;
+                    if ($value instanceof \{{targetEntity}}) {
+                        $id = $value->getId();
+                    }
+
+                    $ids[] = $id;
                 } else {
                     $orNull = ' OR '.$entityName.'.'.$columnName.' IS NULL';
                 }

diff --git a/tests/Repository/MyClassRepositoryBase.php b/tests/Repository/MyClassRepositoryBase.php
@@ -477,7 +477,13 @@ public static function filterInForeignClasses(QueryBuilder $qb, $values, $entity
 
             foreach ($values as $value) {
                 if ($value !== null) {
-                    $ids[] = $value->getId();
+                    // by default we use the value
+                    $id = $value;
+                    if ($value instanceof \Tbn\QueryBuilderRepositoryGeneratorBundle\Tests\Entity\ForeignClass) {
+                        $id = $value->getId();
+                    }
+
+                    $ids[] = $id;
                 } else {
                     $orNull = ' OR '.$entityName.'.'.$columnName.' IS NULL';
                 }

diff --git a/tests/Service/ExpectedMyClassRepositoryBase.txt b/tests/Service/ExpectedMyClassRepositoryBase.txt
@@ -477,7 +477,13 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S
 
             foreach ($values as $value) {
                 if ($value !== null) {
-                    $ids[] = $value->getId();
+                    // by default we use the value
+                    $id = $value;
+                    if ($value instanceof \Tbn\QueryBuilderRepositoryGeneratorBundle\Tests\Entity\ForeignClass) {
+                        $id = $value->getId();
+                    }
+
+                    $ids[] = $id;
                 } else {
                     $orNull = ' OR '.$entityName.'.'.$columnName.' IS NULL';
                 }