@golemio/pid 4.1.1 → 4.1.2-dev.2016480560

package/dist/integration-engine/ropid-gtfs/helpers/DataCacheManager.d.ts

@@ -4,7 +4,6 @@ export declare class DataCacheManager implements IDataCacheManager {
     private readonly staticFileRepository;
     private readonly runTripsRepository;
     private readonly blockStopsRepository;
-    private readonly delayComputationRepository;
     private readonly regionalBusGtfsLookupCacheRepository;
     static getInstance(): DataCacheManager;
     private constructor();

package/dist/integration-engine/ropid-gtfs/helpers/DataCacheManager.js

@@ -17,7 +17,6 @@ class DataCacheManager {
         this.staticFileRepository = new cache_1.StaticFileRedisRepository();
         this.runTripsRepository = new cache_1.RunTripsRedisRepository();
         this.blockStopsRepository = Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.BlockStopsRedisRepository);
-        this.delayComputationRepository = new cache_1.DelayComputationRedisRepository();
         this.regionalBusGtfsLookupCacheRepository = new RegionalBusGtfsCacheRepository_1.RegionalBusGtfsCacheRepository();
     }
     async cleanCache() {

package/dist/integration-engine/ropid-gtfs/helpers/DataCacheManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCacheManager.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/helpers/DataCacheManager.ts"],"names":[],"mappings":";;;AAAA,0IAAqI;AACrI,6EAAwE;AACxE,gDAK8B;AAC9B,kCAA+C;AAC/C,4EAAyE;AAGzE,MAAa,gBAAgB;IAQlB,MAAM,CAAC,WAAW;QACrB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACjB,IAAI,CAAC,SAAS,GAAG,IAAI,gBAAgB,EAAE,CAAC;SAC3C;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED;QACI,IAAI,CAAC,oBAAoB,GAAG,IAAI,iCAAyB,EAAE,CAAC;QAC5D,IAAI,CAAC,kBAAkB,GAAG,IAAI,+BAAuB,EAAE,CAAC;QACxD,IAAI,CAAC,oBAAoB,GAAG,uBAAkB,CAAC,OAAO,CAClD,iDAAuB,CAAC,yBAAyB,CACpD,CAAC;QACF,IAAI,CAAC,0BAA0B,GAAG,IAAI,uCAA+B,EAAE,CAAC;QACxE,IAAI,CAAC,oCAAoC,GAAG,IAAI,+DAA8B,EAAE,CAAC;IACrF,CAAC;IAEM,KAAK,CAAC,UAAU;QACnB,IAAI;YACA,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7C,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,IAAI,CAAC,oCAAoC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SAClE;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,6BAAY,CAAC,yCAAyC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SACjG;IACL,CAAC;CACJ;AApCD,4CAoCC"}
+{"version":3,"file":"DataCacheManager.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/helpers/DataCacheManager.ts"],"names":[],"mappings":";;;AAAA,0IAAqI;AACrI,6EAAwE;AACxE,gDAK8B;AAC9B,kCAA+C;AAC/C,4EAAyE;AAGzE,MAAa,gBAAgB;IAOlB,MAAM,CAAC,WAAW;QACrB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACjB,IAAI,CAAC,SAAS,GAAG,IAAI,gBAAgB,EAAE,CAAC;SAC3C;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED;QACI,IAAI,CAAC,oBAAoB,GAAG,IAAI,iCAAyB,EAAE,CAAC;QAC5D,IAAI,CAAC,kBAAkB,GAAG,IAAI,+BAAuB,EAAE,CAAC;QACxD,IAAI,CAAC,oBAAoB,GAAG,uBAAkB,CAAC,OAAO,CAClD,iDAAuB,CAAC,yBAAyB,CACpD,CAAC;QACF,IAAI,CAAC,oCAAoC,GAAG,IAAI,+DAA8B,EAAE,CAAC;IACrF,CAAC;IAEM,KAAK,CAAC,UAAU;QACnB,IAAI;YACA,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7C,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,IAAI,CAAC,oCAAoC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SAClE;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,6BAAY,CAAC,yCAAyC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SACjG;IACL,CAAC;CACJ;AAlCD,4CAkCC"}

package/docs/cache/types/redis.md

@@ -92,38 +92,172 @@ flowchart TD;
 
 ### gtfsRunSchedule:*
 
-- TODO doplnit
+- key = `*${route_id}_${run_number}`
+- retence dat aktivne v tride `DataCacheManager` 
+- TTL podle casu vygenerovane ho z methody `getNextExpireTimestamp`
+- hodnota je `string`
+- cache obsaguje data z tabulky ropidgtfs_precomputed_trip_schedule
+
+```mermaid
+flowchart TD;
+    psql[("PSQL ropidgtfs_precomputed_trip_schedule")];
+    redis_trip_schedule[("Redis gtfsRunSchedule:*")];
+    connector[("OG Redis connector")];
+    repository["IE RunTripsRedisRepository"];
+
+    propagateDelay["propagateDelay"];
+
+
+    repository<--GET*.runTuple--->propagateDelay;
+    runManager["AbstractGTFSTripRunManager"]
+    get_gtfsrt["GET /v2/departureboards"];
+
+    initial["Zpráva z vozidla"];
+    initial--process-->runManager;
+    repository--GET*.runTuple<-->redis_trip_schedule;
+    runManager--GET*.runTuple<-->repository;
+    runManager--SET *.runTuple-->repository;
+    repository--SET *.runTuple-->redis_trip_schedule;
+    runManager--SELECT if not found in redis<-->psql;
+
+    get_gtfsrt-->connector;
+    connector--**MGET** *runTuple<-->redis_trip_schedule;
+```
 
 ### gtfsBlockSchedule:*
 
-- TODO doplnit
+- key = `*gtfs_block_id`
+- retence dat aktivne v tride `DataCacheManager` 
+- TTL podle casu vygenerovane ho z methody `getNextExpireTimestamp`
+- hodnota je `string`
+- cache obsahuje data trip_stops podle gtfs block_id
 
-### gtfsDelayComputation:*
+```mermaid
+flowchart TD;
+    psql[("PSQL ropidgtfs_stop_times")];
+    cache[("Redis gtfsBlockSchedule:*")];
+    repository["IE BlockStopsRedisRepository"];
+    updateDelay["updateDelay"];
+    updateGTFSTripId["updateGTFSTripId"];
+    tripStopsManager["tripStopsManager"];
+    initial["Zpráva z vozidla"];
+
+    initial--process-->updateGTFSTripId;
+    updateGTFSTripId<--create cache for trip stops-->tripStopsManager;
+    updateGTFSTripId-->updateDelay;
+    updateDelay<--get/update cache for trip stops-->tripStopsManager;
+    updateDelay-->propagateDelay;
+    propagateDelay-->propagateTrainDelay;
+    propagateTrainDelay<--get/update cache for trip stops-->tripStopsManager;
+
+
+
+    repository--GET*.blockId<-->redis_trip_schedule;
+    tripStopsManager--GET*.blockId<-->repository;
+    tripStopsManager--SET *.blockId-->repository;
+    repository--SET *.blockId-->cache;
+    tripStopsManager--SELECT if not found in redis<-->psql;
 
-- TODO doplnit
+```
+### gtfsDelayComputation:*
 
+- key = `*${gtfs_trip_id}`
+- TTL nastavovano na valid_to posledni pozice kdyz je znama kdyz ne tak na 30 min 
+- hodnota je `json`
+- cache obsahuje informace o tripu
+  - stop_times
+  - shapes_anchor_points
+  - shapes
+  
 ### Flowchart
 
 ```mermaid
 flowchart TD;
-    todo["TODO"];
+
+updateDelay["UpdateDelay Task"];
+
+saveRunToDb["save*RunToDb Task"];
+updateRunsGTFSTripId["updateRunsGTFSTripId Task"]
+processRegionalBusPositions["processRegionalBusPositions Task"]
+processRegionalBusRunMessages["processRegionalBusRunMessages Task"]
+repository["DelayComputationRedisRepository"];
+cache["Redis gtfsDelayComputation:*"];
+initial["Zprava z vozidla"]
+
+initial-->saveRunToDb
+saveRunToDb--common message-->updateRunsGTFSTripId
+updateRunsGTFSTripId-->updateDelay;
+updateDelay<--getTripPropertiesBatch-->repository;
+updateDelay<--cacheTripDataBatch-->repository;
+
+saveRunToDb--ArrivaCity run message-->processRegionalBusRunMessages
+processRegionalBusRunMessages-->processRegionalBusPositions
+processRegionalBusPositions<--getTripPropertiesBatch-->repository;
+processRegionalBusPositions<--cacheTripDataBatch-->repository;
+
+repository--JSON.GET-->cache
+repository--JSON.SET-->cache
+
 ```
 
 ## Cache pro předzpracování a párování dat z Telmaxu (Arriva City)
 
 ### vpRegionalBusCisLookup:*
 
-- TODO doplnit
+- key = `*${external_trip_id}`
+- TTL podle casu vygenerovane ho z methody `getNextExpireTimestamp`
+- hodnota je string (JSON.stringify())
+- cache obsahuje cis informace o tripu
+  - cis_line_id
+  - cis_trip_number
+  - registration_number
+  
+```mermaid
+flowchart TD
+    cache["vpRegionalBusCisLookup:*"]
+
+    repo["RegionalBusCisCacheRepository"]
+    telmax["Telmax (Arriva City)"]
+    task["saveArrivaCityRunsToDB task"]
+
+    telmax-->|bus position message|task
+    task-->|lookup CIS ID|repo
+    repo-->|get/set|cache
+    task-->|update cache|repo
+    cache-->|return data|repo
+```
 
 ### vpRegionalBusGtfsLookup:*
 
-- TODO doplnit
+- key = `*${cis_line_id}_${cis_trip_number}`
+- TTL zadne nema
+- retence dat aktivne v tride `DataCacheManager` 
+- hodnota je string (JSON.stringify())
+- cache obsahuje gtfs informace o tripu
+    - gtfs_trip_id
+    - route_name
+    - run_number
+    - agency_name
+    - is_wheelchair_accessible
+
+  
+```mermaid
+flowchart TD
+    cache["vpRegionalBusGtfsLookup:*"]
 
-### Flowchart
+    repo["RegionalBusGtfsCacheRepository"]
+    telmax["Telmax (Arriva City)"]
+    task["processRegionalBusRunMessages Task"]
+    psql["gtfs data in DB"]
 
-```mermaid
-flowchart TD;
-    todo["TODO"];
+
+
+    telmax-->|bus position message|task
+    task<--No gtfs data for trip in cache-->psql
+    task-->|lookup GTFS trip|repo
+    repo-->|get/set|cache
+    task-->|update cache|repo
+    cache-->|return data|repo
 ```
 
 ## Cache pro public API

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/pid",
-    "version": "4.1.1",
+    "version": "4.1.2-dev.2016480560",
     "description": "Golemio PID Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -75,7 +75,7 @@
         "@golemio/core": ">=1.16.0-rc.1551191551"
     },
     "dependencies": {
-        "@golemio/ovapi-gtfs-realtime-bindings": "1.2.3",
+        "@golemio/ovapi-gtfs-realtime-bindings": "1.2.4-dev.1288219308",
         "@turf/turf": "^6.5.0",
         "cheap-ruler": "^3.0.2",
         "csv-parser": "^3.0.0",