Fix nameConverter usage in Metadata

src/Metadata/Resource/Factory/ParameterResourceMetadataCollectionFactory.php

@@ -259,10 +259,6 @@ private function setDefaults(string $key, Parameter $parameter, ?object $filter,
             $parameter = $parameter->withProperty($key);
         }
 
-        if ($this->nameConverter && $property = $parameter->getProperty()) {
-            $parameter = $parameter->withProperty($this->nameConverter->normalize($property));
-        }
-
         if (isset($properties[$currentKey]) && ($eloquentRelation = ($properties[$currentKey]->getExtraProperties()['eloquent_relation'] ?? null)) && isset($eloquentRelation['foreign_key'])) {
             $parameter = $parameter->withProperty($eloquentRelation['foreign_key']);
         }

tests/Fixtures/TestBundle/Document/Chicken.php

@@ -33,6 +33,10 @@
             filter: new PartialSearchFilter(),
             property: 'name',
         ),
+        'nameConverted' => new QueryParameter(filter: new ExactFilter()),
+        'nameConvertedAlias' => new QueryParameter(filter: new ExactFilter(), property: 'nameConverted'),
+        'nameNotConverted' => new QueryParameter(filter: new ExactFilter()),
+        'nameNotConvertedAlias' => new QueryParameter(filter: new ExactFilter(), property: 'nameNotConverted'),
         'autocomplete' => new QueryParameter(filter: new FreeTextQueryFilter(new OrFilter(new ExactFilter())), properties: ['name', 'ean']),
         'q' => new QueryParameter(filter: new FreeTextQueryFilter(new PartialSearchFilter()), properties: ['name', 'ean']),
     ],
@@ -45,6 +49,12 @@ class Chicken
     #[ODM\Field(type: 'string')]
     private string $name;
 
+    #[ODM\Field(type: 'string')]
+    private string $nameConverted;
+
+    #[ODM\Field(type: 'string')]
+    private string $nameNotConverted;
+
     #[ODM\Field(type: 'string', nullable: true)]
     private ?string $ean;
 
@@ -64,10 +74,22 @@ public function getName(): ?string
     public function setName(string $name): self
     {
         $this->name = $name;
+        $this->nameConverted = $name;
+        $this->nameNotConverted = $name;
 
         return $this;
     }
 
+    public function getNameConverted(): ?string
+    {
+        return $this->nameConverted;
+    }
+
+    public function getNameNotConverted(): ?string
+    {
+        return $this->nameNotConverted;
+    }
+
     public function getEan(): ?string
     {
         return $this->ean;

tests/Fixtures/TestBundle/Document/FilteredBooleanParameter.php

@@ -33,18 +33,44 @@
             property: 'active',
             nativeType: new BuiltinType(TypeIdentifier::BOOL),
         ),
+        'nameConverted' => new QueryParameter(
+            filter: new BooleanFilter(),
+            nativeType: new BuiltinType(TypeIdentifier::BOOL),
+        ),
+        'nameNotConverted' => new QueryParameter(
+            filter: new BooleanFilter(),
+            nativeType: new BuiltinType(TypeIdentifier::BOOL),
+        ),
+        'aliasWithNameConverter' => new QueryParameter(
+            filter: new BooleanFilter(),
+            property: 'nameConverted',
+            nativeType: new BuiltinType(TypeIdentifier::BOOL),
+        ),
+        'aliasWithoutNameConverter' => new QueryParameter(
+            filter: new BooleanFilter(),
+            property: 'nameNotConverted',
+            nativeType: new BuiltinType(TypeIdentifier::BOOL),
+        ),
     ],
 )]
 #[ODM\Document]
 class FilteredBooleanParameter
 {
+    #[ODM\Field(type: 'bool', nullable: true)]
+    private ?bool $nameConverted;
+
+    #[ODM\Field(type: 'bool', nullable: true)]
+    private ?bool $nameNotConverted;
+
     public function __construct(
         #[ODM\Id(type: 'int', strategy: 'INCREMENT')]
         public ?int $id = null,
 
         #[ODM\Field(type: 'bool', nullable: true)]
         public ?bool $active = null,
     ) {
+        $this->nameConverted = $this->active;
+        $this->nameNotConverted = $this->active;
     }
 
     public function getId(): ?int
@@ -60,5 +86,7 @@ public function isActive(): bool
     public function setActive(?bool $active): void
     {
         $this->active = $active;
+        $this->nameConverted = $active;
+        $this->nameNotConverted = $active;
     }
 }

tests/Fixtures/TestBundle/Entity/Chicken.php

@@ -33,6 +33,10 @@
             filter: new PartialSearchFilter(),
             property: 'name',
         ),
+        'nameConverted' => new QueryParameter(filter: new ExactFilter()),
+        'nameConvertedAlias' => new QueryParameter(filter: new ExactFilter(), property: 'nameConverted'),
+        'nameNotConverted' => new QueryParameter(filter: new ExactFilter()),
+        'nameNotConvertedAlias' => new QueryParameter(filter: new ExactFilter(), property: 'nameNotConverted'),
         'autocomplete' => new QueryParameter(filter: new FreeTextQueryFilter(new OrFilter(new ExactFilter())), properties: ['name', 'ean']),
         'q' => new QueryParameter(filter: new FreeTextQueryFilter(new PartialSearchFilter()), properties: ['name', 'ean']),
     ],
@@ -47,6 +51,12 @@ class Chicken
     #[ORM\Column(type: 'string', length: 255)]
     private string $name;
 
+    #[ORM\Column(type: 'string', length: 255)]
+    private string $nameConverted;
+
+    #[ORM\Column(type: 'string', length: 255)]
+    private string $nameNotConverted;
+
     #[ORM\Column(type: 'string', length: 255, nullable: true)]
     private ?string $ean;
 
@@ -67,10 +77,22 @@ public function getName(): ?string
     public function setName(string $name): self
     {
         $this->name = $name;
+        $this->nameConverted = $name;
+        $this->nameNotConverted = $name;
 
         return $this;
     }
 
+    public function getNameConverted(): ?string
+    {
+        return $this->nameConverted;
+    }
+
+    public function getNameNotConverted(): ?string
+    {
+        return $this->nameNotConverted;
+    }
+
     public function getEan(): ?string
     {
         return $this->ean;

tests/Fixtures/TestBundle/Entity/FilteredBooleanParameter.php

@@ -33,11 +33,35 @@
             property: 'active',
             nativeType: new BuiltinType(TypeIdentifier::BOOL),
         ),
+        'nameConverted' => new QueryParameter(
+            filter: new BooleanFilter(),
+            nativeType: new BuiltinType(TypeIdentifier::BOOL),
+        ),
+        'nameNotConverted' => new QueryParameter(
+            filter: new BooleanFilter(),
+            nativeType: new BuiltinType(TypeIdentifier::BOOL),
+        ),
+        'aliasWithNameConverter' => new QueryParameter(
+            filter: new BooleanFilter(),
+            property: 'nameConverted',
+            nativeType: new BuiltinType(TypeIdentifier::BOOL),
+        ),
+        'aliasWithoutNameConverter' => new QueryParameter(
+            filter: new BooleanFilter(),
+            property: 'nameNotConverted',
+            nativeType: new BuiltinType(TypeIdentifier::BOOL),
+        ),
     ],
 )]
 #[ORM\Entity]
 class FilteredBooleanParameter
 {
+    #[ORM\Column(nullable: true)]
+    private ?bool $nameConverted;
+
+    #[ORM\Column(nullable: true)]
+    private ?bool $nameNotConverted;
+
     public function __construct(
         #[ORM\Column]
         #[ORM\Id]
@@ -47,6 +71,8 @@ public function __construct(
         #[ORM\Column(nullable: true)]
         public ?bool $active = null,
     ) {
+        $this->nameConverted = $this->active;
+        $this->nameNotConverted = $this->active;
     }
 
     public function getId(): ?int
@@ -62,5 +88,7 @@ public function isActive(): bool
     public function setActive(?bool $isActive): void
     {
         $this->active = $isActive;
+        $this->nameConverted = $isActive;
+        $this->nameNotConverted = $isActive;
     }
 }

tests/Functional/Parameters/BooleanFilterTest.php

@@ -74,6 +74,22 @@ public static function booleanFilterScenariosProvider(): \Generator
         yield 'enabled_alias_false' => ['/filtered_boolean_parameters?enabled=false', 1, false];
         yield 'enabled_alias_numeric_1' => ['/filtered_boolean_parameters?enabled=1', 2, true];
         yield 'enabled_alias_numeric_0' => ['/filtered_boolean_parameters?enabled=0', 1, false];
+        yield 'name_converted_true' => ['/filtered_boolean_parameters?nameConverted=true', 2, true];
+        yield 'name_converted_false' => ['/filtered_boolean_parameters?nameConverted=false', 1, false];
+        yield 'name_converted_numeric_1' => ['/filtered_boolean_parameters?nameConverted=1', 2, true];
+        yield 'name_converted_numeric_0' => ['/filtered_boolean_parameters?nameConverted=0', 1, false];
+        yield 'name_not_converted_true' => ['/filtered_boolean_parameters?nameNotConverted=true', 2, true];
+        yield 'name_not_converted_false' => ['/filtered_boolean_parameters?nameNotConverted=false', 1, false];
+        yield 'name_not_converted_numeric_1' => ['/filtered_boolean_parameters?nameNotConverted=1', 2, true];
+        yield 'name_not_converted_numeric_0' => ['/filtered_boolean_parameters?nameNotConverted=0', 1, false];
+        yield 'alias_name_converted_true' => ['/filtered_boolean_parameters?aliasWithNameConverter=true', 2, true];
+        yield 'alias_name_converted_false' => ['/filtered_boolean_parameters?aliasWithNameConverter=false', 1, false];
+        yield 'alias_name_converted_numeric_1' => ['/filtered_boolean_parameters?aliasWithNameConverter=1', 2, true];
+        yield 'alias_name_converted_numeric_0' => ['/filtered_boolean_parameters?aliasWithNameConverter=0', 1, false];
+        yield 'alias_name_not_converted_true' => ['/filtered_boolean_parameters?aliasWithoutNameConverter=true', 2, true];
+        yield 'alias_name_not_converted_false' => ['/filtered_boolean_parameters?aliasWithoutNameConverter=false', 1, false];
+        yield 'alias_name_not_converted_numeric_1' => ['/filtered_boolean_parameters?aliasWithoutNameConverter=1', 2, true];
+        yield 'alias_name_not_converted_numeric_0' => ['/filtered_boolean_parameters?aliasWithoutNameConverter=0', 1, false];
     }
 
     #[DataProvider('booleanFilterNullAndEmptyScenariosProvider')]

tests/Functional/Parameters/ExactFilterTest.php

@@ -103,6 +103,30 @@ public static function exactSearchFilterProvider(): \Generator
             0,
             [],
         ];
+
+        yield 'filter by nameConverted' => [
+            '/chickens?nameConverted=Gertrude',
+            1,
+            ['Gertrude'],
+        ];
+
+        yield 'filter by nameConvertedAlias' => [
+            '/chickens?nameConvertedAlias=Gertrude',
+            1,
+            ['Gertrude'],
+        ];
+
+        yield 'filter by nameNotConverted' => [
+            '/chickens?nameNotConverted=Gertrude',
+            1,
+            ['Gertrude'],
+        ];
+
+        yield 'filter by nameNotConvertedAlias' => [
+            '/chickens?nameNotConvertedAlias=Gertrude',
+            1,
+            ['Gertrude'],
+        ];
     }
 
     /**