feature: add a filter factory to allow resource collection to be filt…

…ered
larriereguichet · Oct 28, 2023 · 3940a33 · 3940a33
1 parent b628629
commit 3940a33
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/src/Filter/Factory/EventFilterFactory.php b/src/Filter/Factory/EventFilterFactory.php
@@ -17,19 +17,19 @@ public function __construct(
     ) {
     }
 
-    public function create(FilterInterface $filter): FilterInterface
+    public function create(FilterInterface $filterDefinition): FilterInterface
     {
-        $event = new FilterEvent($filter);
+        $event = new FilterEvent($filterDefinition);
         $this->eventDispatcher->dispatch($event, FilterEvent::FILTER_CREATE);
-        $this->eventDispatcher->dispatch($event, sprintf(FilterEvent::FILTER_CREATE_PATTERN, $filter->getName()));
+        $this->eventDispatcher->dispatch($event, sprintf(FilterEvent::FILTER_CREATE_PATTERN, $filterDefinition->getName()));
 
-        $filter = $this->decorated->create($filter);
+        $filterDefinition = $this->decorated->create($filterDefinition);
 
-        $event = new FilterEvent($filter);
+        $event = new FilterEvent($filterDefinition);
         $this->eventDispatcher->dispatch($event, FilterEvent::FILTER_CREATED);
-        $this->eventDispatcher->dispatch($event, sprintf(FilterEvent::FILTER_CREATED_PATTERN, $filter->getName()));
+        $this->eventDispatcher->dispatch($event, sprintf(FilterEvent::FILTER_CREATED_PATTERN, $filterDefinition->getName()));
 
-        return $filter;
+        return $filterDefinition;
     }
 
     public function createFromProperty(PropertyInterface $property): FilterInterface

diff --git a/src/Filter/Factory/FilterFactory.php b/src/Filter/Factory/FilterFactory.php
@@ -9,7 +9,7 @@
 use LAG\AdminBundle\Metadata\Filter\FilterInterface;
 use LAG\AdminBundle\Metadata\Filter\StringFilter;
 use LAG\AdminBundle\Metadata\Property\PropertyInterface;
-use LAG\AdminBundle\Metadata\Property\StringProperty;
+use LAG\AdminBundle\Metadata\Property\Text;
 use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
@@ -20,8 +20,9 @@ public function __construct(
     ) {
     }
 
-    public function create(FilterInterface $filter): FilterInterface
+    public function create(FilterInterface $filterDefinition): FilterInterface
     {
+        $filter = $this->initializeFilter($filterDefinition);
         $errors = $this->validator->validate($filter, [new Valid()]);
 
         if ($errors->count() > 0) {
@@ -36,13 +37,24 @@ public function createFromProperty(PropertyInterface $property): FilterInterface
         $class = Filter::class;
         $name = $property->getName();
 
-        if ($property instanceof StringProperty) {
+        if ($property instanceof Text) {
             $class = StringFilter::class;
         }
 
-        return new $class(
+        $definition = new $class(
             name: $name,
             propertyPath: $property->getPropertyPath(),
         );
+
+        return $this->create($definition);
+    }
+
+    private function initializeFilter(FilterInterface $filter): FilterInterface
+    {
+        if ($filter->getPropertyPath() === null) {
+            $filter = $filter->withPropertyPath($filter->getName());
+        }
+
+        return $filter;
     }
 }
diff --git a/src/Filter/Factory/FilterFactoryInterface.php b/src/Filter/Factory/FilterFactoryInterface.php
@@ -9,7 +9,7 @@
 
 interface FilterFactoryInterface
 {
-    public function create(FilterInterface $filter): FilterInterface;
+    public function create(FilterInterface $filterDefinition): FilterInterface;
 
     public function createFromProperty(PropertyInterface $property): FilterInterface;
 }