Merge pull request #486 from os2display/358/change-area-and-facility-fields-to-id

Changed filter to filter through IDs instead of name on Area and Faci…

Author: tuj

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- [#486](https://github.com/os2display/display-api-service/pull/486)
+  - Changed BRND feed area and facility filters to match on `områdeId` and `facilitetsId` instead of area/facility names.
+  - Mapped area and facility IDs centrally in `parseBrndBooking()`.
+  - ID filtering is only supported for BRND API v2.0; area/facility fields are hidden in admin for v1.0 feed sources.
 - [#444](https://github.com/os2display/display-api-service/pull/444)
   - Renamed 15 `changed_idx` indexes to `<table>_changed_idx` for cross-platform portability
     (Postgres scopes index names schema-wide).

src/Feed/BrndFeedType.php

@@ -29,6 +29,8 @@ class BrndFeedType implements FeedTypeInterface
      */
     private const string BRND_API_TIMEZONE = 'Europe/Copenhagen';
 
+    private const string BRND_API_VERSION_WITH_ID_FILTERING = '2.0';
+
     public function __construct(
         private readonly FeedService $feedService,
         private readonly ApiClient $apiClient,
@@ -40,7 +42,7 @@ public function getAdminFormOptions(FeedSource $feedSource): array
     {
         $feedEntryRecipients = $this->feedService->getFeedSourceConfigUrl($feedSource, 'sport-center');
 
-        return [
+        $options = [
             [
                 'key' => 'brnd-sport-center-id',
                 'input' => 'input',
@@ -49,23 +51,28 @@ public function getAdminFormOptions(FeedSource $feedSource): array
                 'label' => 'Sportcenter ID',
                 'formGroupClasses' => 'mb-3',
             ],
-            [
+        ];
+
+        if ($this->supportsIdFiltering($feedSource)) {
+            $options[] = [
                 'key' => 'brnd-area',
                 'input' => 'input',
                 'type' => 'text',
                 'name' => 'area',
-                'label' => 'Område',
+                'label' => 'Område ID',
                 'formGroupClasses' => 'mb-3',
-            ],
-            [
+            ];
+            $options[] = [
                 'key' => 'brnd-facility',
                 'input' => 'input',
                 'type' => 'text',
                 'name' => 'facility',
-                'label' => 'Facilitet',
+                'label' => 'Facilitet ID',
                 'formGroupClasses' => 'mb-3',
-            ],
-        ];
+            ];
+        }
+
+        return $options;
     }
 
     public function getData(Feed $feed): array
@@ -94,12 +101,13 @@ public function getData(Feed $feed): array
                 return $result;
             }
 
+            $supportsIdFiltering = $this->supportsIdFiltering($feedSource);
             $areaFilterNormalized = self::normalizeFilterValue($areaFilter);
             $facilityFilterNormalized = self::normalizeFilterValue($facilityFilter);
 
             $bookings = $this->apiClient->getInfomonitorBookingsDetails($feedSource, $sportCenterId);
 
-            $result['bookings'] = array_reduce($bookings, function (array $carry, mixed $booking) use ($areaFilterNormalized, $facilityFilterNormalized): array {
+            $result['bookings'] = array_reduce($bookings, function (array $carry, mixed $booking) use ($areaFilterNormalized, $facilityFilterNormalized, $supportsIdFiltering): array {
                 if (!is_array($booking)) {
                     return $carry;
                 }
@@ -111,18 +119,18 @@ public function getData(Feed $feed): array
                     return $carry;
                 }
 
-                // Bail out if area filter applies and booking area does not match.
-                if ('' !== $areaFilterNormalized) {
-                    $bookingArea = self::normalizeFilterValue($parsedBooking['area'] ?? '');
-                    if ($bookingArea !== $areaFilterNormalized) {
+                // Bail out if area filter applies and booking area ID does not match.
+                if ($supportsIdFiltering && '' !== $areaFilterNormalized) {
+                    $bookingAreaId = self::normalizeFilterValue($parsedBooking['areaId'] ?? '');
+                    if ($bookingAreaId !== $areaFilterNormalized) {
                         return $carry;
                     }
                 }
 
-                // Bail out if facility filter applies and booking facility does not match.
-                if ('' !== $facilityFilterNormalized) {
-                    $bookingFacility = self::normalizeFilterValue($parsedBooking['facility'] ?? '');
-                    if ($bookingFacility !== $facilityFilterNormalized) {
+                // Bail out if facility filter applies and booking facility ID does not match.
+                if ($supportsIdFiltering && '' !== $facilityFilterNormalized) {
+                    $bookingFacilityId = self::normalizeFilterValue($parsedBooking['facilityId'] ?? '');
+                    if ($bookingFacilityId !== $facilityFilterNormalized) {
                         return $carry;
                     }
                 }
@@ -142,13 +150,15 @@ public function getData(Feed $feed): array
 
     private static function normalizeFilterValue(mixed $value): string
     {
+        if (is_int($value) || is_float($value)) {
+            return (string) $value;
+        }
+
         if (!is_string($value)) {
             return '';
         }
 
-        $value = trim($value);
-
-        return strtolower($value);
+        return trim($value);
     }
 
     private function parseBrndBooking(array $booking): array
@@ -195,6 +205,8 @@ private function parseBrndBooking(array $booking): array
             'complex' => $booking['anlæg'] ?? '',
             'area' => $booking['område'] ?? '',
             'facility' => $booking['facilitet'] ?? '',
+            'areaId' => $booking['områdeId'] ?? '',
+            'facilityId' => $booking['facilitetsId'] ?? '',
             'activity' => $booking['aktivitet'] ?? '',
             'team' => $booking['hold'] ?? '',
             'status' => $booking['status'] ?? '',
@@ -204,6 +216,17 @@ private function parseBrndBooking(array $booking): array
         ];
     }
 
+    private function supportsIdFiltering(FeedSource $feedSource): bool
+    {
+        $secrets = $feedSource->getSecrets();
+
+        if (!is_array($secrets)) {
+            return false;
+        }
+
+        return self::BRND_API_VERSION_WITH_ID_FILTERING === ($secrets['api_version'] ?? '1.0');
+    }
+
     public function getConfigOptions(Request $request, FeedSource $feedSource, string $name): ?array
     {
         return null;