Merge pull request #363 from os2display/feature/358-more-filter-options

358: Add area and facility filters

Author: tuj

CHANGELOG.md

@@ -4,11 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-### Added
-
+- [#363](https://github.com/os2display/display-api-service/pull/363)
+  - Added optional 'area' and 'facility' configuration fields
 - [#362](https://github.com/os2display/display-api-service/pull/362)
   - Added new API version field and variable to handle new feature from issue #352.
-
 - [#385](https://github.com/os2display/display-api-service/pull/385)
   - Replaced PSR-6 caching with Symfony `CacheInterface::get()` in
     `FeedService` and `EventDatabaseApiV2FeedType` for stampede prevention.

src/Feed/BrndFeedType.php

@@ -49,6 +49,22 @@ public function getAdminFormOptions(FeedSource $feedSource): array
                 'label' => 'Sportcenter ID',
                 'formGroupClasses' => 'mb-3',
             ],
+            [
+                'key' => 'brnd-area',
+                'input' => 'input',
+                'type' => 'text',
+                'name' => 'area',
+                'label' => 'Område',
+                'formGroupClasses' => 'mb-3',
+            ],
+            [
+                'key' => 'brnd-facility',
+                'input' => 'input',
+                'type' => 'text',
+                'name' => 'facility',
+                'label' => 'Facilitet',
+                'formGroupClasses' => 'mb-3',
+            ],
         ];
     }
 
@@ -71,28 +87,68 @@ public function getData(Feed $feed): array
 
             $baseUri = $secrets->apiBaseUri;
             $sportCenterId = $configuration['sport_center_id'] ?? null;
+            $areaFilter = $configuration['area'] ?? '';
+            $facilityFilter = $configuration['facility'] ?? '';
 
-            if ('' === $baseUri || null === $sportCenterId || '' === $sportCenterId) {
+            if ('' === $baseUri || !is_string($sportCenterId) || '' === trim($sportCenterId)) {
                 return $result;
             }
 
+            $areaFilterNormalized = self::normalizeFilterValue($areaFilter);
+            $facilityFilterNormalized = self::normalizeFilterValue($facilityFilter);
+
             $bookings = $this->apiClient->getInfomonitorBookingsDetails($feedSource, $sportCenterId);
 
-            return array_reduce($bookings, function (array $carry, array $booking): array {
+            $result['bookings'] = array_reduce($bookings, function (array $carry, mixed $booking) use ($areaFilterNormalized, $facilityFilterNormalized): array {
+                if (!is_array($booking)) {
+                    return $carry;
+                }
+
                 $parsedBooking = $this->parseBrndBooking($booking);
 
-                // Validate that booking has required fields
-                if (!empty($parsedBooking['bookingcode']) && !empty($parsedBooking['bookingBy'])) {
-                    $carry[] = $parsedBooking;
+                // Bail out if required fields are missing.
+                if (empty($parsedBooking['bookingcode']) || empty($parsedBooking['bookingBy'])) {
+                    return $carry;
                 }
 
+                // Bail out if area filter applies and booking area does not match.
+                if ('' !== $areaFilterNormalized) {
+                    $bookingArea = self::normalizeFilterValue($parsedBooking['area'] ?? '');
+                    if ($bookingArea !== $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) {
+                        return $carry;
+                    }
+                }
+
+                $carry[] = $parsedBooking;
+
                 return $carry;
             }, []);
         } catch (\Throwable $throwable) {
             $this->logger->error($throwable->getMessage());
 
             throw $throwable;
         }
+
+        return $result;
+    }
+
+    private static function normalizeFilterValue(mixed $value): string
+    {
+        if (!is_string($value)) {
+            return '';
+        }
+
+        $value = trim($value);
+
+        return strtolower($value);
     }
 
     private function parseBrndBooking(array $booking): array