UHF-12838: Allow configuring mobilenote lookback offset

hyrsky · hyrsky · commit 99edd6166260 · 2026-03-10T12:37:59.000+02:00
diff --git a/public/modules/custom/helfi_kymp_content/config/install/helfi_kymp_content.settings.yml b/public/modules/custom/helfi_kymp_content/config/install/helfi_kymp_content.settings.yml
@@ -0,0 +1 @@
+sync_lookback_offset: '-30 days'
diff --git a/public/modules/custom/helfi_kymp_content/config/schema/helfi_kymp_content.schema.yml b/public/modules/custom/helfi_kymp_content/config/schema/helfi_kymp_content.schema.yml
@@ -6,3 +6,18 @@ helfi_kymp_content.project_search:
     project_search_path:
       type: path
       label: 'Project search path'
+
+helfi_kymp_content.settings:
+  type: config_object
+  label: 'Mobile note'
+  mapping:
+    address_api_key:
+      type: string
+    wfs_url:
+      type: string
+    wfs_username:
+      type: string
+    wfs_password:
+      type: string
+    sync_lookback_offset:
+      type: string
diff --git a/public/modules/custom/helfi_kymp_content/src/MobileNoteDataService.php b/public/modules/custom/helfi_kymp_content/src/MobileNoteDataService.php
@@ -5,7 +5,7 @@
 namespace Drupal\helfi_kymp_content;
 
 use Drupal\Component\Datetime\TimeInterface;
-use Drupal\Core\Site\Settings;
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\TypedData\Exception\MissingDataException;
 use Drupal\Core\TypedData\TypedDataManagerInterface;
 use Drupal\Core\Utility\Error;
@@ -49,7 +49,7 @@ public function __construct(
     protected ClientInterface $client,
     protected TypedDataManagerInterface $typedDataManager,
     protected TimeInterface $time,
-    protected Settings $settings,
+    protected ConfigFactoryInterface $configFactory,
     protected PaikkatietoClient $paikkatietoClient,
   ) {
     // EPSG:3879 is Helsinki local CRS (ETRS-GK25FIN).
@@ -136,20 +136,20 @@ public function fetchNearbyStreets(array $items): void {
    * @throws \InvalidArgumentException
    */
   protected function fetchFromApi(): array {
-    $settings = $this->settings->get('helfi_kymp_mobilenote', []);
+    $settings = $this->configFactory->get('helfi_kymp_content.settings');
 
     if (
-      empty($settings['wfs_url']) ||
-      empty($settings['wfs_username']) ||
-      empty($settings['wfs_password'])
+      empty($settings->get('wfs_url')) ||
+      empty($settings->get('wfs_username')) ||
+      empty($settings->get('wfs_password'))
     ) {
       throw new \InvalidArgumentException('MobileNote: Missing API credentials.');
     }
 
     try {
       $minDate = (new \DateTime())
         ->setTimestamp($this->time->getRequestTime())
-        ->modify($settings['sync_lookback_offset'] ?? '-30 days');
+        ->modify($settings->get('sync_lookback_offset') ?? '-30 days');
     }
     catch (\DateMalformedStringException $e) {
       throw new \InvalidArgumentException($e->getMessage(), previous: $e);
@@ -166,16 +166,16 @@ protected function fetchFromApi(): array {
 </Filter>
 XML;
 
-    $response = $this->client->request('GET', $settings['wfs_url'], [
-      'auth' => [$settings['wfs_username'], $settings['wfs_password']],
+    $response = $this->client->request('GET', $settings->get('wfs_url'), [
+      'auth' => [$settings->get('wfs_username'), $settings->get('wfs_password')],
       'query' => [
         'service' => 'WFS',
         'version' => '1.1.0',
         'request' => 'GetFeature',
         'typeName' => 'ppoytakirjaExtranet',
         'outputFormat' => 'application/json',
         'srsName' => 'EPSG:3879',
-        'maxFeatures' => 1000,
+        'maxFeatures' => 10000,
         'filter' => preg_replace('/\s+/', ' ', trim($filterXml)),
       ],
       'timeout' => 30,
diff --git a/public/modules/custom/helfi_kymp_content/src/Paikkatieto/PaikkatietoClient.php b/public/modules/custom/helfi_kymp_content/src/Paikkatieto/PaikkatietoClient.php
@@ -4,7 +4,7 @@
 
 namespace Drupal\helfi_kymp_content\Paikkatieto;
 
-use Drupal\Core\Site\Settings;
+use Drupal\Core\Config\ConfigFactoryInterface;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\RequestException;
@@ -27,7 +27,7 @@ class PaikkatietoClient implements LoggerAwareInterface {
   private const float EARTH_RADIUS = 6371000;
 
   public function __construct(
-    private readonly Settings $settings,
+    private readonly ConfigFactoryInterface $configFactory,
     private readonly ClientInterface $httpClient,
   ) {
   }
@@ -142,8 +142,8 @@ public function fetchStreetsByPoint(float $lat, float $lon, int $distance = 75):
    * @throws \InvalidArgumentException
    */
   private function makeRequest(array $queryParams, int $maxRetries = 3): array {
-    $apiSettings = $this->settings->get('helfi_kymp_mobilenote', []);
-    $apiKey = $apiSettings['address_api_key'] ?? NULL;
+    $config = $this->configFactory->get('helfi_kymp_content.settings');
+    $apiKey = $config->get('address_api_key');
 
     if (empty($apiKey)) {
       throw new \InvalidArgumentException('Paikkatietoapi: Missing API key.');
diff --git a/public/modules/custom/helfi_kymp_content/tests/src/Kernel/MobileNoteCronHooksTest.php b/public/modules/custom/helfi_kymp_content/tests/src/Kernel/MobileNoteCronHooksTest.php
@@ -7,7 +7,6 @@
 use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Site\Settings;
 use Drupal\Core\State\StateInterface;
 use Drupal\helfi_kymp_content\Hook\MobileNoteCronHooks;
 use Drupal\helfi_kymp_content\MobileNoteDataService;
@@ -62,13 +61,11 @@ protected function setUp(): void {
     parent::setUp();
 
     // Configure MobileNote API settings.
-    $settings = Settings::getAll();
-    $settings['helfi_kymp_mobilenote'] = [
-      'wfs_url' => 'https://example.com/wfs',
-      'wfs_username' => 'user',
-      'wfs_password' => 'pass',
-    ];
-    new Settings($settings);
+    $this->config('helfi_kymp_content.settings')
+      ->set('wfs_url', 'https://example.com/wfs')
+      ->set('wfs_username', 'user')
+      ->set('wfs_password', 'pass')
+      ->save();
 
     // Mock HTTP client with fixture data.
     $client = $this->createMockHttpClient([
diff --git a/public/modules/custom/helfi_kymp_content/tests/src/Kernel/MobileNoteDataServiceTest.php b/public/modules/custom/helfi_kymp_content/tests/src/Kernel/MobileNoteDataServiceTest.php
@@ -4,7 +4,6 @@
 
 namespace Drupal\Tests\helfi_kymp_content\Kernel;
 
-use Drupal\Core\Site\Settings;
 use Drupal\helfi_kymp_content\MobileNoteDataService;
 use Drupal\KernelTests\KernelTestBase;
 use GuzzleHttp\ClientInterface;
@@ -44,16 +43,13 @@ class MobileNoteDataServiceTest extends KernelTestBase {
   protected function setUp(): void {
     parent::setUp();
 
-    // Mock settings.
-    $settings = Settings::getAll();
-    $settings['helfi_kymp_mobilenote'] = [
-      'wfs_url' => 'https://example.com/wfs',
-      'wfs_username' => 'test_user',
-      'wfs_password' => 'test_pass',
-      'sync_lookback_offset' => '-30 days',
-      'address_api_key' => 'TEST_KEY',
-    ];
-    new Settings($settings);
+    $this->config('helfi_kymp_content.settings')
+      ->set('wfs_url', 'https://example.com/wfs')
+      ->set('wfs_username', 'test_user')
+      ->set('wfs_password', 'test_pass')
+      ->set('sync_lookback_offset', '-30 days')
+      ->set('address_api_key', 'TEST_KEY')
+      ->save();
   }
 
   /**
diff --git a/public/modules/custom/helfi_kymp_content/tests/src/Kernel/MobileNoteDataSourceTest.php b/public/modules/custom/helfi_kymp_content/tests/src/Kernel/MobileNoteDataSourceTest.php
@@ -4,7 +4,6 @@
 
 namespace Drupal\Tests\helfi_kymp_content\Kernel;
 
-use Drupal\Core\Site\Settings;
 use Drupal\helfi_kymp_content\Plugin\DataType\MobileNoteData;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\search_api\Entity\Index;
@@ -35,14 +34,12 @@ class MobileNoteDataSourceTest extends KernelTestBase {
    * Tests data fetching and coordinate conversion.
    */
   public function testDatasource(): void {
-    new Settings([
-      'helfi_kymp_mobilenote' => [
-        'wfs_url' => 'https://example.com/wfs',
-        'wfs_username' => 'test_user',
-        'wfs_password' => 'test_pass',
-        'sync_lookback_offset' => '-30 days',
-      ],
-    ]);
+    $this->config('helfi_kymp_content.settings')
+      ->set('wfs_url', 'https://example.com/wfs')
+      ->set('wfs_username', 'test_user')
+      ->set('wfs_password', 'test_pass')
+      ->set('sync_lookback_offset', '-30 days')
+      ->save();
 
     $this->setupMockHttpClient([
       new Response(body: json_encode([
diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
@@ -74,12 +74,9 @@
 $config['raven.settings']['ignored_channels'][] = 'search_api';
 
 // MobileNote WFS API settings.
-$settings['helfi_kymp_mobilenote'] = [
-  'wfs_url' => getenv('MN_WFS_URL') ?: '',
-  'wfs_username' => getenv('MN_WFS_USERNAME') ?: '',
-  'wfs_password' => getenv('MN_WFS_PASSWORD') ?: '',
-  'address_api_key' => getenv('PAIKKATIETOHAKU_API_KEY') ?: '',
-  // Sync filter: fetch items where voimassaoloAlku >= (today - offset).
-  'sync_lookback_offset' => '-30 days',
-];
+$config['helfi_kymp_content.settings']['wfs_url'] = getenv('MN_WFS_URL');
+$config['helfi_kymp_content.settings']['wfs_username'] = getenv('MN_WFS_USERNAME');
+$config['helfi_kymp_content.settings']['wfs_password'] = getenv('MN_WFS_PASSWORD');
 
+// Paikkatietohaku:
+$config['helfi_kymp_content.settings']['address_api_key'] = getenv('PAIKKATIETOHAKU_API_KEY');
