@golemio/pid 3.5.0 → 3.5.1-dev.1632490375

package/dist/output-gateway/pid/ioc/Di.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OgPidContainer = void 0;
+const PublicVehiclePositionsRepository_1 = require("../../public/data-access/redis/PublicVehiclePositionsRepository");
 const CisStopGroupRepository_1 = require("../../ropid-gtfs/data-access/CisStopGroupRepository");
+const RunTripsRedisRepository_1 = require("../../ropid-gtfs/data-access/redis/RunTripsRedisRepository");
 const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
 const V3InfotextsController_1 = require("../controllers/v3/V3InfotextsController");
 const V3TransferBoardsController_1 = require("../controllers/v3/V3TransferBoardsController");
@@ -24,6 +26,8 @@ ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.JISInfotextRopidGTFSSto
 ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.JISInfotextRopidGTFSStopsRepository, JISInfotextRopidGTFSStopsRepository_1.JISInfotextRopidGTFSStopsRepository);
 ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.JISInfotextRepository, JISInfotextRepository_1.JISInfotextRepository);
 ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.DeparturesRepository, data_access_1.DeparturesRepository);
+ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.RunTripsRedisRepository, RunTripsRedisRepository_1.RunTripsRedisRepository);
+ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.PublicVehiclePositionsRepository, PublicVehiclePositionsRepository_1.PublicVehiclePositionsRepository);
 //#endregion
 //#region Transformations
 ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.JISInfotextDepartureTransformation, JISInfotextDepartureTransformation_1.JISInfotextDepartureTransformation);

package/dist/output-gateway/pid/ioc/Di.js.map

@@ -1 +1 @@
-{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,gGAA2F;AAC3F,+DAA+E;AAE/E,mFAAgF;AAChF,6FAA0F;AAC1F,gDAAsD;AACtD,gFAA6E;AAC7E,4GAAyG;AACzG,qEAAkE;AAClE,6DAA0D;AAC1D,qEAAkE;AAClE,sHAAmH;AACnH,oHAAiH;AACjH,oHAAiH;AACjH,gHAA6G;AAC7G,6CAA0C;AAE1C,MAAM,cAAc,GAAwB,4BAAsB,CAAC,oBAAoB,EAAE,CAAC;AA4B/D,wCAAc;AA1BzC,sBAAsB;AACtB,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,sBAAsB,EAAE,+CAAsB,CAAC,CAAC;AAC5F,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,mCAAmC,EAAE,yEAAmC,CAAC,CAAC;AACtH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,mCAAmC,EAAE,yEAAmC,CAAC,CAAC;AACtH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,qBAAqB,EAAE,6CAAqB,CAAC,CAAC;AAC1F,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,oBAAoB,EAAE,kCAAoB,CAAC,CAAC;AACxF,YAAY;AAEZ,yBAAyB;AACzB,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,kCAAkC,EAAE,uEAAkC,CAAC,CAAC;AACpH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,iCAAiC,EAAE,qEAAiC,CAAC,CAAC;AAClH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,iCAAiC,EAAE,qEAAiC,CAAC,CAAC;AAClH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,+BAA+B,EAAE,iEAA+B,CAAC,CAAC;AAC9G,YAAY;AAEZ,gBAAgB;AAChB,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,UAAU,EAAE,uBAAU,CAAC,CAAC;AACpE,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,cAAc,EAAE,+BAAc,CAAC,CAAC;AAC5E,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,cAAc,EAAE,+BAAc,CAAC,CAAC;AAC5E,YAAY;AAEZ,qBAAqB;AACrB,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,0BAA0B,EAAE,uDAA0B,CAAC,CAAC;AACpG,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,qBAAqB,EAAE,6CAAqB,CAAC,CAAC"}
+{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,sHAAiH;AACjH,gGAA2F;AAC3F,wGAAmG;AACnG,+DAA+E;AAE/E,mFAAgF;AAChF,6FAA0F;AAC1F,gDAAsD;AACtD,gFAA6E;AAC7E,4GAAyG;AACzG,qEAAkE;AAClE,6DAA0D;AAC1D,qEAAkE;AAClE,sHAAmH;AACnH,oHAAiH;AACjH,oHAAiH;AACjH,gHAA6G;AAC7G,6CAA0C;AAE1C,MAAM,cAAc,GAAwB,4BAAsB,CAAC,oBAAoB,EAAE,CAAC;AA8B/D,wCAAc;AA5BzC,sBAAsB;AACtB,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,sBAAsB,EAAE,+CAAsB,CAAC,CAAC;AAC5F,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,mCAAmC,EAAE,yEAAmC,CAAC,CAAC;AACtH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,mCAAmC,EAAE,yEAAmC,CAAC,CAAC;AACtH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,qBAAqB,EAAE,6CAAqB,CAAC,CAAC;AAC1F,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,oBAAoB,EAAE,kCAAoB,CAAC,CAAC;AACxF,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,uBAAuB,EAAE,iDAAuB,CAAC,CAAC;AAC9F,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,gCAAgC,EAAE,mEAAgC,CAAC,CAAC;AAChH,YAAY;AAEZ,yBAAyB;AACzB,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,kCAAkC,EAAE,uEAAkC,CAAC,CAAC;AACpH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,iCAAiC,EAAE,qEAAiC,CAAC,CAAC;AAClH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,iCAAiC,EAAE,qEAAiC,CAAC,CAAC;AAClH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,+BAA+B,EAAE,iEAA+B,CAAC,CAAC;AAC9G,YAAY;AAEZ,gBAAgB;AAChB,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,UAAU,EAAE,uBAAU,CAAC,CAAC;AACpE,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,cAAc,EAAE,+BAAc,CAAC,CAAC;AAC5E,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,cAAc,EAAE,+BAAc,CAAC,CAAC;AAC5E,YAAY;AAEZ,qBAAqB;AACrB,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,0BAA0B,EAAE,uDAA0B,CAAC,CAAC;AACpG,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,qBAAqB,EAAE,6CAAqB,CAAC,CAAC"}

package/dist/output-gateway/pid/ioc/OgPidToken.d.ts

@@ -3,6 +3,8 @@ export declare const OgPidToken: {
     JISInfotextRopidGTFSStopsRepository: symbol;
     JISInfotextRepository: symbol;
     DeparturesRepository: symbol;
+    RunTripsRedisRepository: symbol;
+    PublicVehiclePositionsRepository: symbol;
     JISInfotextDepartureTransformation: symbol;
     JISInfotextTransferTransformation: symbol;
     JISInfotextOverviewTransformation: symbol;

package/dist/output-gateway/pid/ioc/OgPidToken.js

@@ -7,6 +7,8 @@ exports.OgPidToken = {
     JISInfotextRopidGTFSStopsRepository: Symbol(),
     JISInfotextRepository: Symbol(),
     DeparturesRepository: Symbol(),
+    RunTripsRedisRepository: Symbol(),
+    PublicVehiclePositionsRepository: Symbol(),
     //#endregion
     //#region Transformations
     JISInfotextDepartureTransformation: Symbol(),

package/dist/output-gateway/pid/ioc/OgPidToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"OgPidToken.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/ioc/OgPidToken.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAG;IACtB,sBAAsB;IACtB,sBAAsB,EAAE,MAAM,EAAE;IAChC,mCAAmC,EAAE,MAAM,EAAE;IAC7C,qBAAqB,EAAE,MAAM,EAAE;IAC/B,oBAAoB,EAAE,MAAM,EAAE;IAC9B,YAAY;IAEZ,yBAAyB;IACzB,kCAAkC,EAAE,MAAM,EAAE;IAC5C,iCAAiC,EAAE,MAAM,EAAE;IAC3C,iCAAiC,EAAE,MAAM,EAAE;IAC3C,+BAA+B,EAAE,MAAM,EAAE;IACzC,YAAY;IAEZ,gBAAgB;IAChB,UAAU,EAAE,MAAM,EAAE;IACpB,cAAc,EAAE,MAAM,EAAE;IACxB,cAAc,EAAE,MAAM,EAAE;IACxB,YAAY;IAEZ,qBAAqB;IACrB,0BAA0B,EAAE,MAAM,EAAE;IACpC,qBAAqB,EAAE,MAAM,EAAE;IAC/B,YAAY;CACf,CAAC"}
+{"version":3,"file":"OgPidToken.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/ioc/OgPidToken.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAG;IACtB,sBAAsB;IACtB,sBAAsB,EAAE,MAAM,EAAE;IAChC,mCAAmC,EAAE,MAAM,EAAE;IAC7C,qBAAqB,EAAE,MAAM,EAAE;IAC/B,oBAAoB,EAAE,MAAM,EAAE;IAC9B,uBAAuB,EAAE,MAAM,EAAE;IACjC,gCAAgC,EAAE,MAAM,EAAE;IAC1C,YAAY;IAEZ,yBAAyB;IACzB,kCAAkC,EAAE,MAAM,EAAE;IAC5C,iCAAiC,EAAE,MAAM,EAAE;IAC3C,iCAAiC,EAAE,MAAM,EAAE;IAC3C,+BAA+B,EAAE,MAAM,EAAE;IACzC,YAAY;IAEZ,gBAAgB;IAChB,UAAU,EAAE,MAAM,EAAE;IACpB,cAAc,EAAE,MAAM,EAAE;IACxB,cAAc,EAAE,MAAM,EAAE;IACxB,YAAY;IAEZ,qBAAqB;IACrB,0BAA0B,EAAE,MAAM,EAAE;IACpC,qBAAqB,EAAE,MAAM,EAAE;IAC/B,YAAY;CACf,CAAC"}

package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.d.ts

@@ -1,34 +1,20 @@
-import { Moment } from "@golemio/core/dist/shared/moment-timezone";
-import { DepartureFilter, DepartureMode, DepartureOrder, DepartureSkip } from "..";
+import { IDepartureBoardOutputDto } from "../domain/DepartureInterfaces";
+import { IGetDeparturesOptions } from "./interfaces/IGetDeparturesOptions";
 declare class PIDDepartureBoardsModel {
-    private stopsMaxCount;
-    private ropidDeparturesDirectionsModel;
-    private departuresRepository;
+    private readonly log;
+    private readonly ropidDeparturesDirectionsModel;
+    private readonly departuresRepository;
+    private readonly runTripsRedisRepository;
+    private readonly positionsRedisRepository;
     private readonly infotextRepository;
     private readonly infotextTransformation;
     constructor();
-    /** Retrieves all gtfs stop times for specific stop, optionaly enhanced with realtime delays
-     * @param {string} id Id of the stop
-     * @returns Object of the retrieved record or null
-     */
-    GetAll: (options: {
-        aswIds?: string[];
-        cisIds?: string[];
-        gtfsIds?: string[];
-        names?: string[];
-        total: number;
-        limit: number;
-        offset: number;
-        mode: DepartureMode;
-        minutesBefore: number;
-        minutesAfter: number;
-        timeFrom?: Moment;
-        order: DepartureOrder;
-        filter: DepartureFilter;
-        skip: DepartureSkip[];
-        includeMetroTrains?: boolean;
-        airCondition?: boolean;
-        timezone: string;
-    }) => Promise<any>;
+    getAll(options: IGetDeparturesOptions): Promise<IDepartureBoardOutputDto>;
+    private retrieveAndReturnStops;
+    private retrieveAndReturnInfotexts;
+    private retrieveAndReturnDirections;
+    private retrieveAndReturnDepartures;
+    private retrieveAndReturnRunTrips;
+    private retrieveAndReturnUntrackedTrips;
 }
 export { PIDDepartureBoardsModel };

package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.js

@@ -12,102 +12,223 @@ const trace_provider_1 = require("@golemio/core/dist/monitoring/opentelemetry/tr
 const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
 const _1 = require(".");
+const __1 = require("..");
 const Di_1 = require("../ioc/Di");
 const OgPidToken_1 = require("../ioc/OgPidToken");
 const PIDDepartureModel_1 = __importDefault(require("./helpers/PIDDepartureModel"));
+const STOPS_MAX_COUNT = 100;
+// TODO refactor - split into facade and multiple service/strategy classes
+// Check V3TransferBoardsController and TransferFacade for inspiration
 class PIDDepartureBoardsModel {
     constructor() {
-        this.stopsMaxCount = 100;
-        /** Retrieves all gtfs stop times for specific stop, optionaly enhanced with realtime delays
-         * @param {string} id Id of the stop
-         * @returns Object of the retrieved record or null
-         */
-        this.GetAll = async (options) => {
-            const currentMoment = (0, moment_timezone_1.default)();
-            const minutesOffset = options.timeFrom ? options.timeFrom.diff(currentMoment, "minutes") : 0;
-            const spanStops = (0, trace_provider_1.createChildSpan)("V2PIDRouter.DB.stops");
-            spanStops?.setAttributes({ ...options, timeFrom: options.timeFrom?.toString() });
+        this.log = Di_1.OgPidContainer.resolve(CoreToken_1.CoreToken.Logger);
+        this.ropidDeparturesDirectionsModel = new _1.RopidDeparturesDirectionsModel();
+        this.departuresRepository = new data_access_1.DeparturesRepository(Di_1.OgPidContainer.resolve(CoreToken_1.CoreToken.PostgresConnector), Di_1.OgPidContainer.resolve(CoreToken_1.CoreToken.SimpleConfig));
+        this.runTripsRedisRepository = Di_1.OgPidContainer.resolve(OgPidToken_1.OgPidToken.RunTripsRedisRepository);
+        this.positionsRedisRepository = Di_1.OgPidContainer.resolve(OgPidToken_1.OgPidToken.PublicVehiclePositionsRepository);
+        this.infotextRepository = Di_1.OgPidContainer.resolve(OgPidToken_1.OgPidToken.JISInfotextRepository);
+        this.infotextTransformation = Di_1.OgPidContainer.resolve(OgPidToken_1.OgPidToken.JISInfotextDepartureTransformation);
+    }
+    async getAll(options) {
+        const currentMoment = (0, moment_timezone_1.default)();
+        //#region Data retrieval from DB (GTFS stops, infotexts, directions, departures)
+        const { stopsToInclude, stopIds } = await this.retrieveAndReturnStops(options);
+        const [infotextsToInclude, directions, departures] = await Promise.all([
+            this.retrieveAndReturnInfotexts(stopIds, currentMoment, options),
+            this.retrieveAndReturnDirections(stopIds),
+            this.retrieveAndReturnDepartures(stopIds, currentMoment, options),
+        ]);
+        //#endregion
+        //#region Data retrieval from Redis (run schedule, untracked trips)
+        let runScheduleMap = new Map();
+        let untrackedTrips = new Set();
+        const isMissingRequested = options.skip.includes(__1.DepartureSkip.MISSING) && !options.skip.includes(__1.DepartureSkip.UNTRACKED);
+        // Note: The run schedule and untracked trips are populated only if the skip[]=missing (without untracked) is present
+        // Check the PIDDeparturesModel.skip function. In other cases they are not needed
+        if (isMissingRequested) {
+            const runTuples = new Set();
+            for (const departure of departures) {
+                runTuples.add(`${departure.origin_route_name}_${departure.run_number}`);
+            }
+            const { runSchedule, runTripIds } = await this.retrieveAndReturnRunTrips(runTuples);
+            runScheduleMap = runSchedule;
+            untrackedTrips = await this.retrieveAndReturnUntrackedTrips(runTripIds);
+        }
+        //#endregion
+        //#region Processing and returning departures
+        const spanProcessing = (0, trace_provider_1.createChildSpan)("V2PIDRouter.Processing");
+        try {
+            const departuresToInclude = new PIDDepartureModel_1.default(departures, {
+                limit: options.limit,
+                offset: options.offset,
+                total: options.total,
+                mode: options.mode,
+                order: options.order,
+                filter: options.filter,
+                skip: options.skip,
+                departuresDirections: directions,
+                timezone: options.timezone,
+                tripNumber: null,
+                runScheduleMap,
+                untrackedTrips,
+            }).toArray();
+            spanProcessing?.end();
+            return {
+                departures: departuresToInclude,
+                infotexts: infotextsToInclude,
+                stops: stopsToInclude,
+            };
+        }
+        catch (error) {
+            spanProcessing?.recordException(error);
+            if (error instanceof golemio_errors_1.AbstractGolemioError) {
+                throw error;
+            }
+            throw new golemio_errors_1.GeneralError("Error while processing departures", this.constructor.name, error, 500);
+        }
+        //#endregion
+    }
+    async retrieveAndReturnStops(options) {
+        const spanStops = (0, trace_provider_1.createChildSpan)("V2PIDRouter.DB.stops");
+        spanStops?.setAttributes({ ...options, timeFrom: options.timeFrom?.toString() });
+        try {
             const stopsToInclude = await models_1.models.GTFSStopModel.GetAll({
                 includeMetroTrains: options.includeMetroTrains,
                 appendAswId: true,
                 aswIds: options.aswIds,
                 cisIds: options.cisIds,
                 gtfsIds: options.gtfsIds,
-                limit: this.stopsMaxCount + 1,
+                limit: STOPS_MAX_COUNT + 1,
                 locationType: StopEnums_1.GtfsStopLocationType.StopOrPlatform,
                 names: options.names,
                 returnRaw: true,
             });
             if (stopsToInclude.length === 0) {
-                throw new golemio_errors_1.GeneralError("No stops found.", "DepartureBoardsRouter", undefined, 404);
+                throw new golemio_errors_1.GeneralError("No stops found.", this.constructor.name, undefined, 404);
             }
-            if (stopsToInclude.length > this.stopsMaxCount) {
-                throw new golemio_errors_1.GeneralError(`Too many stops, try lower number or split requests. The maximum is ${this.stopsMaxCount} stops.`, "DepartureBoardsRouter", undefined, 413);
+            else if (stopsToInclude.length > STOPS_MAX_COUNT) {
+                throw new golemio_errors_1.GeneralError(`Too many stops, try lower number or split requests. The maximum is ${STOPS_MAX_COUNT} stops.`, this.constructor.name, undefined, 413);
             }
-            const stopsIds = stopsToInclude.map((e) => e.stop_id);
+            const stopIds = stopsToInclude.map(({ stop_id }) => stop_id);
             spanStops?.end();
-            const spanInfotexts = (0, trace_provider_1.createChildSpan)("V2PIDRouter.DB.infotexts");
-            let infotextsToInclude;
-            try {
-                const infotexts = await this.infotextRepository.findAllForDepartureBoard(stopsIds, (options.timeFrom ?? currentMoment).toDate());
-                infotextsToInclude = this.infotextTransformation.transformArray(infotexts.map((infotext) => ({
-                    data: infotext,
-                    timeZone: options.timezone,
-                })));
-            }
-            catch (err) {
-                if (err instanceof golemio_errors_1.AbstractGolemioError) {
-                    throw err;
-                }
-                throw new golemio_errors_1.GeneralError("Database error", "DepartureBoardsModel", err, 500);
+            return { stopsToInclude, stopIds };
+        }
+        catch (error) {
+            spanStops?.recordException(error);
+            if (error instanceof golemio_errors_1.AbstractGolemioError) {
+                throw error;
             }
+            throw new golemio_errors_1.GeneralError("Error while getting stops", this.constructor.name, error, 500);
+        }
+    }
+    async retrieveAndReturnInfotexts(stopIds, currentMoment, options) {
+        const spanInfotexts = (0, trace_provider_1.createChildSpan)("V2PIDRouter.DB.infotexts");
+        try {
+            const infotexts = await this.infotextRepository.findAllForDepartureBoard(stopIds, (options.timeFrom ?? currentMoment).toDate());
+            const infotextsToInclude = this.infotextTransformation.transformArray(infotexts.map((infotext) => ({
+                data: infotext,
+                timeZone: options.timezone,
+            })));
             spanInfotexts?.end();
-            const spanDirections = (0, trace_provider_1.createChildSpan)("V2PIDRouter.DB.directions");
-            let departuresDirections;
-            try {
-                departuresDirections = await this.ropidDeparturesDirectionsModel.GetAll(stopsIds);
-            }
-            catch (err) {
-                throw new golemio_errors_1.GeneralError("Database error", "DepartureBoardsModel", err, 500);
+            return infotextsToInclude;
+        }
+        catch (error) {
+            spanInfotexts?.recordException(error);
+            if (error instanceof golemio_errors_1.AbstractGolemioError) {
+                throw error;
             }
+            throw new golemio_errors_1.GeneralError("Error while getting infotexts", this.constructor.name, error, 500);
+        }
+    }
+    async retrieveAndReturnDirections(stopIds) {
+        const spanDirections = (0, trace_provider_1.createChildSpan)("V2PIDRouter.DB.directions");
+        try {
+            const departuresDirections = await this.ropidDeparturesDirectionsModel.GetAll(stopIds);
             spanDirections?.end();
-            try {
-                const results = await this.departuresRepository.GetAll({
-                    currentMoment,
-                    minutesAfter: options.minutesAfter,
-                    minutesBefore: options.minutesBefore,
-                    minutesOffset,
-                    stopsIds,
-                    mode: options.mode,
-                    isAirCondition: !!options.airCondition,
-                });
-                const spanDepartures = (0, trace_provider_1.createChildSpan)("V2PIDRouter.DB.departures");
-                const res = {
-                    departures: new PIDDepartureModel_1.default(results, {
-                        limit: options.limit,
-                        offset: options.offset,
-                        total: options.total,
-                        mode: options.mode,
-                        order: options.order,
-                        filter: options.filter,
-                        skip: options.skip,
-                        departuresDirections,
-                        timezone: options.timezone,
-                    }).toArray(),
-                    infotexts: infotextsToInclude,
-                    stops: stopsToInclude,
-                };
-                spanDepartures?.end();
-                return res;
+            return departuresDirections;
+        }
+        catch (error) {
+            spanDirections?.recordException(error);
+            if (error instanceof golemio_errors_1.AbstractGolemioError) {
+                throw error;
             }
-            catch (err) {
-                throw new golemio_errors_1.GeneralError("Database error", "DepartureBoardsModel", err, 500);
+            throw new golemio_errors_1.GeneralError("Error while getting directions", this.constructor.name, error, 500);
+        }
+    }
+    async retrieveAndReturnDepartures(stopIds, currentMoment, options) {
+        const spanDepartures = (0, trace_provider_1.createChildSpan)("V2PIDRouter.DB.departures");
+        spanDepartures?.setAttributes({ stopIds });
+        try {
+            const minutesOffset = options.timeFrom ? options.timeFrom.diff(currentMoment, "minutes") : 0;
+            const departures = await this.departuresRepository.GetAll({
+                currentMoment,
+                minutesAfter: options.minutesAfter,
+                minutesBefore: options.minutesBefore,
+                minutesOffset,
+                stopsIds: stopIds,
+                mode: options.mode,
+                isAirCondition: !!options.airCondition,
+            });
+            spanDepartures?.end();
+            return departures;
+        }
+        catch (error) {
+            spanDepartures?.recordException(error);
+            if (error instanceof golemio_errors_1.AbstractGolemioError) {
+                throw error;
             }
-        };
-        this.ropidDeparturesDirectionsModel = new _1.RopidDeparturesDirectionsModel();
-        this.departuresRepository = new data_access_1.DeparturesRepository(Di_1.OgPidContainer.resolve(CoreToken_1.CoreToken.PostgresConnector), Di_1.OgPidContainer.resolve(CoreToken_1.CoreToken.SimpleConfig));
-        this.infotextRepository = Di_1.OgPidContainer.resolve(OgPidToken_1.OgPidToken.JISInfotextRepository);
-        this.infotextTransformation = Di_1.OgPidContainer.resolve(OgPidToken_1.OgPidToken.JISInfotextDepartureTransformation);
+            throw new golemio_errors_1.GeneralError("Error while getting departures", this.constructor.name, error, 500);
+        }
+    }
+    async retrieveAndReturnRunTrips(runTuples) {
+        const runScheduleMap = new Map();
+        const tripIds = new Set();
+        const spanRunTrips = (0, trace_provider_1.createChildSpan)("V2PIDRouter.Redis.runTrips");
+        try {
+            const runTuplesArray = Array.from(runTuples);
+            const runSchedule = await this.runTripsRedisRepository.getMultipleSchedule(runTuplesArray);
+            for (let i = 0; i < runSchedule.length; i++) {
+                const runTrip = runSchedule[i];
+                if (runTrip) {
+                    const tuple = runTuplesArray[i];
+                    runScheduleMap.set(tuple, runTrip.schedule);
+                    for (const trip of runTrip.schedule) {
+                        tripIds.add(trip.trip_id);
+                    }
+                }
+            }
+            spanRunTrips?.end();
+        }
+        catch (error) {
+            spanRunTrips?.recordException(error);
+            this.log.error(error, 
+            // eslint-disable-next-line max-len
+            "Cannot retrieve run schedule. The API consumer will receive departures with missing vehicles even if they requested to skip them.");
+        }
+        finally {
+            return {
+                runSchedule: runScheduleMap,
+                runTripIds: tripIds,
+            };
+        }
+    }
+    async retrieveAndReturnUntrackedTrips(tripIds) {
+        let untrackedTrips = new Set();
+        const spanUntrackedTrips = (0, trace_provider_1.createChildSpan)("V2PIDRouter.Redis.untrackedTrips");
+        try {
+            const tripIdsArray = Array.from(tripIds);
+            untrackedTrips = await this.positionsRedisRepository.getTripsWithUntrackedVehicles(tripIdsArray);
+            spanUntrackedTrips?.end();
+        }
+        catch (error) {
+            spanUntrackedTrips?.recordException(error);
+            this.log.error(error, 
+            // eslint-disable-next-line max-len
+            "Cannot retrieve untracked trips. The API consumer will receive departures with missing vehicles even if they requested to skip them.");
+        }
+        finally {
+            return untrackedTrips;
+        }
     }
 }
 exports.PIDDepartureBoardsModel = PIDDepartureBoardsModel;

package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"PIDDepartureBoardsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/PIDDepartureBoardsModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PIDDepartureBoardsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/PIDDepartureBoardsModel.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/pid/models/helpers/PIDDepartureModel.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const pid_1 = require("../..");
 const DepartureBoardMapper_1 = __importDefault(require("../../helpers/DepartureBoardMapper"));
 const FilterHelper_1 = require("./FilterHelper");
+const SkipHelper_1 = require("./SkipHelper");
 class PIDDeparturesModel {
     constructor(departures, options) {
         this.toArray = () => {
@@ -42,23 +43,34 @@ class PIDDeparturesModel {
          */
         this.skip = () => {
             this.departures = this.departures.filter((departure) => {
-                let isAtStop = false;
-                let isPassStop = false;
-                let isCurrentTrip = false;
-                if ("arrival_datetime" in departure) {
-                    isAtStop = departure.stop_sequence === departure["trip.last_position.this_stop_sequence"];
-                    isPassStop =
-                        !!departure["trip.last_position.last_stop_sequence"] &&
-                            departure.stop_sequence <= departure["trip.last_position.last_stop_sequence"];
+                if (this.options.skip.length === 0) {
+                    return true;
                 }
-                else if (this.options.tripNumber) {
-                    // Skip transfers of current trip (in the vehicle in which the transfer board is located)
-                    isCurrentTrip = departure.trip_short_name?.endsWith(this.options.tripNumber) ?? false;
+                let isSkipUntracked = false;
+                let isSkipMissing = false;
+                let isSkipCanceled = false;
+                let isSkipAtStop = false;
+                for (const skip of this.options.skip) {
+                    if (skip === pid_1.DepartureSkip.UNTRACKED) {
+                        isSkipUntracked = true;
+                    }
+                    else if (skip === pid_1.DepartureSkip.MISSING) {
+                        isSkipMissing = true;
+                    }
+                    else if (skip === pid_1.DepartureSkip.CANCELED) {
+                        isSkipCanceled = true;
+                    }
+                    else if (skip === pid_1.DepartureSkip.AT_STOP) {
+                        isSkipAtStop = true;
+                    }
                 }
-                return !(isCurrentTrip ||
-                    (this.options.skip.includes(pid_1.DepartureSkip.UNTRACKED) && !departure.is_delay_available) ||
-                    (this.options.skip.includes(pid_1.DepartureSkip.CANCELED) && departure.is_canceled) ||
-                    (this.options.skip.includes(pid_1.DepartureSkip.AT_STOP) && (isAtStop || isPassStop)));
+                return !((this.options.tripNumber && SkipHelper_1.SkipHelper.isMatchingTripNumber(departure, this.options.tripNumber)) ||
+                    (isSkipUntracked && SkipHelper_1.SkipHelper.hasNoDelayInfo(departure)) ||
+                    (!isSkipUntracked &&
+                        isSkipMissing &&
+                        SkipHelper_1.SkipHelper.isVehicleMissing(departure, this.options.runScheduleMap, this.options.untrackedTrips)) ||
+                    (isSkipCanceled && SkipHelper_1.SkipHelper.isTripCanceled(departure)) ||
+                    (isSkipAtStop && SkipHelper_1.SkipHelper.isVehicleAtStop(departure)));
             });
         };
         /** Sorts by proper datetime by given options

package/dist/output-gateway/pid/models/helpers/PIDDepartureModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"PIDDepartureModel.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/models/helpers/PIDDepartureModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PIDDepartureModel.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/models/helpers/PIDDepartureModel.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/pid/models/helpers/SkipHelper.d.ts

@@ -0,0 +1,19 @@
+import type { DepartureUnion } from "../..";
+import type { IScheduleDto } from "../../../../schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto";
+export declare class SkipHelper {
+    /**
+     * Used exclusively in transfer boards to skip transfers for the current trip
+     * (i.e., transfers within the vehicle where the transfer board is located)
+     */
+    static isMatchingTripNumber(departure: DepartureUnion, tripNumber: string): boolean;
+    static hasNoDelayInfo(departure: DepartureUnion): boolean;
+    /**
+     * Used exclusively in departure boards when skip[]=missing is requested (without untracked)
+     */
+    static isVehicleMissing(departure: DepartureUnion, runScheduleMap: Map<string, IScheduleDto[]> | null, untrackedTrips: Set<string> | null, nowDate?: Date): boolean;
+    static isTripCanceled(departure: DepartureUnion): boolean;
+    static isVehicleAtStop(departure: DepartureUnion): boolean;
+    private static isOutsideStartThreshold;
+    private static hasAlreadyDeparted;
+    private static hasLargeTimegapBetweenTrips;
+}