IComponentMapper::ITEMS_FILTER - callback

FreezyBee · Apr 28, 2021 · 2cc5bfd · 2cc5bfd
1 parent a0ef733
commit 2cc5bfd
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -57,7 +57,11 @@ Documentation
                 // order items
                 ->setOption(IComponentMapper::ITEMS_ORDER, ['age' => 'ASC'])
                 // filter items
-                ->setOption(IComponentMapper::ITEMS_FILTER, ['age !=' => 0])
+                ->setOption(IComponentMapper::ITEMS_FILTER, ['age' => 0])
+                // filter items by callback
+                ->setOption(IComponentMapper::ITEMS_FILTER, function(QueryBuilder $qb) {
+                    $qb->andWhere('entity.age != 0')
+                })
                 // custom select label renderer
                 ->setOption(IComponentMapper::ITEMS_TITLE, function (Author $author) {
                     return $author->getName() . ' - ' . $author->getAge();
@@ -106,4 +110,4 @@ Documentation
             return $form;
         }
     }
-```
+```
diff --git a/src/Utils/RelationsHelper.php b/src/Utils/RelationsHelper.php
@@ -83,22 +83,34 @@ protected function relatedMetadata($entity, string $relationName): ClassMetadata
     /**
      * @param ClassMetadata $meta
      * @param callable|string $associationKeyOrCallback
-     * @param string[] $criteria
+     * @param array<string, mixed>|callable $criteria
      * @param string[] $orderBy
      * @return mixed[]
      */
-    protected function findPairs(ClassMetadata $meta, $associationKeyOrCallback, array $criteria, array $orderBy): array
+    protected function findPairs(ClassMetadata $meta, $associationKeyOrCallback, $criteria, array $orderBy): array
     {
         $classname = $meta->getName();
         if (!class_exists($classname)) {
             throw new LogicException();
         }
 
-        $repository = $this->em->getRepository($classname);
-
         $items = [];
         $idKey = $meta->getSingleIdentifierFieldName();
-        foreach ($repository->findBy($criteria, $orderBy) as $entity) {
+
+        if (is_callable($criteria)) {
+            $qb = $this->em->createQueryBuilder()
+                ->select('entity')
+                ->from($classname, 'entity');
+
+            // call user func
+            $criteria($qb);
+
+            $entities = $qb->getQuery()->getResult();
+        } else {
+            $entities = $this->em->getRepository($classname)->findBy($criteria, $orderBy);
+        }
+
+        foreach ($entities as $entity) {
             $identifier = $this->accessor->getValue($entity, $idKey);
             if (is_object($identifier) && method_exists($identifier, 'toString')) {
                 // support for UuidInterface

diff --git a/tests/Integration/Mappers/ManyToManyTest.phpt b/tests/Integration/Mappers/ManyToManyTest.phpt
@@ -11,6 +11,7 @@ namespace FreezyBee\DoctrineFormMapper\Tests\Integration\Mappers;
 
 require __DIR__ . '/../../bootstrap.php';
 
+use Doctrine\ORM\QueryBuilder;
 use FreezyBee\DoctrineFormMapper\DoctrineFormMapper;
 use FreezyBee\DoctrineFormMapper\IComponentMapper;
 use FreezyBee\DoctrineFormMapper\Mappers\ManyToMany;
@@ -63,6 +64,23 @@ class ManyToManyTest extends TestCase
         Assert::same([1001, 1002], $component->getValue());
     }
 
+    public function testLoadItemsWithCriteriaCallback()
+    {
+        $em = $this->getEntityManager();
+        $meta = $em->getClassMetadata(Article::class);
+
+        $component = new MultiSelectBox;
+        $component->setOption(IComponentMapper::ITEMS_TITLE, 'name');
+        $component->setOption(IComponentMapper::ITEMS_FILTER, function (QueryBuilder $qb) {
+            $qb->andWhere('entity.id = 1001');
+        });
+        $component->setParent(new Container, 'tags');
+
+        $result = $this->mapper->load($meta, $component, new Article(new Author('', new Address())));
+        Assert::true($result);
+        Assert::same([1001 => 'tag name1'], $component->getItems());
+    }
+
     /**
      *
      */

diff --git a/tests/Integration/Mappers/ManyToOneTest.phpt b/tests/Integration/Mappers/ManyToOneTest.phpt
@@ -11,6 +11,7 @@ namespace FreezyBee\DoctrineFormMapper\Tests\Integration\Mappers;
 
 require __DIR__ . '/../../bootstrap.php';
 
+use Doctrine\ORM\QueryBuilder;
 use FreezyBee\DoctrineFormMapper\DoctrineFormMapper;
 use FreezyBee\DoctrineFormMapper\Exceptions\InvalidStateException;
 use FreezyBee\DoctrineFormMapper\IComponentMapper;
@@ -66,6 +67,23 @@ class ManyToOneTest extends TestCase
         Assert::same([11 => 'author name1', 12 => 'author name2', 13 => 'author name3'], $component->getItems());
     }
 
+    public function testLoadItemsWithCriteriaCallback()
+    {
+        $em = $this->getEntityManager();
+        $meta = $em->getClassMetadata(Article::class);
+
+        $component = new SelectBox;
+        $component->setOption(IComponentMapper::ITEMS_TITLE, 'name');
+        $component->setOption(IComponentMapper::ITEMS_FILTER, function (QueryBuilder $qb) {
+            $qb->andWhere('entity.id = 11');
+        });
+        $component->setParent(new Container, 'author');
+
+        $result = $this->mapper->load($meta, $component, new Article(new Author('', new Address())));
+        Assert::true($result);
+        Assert::same([11 => 'author name1'], $component->getItems());
+    }
+
     /**
      *
      */