Merge branch 'develop' into feature/358-more-filter-options

Author: tuj

CHANGELOG.md

@@ -4,8 +4,15 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+<<<<<<< feature/358-more-filter-options
 - [#363](https://github.com/os2display/display-api-service/pull/363)
   - Added optional 'area' and 'facility' configuration fields
+=======
+### Added
+
+- [#362](https://github.com/os2display/display-api-service/pull/362)
+  - Added new API version field and variable to handle new feature from issue #352.
+>>>>>>> develop
 
 - [#385](https://github.com/os2display/display-api-service/pull/385)
   - Replaced PSR-6 caching with Symfony `CacheInterface::get()` in
@@ -32,9 +39,12 @@ All notable changes to this project will be documented in this file.
 
 ## [2.6.1] - 2026-03-06
 
-- [#347](https://github.com/os2display/display-api-service/pull/347)
-  - Added onFlush listener to handle ManyToMany collection changes for relations checksum propagation.
-  - Added command to refresh relation checksums.
+### Added
+
+- [#347](https://github.com/os2display/display-api-service/pull/347):
+  Added onFlush listener to handle ManyToMany collection changes for
+  relations checksum propagation.
+- [#347](https://github.com/os2display/display-api-service/pull/347): Added command to refresh relation checksums.
 
 ## [2.6.0] - 2025-12-05
 
@@ -44,7 +54,7 @@ All notable changes to this project will be documented in this file.
   - Fix date parsing issue in BRND booking feed type
 - [#313](https://github.com/os2display/display-api-service/pull/313)
   - Add BRND booking feed type
-  
+
 ## [2.5.2] - 2025-09-25
 
 - [#260](https://github.com/os2display/display-api-service/pull/260)

src/Feed/BrndFeedType.php

@@ -224,6 +224,10 @@ public function getRequiredSecrets(): array
                 'type' => 'string',
                 'exposeValue' => false,
             ],
+            'api_version' => [
+                'type' => 'string',
+                'exposeValue' => true,
+            ],
         ];
     }
 
@@ -253,6 +257,11 @@ public function getSchema(): array
                 'api_auth_key' => [
                     'type' => 'string',
                 ],
+                'api_version' => [
+                    'type' => 'string',
+                    'pattern' => '^\d+(\.\d+)?$',
+                    'default' => '1.0',
+                ],
             ],
             'required' => ['api_base_uri', 'company_id', 'api_auth_key'],
         ];

src/Feed/SourceType/Brnd/ApiClient.php

@@ -94,7 +94,9 @@ private function getInfomonitorBookingsDetailsData(
         try {
             $client = $this->getApiClient($feedSource);
 
-            return $client->request('POST', '/v1.0/get-infomonitor-bookings-details', [
+            $versionPath = '/v'.$secrets->apiVersion;
+
+            return $client->request('POST', $versionPath.'/get-infomonitor-bookings-details', [
                 'json' => [
                     'companyID' => $secrets->companyId,
                     'associationID' => $sportCenterId,
@@ -164,7 +166,8 @@ private function fetchToken(FeedSource $feedSource): string
         } else {
             try {
                 $secrets = new SecretsDTO($feedSource);
-                $response = $this->client->request('POST', $secrets->apiBaseUri.'/v1.0/generate-token', [
+                $versionPath = '/v'.$secrets->apiVersion;
+                $response = $this->client->request('POST', $secrets->apiBaseUri.$versionPath.'/generate-token', [
                     'headers' => [
                         'Content-Type' => 'application/json',
                         'Accept' => '*/*',

src/Feed/SourceType/Brnd/SecretsDTO.php

@@ -11,6 +11,7 @@
     public string $apiBaseUri;
     public string $apiAuthKey;
     public string $companyId;
+    public string $apiVersion;
 
     public function __construct(FeedSource $feedSource)
     {
@@ -29,7 +30,15 @@ public function __construct(FeedSource $feedSource)
         }
 
         $this->apiBaseUri = rtrim((string) $secrets['api_base_uri'], '/');
-        $this->companyId = $secrets['company_id'];
-        $this->apiAuthKey = $secrets['api_auth_key'];
+        $this->companyId = (string) $secrets['company_id'];
+        $this->apiAuthKey = (string) $secrets['api_auth_key'];
+
+        $version = $secrets['api_version'] ?? '1.0';
+
+        if (!is_string($version) || 1 !== preg_match('/^\d+(\.\d+)?$/', $version)) {
+            throw new \RuntimeException('Invalid api_version. Expected format like "1.0" or "2.0".');
+        }
+
+        $this->apiVersion = $version;
     }
 }