Merge branch 'release/3.0.0' into feature/3x-github-packages

Author: tuj

.env

@@ -64,6 +64,7 @@ REDIS_CACHE_DSN=redis://redis:6379/0
 ###> Http Client ###
 HTTP_CLIENT_TIMEOUT=5
 HTTP_CLIENT_MAX_DURATION=30
+HTTP_CLIENT_LOG_LEVEL=error
 ###< Http Client ###
 
 ###> App ###

config/packages/cache.yaml

@@ -19,6 +19,9 @@ framework:
 
             feed.without.expire.cache:
                 adapter: cache.adapter.redis
+                # Safety net (24 hours) — code sets explicit TTL on items,
+                # but this ensures orphaned keys don't persist indefinitely.
+                default_lifetime: 86400
 
             # Creates a "calendar.api.cache" service
             calendar.api.cache:

config/packages/monolog.yaml

@@ -0,0 +1,2 @@
+monolog:
+    channels: ['app_http']

config/packages/prod/monolog.yaml

@@ -11,6 +11,12 @@ monolog:
             path: php://stderr
             level: debug
             formatter: monolog.formatter.json
+        app_http:
+            type: stream
+            path: php://stderr
+            level: info
+            channels: ['app_http']
+            formatter: monolog.formatter.json
         console:
             type: console
             process_psr_3_messages: false

config/services.yaml

@@ -48,6 +48,13 @@ services:
             - '../src/Kernel.php'
             - '../src/Tests/'
 
+    App\HttpClient\LoggingHttpClient:
+        decorates: http_client
+        arguments:
+            $client: '@.inner'
+            $logger: '@monolog.logger.app_http'
+            $logLevel: '%env(string:HTTP_CLIENT_LOG_LEVEL)%'
+
     #### App Scope below ###
 
     Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface: '@Lexik\Bundle\JWTAuthenticationBundle\Security\Http\Authentication\AuthenticationFailureHandler'

docker-compose.override.yml

@@ -7,6 +7,7 @@ services:
 
   redis:
     image: "redis:6"
+    command: redis-server --maxmemory 128mb --maxmemory-policy allkeys-lru
     networks:
       - app
     ports:

docs/v2-changelogs/api.md

@@ -4,10 +4,28 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- [#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.
+  - Renamed HTTP client logging channel from `http_client` to `app_http` to separate from Symfony's built-in logging.
+  - Injected container-managed `HttpClientInterface` into `RssFeedType` for logging coverage.
+  - Improved `CalendarApiFeedType` error logging with feed ID, tenant key, and exception context.
+  - Added default TTL (24h) to `feed.without.expire.cache` pool as safety net for orphaned keys.
+  - Added Redis `maxmemory` and `allkeys-lru` eviction policy to dev config.
+  - Added unit tests for `LoggingHttpClient`.
+- [#383](https://github.com/os2display/display-api-service/pull/383)
+  - Fixed `testUnlinkSlide` using same slide for both lookups, causing "Relation not found" failure.
+- [#382](https://github.com/os2display/display-api-service/pull/382)
+  - Fixed cache stampede in CalendarApiFeedType by using Symfony CacheInterface with stampede prevention.
+  - Added HTTP client logging decorator with dedicated `http_client` Monolog channel.
+  - Added configurable `HTTP_CLIENT_LOG_LEVEL` env var (defaults to `error`).
+  - Migrated Brnd and Colibo ApiClients to use injected HttpClient for logging coverage.
 - [#379](https://github.com/os2display/display-api-service/pull/379)
   - Ensure the http client has a default time out setting. Make it configurable in env.
 - [#376](https://github.com/os2display/display-api-service/pull/376)
   - Add prod override for cache.app to use Redis in production.
+- [#386](https://github.com/os2display/display-api-service/pull/386)
+  - Add better cache handling when getData throws errors.
 
 ## [2.6.1] - 2026-03-10
 

src/Feed/BrndFeedType.php

@@ -78,7 +78,7 @@ public function getData(Feed $feed): array
 
             $bookings = $this->apiClient->getInfomonitorBookingsDetails($feedSource, $sportCenterId);
 
-            $result['bookings'] = array_reduce($bookings, function (array $carry, array $booking): array {
+            return array_reduce($bookings, function (array $carry, array $booking): array {
                 $parsedBooking = $this->parseBrndBooking($booking);
 
                 // Validate that booking has required fields
@@ -90,11 +90,9 @@ public function getData(Feed $feed): array
             }, []);
         } catch (\Throwable $throwable) {
             $this->logger->error($throwable->getMessage());
-            // Silently catch all exceptions and return empty result
-            // $result is already initialized with empty bookings array
-        }
 
-        return $result;
+            throw $throwable;
+        }
     }
 
     private function parseBrndBooking(array $booking): array