Merge pull request #32 from TomHAnderson/feature/simplify-apply-filters

Feature/simplify apply filters
API-Skeletons · Dec 2, 2023 · 2df392c · 2df392c
2 parents bd99e53 + 3bc35e1
commit 2df392c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 67 deletions.
diff --git a/src/Criteria/Filters.php b/src/Criteria/Filters.php
@@ -70,62 +70,19 @@ public static function getDescriptions(): array
         ];
     }
 
-    /** @param mixed[] $filterTypes */
-    public function filterQueryBuilder(array $filterTypes, QueryBuilder $queryBuilder): void
+    /**
+     * Add where clauses to a queryBuidler based on the FilterType of the entity
+     * The alias for the entity must be named `entity`
+     *
+     * @param mixed[] $filterTypes
+     */
+    public function applyToQueryBuilder(array $filterTypes, QueryBuilder $queryBuilder): void
     {
         foreach ($filterTypes as $field => $filters) {
             $entityField = 'entity.' . $field;
 
             foreach ($filters as $filter => $value) {
                 switch ($filter) {
-                    case self::EQ:
-                        $parameter = 'p' . uniqid();
-                        $queryBuilder->andWhere(
-                            $queryBuilder->expr()->eq($entityField, ':' . $parameter),
-                        )
-                            ->setParameter($parameter, $value);
-                        break;
-
-                    case self::NEQ:
-                        $parameter = 'p' . uniqid();
-                        $queryBuilder->andWhere(
-                            $queryBuilder->expr()->neq($entityField, ':' . $parameter),
-                        )
-                            ->setParameter($parameter, $value);
-                        break;
-
-                    case self::LT:
-                        $parameter = 'p' . uniqid();
-                        $queryBuilder->andWhere(
-                            $queryBuilder->expr()->lt($entityField, ':' . $parameter),
-                        )
-                            ->setParameter($parameter, $value);
-                        break;
-
-                    case self::LTE:
-                        $parameter = 'p' . uniqid();
-                        $queryBuilder->andWhere(
-                            $queryBuilder->expr()->lte($entityField, ':' . $parameter),
-                        )
-                            ->setParameter($parameter, $value);
-                        break;
-
-                    case self::GT:
-                        $parameter = 'p' . uniqid();
-                        $queryBuilder->andWhere(
-                            $queryBuilder->expr()->gt($entityField, ':' . $parameter),
-                        )
-                            ->setParameter($parameter, $value);
-                        break;
-
-                    case self::GTE:
-                        $parameter = 'p' . uniqid();
-                        $queryBuilder->andWhere(
-                            $queryBuilder->expr()->gte($entityField, ':' . $parameter),
-                        )
-                            ->setParameter($parameter, $value);
-                        break;
-
                     case self::BETWEEN:
                         $from = 'p' . uniqid();
                         $to   = 'p' . uniqid();
@@ -164,22 +121,6 @@ public function filterQueryBuilder(array $filterTypes, QueryBuilder $queryBuilde
                             ->setParameter($parameter, '%' . $value);
                         break;
 
-                    case self::IN:
-                        $parameter = 'p' . uniqid();
-                        $queryBuilder->andWhere(
-                            $queryBuilder->expr()->in($entityField, ':' . $parameter),
-                        )
-                        ->setParameter($parameter, $value);
-                        break;
-
-                    case self::NOTIN:
-                        $parameter = 'p' . uniqid();
-                        $queryBuilder->andWhere(
-                            $queryBuilder->expr()->notIn($entityField, ':' . $parameter),
-                        )
-                        ->setParameter($parameter, $value);
-                        break;
-
                     case self::ISNULL:
                         if ($value === true) {
                             $queryBuilder->andWhere(
@@ -198,6 +139,14 @@ public function filterQueryBuilder(array $filterTypes, QueryBuilder $queryBuilde
                     case self::SORT:
                         $queryBuilder->addOrderBy($entityField, $value);
                         break;
+
+                    default:
+                        $parameter = 'p' . uniqid();
+                        $queryBuilder->andWhere(
+                            $queryBuilder->expr()->$filter($entityField, ':' . $parameter),
+                        )
+                            ->setParameter($parameter, $value);
+                        break;
                 }
             }
         }

diff --git a/src/Resolve/ResolveEntityFactory.php b/src/Resolve/ResolveEntityFactory.php
@@ -40,7 +40,7 @@ public function get(Entity $entity, string $eventName): Closure
                 ->from($entityClass, 'entity');
 
             if (isset($args['filter'])) {
-                $filters->filterQueryBuilder($args['filter'], $queryBuilder);
+                $filters->applyToQueryBuilder($args['filter'], $queryBuilder);
             }
 
             return $this->buildPagination(