-
Notifications
You must be signed in to change notification settings - Fork 15
IBX-7418: Added ContentNameCriterion #312
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
6b9c65d
Added ContentNameCriterion
ciastektk 52c51e8
Added ContentName CriterionHandler
ciastektk 0792e54
[Tests] Added integration tests coverage
ciastektk 02b162b
[Tests] Added tests coverage for extended syntax search
ciastektk 4815b15
Renamed ContentNameCriterion to ContentName
ciastektk bb3bb07
Added missing type hint
ciastektk d65c015
Update tests/integration/Core/Repository/SearchServiceContentNameTest…
ciastektk fcb7bf0
Update tests/integration/Core/Repository/SearchServiceContentNameTest…
ciastektk ce20e18
Renamed consts with tables aliases
ciastektk e34db18
Fixes after review
ciastektk 71153dc
Dropped testCriterionExtendedSyntax
ciastektk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
30 changes: 30 additions & 0 deletions
30
src/contracts/Repository/Values/Content/Query/Criterion/ContentName.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
<?php | ||
|
||
/** | ||
* @copyright Copyright (C) Ibexa AS. All rights reserved. | ||
* @license For full copyright and license information view LICENSE file distributed with this source code. | ||
*/ | ||
declare(strict_types=1); | ||
|
||
namespace Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; | ||
|
||
use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; | ||
use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator\Specifications; | ||
|
||
final class ContentName extends Criterion | ||
{ | ||
public function __construct(string $value) | ||
{ | ||
parent::__construct(null, Operator::LIKE, $value); | ||
} | ||
|
||
/** | ||
* @return array<\Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator\Specifications> | ||
*/ | ||
public function getSpecifications(): array | ||
{ | ||
return [ | ||
new Specifications(Operator::LIKE, Specifications::FORMAT_SINGLE), | ||
]; | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 96 additions & 0 deletions
96
src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/ContentName.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
<?php | ||
|
||
/** | ||
* @copyright Copyright (C) Ibexa AS. All rights reserved. | ||
* @license For full copyright and license information view LICENSE file distributed with this source code. | ||
*/ | ||
declare(strict_types=1); | ||
|
||
namespace Ibexa\Core\Search\Legacy\Content\Common\Gateway\CriterionHandler; | ||
|
||
use Doctrine\DBAL\Query\QueryBuilder; | ||
use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; | ||
use Ibexa\Core\Persistence\Legacy\Content\Gateway; | ||
use Ibexa\Core\Search\Legacy\Content\Common\Gateway\CriteriaConverter; | ||
use Ibexa\Core\Search\Legacy\Content\Common\Gateway\CriterionHandler; | ||
|
||
/** | ||
* @internal | ||
*/ | ||
final class ContentName extends CriterionHandler | ||
{ | ||
private const CONTENTOBJECT_NAME_ALIAS = 'ezc_n'; | ||
private const CONTENTOBJECT_ALIAS = 'c'; | ||
|
||
public function accept(Criterion $criterion): bool | ||
{ | ||
return $criterion instanceof Criterion\ContentName | ||
&& $criterion->operator === Criterion\Operator::LIKE; | ||
} | ||
|
||
/** | ||
* @param array{ | ||
* languages: array<string>, | ||
* useAlwaysAvailable: bool, | ||
* } $languageSettings | ||
* | ||
* @throws \Doctrine\DBAL\Exception | ||
*/ | ||
public function handle( | ||
CriteriaConverter $converter, | ||
QueryBuilder $queryBuilder, | ||
Criterion $criterion, | ||
array $languageSettings | ||
): string { | ||
$subQuery = $this->connection->createQueryBuilder(); | ||
$subQuery | ||
->select('1') | ||
->from(Gateway::CONTENT_NAME_TABLE, self::CONTENTOBJECT_NAME_ALIAS) | ||
->andWhere( | ||
$queryBuilder->expr()->eq( | ||
self::CONTENTOBJECT_NAME_ALIAS . '.contentobject_id', | ||
self::CONTENTOBJECT_ALIAS . '.id' | ||
), | ||
$queryBuilder->expr()->eq( | ||
self::CONTENTOBJECT_NAME_ALIAS . '.content_version', | ||
self::CONTENTOBJECT_ALIAS . '.current_version' | ||
), | ||
$queryBuilder->expr()->like( | ||
$this->toLowerCase(self::CONTENTOBJECT_NAME_ALIAS . '.name'), | ||
$this->toLowerCase( | ||
$queryBuilder->createNamedParameter( | ||
$this->prepareValue($criterion) | ||
) | ||
) | ||
) | ||
); | ||
|
||
return sprintf( | ||
'EXISTS (%s)', | ||
$subQuery->getSQL() | ||
); | ||
} | ||
|
||
private function prepareValue(Criterion $criterion): string | ||
{ | ||
/** @var string $value */ | ||
$value = $criterion->value; | ||
|
||
return str_replace( | ||
'*', | ||
'%', | ||
addcslashes( | ||
$value, | ||
'%_' | ||
) | ||
); | ||
} | ||
|
||
/** | ||
* @throws \Doctrine\DBAL\Exception | ||
*/ | ||
private function toLowerCase(string $value): string | ||
{ | ||
return $this->connection->getDatabasePlatform()->getLowerExpression($value); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.