Fix countFilter condition (#1287)

* Fix countFilter condition * Improve tests
sonata-project · Feb 5, 2021 · 0a32db3 · 0a32db3
1 parent 83a789f
commit 0a32db3
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 79 deletions.
diff --git a/src/Filter/CountFilter.php b/src/Filter/CountFilter.php
@@ -53,7 +53,7 @@ public function filter(BaseProxyQueryInterface $query, $alias, $field, $data)
         $parameterName = $this->getNewParameterName($query);
         $rootAlias = current($query->getQueryBuilder()->getRootAliases());
         $query->getQueryBuilder()->addGroupBy($rootAlias);
-        $this->applyWhere($query, sprintf('COUNT(%s.%s) %s :%s', $alias, $field, $operator, $parameterName));
+        $this->applyHaving($query, sprintf('COUNT(%s.%s) %s :%s', $alias, $field, $operator, $parameterName));
         $query->getQueryBuilder()->setParameter($parameterName, $data['value']);
     }
 

diff --git a/tests/Filter/BooleanFilterTest.php b/tests/Filter/BooleanFilterTest.php
@@ -58,7 +58,7 @@ public function testFilterNo(): void
 
         $filter->filter($builder, 'alias', 'field', ['type' => null, 'value' => BooleanType::TYPE_NO]);
 
-        $this->assertSame(['alias.field = :field_name_0'], $builder->query);
+        $this->assertSame(['WHERE alias.field = :field_name_0'], $builder->query);
         $this->assertSame(['field_name_0' => 0], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
     }
@@ -72,7 +72,7 @@ public function testFilterYes(): void
 
         $filter->filter($builder, 'alias', 'field', ['type' => null, 'value' => BooleanType::TYPE_YES]);
 
-        $this->assertSame(['alias.field = :field_name_0'], $builder->query);
+        $this->assertSame(['WHERE alias.field = :field_name_0'], $builder->query);
         $this->assertSame(['field_name_0' => 1], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
     }
@@ -86,7 +86,7 @@ public function testFilterArray(): void
 
         $filter->filter($builder, 'alias', 'field', ['type' => null, 'value' => [BooleanType::TYPE_NO]]);
 
-        $this->assertSame(['alias.field IN ("0")'], $builder->query);
+        $this->assertSame(['WHERE alias.field IN ("0")'], $builder->query);
         $this->assertTrue($filter->isActive());
     }
 }
diff --git a/tests/Filter/CallbackFilterTest.php b/tests/Filter/CallbackFilterTest.php
@@ -48,7 +48,7 @@ public function testFilterClosure(): void
 
         $filter->filter($builder, 'alias', 'field', 'myValue');
 
-        $this->assertSame(['CUSTOM QUERY alias.field'], $builder->query);
+        $this->assertSame(['WHERE CUSTOM QUERY alias.field'], $builder->query);
         $this->assertSame(['value' => 'myValue'], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
     }
@@ -64,7 +64,7 @@ public function testFilterMethod(): void
 
         $filter->filter($builder, 'alias', 'field', 'myValue');
 
-        $this->assertSame(['CUSTOM QUERY alias.field'], $builder->query);
+        $this->assertSame(['WHERE CUSTOM QUERY alias.field'], $builder->query);
         $this->assertSame(['value' => 'myValue'], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
     }
@@ -106,7 +106,7 @@ public function testApplyMethod(): void
 
         $filter->apply($builder, ['value' => 'myValue']);
 
-        $this->assertSame(['CUSTOM QUERY o.field_name_test'], $builder->query);
+        $this->assertSame(['WHERE CUSTOM QUERY o.field_name_test'], $builder->query);
         $this->assertSame(['value' => 'myValue'], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
     }
@@ -136,7 +136,7 @@ public function testWrongCallbackReturnType(): void
         );
         $filter->filter($builder, 'alias', 'field', 'myValue');
 
-        $this->assertSame(['CUSTOM QUERY alias.field'], $builder->query);
+        $this->assertSame(['WHERE CUSTOM QUERY alias.field'], $builder->query);
         $this->assertSame(['value' => 'myValue'], $builder->queryParameters);
     }
 }
diff --git a/tests/Filter/ChoiceFilterTest.php b/tests/Filter/ChoiceFilterTest.php
@@ -53,7 +53,7 @@ public function testFilterArray(): void
 
         $filter->filter($builder, 'alias', 'field', ['type' => EqualOperatorType::TYPE_EQUAL, 'value' => ['1', '2']]);
 
-        $this->assertSame(['alias.field IN :field_name_0'], $builder->query);
+        $this->assertSame(['WHERE alias.field IN :field_name_0'], $builder->query);
         $this->assertSame(['field_name_0' => ['1', '2']], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
     }
@@ -67,15 +67,15 @@ public function testFilterArrayWithNullValue(): void
 
         $filter->filter($builder, 'alias', 'field', ['type' => EqualOperatorType::TYPE_EQUAL, 'value' => ['1', null]]);
 
-        $this->assertSame(['alias.field IN :field_name_0 OR alias.field IS NULL'], $builder->query);
+        $this->assertSame(['WHERE alias.field IN :field_name_0 OR alias.field IS NULL'], $builder->query);
         $this->assertSame(['field_name_0' => ['1']], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
 
         $builder = new ProxyQuery($this->createQueryBuilderStub());
 
         $filter->filter($builder, 'alias', 'field', ['type' => EqualOperatorType::TYPE_NOT_EQUAL, 'value' => ['1', null]]);
 
-        $this->assertSame(['alias.field IS NOT NULL AND alias.field NOT IN :field_name_0'], $builder->query);
+        $this->assertSame(['WHERE alias.field IS NOT NULL AND alias.field NOT IN :field_name_0'], $builder->query);
         $this->assertSame(['field_name_0' => ['1']], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
     }
@@ -89,7 +89,7 @@ public function testFilterScalar(): void
 
         $filter->filter($builder, 'alias', 'field', ['type' => EqualOperatorType::TYPE_EQUAL, 'value' => '1']);
 
-        $this->assertSame(['alias.field = :field_name_0'], $builder->query);
+        $this->assertSame(['WHERE alias.field = :field_name_0'], $builder->query);
         $this->assertSame(['field_name_0' => '1'], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
     }
@@ -103,15 +103,15 @@ public function testFilterNull(): void
 
         $filter->filter($builder, 'alias', 'field', ['type' => EqualOperatorType::TYPE_EQUAL, 'value' => null]);
 
-        $this->assertSame(['alias.field IS NULL'], $builder->query);
+        $this->assertSame(['WHERE alias.field IS NULL'], $builder->query);
         $this->assertSame([], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
 
         $builder = new ProxyQuery($this->createQueryBuilderStub());
 
         $filter->filter($builder, 'alias', 'field', ['type' => EqualOperatorType::TYPE_NOT_EQUAL, 'value' => null]);
 
-        $this->assertSame(['alias.field IS NOT NULL'], $builder->query);
+        $this->assertSame(['WHERE alias.field IS NOT NULL'], $builder->query);
         $this->assertSame([], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
     }
@@ -125,7 +125,7 @@ public function testFilterZero(): void
 
         $filter->filter($builder, 'alias', 'field', ['type' => EqualOperatorType::TYPE_EQUAL, 'value' => 0]);
 
-        $this->assertSame(['alias.field = :field_name_0'], $builder->query);
+        $this->assertSame(['WHERE alias.field = :field_name_0'], $builder->query);
         $this->assertSame(['field_name_0' => 0], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
     }

diff --git a/tests/Filter/ClassFilterTest.php b/tests/Filter/ClassFilterTest.php
@@ -69,9 +69,9 @@ public function testFilter(): void
         $filter->filter($builder, 'alias', 'field', ['value' => 'type']);
 
         $expected = [
-            'alias INSTANCE OF type',
-            'alias NOT INSTANCE OF type',
-            'alias INSTANCE OF type',
+            'WHERE alias INSTANCE OF type',
+            'WHERE alias NOT INSTANCE OF type',
+            'WHERE alias INSTANCE OF type',
         ];
 
         $this->assertSame($expected, $builder->query);

diff --git a/tests/Filter/CountFilterTest.php b/tests/Filter/CountFilterTest.php
@@ -65,12 +65,12 @@ public function testFilter(string $expected, ?int $type): void
     public function filterDataProvider(): array
     {
         return [
-            ['COUNT(alias.field) = :field_name_0', NumberOperatorType::TYPE_EQUAL],
-            ['COUNT(alias.field) >= :field_name_0', NumberOperatorType::TYPE_GREATER_EQUAL],
-            ['COUNT(alias.field) > :field_name_0', NumberOperatorType::TYPE_GREATER_THAN],
-            ['COUNT(alias.field) <= :field_name_0', NumberOperatorType::TYPE_LESS_EQUAL],
-            ['COUNT(alias.field) < :field_name_0', NumberOperatorType::TYPE_LESS_THAN],
-            ['COUNT(alias.field) = :field_name_0', null],
+            ['HAVING COUNT(alias.field) = :field_name_0', NumberOperatorType::TYPE_EQUAL],
+            ['HAVING COUNT(alias.field) >= :field_name_0', NumberOperatorType::TYPE_GREATER_EQUAL],
+            ['HAVING COUNT(alias.field) > :field_name_0', NumberOperatorType::TYPE_GREATER_THAN],
+            ['HAVING COUNT(alias.field) <= :field_name_0', NumberOperatorType::TYPE_LESS_EQUAL],
+            ['HAVING COUNT(alias.field) < :field_name_0', NumberOperatorType::TYPE_LESS_THAN],
+            ['HAVING COUNT(alias.field) = :field_name_0', null],
         ];
     }
 }
diff --git a/tests/Filter/DateRangeFilterTest.php b/tests/Filter/DateRangeFilterTest.php
@@ -67,7 +67,7 @@ public function testFilterStartDateAndEndDate(): void
             ],
         ]);
 
-        $this->assertSame(['alias.field >= :field_name_0', 'alias.field <= :field_name_1'], $builder->query);
+        $this->assertSame(['WHERE alias.field >= :field_name_0', 'WHERE alias.field <= :field_name_1'], $builder->query);
         $this->assertSame([
             'field_name_0' => $startDateTime,
             'field_name_1' => $endDateTime,
@@ -92,7 +92,7 @@ public function testFilterStartDate(): void
             ],
         ]);
 
-        $this->assertSame(['alias.field >= :field_name_0'], $builder->query);
+        $this->assertSame(['WHERE alias.field >= :field_name_0'], $builder->query);
         $this->assertSame(['field_name_0' => $startDateTime], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
     }
@@ -114,7 +114,7 @@ public function testFilterEndDate(): void
             ],
         ]);
 
-        $this->assertSame(['alias.field <= :field_name_1'], $builder->query);
+        $this->assertSame(['WHERE alias.field <= :field_name_1'], $builder->query);
         $this->assertSame(['field_name_1' => $endDateTime], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
     }
@@ -147,7 +147,7 @@ public function testFilterEndDateCoversWholeDay(
         ]);
 
         $this->assertTrue($filter->isActive());
-        $this->assertSame(['alias.field <= :field_name_1'], $builder->query);
+        $this->assertSame(['WHERE alias.field <= :field_name_1'], $builder->query);
         $this->assertSame(['field_name_1' => $modelEndDateTime], $builder->queryParameters);
         $this->assertSame($expectedEndDateTime->getTimestamp(), $modelEndDateTime->getTimestamp());
     }
@@ -205,7 +205,7 @@ public function testFilterEndDateImmutable(): void
             ],
         ]);
 
-        $this->assertSame(['alias.field <= :field_name_1'], $builder->query);
+        $this->assertSame(['WHERE alias.field <= :field_name_1'], $builder->query);
         $this->assertCount(1, $builder->queryParameters);
         $this->assertSame(
             $endDateTime->modify('+23 hours 59 minutes 59 seconds')->getTimestamp(),

diff --git a/tests/Filter/EmptyFilterTest.php b/tests/Filter/EmptyFilterTest.php
@@ -73,10 +73,10 @@ public function testRenderSettings(): void
     public function valueDataProvider(): array
     {
         return [
-            [false, BooleanType::TYPE_YES, 'alias.field IS NULL'],
-            [false, BooleanType::TYPE_NO, 'alias.field IS NOT NULL'],
-            [true, BooleanType::TYPE_YES, 'alias.field IS NOT NULL'],
-            [true, BooleanType::TYPE_NO, 'alias.field IS NULL'],
+            [false, BooleanType::TYPE_YES, 'WHERE alias.field IS NULL'],
+            [false, BooleanType::TYPE_NO, 'WHERE alias.field IS NOT NULL'],
+            [true, BooleanType::TYPE_YES, 'WHERE alias.field IS NOT NULL'],
+            [true, BooleanType::TYPE_NO, 'WHERE alias.field IS NULL'],
         ];
     }
 }
diff --git a/tests/Filter/FilterTestCase.php b/tests/Filter/FilterTestCase.php
@@ -38,13 +38,13 @@ static function (string $name, $value) use ($queryBuilder): void {
 
         $queryBuilder->method('andWhere')->willReturnCallback(
             static function ($query) use ($queryBuilder): void {
-                $queryBuilder->query[] = (string) $query;
+                $queryBuilder->query[] = sprintf('WHERE %s', $query);
             }
         );
 
         $queryBuilder->method('andHaving')->willReturnCallback(
             static function ($query) use ($queryBuilder): void {
-                $queryBuilder->query[] = (string) $query;
+                $queryBuilder->query[] = sprintf('HAVING %s', $query);
             }
         );
 

diff --git a/tests/Filter/ModelFilterTest.php b/tests/Filter/ModelFilterTest.php
@@ -60,7 +60,7 @@ public function testFilterArray(): void
         ]);
 
         // the alias is now computer by the entityJoin method
-        $this->assertSame(['alias IN :field_name_0'], $builder->query);
+        $this->assertSame(['WHERE alias IN :field_name_0'], $builder->query);
         $this->assertSame(['field_name_0' => ['1', '2']], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
     }
@@ -79,7 +79,7 @@ public function testFilterArrayTypeIsNotEqual(): void
 
         // the alias is now computer by the entityJoin method
         $this->assertSame(
-            'alias NOT IN :field_name_0 OR IDENTITY('.current(($builder->getRootAliases())).'.field_name) IS NULL',
+            'WHERE alias NOT IN :field_name_0 OR IDENTITY('.current(($builder->getRootAliases())).'.field_name) IS NULL',
             $builder->query[0]
         );
         $this->assertSame(['field_name_0' => ['1', '2']], $builder->queryParameters);
@@ -95,7 +95,7 @@ public function testFilterScalar(): void
 
         $filter->filter($builder, 'alias', 'field', ['type' => EqualOperatorType::TYPE_EQUAL, 'value' => 2]);
 
-        $this->assertSame(['alias IN :field_name_0'], $builder->query);
+        $this->assertSame(['WHERE alias IN :field_name_0'], $builder->query);
         $this->assertSame(['field_name_0' => [2]], $builder->queryParameters);
         $this->assertTrue($filter->isActive());
     }
@@ -110,7 +110,7 @@ public function testFilterScalarTypeIsNotEqual(): void
         $filter->filter($builder, 'alias', 'field', ['type' => EqualOperatorType::TYPE_NOT_EQUAL, 'value' => 2]);
 
         $this->assertSame(
-            'alias NOT IN :field_name_0 OR IDENTITY('.current(($builder->getRootAliases())).'.field_name) IS NULL',
+            'WHERE alias NOT IN :field_name_0 OR IDENTITY('.current(($builder->getRootAliases())).'.field_name) IS NULL',
             $builder->query[0]
         );
 
@@ -160,7 +160,7 @@ public function testAssociationWithValidMapping(): void
 
         $this->assertSame([
             'LEFT JOIN o.association_mapping AS s_association_mapping',
-            's_association_mapping IN :field_name_0',
+            'WHERE s_association_mapping IN :field_name_0',
         ], $builder->query);
         $this->assertTrue($filter->isActive());
     }
@@ -192,7 +192,7 @@ public function testAssociationWithValidParentAssociationMappings(): void
             'LEFT JOIN o.association_mapping AS s_association_mapping',
             'LEFT JOIN s_association_mapping.sub_association_mapping AS s_association_mapping_sub_association_mapping',
             'LEFT JOIN s_association_mapping_sub_association_mapping.sub_sub_association_mapping AS s_association_mapping_sub_association_mapping_sub_sub_association_mapping',
-            's_association_mapping_sub_association_mapping_sub_sub_association_mapping IN :field_name_0',
+            'WHERE s_association_mapping_sub_association_mapping_sub_sub_association_mapping IN :field_name_0',
         ], $builder->query);
         $this->assertTrue($filter->isActive());
     }

diff --git a/tests/Filter/NullFilterTest.php b/tests/Filter/NullFilterTest.php
@@ -68,10 +68,10 @@ public function testRenderSettings(): void
     public function valueDataProvider(): array
     {
         return [
-            [false, BooleanType::TYPE_YES, 'alias.field IS NULL'],
-            [false, BooleanType::TYPE_NO, 'alias.field IS NOT NULL'],
-            [true, BooleanType::TYPE_YES, 'alias.field IS NOT NULL'],
-            [true, BooleanType::TYPE_NO, 'alias.field IS NULL'],
+            [false, BooleanType::TYPE_YES, 'WHERE alias.field IS NULL'],
+            [false, BooleanType::TYPE_NO, 'WHERE alias.field IS NOT NULL'],
+            [true, BooleanType::TYPE_YES, 'WHERE alias.field IS NOT NULL'],
+            [true, BooleanType::TYPE_NO, 'WHERE alias.field IS NULL'],
         ];
     }
 }
diff --git a/tests/Filter/NumberFilterTest.php b/tests/Filter/NumberFilterTest.php
@@ -61,12 +61,12 @@ public function testFilter(): void
         $filter->filter($builder, 'alias', 'field', ['value' => 42]);
 
         $expected = [
-            'alias.field = :field_name_0',
-            'alias.field >= :field_name_1',
-            'alias.field > :field_name_2',
-            'alias.field <= :field_name_3',
-            'alias.field < :field_name_4',
-            'alias.field = :field_name_5',
+            'WHERE alias.field = :field_name_0',
+            'WHERE alias.field >= :field_name_1',
+            'WHERE alias.field > :field_name_2',
+            'WHERE alias.field <= :field_name_3',
+            'WHERE alias.field < :field_name_4',
+            'WHERE alias.field = :field_name_5',
         ];
 
         $this->assertSame($expected, $builder->query);