-
-
Notifications
You must be signed in to change notification settings - Fork 867
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
feat(doctrine): add new filter for filtering an entity using PHP backed enum, resolves #6506 #6547
Merged
Merged
Changes from all commits
Commits
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
This file contains 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,98 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the API Platform project. | ||
* | ||
* (c) Kévin Dunglas <dunglas@gmail.com> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
declare(strict_types=1); | ||
|
||
namespace ApiPlatform\Doctrine\Common\Filter; | ||
|
||
use ApiPlatform\Doctrine\Common\PropertyHelperTrait; | ||
use ApiPlatform\Metadata\Exception\InvalidArgumentException; | ||
use Psr\Log\LoggerInterface; | ||
|
||
/** | ||
* Trait for filtering the collection by backed enum values. | ||
* | ||
* Filters collection on equality of backed enum properties. | ||
* | ||
* For each property passed, if the resource does not have such property or if | ||
* the value is not one of cases the property is ignored. | ||
* | ||
* @author Rémi Marseille <marseille.remi@gmail.com> | ||
*/ | ||
trait BackedEnumFilterTrait | ||
{ | ||
use PropertyHelperTrait; | ||
|
||
/** | ||
* @var array<string, string> | ||
*/ | ||
private array $enumTypes; | ||
|
||
/** | ||
* {@inheritdoc} | ||
*/ | ||
public function getDescription(string $resourceClass): array | ||
{ | ||
$description = []; | ||
|
||
$properties = $this->getProperties(); | ||
if (null === $properties) { | ||
$properties = array_fill_keys($this->getClassMetadata($resourceClass)->getFieldNames(), null); | ||
} | ||
|
||
foreach ($properties as $property => $unused) { | ||
if (!$this->isPropertyMapped($property, $resourceClass) || !$this->isBackedEnumField($property, $resourceClass)) { | ||
continue; | ||
} | ||
$propertyName = $this->normalizePropertyName($property); | ||
$description[$propertyName] = [ | ||
'property' => $propertyName, | ||
'type' => 'string', | ||
'required' => false, | ||
'schema' => [ | ||
'type' => 'string', | ||
'enum' => array_map(fn (\BackedEnum $case) => $case->value, $this->enumTypes[$property]::cases()), | ||
], | ||
]; | ||
} | ||
|
||
return $description; | ||
} | ||
|
||
abstract protected function getProperties(): ?array; | ||
|
||
abstract protected function getLogger(): LoggerInterface; | ||
|
||
abstract protected function normalizePropertyName(string $property): string; | ||
|
||
/** | ||
* Determines whether the given property refers to a backed enum field. | ||
*/ | ||
abstract protected function isBackedEnumField(string $property, string $resourceClass): bool; | ||
|
||
private function normalizeValue($value, string $property): mixed | ||
{ | ||
$values = array_map(fn (\BackedEnum $case) => $case->value, $this->enumTypes[$property]::cases()); | ||
|
||
if (\in_array($value, $values, true)) { | ||
return $value; | ||
} | ||
|
||
$this->getLogger()->notice('Invalid filter ignored', [ | ||
'exception' => new InvalidArgumentException(\sprintf('Invalid backed enum value for "%s" property, expected one of ( "%s" )', | ||
$property, | ||
implode('" | "', $values) | ||
)), | ||
]); | ||
|
||
return null; | ||
} | ||
} |
This file contains 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,178 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the API Platform project. | ||
* | ||
* (c) Kévin Dunglas <dunglas@gmail.com> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
declare(strict_types=1); | ||
|
||
namespace ApiPlatform\Doctrine\Orm\Filter; | ||
|
||
use ApiPlatform\Doctrine\Common\Filter\BackedEnumFilterTrait; | ||
use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; | ||
use ApiPlatform\Metadata\Operation; | ||
use Doctrine\ORM\Mapping\ClassMetadata; | ||
use Doctrine\ORM\Mapping\FieldMapping; | ||
use Doctrine\ORM\Query\Expr\Join; | ||
use Doctrine\ORM\QueryBuilder; | ||
|
||
/** | ||
* The backed enum filter allows you to search on backed enum fields and values. | ||
* | ||
* Note: it is possible to filter on properties and relations too. | ||
* | ||
* Syntax: `?property=foo`. | ||
* | ||
* <div data-code-selector> | ||
* | ||
* ```php | ||
* <?php | ||
* // api/src/Entity/Book.php | ||
* use ApiPlatform\Metadata\ApiFilter; | ||
* use ApiPlatform\Metadata\ApiResource; | ||
* use ApiPlatform\Doctrine\Orm\Filter\BackedEnumFilter; | ||
* | ||
* #[ApiResource] | ||
* #[ApiFilter(BackedEnumFilter::class, properties: ['status'])] | ||
* class Book | ||
* { | ||
* // ... | ||
* } | ||
* ``` | ||
* | ||
* ```yaml | ||
* # config/services.yaml | ||
* services: | ||
* book.backed_enum_filter: | ||
* parent: 'api_platform.doctrine.orm.backed_enum_filter' | ||
* arguments: [ { status: ~ } ] | ||
* tags: [ 'api_platform.filter' ] | ||
* # The following are mandatory only if a _defaults section is defined with inverted values. | ||
* # You may want to isolate filters in a dedicated file to avoid adding the following lines (by adding them in the defaults section) | ||
* autowire: false | ||
* autoconfigure: false | ||
* public: false | ||
* | ||
* # api/config/api_platform/resources.yaml | ||
* resources: | ||
* App\Entity\Book: | ||
* - operations: | ||
* ApiPlatform\Metadata\GetCollection: | ||
* filters: ['book.backed_enum_filter'] | ||
* ``` | ||
* | ||
* ```xml | ||
* <?xml version="1.0" encoding="UTF-8" ?> | ||
* <!-- api/config/services.xml --> | ||
* <?xml version="1.0" encoding="UTF-8" ?> | ||
* <container | ||
* xmlns="http://symfony.com/schema/dic/services" | ||
* xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
* xsi:schemaLocation="http://symfony.com/schema/dic/services | ||
* https://symfony.com/schema/dic/services/services-1.0.xsd"> | ||
* <services> | ||
* <service id="book.backed_enum_filter" parent="api_platform.doctrine.orm.backed_enum_filter"> | ||
* <argument type="collection"> | ||
* <argument key="status"/> | ||
* </argument> | ||
* <tag name="api_platform.filter"/> | ||
* </service> | ||
* </services> | ||
* </container> | ||
* <!-- api/config/api_platform/resources.xml --> | ||
* <resources | ||
* xmlns="https://api-platform.com/schema/metadata/resources-3.0" | ||
* xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
* xsi:schemaLocation="https://api-platform.com/schema/metadata/resources-3.0 | ||
* https://api-platform.com/schema/metadata/resources-3.0.xsd"> | ||
* <resource class="App\Entity\Book"> | ||
* <operations> | ||
* <operation class="ApiPlatform\Metadata\GetCollection"> | ||
* <filters> | ||
* <filter>book.backed_enum_filter</filter> | ||
* </filters> | ||
* </operation> | ||
* </operations> | ||
* </resource> | ||
* </resources> | ||
* ``` | ||
* | ||
* </div> | ||
* | ||
* Given that the collection endpoint is `/books`, you can filter books with the following query: `/books?status=published`. | ||
* | ||
* @author Rémi Marseille <marseille.remi@gmail.com> | ||
*/ | ||
final class BackedEnumFilter extends AbstractFilter | ||
{ | ||
use BackedEnumFilterTrait; | ||
|
||
/** | ||
* {@inheritdoc} | ||
*/ | ||
protected function filterProperty(string $property, mixed $value, QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation = null, array $context = []): void | ||
{ | ||
if ( | ||
!$this->isPropertyEnabled($property, $resourceClass) | ||
|| !$this->isPropertyMapped($property, $resourceClass) | ||
|| !$this->isBackedEnumField($property, $resourceClass) | ||
) { | ||
return; | ||
} | ||
|
||
$value = $this->normalizeValue($value, $property); | ||
if (null === $value) { | ||
return; | ||
} | ||
|
||
$alias = $queryBuilder->getRootAliases()[0]; | ||
$field = $property; | ||
|
||
if ($this->isPropertyNested($property, $resourceClass)) { | ||
[$alias, $field] = $this->addJoinsForNestedProperty($property, $alias, $queryBuilder, $queryNameGenerator, $resourceClass, Join::INNER_JOIN); | ||
} | ||
|
||
$valueParameter = $queryNameGenerator->generateParameterName($field); | ||
|
||
$queryBuilder | ||
->andWhere(\sprintf('%s.%s = :%s', $alias, $field, $valueParameter)) | ||
->setParameter($valueParameter, $value); | ||
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
*/ | ||
protected function isBackedEnumField(string $property, string $resourceClass): bool | ||
{ | ||
$propertyParts = $this->splitPropertyParts($property, $resourceClass); | ||
$metadata = $this->getNestedMetadata($resourceClass, $propertyParts['associations']); | ||
|
||
if (!$metadata instanceof ClassMetadata) { | ||
return false; | ||
} | ||
|
||
$fieldMapping = $metadata->fieldMappings[$propertyParts['field']]; | ||
|
||
// Doctrine ORM 2.x returns an array and Doctrine ORM 3.x returns a FieldMapping object | ||
if ($fieldMapping instanceof FieldMapping) { | ||
$fieldMapping = (array) $fieldMapping; | ||
} | ||
|
||
if (!$enumType = $fieldMapping['enumType']) { | ||
return false; | ||
} | ||
|
||
if (!($enumType::cases()[0] ?? null) instanceof \BackedEnum) { | ||
return false; | ||
} | ||
|
||
$this->enumTypes[$property] = $enumType; | ||
|
||
return true; | ||
} | ||
} |
This file contains 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,49 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the API Platform project. | ||
* | ||
* (c) Kévin Dunglas <dunglas@gmail.com> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
declare(strict_types=1); | ||
|
||
namespace ApiPlatform\Doctrine\Orm\Tests\Filter; | ||
|
||
use ApiPlatform\Doctrine\Orm\Filter\BackedEnumFilter; | ||
use ApiPlatform\Doctrine\Orm\Tests\DoctrineOrmFilterTestCase; | ||
use ApiPlatform\Doctrine\Orm\Tests\Fixtures\Entity\Dummy; | ||
|
||
/** | ||
* @author Rémi Marseille <marseille.remi@gmail.com> | ||
*/ | ||
final class BackedEnumFilterTest extends DoctrineOrmFilterTestCase | ||
{ | ||
use BackedEnumFilterTestTrait; | ||
|
||
protected string $filterClass = BackedEnumFilter::class; | ||
|
||
public static function provideApplyTestData(): array | ||
{ | ||
return array_merge_recursive( | ||
self::provideApplyTestArguments(), | ||
[ | ||
'valid case' => [ | ||
\sprintf('SELECT o FROM %s o WHERE o.dummyBackedEnum = :dummyBackedEnum_p1', Dummy::class), | ||
], | ||
'invalid case' => [ | ||
\sprintf('SELECT o FROM %s o', Dummy::class), | ||
], | ||
'valid case for nested property' => [ | ||
\sprintf('SELECT o FROM %s o INNER JOIN o.relatedDummy relatedDummy_a1 WHERE relatedDummy_a1.dummyBackedEnum = :dummyBackedEnum_p1', Dummy::class), | ||
], | ||
'invalid case for nested property' => [ | ||
\sprintf('SELECT o FROM %s o', Dummy::class), | ||
], | ||
] | ||
); | ||
} | ||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does
main
support ORM 2.x ? I think that we can add the code only for3.x
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks like it is https://github.com/api-platform/core/blob/main/composer.json#L68