Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Doctrine/Odm/Filter/PartialSearchFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ final class PartialSearchFilter implements FilterInterface, OpenApiParameterFilt
use BackwardCompatibleFilterDescriptionTrait;
use OpenApiFilterTrait;

public function __construct(private readonly bool $caseSensitive = true)
{
}

public function apply(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
{
$parameter = $context['parameter'];
Expand All @@ -47,7 +51,7 @@ public function apply(Builder $aggregationBuilder, string $resourceClass, ?Opera
if (!is_iterable($values)) {
$escapedValue = preg_quote($values, '/');
$match->{$operator}(
$aggregationBuilder->matchExpr()->field($property)->equals(new Regex($escapedValue, 'i'))
$aggregationBuilder->matchExpr()->field($property)->equals(new Regex($escapedValue, $this->caseSensitive ? '' : 'i'))
);

return;
Expand All @@ -60,7 +64,7 @@ public function apply(Builder $aggregationBuilder, string $resourceClass, ?Opera
$or->addOr(
$aggregationBuilder->matchExpr()
->field($property)
->equals(new Regex($escapedValue, 'i'))
->equals(new Regex($escapedValue, $this->caseSensitive ? '' : 'i'))
);
}

Expand Down
21 changes: 16 additions & 5 deletions src/Doctrine/Orm/Filter/PartialSearchFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ final class PartialSearchFilter implements FilterInterface, OpenApiParameterFilt
use BackwardCompatibleFilterDescriptionTrait;
use OpenApiFilterTrait;

public function __construct(private readonly bool $caseSensitive = false)
{
}

public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation = null, array $context = []): void
{
$parameter = $context['parameter'];
Expand All @@ -44,19 +48,26 @@ public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $q

if (!is_iterable($values)) {
$parameterName = $queryNameGenerator->generateParameterName($property);
$queryBuilder->setParameter($parameterName, $this->formatLikeValue(strtolower($values)));
$value = $this->caseSensitive ? $values : strtolower($values);
$queryBuilder->setParameter($parameterName, $this->formatLikeValue($value));

$likeExpression = 'LOWER('.$field.') LIKE :'.$parameterName.' ESCAPE \'\\\'';
$likeExpression = $this->caseSensitive
? $field.' LIKE :'.$parameterName.' ESCAPE \'\\\''
: 'LOWER('.$field.') LIKE :'.$parameterName.' ESCAPE \'\\\'';
$queryBuilder->{$context['whereClause'] ?? 'andWhere'}($likeExpression);

return;
}

$likeExpressions = [];
foreach ($values as $val) {
foreach ($values as $value) {
$parameterName = $queryNameGenerator->generateParameterName($property);
$likeExpressions[] = 'LOWER('.$field.') LIKE :'.$parameterName.' ESCAPE \'\\\'';
$queryBuilder->setParameter($parameterName, $this->formatLikeValue(strtolower($val)));
$likeExpressions[] = $this->caseSensitive
? $field.' LIKE :'.$parameterName.' ESCAPE \'\\\''
: 'LOWER('.$field.') LIKE :'.$parameterName.' ESCAPE \'\\\'';

$val = $this->caseSensitive ? $value : strtolower($value);
$queryBuilder->setParameter($parameterName, $this->formatLikeValue($val));
}

$queryBuilder->{$context['whereClause'] ?? 'andWhere'}(
Expand Down
4 changes: 4 additions & 0 deletions tests/Fixtures/TestBundle/Document/Chicken.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
filter: new PartialSearchFilter(),
property: 'name',
),
'namePartialSensitive' => new QueryParameter(
filter: new PartialSearchFilter(true),
property: 'name',
),
'autocomplete' => new QueryParameter(filter: new FreeTextQueryFilter(new OrFilter(new ExactFilter())), properties: ['name', 'ean']),
'q' => new QueryParameter(filter: new FreeTextQueryFilter(new PartialSearchFilter()), properties: ['name', 'ean']),
],
Expand Down
4 changes: 4 additions & 0 deletions tests/Fixtures/TestBundle/Entity/Chicken.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
filter: new PartialSearchFilter(),
property: 'name',
),
'namePartialSensitive' => new QueryParameter(
filter: new PartialSearchFilter(true),
property: 'name',
),
'autocomplete' => new QueryParameter(filter: new FreeTextQueryFilter(new OrFilter(new ExactFilter())), properties: ['name', 'ean']),
'q' => new QueryParameter(filter: new FreeTextQueryFilter(new PartialSearchFilter()), properties: ['name', 'ean']),
],
Expand Down
38 changes: 38 additions & 0 deletions tests/Functional/Parameters/PartialSearchFilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,44 @@ public static function partialSearchFilterProvider(): \Generator
];
}


#[DataProvider('partialSearchFilterCaseSensitiveProvider')]
public function testPartialSearchCaseSensitiveFilter(string $url, int $expectedCount, array $expectedNames): void
{
if ($this->isMysql() || $this->isSqlite()) {
$this->markTestSkipped('Mysql and sqlite use case insensitive LIKE.');
}

$this->testPartialSearchFilter($url, $expectedCount, $expectedNames);
}

public static function partialSearchFilterCaseSensitiveProvider(): \Generator
{
yield 'filter by partial name "tru"' => [
'/chickens?namePartial=tru',
1,
['Gertrude'],
];

yield 'filter by partial name "TRU"' => [
'/chickens?namePartial=TRU',
1,
['Gertrude'],
];

yield 'filter by case sensitive partial name "tru"' => [
'/chickens?namePartialSensitive=tru',
1,
['Gertrude'],
];

yield 'filter by case sensitive partial name "TRU"' => [
'/chickens?namePartialSensitive=TRU',
0,
[],
];
}

/**
* @throws \Throwable
* @throws MongoDBException
Expand Down
10 changes: 10 additions & 0 deletions tests/RecreateSchemaTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,21 @@ private function isMongoDB(): bool
return 'mongodb' === static::getContainer()->getParameter('kernel.environment');
}

private function isMysql(): bool
{
return 'mysql' === static::getContainer()->getParameter('kernel.environment');
}

private function isPostgres(): bool
{
return 'postgres' === static::getContainer()->getParameter('kernel.environment');
}

private function isSqlite(): bool
{
return \in_array(static::getContainer()->getParameter('kernel.environment'), ['sqlite', 'test'], true);
}

private function getManager(): EntityManagerInterface|DocumentManager
{
return static::getContainer()->get($this->isMongoDB() ? 'doctrine_mongodb' : 'doctrine')->getManager();
Expand Down
Loading