feat: require FilterDefinition

helsingborg-stad · Mar 4, 2025 · 865e9b2 · 865e9b2
1 parent b266725
commit 865e9b2
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 262 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/library/App.php b/library/App.php
@@ -926,6 +926,7 @@ private function setupExternalContent(): void
          * Sync external content.
          */
         $this->wpService->addAction('Municipio/ExternalContent/Sync', function (string $postType, ?int $postId = null) use ($sourceConfigs) {
+
             $sourceConfig       = reset(array_filter($sourceConfigs, fn($config) => $config->getPostType() === $postType));
             $sourceReader       = (new \Municipio\ExternalContent\SourceReaders\Factories\SourceReaderFromConfig())->create($sourceConfig);
             $schemaObjectToPost = (new \Municipio\ExternalContent\WpPostArgsFromSchemaObject\Factory\Factory($sourceConfig))->create();

diff --git a/library/ExternalContent/Config/SourceConfig.php b/library/ExternalContent/Config/SourceConfig.php
@@ -2,6 +2,8 @@
 
 namespace Municipio\ExternalContent\Config;
 
+use Municipio\ExternalContent\PropertyPathFilter\FilterDefinition\Contracts\FilterDefinition;
+
 /**
  * Class SourceConfig
  *
@@ -25,17 +27,18 @@ class SourceConfig implements SourceConfigInterface
      * @param string $sourceTypesenseCollection
      */
     public function __construct(
-        private string $postType = '',
-        private string $automaticImportSchedule = '',
-        private string $schemaType = '',
-        private string $sourceType = '',
-        private array $taxonomies = [],
-        private string $sourceJsonFilePath = '',
-        private string $sourceTypesenseApiKey = '',
-        private string $sourceTypesenseProtocol = '',
-        private string $sourceTypesenseHost = '',
-        private string $sourceTypesensePort = '',
-        private string $sourceTypesenseCollection = ''
+        private string $postType,
+        private string $automaticImportSchedule,
+        private string $schemaType,
+        private string $sourceType,
+        private array $taxonomies,
+        private string $sourceJsonFilePath,
+        private string $sourceTypesenseApiKey,
+        private string $sourceTypesenseProtocol,
+        private string $sourceTypesenseHost,
+        private string $sourceTypesensePort,
+        private string $sourceTypesenseCollection,
+        private FilterDefinition $filterDefinition
     ) {
     }
 
@@ -134,4 +137,12 @@ public function getId(): string
     {
         return $this->postType;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilterDefinition(): FilterDefinition
+    {
+        return $this->filterDefinition;
+    }
 }
diff --git a/library/ExternalContent/Config/SourceConfigFactory.php b/library/ExternalContent/Config/SourceConfigFactory.php
@@ -3,6 +3,7 @@
 namespace Municipio\ExternalContent\Config;
 
 use Municipio\Config\Features\SchemaData\SchemaDataConfigInterface;
+use Municipio\ExternalContent\PropertyPathFilter\FilterDefinition\FilterDefinition;
 use WpService\Contracts\GetOption;
 use WpService\Contracts\GetOptions;
 
@@ -77,7 +78,8 @@ private function createSourceConfigsFromNamedSettings(array $namedSettings): Sou
             $namedSettings['source_typesense_protocol'] ?? '',
             $namedSettings['source_typesense_host'] ?? '',
             $namedSettings['source_typesense_port'] ?? '',
-            $namedSettings['source_typesense_collection'] ?? ''
+            $namedSettings['source_typesense_collection'] ?? '',
+            new FilterDefinition([])
         );
     }
 

diff --git a/library/ExternalContent/Config/SourceConfigInterface.php b/library/ExternalContent/Config/SourceConfigInterface.php
@@ -2,6 +2,8 @@
 
 namespace Municipio\ExternalContent\Config;
 
+use Municipio\ExternalContent\PropertyPathFilter\FilterDefinition\Contracts\FilterDefinition;
+
 interface SourceConfigInterface
 {
     /**
@@ -85,4 +87,11 @@ public function getSourceTypesenseCollection(): string;
      * Get the source unique ID
      */
     public function getId(): string;
+
+    /**
+     * Retrieves the filter definition.
+     *
+     * @return FilterDefinition The filter definition.
+     */
+    public function getFilterDefinition(): FilterDefinition;
 }
diff --git a/library/ExternalContent/Config/SourceConfigWithUniqueId.php b/library/ExternalContent/Config/SourceConfigWithUniqueId.php
@@ -2,6 +2,8 @@
 
 namespace Municipio\ExternalContent\Config;
 
+use Municipio\ExternalContent\PropertyPathFilter\FilterDefinition\Contracts\FilterDefinition;
+
 /**
  * Class SourceConfig
  *
@@ -103,6 +105,14 @@ public function getSourceTypesenseCollection(): string
         return $this->inner->getSourceTypesenseCollection();
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getFilterDefinition(): FilterDefinition
+    {
+        return $this->inner->getFilterDefinition();
+    }
+
     /**
      * @inheritDoc
      */