UHF-12774: Add 25 hours to valid_to timestamp (#1268)

* Handle timezones
* Add 24 hours to valid_to timestamp

Valid to from api is only a date. We must assume that the item is valid to the end of the date.

Author: hyrsky

public/modules/custom/helfi_kymp_content/src/MobileNoteDataService.php

@@ -213,21 +213,28 @@ protected function transformFeature(array $feature): MobileNoteData {
     $properties = $feature['properties'] ?? [];
     $geometry = $feature['geometry'] ?? [];
 
-    $item = [
-      'id' => $featureId,
-      'address' => $properties['osoite'] ?? '',
-      'reason' => $properties['merkinSyy']['value'] ?? '',
-      'valid_from' => $this->dateToTimestamp($properties['voimassaoloAlku'] ?? NULL),
-      'valid_to' => $this->dateToTimestamp($properties['voimassaoloLoppu'] ?? NULL),
-      'time_range' => $properties['kello'] ?? '',
-      'created_at' => $this->dateTimeToTimestamp($properties['luontipvm'] ?? NULL),
-      'updated_at' => $this->dateTimeToTimestamp($properties['paivityspvm'] ?? NULL),
-      'address_info' => $properties['osoitteenlisatieto'] ?? '',
-      'sign_type' => $properties['merkinLaatu']['value'] ?? '',
-      'additional_text' => $properties['lisakilvenTeksti'] ?? '',
-      'notes' => $properties['huomautukset'] ?? '',
-      'phone' => $properties['puhelinnumero'] ?? '',
-    ];
+    try {
+      $item = [
+        'id' => $featureId,
+        'address' => $properties['osoite'] ?? '',
+        'reason' => $properties['merkinSyy']['value'] ?? '',
+        'valid_from' => $this->dateToTimestamp($properties['voimassaoloAlku'] ?? NULL),
+        // We only get date string from mobilenote. We
+        // add 24 hours to get the end timestamp.
+        'valid_to' => $this->dateToTimestamp($properties['voimassaoloLoppu'] ?? NULL) + 86400,
+        'time_range' => $properties['kello'] ?? '',
+        'created_at' => $this->dateTimeToTimestamp($properties['luontipvm'] ?? NULL),
+        'updated_at' => $this->dateTimeToTimestamp($properties['paivityspvm'] ?? NULL),
+        'address_info' => $properties['osoitteenlisatieto'] ?? '',
+        'sign_type' => $properties['merkinLaatu']['value'] ?? '',
+        'additional_text' => $properties['lisakilvenTeksti'] ?? '',
+        'notes' => $properties['huomautukset'] ?? '',
+        'phone' => $properties['puhelinnumero'] ?? '',
+      ];
+    }
+    catch (\DateException $e) {
+      throw new \InvalidArgumentException("MobileNote: Invalid date", previous: $e);
+    }
 
     // Convert geometry to GeoJSON object.
     if (!empty($geometry['coordinates'])) {
@@ -252,17 +259,15 @@ protected function transformFeature(array $feature): MobileNoteData {
    *
    * @return int|null
    *   The timestamp or NULL.
+   *
+   * @throws \DateException
    */
   protected function dateToTimestamp(?string $dateString): ?int {
     if (empty($dateString)) {
-      return NULL;
-    }
-    try {
-      return (new \DateTime($dateString))->getTimestamp();
-    }
-    catch (\DateMalformedStringException) {
-      return NULL;
+      throw new \DateMalformedStringException('Empty date string');
     }
+
+    return (new \DateTime($dateString, new \DateTimeZone('Europe/Helsinki')))->getTimestamp();
   }
 
   /**
@@ -279,9 +284,9 @@ protected function dateTimeToTimestamp(?string $dateTimeString): ?int {
       return NULL;
     }
     try {
-      return (new \DateTime($dateTimeString))->getTimestamp();
+      return (new \DateTime($dateTimeString, new \DateTimeZone('Europe/Helsinki')))->getTimestamp();
     }
-    catch (\DateMalformedStringException) {
+    catch (\DateException) {
       return NULL;
     }
   }

public/modules/custom/helfi_kymp_content/tests/src/Kernel/MobileNoteDataServiceTest.php

@@ -134,8 +134,11 @@ public function testGetMobileNoteData(): void {
     $this->assertContains('Mannerheimvägen', $item['street_names']);
     $this->assertCount(2, $item['street_names']);
 
-    // Verify date conversion.
-    $this->assertEquals(strtotime('2026-01-20'), $item['valid_from']);
+    // Verify date conversion (Europe/Helsinki timezone).
+    $tz = new \DateTimeZone('Europe/Helsinki');
+    $this->assertEquals((new \DateTime('2026-01-20', $tz))->getTimestamp(), $item['valid_from']);
+    // valid_to should be the date + 24 hours (86400 seconds).
+    $this->assertEquals((new \DateTime('2026-01-21', $tz))->getTimestamp() + 86400, $item['valid_to']);
 
     // Verify EPSG:3879 to WGS84 coordinate conversion.
     $coords = $item['geometry']->coordinates[0];
@@ -163,6 +166,8 @@ public function testGetMobileNoteDataNoEnrich(): void {
           'properties' => [
             'osoite' => 'Test Street 2',
             'merkinSyy' => ['value' => 'Test Reason'],
+            'voimassaoloAlku' => '2026-01-20',
+            'voimassaoloLoppu' => '2026-01-21',
           ],
         ],
       ],

public/modules/custom/helfi_kymp_content/tests/src/Kernel/MobileNoteDataSourceTest.php

@@ -99,8 +99,9 @@ public function testDatasource(): void {
     $this->assertEquals('Test Reason', $item['reason']);
     $this->assertEquals('Extra', $item['additional_text']);
 
-    // Verify date conversion.
-    $this->assertEquals(strtotime('2026-01-20'), $item['valid_from']);
+    // Verify date conversion (Europe/Helsinki timezone).
+    $tz = new \DateTimeZone('Europe/Helsinki');
+    $this->assertEquals((new \DateTime('2026-01-20', $tz))->getTimestamp(), $item['valid_from']);
 
     // Verify EPSG:3879 to WGS84 coordinate conversion.
     $coords = $item['geometry']->coordinates[0];