Add filters based on type

config/filters.yaml

@@ -33,4 +33,4 @@ services:
 
   # DataObject
   Pimcore\Bundle\StudioApiBundle\Filter\DataObject\ClassIdFilter:
-      tags: [ 'pimcore.studio_api.collection.filter' ]
+      tags: [ 'pimcore.studio_api.collection.data_object.filter' ]

src/DependencyInjection/CompilerPass/FilterPass.php

@@ -36,9 +36,13 @@ final class FilterPass implements CompilerPassInterface
     public function process(ContainerBuilder $container): void
     {
         $taggedServices = array_keys(
-            $container->findTaggedServiceIds(
-                TaggedIteratorAdapter::FILTER_TAG
-            )
+            [
+                ... $container->findTaggedServiceIds(TaggedIteratorAdapter::FILTER_TAG),
+                ... $container->findTaggedServiceIds(TaggedIteratorAdapter::FILTER_ASSET_TAG),
+                ... $container->findTaggedServiceIds(TaggedIteratorAdapter::FILTER_DATA_OBJECT_TAG),
+                ... $container->findTaggedServiceIds(TaggedIteratorAdapter::FILTER_DOCUMENT_TAG)
+
+            ]
         );
 
         foreach ($taggedServices as $environmentType) {

src/Service/Filter/FilterLoaderInterface.php

@@ -21,5 +21,5 @@
  */
 interface FilterLoaderInterface
 {
-    public function loadFilters(): array;
+    public function loadFilters(): Filters;
 }

src/Service/Filter/FilterService.php

@@ -32,13 +32,31 @@ public function __construct(
     /**
      * @throws InvalidQueryTypeException
      */
-    public function applyCollectionFilter(Parameters $collection, string $type): QueryInterface
+    public function applyCollectionFilter(Parameters $parameters, string $type): QueryInterface
     {
         $query = $this->queryFactory->create($type);
-        foreach ($this->filterLoader->loadFilters() as $filter) {
-            $query = $filter->apply($collection, $query);
+        // apply default filters
+        $filters = $this->filterLoader->loadFilters();
+
+        foreach($filters->getFilters() as $filter) {
+            $query = $filter->apply($parameters, $query);
+        }
+
+        // apply type specific filters
+
+        foreach ($this->getTypeFilters($filters, $type) as $filter) {
+            $query = $filter->apply($parameters, $query);
         }
 
         return $query;
     }
+
+    private function getTypeFilters(Filters $filters, string $type): array
+    {
+        return match($type) {
+            'asset' => $filters->getAssetFilters(),
+            'dataObject' => $filters->getDataObjectFilters(),
+            'document' => $filters->getDocumentFilters()
+        };
+    }
 }

src/Service/Filter/FilterServiceInterface.php

@@ -25,5 +25,5 @@ interface FilterServiceInterface
     /**
      * @throws InvalidQueryTypeException
      */
-    public function applyCollectionFilter(Parameters $collection, string $type): QueryInterface;
+    public function applyCollectionFilter(Parameters $parameters, string $type): QueryInterface;
 }

src/Service/Filter/Filters.php

@@ -0,0 +1,48 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioApiBundle\Service\Filter;
+
+final readonly class Filters
+{
+    public function __construct(
+        private array $filters = [],
+        private array $assetFilters = [],
+        private array $dataObjectFilters = [],
+        private array $documentFilters = []
+    ) {
+    }
+
+    public function getFilters(): array
+    {
+        return $this->filters;
+    }
+
+    public function getAssetFilters(): array
+    {
+        return $this->assetFilters;
+    }
+
+    public function getDataObjectFilters(): array
+    {
+        return $this->dataObjectFilters;
+    }
+
+    public function getDocumentFilters(): array
+    {
+        return $this->documentFilters;
+    }
+}

src/Service/Filter/Loader/TaggedIteratorAdapter.php

@@ -17,6 +17,7 @@
 namespace Pimcore\Bundle\StudioApiBundle\Service\Filter\Loader;
 
 use Pimcore\Bundle\StudioApiBundle\Service\Filter\FilterLoaderInterface;
+use Pimcore\Bundle\StudioApiBundle\Service\Filter\Filters;
 use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
 
 /**
@@ -26,14 +27,29 @@ final class TaggedIteratorAdapter implements FilterLoaderInterface
 {
     public const FILTER_TAG = 'pimcore.studio_api.collection.filter';
 
+    public const FILTER_ASSET_TAG = 'pimcore.studio_api.collection.asset.filter';
+    public const FILTER_DATA_OBJECT_TAG = 'pimcore.studio_api.collection.data_object.filter';
+    public const FILTER_DOCUMENT_TAG = 'pimcore.studio_api.collection.document.filter';
+
     public function __construct(
         #[TaggedIterator(self::FILTER_TAG)]
-        private readonly iterable $taggedServices
+        private readonly iterable $taggedFilters,
+        #[TaggedIterator(self::FILTER_ASSET_TAG)]
+        private readonly iterable $taggedAssetFilters,
+        #[TaggedIterator(self::FILTER_DATA_OBJECT_TAG)]
+        private readonly iterable $taggedDataObjectFilters,
+        #[TaggedIterator(self::FILTER_DOCUMENT_TAG)]
+        private readonly iterable $taggedDocumentFilters
     ) {
     }
 
-    public function loadFilters(): array
+    public function loadFilters(): Filters
     {
-        return [... $this->taggedServices];
+        return new Filters(
+           [... $this->taggedFilters],
+           [... $this->taggedAssetFilters],
+           [... $this->taggedDataObjectFilters],
+           [... $this->taggedDocumentFilters]
+        );
     }
 }