Add travel type filter to caching

Traewelling · Dec 13, 2024 · 3c6aa95 · 3c6aa95
1 parent 5c00732
commit 3c6aa95
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/app/DataProviders/CachedHafas.php b/app/DataProviders/CachedHafas.php
@@ -51,7 +51,7 @@ public function getDepartures(Station $station, Carbon $when, int $duration = 15
         // set duration longer than 15 minutes
         $duration = $duration < 15 ? 30 : $duration;
 
-        $key = CacheKey::getHafasDeparturesKey($station->id, $when, $localtime);
+        $key = CacheKey::getHafasDeparturesKey($station->id, $when, $localtime, $type);
 
         $departures = $this->remember(
             $key,

diff --git a/app/Helpers/CacheKey.php b/app/Helpers/CacheKey.php
@@ -3,6 +3,7 @@
 
 namespace App\Helpers;
 
+use App\Enum\TravelType;
 use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Cache;
@@ -24,7 +25,7 @@ class CacheKey
     private const string STATISTICS_GLOBAL    = 'StatisticsGlobal';
     private const string HAFAS_TRIP           = '_HafasTrip_%s_%s';
     private const string HAFAS_STATIONS       = '_HafasStations';
-    private const string HAFAS_DEPARTURES     = '_HafasDepartures_%d_%s_%s';
+    private const string HAFAS_DEPARTURES     = '_HafasDepartures_%d_%s_%s_%s';
     private const string HAFAFS_STATION_RIL   = '_HafasStationRil';
     private const string HAFAS_STATIONS_FUZZY = '_HafasStationsFuzzy';
     private const string HAFAS_CACHE_HIT      = '_HafasCacheHit_%s';
@@ -53,8 +54,14 @@ public static function getHafasStationsKey(string $query): string {
         return sprintf(self::FOR, self::HAFAS_STATIONS, $query);
     }
 
-    public static function getHafasDeparturesKey(string $stationId, Carbon $when, bool $localtime): string {
-        return sprintf(self::HAFAS_DEPARTURES, $stationId, $when->toTimeString(), $localtime ? 'local' : 'utc');
+    public static function getHafasDeparturesKey(string $stationId, Carbon $when, bool $localtime, ?TravelType $type): string {
+        return sprintf(
+            self::HAFAS_DEPARTURES,
+            $stationId,
+            $when->toTimeString(),
+            $localtime ? 'local' : 'utc',
+            $type ? $type->value : 'all'
+        );
     }
 
     public static function getHafasByRilIdentifierKey(string $rilIdentifier): string {