@golemio/pid 2.3.3-dev.677483558 → 2.3.3-dev.678665831

package/dist/integration-engine/vehicle-positions/helpers/DateTimeUtils.d.ts

@@ -0,0 +1,17 @@
+export declare class DateTimeUtils {
+    private static TIMEZONE;
+    private static FORMAT_DATE_TIME;
+    private static FORMAT_TIME;
+    /**
+     * @example 2022-10-26T13:55:42+02:00
+     */
+    static formatISOTimestamp(isoTimestamp?: string): string;
+    /**
+     * @example 13:55:42
+     */
+    static parseTimeFromEpoch(unixTimestamp?: number): string;
+    /**
+     * @example 13:55:42
+     */
+    static parseTimeFromISO(isoTimestamp?: string): string;
+}

package/dist/integration-engine/vehicle-positions/helpers/DateTimeUtils.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DateTimeUtils = void 0;
+const luxon_1 = require("@golemio/core/dist/shared/luxon");
+class DateTimeUtils {
+    /**
+     * @example 2022-10-26T13:55:42+02:00
+     */
+    static formatISOTimestamp(isoTimestamp = new Date().toISOString()) {
+        return luxon_1.DateTime.fromISO(isoTimestamp).setZone(this.TIMEZONE).toFormat(this.FORMAT_DATE_TIME);
+    }
+    /**
+     * @example 13:55:42
+     */
+    static parseTimeFromEpoch(unixTimestamp = new Date().getTime()) {
+        return luxon_1.DateTime.fromMillis(unixTimestamp).setZone(this.TIMEZONE).toFormat(this.FORMAT_TIME);
+    }
+    /**
+     * @example 13:55:42
+     */
+    static parseTimeFromISO(isoTimestamp = new Date().toISOString()) {
+        return luxon_1.DateTime.fromISO(isoTimestamp).setZone(this.TIMEZONE).toFormat(this.FORMAT_TIME);
+    }
+}
+exports.DateTimeUtils = DateTimeUtils;
+DateTimeUtils.TIMEZONE = "Europe/Prague";
+// ISO 8601, no fractional seconds (same as moment.defaultFormat)
+DateTimeUtils.FORMAT_DATE_TIME = "yyyy-LL-dd'T'HH:mm:ssZZ";
+DateTimeUtils.FORMAT_TIME = "HH:mm:ss";
+//# sourceMappingURL=DateTimeUtils.js.map

package/dist/integration-engine/vehicle-positions/helpers/DateTimeUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DateTimeUtils.js","sourceRoot":"","sources":["../../../../src/integration-engine/vehicle-positions/helpers/DateTimeUtils.ts"],"names":[],"mappings":";;;AAAA,2DAA2D;AAE3D,MAAa,aAAa;IAMtB;;OAEG;IACI,MAAM,CAAC,kBAAkB,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACpE,OAAO,gBAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACjG,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,kBAAkB,CAAC,aAAa,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;QACjE,OAAO,gBAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAChG,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,gBAAgB,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QAClE,OAAO,gBAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC5F,CAAC;;AAzBL,sCA0BC;AAzBkB,sBAAQ,GAAG,eAAe,CAAC;AAC1C,iEAAiE;AAClD,8BAAgB,GAAG,yBAAyB,CAAC;AAC7C,yBAAW,GAAG,UAAU,CAAC"}

package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.d.ts

@@ -0,0 +1,24 @@
+import { Moment } from "@golemio/core/dist/shared/moment-timezone";
+import { IVehiclePositionsSchedule } from "../..";
+import { IGtfsRunTripCache, VehiclePositionsPositionsModel, VehiclePositionsTripsModel, VehiclePositionsRunsModel } from "../../models";
+import { RunTripsRedisRepository } from "../../workers/runs/tasks/data-access/RunTripsRedisRepository";
+import { IMetroRunInputForProcessing } from "../../workers/runs/tasks/interfaces/IMetroRunInputForProcessing";
+import { IVehiclePositionsRunCommon } from "../../transformations";
+import { IDelayMessage } from "./interfaces/IDelayMessage";
+export declare abstract class AbstractGTFSTripRunManager {
+    protected readonly positionsRepository: VehiclePositionsPositionsModel;
+    protected readonly tripsRepository: VehiclePositionsTripsModel;
+    protected readonly runsRepository: VehiclePositionsRunsModel;
+    protected readonly runTripsRedisRepository: RunTripsRedisRepository;
+    protected readonly testMode: boolean;
+    constructor(positionsRepository: VehiclePositionsPositionsModel, tripsRepository: VehiclePositionsTripsModel, runsRepository: VehiclePositionsRunsModel, runTripsRedisRepository: RunTripsRedisRepository, testMode?: boolean);
+    abstract generateDelayMsg(schedule: IGtfsRunTripCache[], input: IVehiclePositionsRunCommon | IMetroRunInputForProcessing): Promise<IDelayMessage>;
+    setAndReturnScheduledTrips: (scheduleData: IVehiclePositionsSchedule) => Promise<IGtfsRunTripCache[]>;
+    protected getCurrentTripForRun(schedule: IGtfsRunTripCache[], timestampScheduled: Moment): IGtfsRunTripCache | undefined;
+    /**
+     * Get scheduled trips adjacent to run message timestamp (scheduled)
+     *   originally based on route id and run number
+     */
+    protected getAdjacentTrips(schedule: IGtfsRunTripCache[], timestampScheduled: Moment, currentTripId: string | undefined): IGtfsRunTripCache[];
+    private isTripAdjacent;
+}

package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.js

@@ -0,0 +1,73 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AbstractGTFSTripRunManager = void 0;
+const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
+const vehicle_positions_1 = require("../..");
+const DateTimeUtils_1 = require("../DateTimeUtils");
+class AbstractGTFSTripRunManager {
+    constructor(positionsRepository, tripsRepository, runsRepository, runTripsRedisRepository, testMode = false) {
+        this.positionsRepository = positionsRepository;
+        this.tripsRepository = tripsRepository;
+        this.runsRepository = runsRepository;
+        this.runTripsRedisRepository = runTripsRedisRepository;
+        this.testMode = testMode;
+        this.setAndReturnScheduledTrips = (scheduleData) => __awaiter(this, void 0, void 0, function* () {
+            const { route_id, run_number, msg_last_timestamp } = scheduleData;
+            const scheduledTripIds = yield this.runTripsRedisRepository.get(`${route_id}_${run_number}`);
+            if (scheduledTripIds === null || scheduledTripIds === void 0 ? void 0 : scheduledTripIds.schedule) {
+                return scheduledTripIds.schedule;
+            }
+            const scheduledTrips = yield this.runsRepository.getScheduledTrips(route_id, run_number, msg_last_timestamp);
+            for (const trip of scheduledTrips) {
+                // format time to local timezone string
+                trip.start_timestamp = DateTimeUtils_1.DateTimeUtils.formatISOTimestamp(trip.start_timestamp);
+                trip.end_timestamp = DateTimeUtils_1.DateTimeUtils.formatISOTimestamp(trip.end_timestamp);
+            }
+            yield this.runTripsRedisRepository.set(`${route_id}_${run_number}`, { schedule: scheduledTrips }, undefined, vehicle_positions_1.VehiclePositionsUtils.getNextExpireTimestamp());
+            return scheduledTrips;
+        });
+    }
+    getCurrentTripForRun(schedule, timestampScheduled) {
+        let currentTrip = undefined;
+        for (const tripCache of schedule) {
+            const startTimestamp = new Date(tripCache.start_timestamp);
+            const endTimestamp = new Date(tripCache.end_timestamp);
+            if (!timestampScheduled.isBetween(startTimestamp, endTimestamp, "second", "[]")) {
+                continue;
+            }
+            if (!currentTrip || startTimestamp.getTime() > new Date(currentTrip.start_timestamp).getTime()) {
+                currentTrip = tripCache;
+            }
+        }
+        return currentTrip;
+    }
+    /**
+     * Get scheduled trips adjacent to run message timestamp (scheduled)
+     *   originally based on route id and run number
+     */
+    getAdjacentTrips(schedule, timestampScheduled, currentTripId) {
+        return schedule.filter((scheduledTrip) => scheduledTrip.trip_id !== currentTripId && this.isTripAdjacent(scheduledTrip, timestampScheduled));
+    }
+    isTripAdjacent(scheduledTrip, timestampScheduled) {
+        const startTimestamp = (0, moment_timezone_1.default)(scheduledTrip.start_timestamp);
+        const endTimestamp = (0, moment_timezone_1.default)(scheduledTrip.end_timestamp);
+        const leftBound = timestampScheduled.clone().subtract(15, "minutes");
+        const rightBound = timestampScheduled.clone().add(60, "minutes");
+        return ((leftBound <= endTimestamp && endTimestamp <= timestampScheduled) ||
+            (rightBound >= startTimestamp && startTimestamp >= timestampScheduled));
+    }
+}
+exports.AbstractGTFSTripRunManager = AbstractGTFSTripRunManager;
+//# sourceMappingURL=AbstractGTFSTripRunManager.js.map

package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AbstractGTFSTripRunManager.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.ts"],"names":[],"mappings":"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"}

package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.d.ts

@@ -0,0 +1,11 @@
+import { IGtfsRunTripCache } from "../../models";
+import { IVehiclePositionsRunCommon } from "../../transformations";
+import { IDelayMessage } from "./interfaces/IDelayMessage";
+import { AbstractGTFSTripRunManager } from "./AbstractGTFSTripRunManager";
+export declare class GTFSTripCommonRunManager extends AbstractGTFSTripRunManager {
+    generateDelayMsg(schedule: IGtfsRunTripCache[], input: IVehiclePositionsRunCommon): Promise<IDelayMessage>;
+    private generateDelayMsgFromCurrentTrip;
+    private isCurrentTripTracking;
+    private updateLastTripsAndPositions;
+    private updateTrip;
+}

package/dist/integration-engine/vehicle-positions/helpers/{GtfsTripManager.js → gtfs-trip-run/GTFSTripCommonRunManager.js}

@@ -12,51 +12,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const integration_engine_1 = require("@golemio/core/dist/integration-engine");
+exports.GTFSTripCommonRunManager = void 0;
 const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
-const const_1 = require("../../../const");
-const models_1 = require("../models");
-class GTFSTripManager {
-    constructor(modelPositions, modelTrips, testMode = false) {
-        this.modelPositions = modelPositions;
-        this.modelTrips = modelTrips;
-        this.testMode = testMode;
-    }
-    generateDelayMsg(actualStopTimestampScheduled, schedule, input) {
+const integration_engine_1 = require("@golemio/core/dist/integration-engine");
+const const_1 = require("../../../../const");
+const models_1 = require("../../models");
+const AbstractGTFSTripRunManager_1 = require("./AbstractGTFSTripRunManager");
+class GTFSTripCommonRunManager extends AbstractGTFSTripRunManager_1.AbstractGTFSTripRunManager {
+    generateDelayMsg(schedule, input) {
         return __awaiter(this, void 0, void 0, function* () {
-            const asts = (0, moment_timezone_1.default)(+actualStopTimestampScheduled);
+            const timestampScheduled = (0, moment_timezone_1.default)(Number(input.run_message.actual_stop_timestamp_scheduled));
+            const currentTrip = this.getCurrentTripForRun(schedule, timestampScheduled);
             let delayMsg = {
                 updatedTrips: [],
                 positions: [],
-                schedule: schedule,
+                schedule,
             };
-            // current gtfs trip for run
-            let currentTrip = undefined;
-            for (const tripCache of schedule) {
-                const startTimestamp = new Date(tripCache.start_timestamp);
-                const endTimestamp = new Date(tripCache.end_timestamp);
-                if (!asts.isBetween(startTimestamp, endTimestamp, "second", "[]")) {
-                    continue;
-                }
-                if (!currentTrip || +startTimestamp > +new Date(currentTrip.start_timestamp)) {
-                    currentTrip = tripCache;
-                }
-            }
-            if (currentTrip && currentTrip.trip_id) {
-                delayMsg = yield this.generateDelayMsgFromCurrentTrip(delayMsg, currentTrip, asts, input);
+            if (currentTrip === null || currentTrip === void 0 ? void 0 : currentTrip.trip_id) {
+                delayMsg = yield this.generateDelayMsgFromCurrentTrip(delayMsg, currentTrip, timestampScheduled, input);
             }
             else {
-                integration_engine_1.log.warn(`updateRunsGTFSTripId: could not find current gtfsTrip for run: ${JSON.stringify(input)}`);
+                integration_engine_1.log.warn(`generateDelayMsg: could not find current gtfsTrip for common run: ${JSON.stringify(input)}`);
             }
             // last/next gtfs trip for run
-            return this.updateLastTripsAndPositions(schedule, asts, currentTrip === null || currentTrip === void 0 ? void 0 : currentTrip.trip_id, input, delayMsg);
+            return this.updateLastTripsAndPositions(schedule, timestampScheduled, currentTrip === null || currentTrip === void 0 ? void 0 : currentTrip.trip_id, input, delayMsg);
         });
     }
-    generateDelayMsgFromCurrentTrip(delayMsg, gtfsCurrentTrip, asts, input) {
+    generateDelayMsgFromCurrentTrip(delayMsg, gtfsCurrentTrip, timestampScheduled, input) {
         return __awaiter(this, void 0, void 0, function* () {
             const msgTimestamp = input.run_message.msg_timestamp;
             const event = input.run_message.events;
-            const isCurrentTripTracking = this.isCurrentTripTracking(gtfsCurrentTrip, event, asts, msgTimestamp);
+            const isCurrentTripTracking = this.isCurrentTripTracking(gtfsCurrentTrip, event, timestampScheduled, msgTimestamp);
             const { trip, position } = yield this.updateTrip(input, gtfsCurrentTrip, isCurrentTripTracking);
             delayMsg.updatedTrips.push(trip);
             if (this.testMode)
@@ -64,7 +50,7 @@ class GTFSTripManager {
             return delayMsg;
         });
     }
-    isCurrentTripTracking(gtfsCurrentTrip, event, asts, msgTimestamp) {
+    isCurrentTripTracking(gtfsCurrentTrip, event, timestampScheduled, msgTimestamp) {
         var _a;
         return (
         // tram is always on track while pushes messages only on stops
@@ -72,15 +58,15 @@ class GTFSTripManager {
             // when bus announces DEPARTURE TCP event, it means that trip is on track
             (gtfsCurrentTrip.route_type === models_1.GTFSRouteTypeEnum.BUS && event === const_1.TCPEventEnum.DEPARTURED) ||
             // when trip has set first stop time, and message timestamp is after scheduled start, set as tracking
-            (asts.isSame((0, moment_timezone_1.default)(gtfsCurrentTrip.start_timestamp)) &&
+            (timestampScheduled.isSame((0, moment_timezone_1.default)(gtfsCurrentTrip.start_timestamp)) &&
                 (0, moment_timezone_1.default)(msgTimestamp).isSameOrAfter((0, moment_timezone_1.default)(gtfsCurrentTrip.start_timestamp))) ||
             // of course when trip announcing some next stop time in schedule, then set as tracking
-            asts.isAfter((0, moment_timezone_1.default)(gtfsCurrentTrip.start_timestamp)))) !== null && _a !== void 0 ? _a : false);
+            timestampScheduled.isAfter((0, moment_timezone_1.default)(gtfsCurrentTrip.start_timestamp)))) !== null && _a !== void 0 ? _a : false);
     }
-    updateLastTripsAndPositions(schedule, asts, currentTripId, input, delayMsg) {
+    updateLastTripsAndPositions(schedule, timestampScheduled, currentTripId, input, delayMsg) {
         return __awaiter(this, void 0, void 0, function* () {
-            const gtfsLastNextTrips = this.getLastNextTrips(schedule, asts, currentTripId);
-            for (const gtfsTrip of gtfsLastNextTrips) {
+            const gtfsAdjacentTrips = this.getAdjacentTrips(schedule, timestampScheduled, currentTripId);
+            for (const gtfsTrip of gtfsAdjacentTrips) {
                 const { trip, position } = yield this.updateTrip(input, gtfsTrip, false);
                 delayMsg.updatedTrips.push(trip);
                 if (this.testMode)
@@ -89,20 +75,13 @@ class GTFSTripManager {
             return delayMsg;
         });
     }
-    getLastNextTrips(schedule, asts, currentTripId) {
-        return schedule.filter((el) => {
-            return (((asts.clone().subtract(15, "minutes") <= (0, moment_timezone_1.default)(el.end_timestamp) && (0, moment_timezone_1.default)(el.end_timestamp) <= asts) ||
-                (asts <= (0, moment_timezone_1.default)(el.start_timestamp) && (0, moment_timezone_1.default)(el.start_timestamp) <= asts.clone().add(60, "minutes"))) &&
-                el.trip_id !== currentTripId);
-        });
-    }
     updateTrip(input, gtfsTrip, isTripTracking) {
         return __awaiter(this, void 0, void 0, function* () {
-            const trip = yield this.modelTrips.upsertRunTrip(input, gtfsTrip);
-            const position = yield this.modelPositions.upsertRunPosition(input, gtfsTrip, isTripTracking);
+            const trip = yield this.tripsRepository.upsertCommonRunTrip(input, gtfsTrip);
+            const position = yield this.positionsRepository.upsertCommonRunPosition(input, gtfsTrip, isTripTracking);
             return { trip, position };
         });
     }
 }
-exports.default = GTFSTripManager;
-//# sourceMappingURL=GtfsTripManager.js.map
+exports.GTFSTripCommonRunManager = GTFSTripCommonRunManager;
+//# sourceMappingURL=GTFSTripCommonRunManager.js.map

package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GTFSTripCommonRunManager.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.ts"],"names":[],"mappings":"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"}

package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/GTFSTripMetroRunManager.d.ts

@@ -0,0 +1,10 @@
+import { IGtfsRunTripCache } from "../../models";
+import { IDelayMessage } from "./interfaces/IDelayMessage";
+import { AbstractGTFSTripRunManager } from "./AbstractGTFSTripRunManager";
+import { IMetroRunInputForProcessing } from "../../workers/runs/tasks/interfaces/IMetroRunInputForProcessing";
+export declare class GTFSTripMetroRunManager extends AbstractGTFSTripRunManager {
+    generateDelayMsg(schedule: IGtfsRunTripCache[], input: IMetroRunInputForProcessing): Promise<IDelayMessage>;
+    private generateDelayMsgFromCurrentTrip;
+    private updateLastTripsAndPositions;
+    private updateTrip;
+}

package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/GTFSTripMetroRunManager.js

@@ -0,0 +1,70 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GTFSTripMetroRunManager = void 0;
+const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
+const integration_engine_1 = require("@golemio/core/dist/integration-engine");
+const AbstractGTFSTripRunManager_1 = require("./AbstractGTFSTripRunManager");
+class GTFSTripMetroRunManager extends AbstractGTFSTripRunManager_1.AbstractGTFSTripRunManager {
+    generateDelayMsg(schedule, input) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const timestampScheduled = (0, moment_timezone_1.default)(input.timestampScheduled);
+            const currentTrip = this.getCurrentTripForRun(schedule, timestampScheduled);
+            let delayMsg = {
+                updatedTrips: [],
+                positions: [],
+                schedule,
+            };
+            if (currentTrip === null || currentTrip === void 0 ? void 0 : currentTrip.trip_id) {
+                delayMsg = yield this.generateDelayMsgFromCurrentTrip(delayMsg, currentTrip, input);
+            }
+            else {
+                integration_engine_1.log.warn(`generateDelayMsg: could not find current gtfsTrip for metro run: ${JSON.stringify(input)}`);
+            }
+            // last/next gtfs trip for run
+            return this.updateLastTripsAndPositions(schedule, timestampScheduled, currentTrip === null || currentTrip === void 0 ? void 0 : currentTrip.trip_id, input, delayMsg);
+        });
+    }
+    generateDelayMsgFromCurrentTrip(delayMsg, gtfsCurrentTrip, input) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const isCurrentTripTracking = true;
+            const { trip, position } = yield this.updateTrip(input, gtfsCurrentTrip, isCurrentTripTracking);
+            delayMsg.updatedTrips.push(trip);
+            if (this.testMode)
+                delayMsg.positions.push(position);
+            return delayMsg;
+        });
+    }
+    updateLastTripsAndPositions(schedule, timestampScheduled, currentTripId, input, delayMsg) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const gtfsAdjacentTrips = this.getAdjacentTrips(schedule, timestampScheduled, currentTripId);
+            for (const gtfsTrip of gtfsAdjacentTrips) {
+                const { trip, position } = yield this.updateTrip(input, gtfsTrip, false);
+                delayMsg.updatedTrips.push(trip);
+                if (this.testMode)
+                    delayMsg.positions.push(position);
+            }
+            return delayMsg;
+        });
+    }
+    updateTrip(input, gtfsTrip, isTripTracking) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const trip = yield this.tripsRepository.upsertMetroRunTrip(input, gtfsTrip);
+            const position = yield this.positionsRepository.upsertMetroRunPosition(input, gtfsTrip, isTripTracking);
+            return { trip, position };
+        });
+    }
+}
+exports.GTFSTripMetroRunManager = GTFSTripMetroRunManager;
+//# sourceMappingURL=GTFSTripMetroRunManager.js.map

package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/GTFSTripMetroRunManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GTFSTripMetroRunManager.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/helpers/gtfs-trip-run/GTFSTripMetroRunManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gGAA2E;AAC3E,8EAA4D;AAG5D,6EAA0E;AAG1E,MAAa,uBAAwB,SAAQ,uDAA0B;IACtD,gBAAgB,CAAC,QAA6B,EAAE,KAAkC;;YAC3F,MAAM,kBAAkB,GAAG,IAAA,yBAAM,EAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;YAC5E,IAAI,QAAQ,GAAkB;gBAC1B,YAAY,EAAE,EAAE;gBAChB,SAAS,EAAE,EAAE;gBACb,QAAQ;aACX,CAAC;YAEF,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE;gBACtB,QAAQ,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;aACvF;iBAAM;gBACH,wBAAG,CAAC,IAAI,CAAC,oEAAoE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aACzG;YAED,8BAA8B;YAC9B,OAAO,IAAI,CAAC,2BAA2B,CAAC,QAAQ,EAAE,kBAAkB,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACjH,CAAC;KAAA;IAEa,+BAA+B,CACzC,QAAuB,EACvB,eAAkC,EAClC,KAAkC;;YAElC,MAAM,qBAAqB,GAAG,IAAI,CAAC;YACnC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,eAAe,EAAE,qBAAqB,CAAC,CAAC;YAEhG,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,IAAI,CAAC,QAAQ;gBAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAErD,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;IAEa,2BAA2B,CACrC,QAA6B,EAC7B,kBAA0B,EAC1B,aAAiC,EACjC,KAAkC,EAClC,QAAuB;;YAEvB,MAAM,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC;YAE7F,KAAK,MAAM,QAAQ,IAAI,iBAAiB,EAAE;gBACtC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;gBAEzE,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjC,IAAI,IAAI,CAAC,QAAQ;oBAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aACxD;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;IAEa,UAAU,CAAC,KAAkC,EAAE,QAA2B,EAAE,cAAuB;;YAC7G,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC5E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,sBAAsB,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;YAExG,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QAC9B,CAAC;KAAA;CACJ;AA3DD,0DA2DC"}

package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/GTFSTripRunManagerFactory.d.ts

@@ -0,0 +1,8 @@
+import { AbstractGTFSTripRunManager } from "./AbstractGTFSTripRunManager";
+export declare enum GTFSTripRunType {
+    Common = 0,
+    Metro = 1
+}
+export declare class GTFSTripRunManagerFactory {
+    static create(runType: GTFSTripRunType, ...params: ConstructorParameters<typeof AbstractGTFSTripRunManager>): AbstractGTFSTripRunManager;
+}

package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/GTFSTripRunManagerFactory.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GTFSTripRunManagerFactory = exports.GTFSTripRunType = void 0;
+const GTFSTripCommonRunManager_1 = require("./GTFSTripCommonRunManager");
+const GTFSTripMetroRunManager_1 = require("./GTFSTripMetroRunManager");
+var GTFSTripRunType;
+(function (GTFSTripRunType) {
+    GTFSTripRunType[GTFSTripRunType["Common"] = 0] = "Common";
+    GTFSTripRunType[GTFSTripRunType["Metro"] = 1] = "Metro";
+})(GTFSTripRunType = exports.GTFSTripRunType || (exports.GTFSTripRunType = {}));
+class GTFSTripRunManagerFactory {
+    static create(runType, ...params) {
+        switch (runType) {
+            case GTFSTripRunType.Common:
+            default:
+                return new GTFSTripCommonRunManager_1.GTFSTripCommonRunManager(...params);
+            case GTFSTripRunType.Metro:
+                return new GTFSTripMetroRunManager_1.GTFSTripMetroRunManager(...params);
+        }
+    }
+}
+exports.GTFSTripRunManagerFactory = GTFSTripRunManagerFactory;
+//# sourceMappingURL=GTFSTripRunManagerFactory.js.map

package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/GTFSTripRunManagerFactory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GTFSTripRunManagerFactory.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/helpers/gtfs-trip-run/GTFSTripRunManagerFactory.ts"],"names":[],"mappings":";;;AACA,yEAAsE;AACtE,uEAAoE;AAEpE,IAAY,eAGX;AAHD,WAAY,eAAe;IACvB,yDAAM,CAAA;IACN,uDAAK,CAAA;AACT,CAAC,EAHW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAG1B;AAED,MAAa,yBAAyB;IAC3B,MAAM,CAAC,MAAM,CAChB,OAAwB,EACxB,GAAG,MAAgE;QAEnE,QAAQ,OAAO,EAAE;YACb,KAAK,eAAe,CAAC,MAAM,CAAC;YAC5B;gBACI,OAAO,IAAI,mDAAwB,CAAC,GAAG,MAAM,CAAC,CAAC;YAEnD,KAAK,eAAe,CAAC,KAAK;gBACtB,OAAO,IAAI,iDAAuB,CAAC,GAAG,MAAM,CAAC,CAAC;SACrD;IACL,CAAC;CACJ;AAdD,8DAcC"}

package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/interfaces/IDelayMessage.d.ts

@@ -0,0 +1,6 @@
+import { IGtfsRunTripCache, IUpdateDelayRunTripsData } from "../../../models";
+export interface IDelayMessage {
+    updatedTrips: IUpdateDelayRunTripsData[];
+    positions: any[];
+    schedule?: IGtfsRunTripCache[];
+}

package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/interfaces/IDelayMessage.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=IDelayMessage.js.map

package/dist/integration-engine/vehicle-positions/helpers/gtfs-trip-run/interfaces/IDelayMessage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IDelayMessage.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/helpers/gtfs-trip-run/interfaces/IDelayMessage.ts"],"names":[],"mappings":""}

package/dist/integration-engine/vehicle-positions/models/VehiclePositionsPositionsModel.d.ts

@@ -1,4 +1,5 @@
 import { IVehiclePositionsRunCommon } from "../transformations";
+import { IMetroRunInputForProcessing } from "../workers/runs/tasks/interfaces/IMetroRunInputForProcessing";
 import { IModel, PostgresModel } from "@golemio/core/dist/integration-engine/models";
 import { Validator } from "@golemio/core/dist/shared/golemio-validator";
 import Sequelize from "@golemio/core/dist/shared/sequelize";
@@ -58,7 +59,8 @@ export declare class VehiclePositionsPositionsModel extends PostgresModel implem
     constructor();
     getPositionsForUpdateDelay: (tripIds: string[]) => Promise<ITripPositions[]>;
     bulkUpdate: (data: any[]) => Promise<any>;
-    upsertRunPosition: ({ run, run_message }: IVehiclePositionsRunCommon, gtfsTrip: IGtfsRunTripCache, isCurrent?: boolean) => Promise<any>;
+    upsertCommonRunPosition: ({ run, run_message }: IVehiclePositionsRunCommon, gtfsTrip: IGtfsRunTripCache, isCurrent?: boolean) => Promise<any>;
+    upsertMetroRunPosition: (runInput: IMetroRunInputForProcessing, gtfsTrip: IGtfsRunTripCache, isCurrent?: boolean) => Promise<any>;
     deleteNHoursOldData: (hours: number) => Promise<number>;
     createNotPublic: (input: IVehiclePositionsRunCommon, id: string) => Promise<any>;
 }

package/dist/integration-engine/vehicle-positions/models/VehiclePositionsPositionsModel.js

@@ -194,15 +194,26 @@ class VehiclePositionsPositionsModel extends models_1.PostgresModel {
                 return acc;
             }, { updated: [] });
         });
-        this.upsertRunPosition = ({ run, run_message }, gtfsTrip, isCurrent = true) => __awaiter(this, void 0, void 0, function* () {
+        this.upsertCommonRunPosition = ({ run, run_message }, gtfsTrip, isCurrent = true) => __awaiter(this, void 0, void 0, function* () {
             try {
-                const [record] = yield this.sequelizeModel.upsert(VPPositionsMapper_1.default.mapToDto(run_message, isCurrent, gtfsTrip, run), {
+                const [record] = yield this.sequelizeModel.upsert(VPPositionsMapper_1.default.mapCommonRunToDto(run_message, isCurrent, gtfsTrip, run), {
                     returning: true,
                 });
                 return record.get({ plain: true });
             }
             catch (err) {
-                throw new golemio_errors_1.CustomError("upsertRunPosition: Error while saving to database.", true, this.name, 4001, err);
+                throw new golemio_errors_1.CustomError("upsertCommonRunPosition: Error while saving to database.", true, this.name, 4001, err);
+            }
+        });
+        this.upsertMetroRunPosition = (runInput, gtfsTrip, isCurrent = true) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                const [record] = yield this.sequelizeModel.upsert(VPPositionsMapper_1.default.mapMetroRunToDto(isCurrent, gtfsTrip, runInput), {
+                    returning: true,
+                });
+                return record.get({ plain: true });
+            }
+            catch (err) {
+                throw new golemio_errors_1.CustomError("upsertMetroRunPosition: Error while saving to database.", true, this.name, 4001, err);
             }
         });
         this.deleteNHoursOldData = (hours) => __awaiter(this, void 0, void 0, function* () {

package/dist/integration-engine/vehicle-positions/models/VehiclePositionsPositionsModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"VehiclePositionsPositionsModel.js","sourceRoot":"","sources":["../../../../src/integration-engine/vehicle-positions/models/VehiclePositionsPositionsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qFAA0D;AAC1D,iFAAqF;AACrF,2EAAoE;AACpE,yEAAqF;AACrF,6EAAuE;AACvE,mFAAwE;AACxE,gGAA+D;AAC/D,iFAAgF;AAChF,0CAAgE;AAChE,oFAA4D;AA4C5D,MAAa,8BAA+B,SAAQ,sBAAa;IAc7D;QACI,KAAK,CACD,oCAAgB,CAAC,SAAS,CAAC,IAAI,GAAG,OAAO,EACzC;YACI,yBAAyB,EAAE,oCAAgB,CAAC,SAAS,CAAC,yBAAyB;YAC/E,WAAW,EAAE,oCAAgB,CAAC,SAAS,CAAC,WAAW;YACnD,QAAQ,EAAE,oCAAgB,CAAC,QAAQ;YACnC,UAAU,EAAE,YAAY;YACxB,2BAA2B,EAAE;gBACzB,OAAO,EAAE;oBACL;wBACI,MAAM,EAAE,CAAC,UAAU,CAAC;wBACpB,IAAI,EAAE,qCAAqC;qBAC9C;oBACD;wBACI,MAAM,EAAE,CAAC,aAAa,CAAC;wBACvB,IAAI,EAAE,wCAAwC;qBACjD;iBACJ;aACJ;SACJ,EACD,IAAI,6BAAS,CACT,oCAAgB,CAAC,SAAS,CAAC,IAAI,GAAG,gBAAgB,EAClD,oCAAgB,CAAC,SAAS,CAAC,0BAA0B,CACxD,CACJ,CAAC;QASC,+BAA0B,GAAG,CAAO,OAAiB,EAA6B,EAAE;YACvF,oEAAoE;YACpE,yEAAyE;YAEzE,wCAAwC;YACxC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,OAAO,EAAsB,CAAC;aACjC;YACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBAC1C,UAAU,EAAE;oBACR,8EAA8E;oBAC9E,IAAI;oBACJ,cAAc;oBACd,iBAAiB;oBACjB,iBAAiB;oBACjB,uBAAuB;oBACvB,mBAAmB;iBACtB;gBACD,OAAO,EAAE;oBACL;wBACI,UAAU,EAAE;4BACR,SAAS;4BACT,KAAK;4BACL,KAAK;4BACL,aAAa;4BACb,kBAAkB;4BAClB,OAAO;4BACP,UAAU;4BACV,IAAI;4BACJ,qBAAqB;4BACrB,aAAa;4BACb,gBAAgB;4BAChB,eAAe;4BACf,WAAW;4BACX,oBAAoB;4BACpB,oBAAoB;4BACpB,cAAc;4BACd,wBAAwB;4BACxB,0BAA0B;yBAC7B;wBACD,KAAK,EAAE,IAAI,CAAC,cAAc;wBAC1B,KAAK,EAAE,EAAE;qBACZ;iBACJ;gBACD,aAAa;gBACb,KAAK,EAAE;oBACH,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,kBAAkB,EAAE,KAAK,CAAC;oBAC3E,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC;iBACvE;gBACD,GAAG,EAAE,IAAI;gBACT,KAAK,EAAE;oBACH,YAAY,EAAE,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE;oBACzC,EAAE,EAAE,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE;iBACtC;aACJ,CAAC,CAAC;YAEH,6GAA6G;YAC7G,qDAAqD;YACrD,IAAI;gBACA,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;oBAC3B,IAAI,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAiB,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC/D,IAAI,MAAM,KAAK,CAAC,CAAC,EAAE;wBACf,CAAC,CAAC,IAAI,CAAC;4BACH,qBAAqB,EAAE,CAAC,CAAC,qBAAqB;4BAC9C,YAAY,EAAE,CAAC,CAAC,YAAY;4BAC5B,eAAe,EAAE,CAAC,CAAC,eAAoC;4BACvD,SAAS,EAAE,EAA+B;4BAC1C,iBAAiB,EAAE,CAAC,CAAC,iBAAiB;4BACtC,eAAe,EAAE,CAAC,CAAC,eAAe;4BAClC,EAAE,EAAE,CAAC,CAAC,EAAE;yBACQ,CAAC,CAAC;wBACtB,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAiB,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;qBAC9D;oBACD,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC;wBACrB,OAAO,EAAE,CAAC,CAAC,oCAAoC,CAAC;wBAChD,KAAK,EAAE,CAAC,CAAC,kCAAkC,CAAC;wBAC5C,EAAE,EAAE,CAAC,CAAC,+BAA+B,CAAC;wBACtC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC;wBACpD,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC;wBACpD,WAAW,EAAE,CAAC,CAAC,wCAAwC,CAAC;wBACxD,gBAAgB,EAAE,QAAQ,CAAC,CAAC,CAAC,6CAA6C,CAAC,EAAE,EAAE,CAAC;wBAChF,mBAAmB,EAAE,UAAU,CAAC,CAAC,CAAC,gDAAgD,CAAC,CAAC,IAAI,IAAI;wBAC5F,QAAQ,EAAE,CAAC,CAAC,qCAAqC,CAAC;wBAClD,WAAW,EAAE,CAAC,CAAC,wCAAwC,CAAC;wBACxD,cAAc,EAAE,CAAC,CAAC,2CAA2C,CAAsB;wBACnF,aAAa,EAAE,CAAC,CAAC,0CAA0C,CAAqB;wBAChF,SAAS,EAAE,CAAC,CAAC,sCAAsC,CAAC;wBACpD,kBAAkB,EAAE,CAAC,CAAC,+CAA+C,CAAC;wBACtE,kBAAkB,EAAE,CAAC,CAAC,+CAA+C,CAAC;wBACtE,YAAY,EAAE,CAAC,CAAC,yCAAyC,CAAC;wBAC1D,sBAAsB,EAAE,QAAQ,CAAC,CAAC,CAAC,mDAAmD,CAAC,EAAE,EAAE,CAAC;wBAC5F,wBAAwB,EAAE,QAAQ,CAAC,CAAC,CAAC,qDAAqD,CAAC,EAAE,EAAE,CAAC;qBACxE,CAAC,CAAC;oBAC9B,OAAO,CAAC,CAAC;gBACb,CAAC,EAAE,EAAsB,CAAC,CAAC;aAC9B;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,4BAAW,CACjB,+DAA+D,OAAO,CAAC,MAAM,GAAG,EAChF,IAAI,EACJ,IAAI,CAAC,IAAI,EACT,IAAI,EACJ,GAAG,CACN,CAAC;aACL;QACL,CAAC,CAAA,CAAC;QAEK,eAAU,GAAG,CAAO,IAAW,EAAgB,EAAE;YACpD,MAAM,UAAU,GAAG,8BAAiB,CAAC,aAAa,EAAE,CAAC;YACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAO,CAAC,EAAE,EAAE;gBAClC,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,CAAC;gBACnD,MAAM,CAAC,GAAG,CAAC,GAA+B,MAAM,UAAU,CAAC,KAAK;gBAC5D,mCAAmC;gBACnC,gCAAgC,oCAAgB,CAAC,QAAQ,KAAK,IAAI,CAAC,SAAS,cAAc,CAAC,CAAC,EAAE,iBAAiB,EAC/G;oBACI,WAAW;oBACX,IAAI,EAAE,sBAAU,CAAC,MAAM;oBACvB,GAAG,EAAE,IAAI;iBACZ,CACJ,CAAC;gBAEF,IAAI;oBACA,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;oBACtE,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC;oBAE3B,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,CAAA,EAAE,CAAC;iBAChD;gBAAC,OAAO,GAAG,EAAE;oBACV,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACf,MAAM,WAAW,CAAC,QAAQ,EAAE,CAAC;oBAC7B,MAAM,IAAI,4BAAW,CAAC,iCAAiC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;iBACxF;YACL,CAAC,CAAA,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC5C,OAAO,OAAO,CAAC,MAAM,CACjB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;gBACZ,IAAI,MAAM,CAAC,GAAG,EAAE;oBACZ,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;iBAC/B;gBACD,OAAO,GAAG,CAAC;YACf,CAAC,EACD,EAAE,OAAO,EAAE,EAAE,EAA8B,CAC9C,CAAC;QACN,CAAC,CAAA,CAAC;QAEK,sBAAiB,GAAG,CACvB,EAAE,GAAG,EAAE,WAAW,EAA8B,EAChD,QAA2B,EAC3B,SAAS,GAAG,IAAI,EACJ,EAAE;YACd,IAAI;gBACA,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,2BAAiB,CAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE;oBACjH,SAAS,EAAE,IAAI;iBAClB,CAAC,CAAC;gBAEH,OAAO,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;aACtC;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,4BAAW,CAAC,oDAAoD,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;aAC3G;QACL,CAAC,CAAA,CAAC;QAEK,wBAAmB,GAAG,CAAO,KAAa,EAAmB,EAAE;YAClE,IAAI;gBACA,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBACrC,KAAK,EAAE;wBACH,UAAU,EAAE;4BACR,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,mBAAS,CAAC,OAAO,CAAC,qBAAqB,KAAK,SAAS,CAAC;yBAClE;qBACJ;iBACJ,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,4BAAW,CAAC,8BAA8B,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;aACjG;QACL,CAAC,CAAA,CAAC;QAEK,oBAAe,GAAG,CAAO,KAAiC,EAAE,EAAU,EAAgB,EAAE;YAC3F,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAC7B;gBACI,oBAAoB;gBACpB,gBAAgB,EAAE,KAAK,CAAC,WAAW,CAAC,gBAAgB;gBACpD,GAAG,EAAE,KAAK,CAAC,WAAW,CAAC,GAAG;gBAC1B,GAAG,EAAE,KAAK,CAAC,WAAW,CAAC,GAAG;gBAC1B,WAAW,EAAE,IAAA,yBAAM,EAAC,CAAC,KAAK,CAAC,WAAW,CAAC,0BAA0B,CAAC;qBAC7D,EAAE,CAAC,eAAe,CAAC;qBACnB,MAAM,CAAC,UAAU,CAAC;gBACvB,gBAAgB,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,0BAA0B;gBAC/D,cAAc,EAAE,yBAAiB,CAAC,UAAU;gBAC5C,aAAa,EAAE,wBAAgB,CAAC,SAAS;gBACzC,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,kBAAkB;gBAClD,QAAQ,EAAE,CAAC;gBACX,QAAQ,EAAE,EAAE;gBACZ,SAAS,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM;aACtC,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACtB,CAAC;QACN,CAAC,CAAA,CAAC;QA1ME,IAAI,CAAC,UAAU,GAAG,8BAAiB,CAAC,aAAa,EAAE,CAAC,MAAM,CACtD,oCAAgB,CAAC,KAAK,CAAC,WAAW,EAClC,oCAAgB,CAAC,KAAK,CAAC,yBAAyB,EAChD,EAAE,MAAM,EAAE,oCAAgB,CAAC,QAAQ,EAAE,CACxC,CAAC;QACF,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9F,CAAC;CAqMJ;AAnPD,wEAmPC"}
+{"version":3,"file":"VehiclePositionsPositionsModel.js","sourceRoot":"","sources":["../../../../src/integration-engine/vehicle-positions/models/VehiclePositionsPositionsModel.ts"],"names":[],"mappings":"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"}

package/dist/integration-engine/vehicle-positions/models/VehiclePositionsTripsModel.d.ts

@@ -2,6 +2,7 @@ import { Validator } from "@golemio/core/dist/shared/golemio-validator";
 import Sequelize from "@golemio/core/dist/shared/sequelize";
 import { IModel, PostgresModel } from "@golemio/core/dist/integration-engine/models";
 import { IVehiclePositionsRunCommon } from "../transformations";
+import { IMetroRunInputForProcessing } from "../workers/runs/tasks/interfaces/IMetroRunInputForProcessing";
 import { IGtfsRunTripCache } from "./VehiclePositionsRunsModel";
 import { IPropagateDelay } from "../VehiclePositionsInterfaces";
 export interface IGTFSRtFeedEntity {
@@ -144,7 +145,8 @@ export declare class VehiclePositionsTripsModel extends PostgresModel implements
     findGTFSTripId: (trip: IUpdateGTFSTripIdData) => Promise<IUpdateDelayTripsIdsData | IUpdateDelayTripsIdsData[] | undefined>;
     deleteNHoursOldData: (hours: number) => Promise<number>;
     private deduceTimestamps;
-    upsertRunTrip: ({ run }: IVehiclePositionsRunCommon, gtfsTrip: IGtfsRunTripCache) => Promise<IUpdateDelayRunTripsData>;
+    upsertCommonRunTrip: ({ run }: IVehiclePositionsRunCommon, gtfsTrip: IGtfsRunTripCache) => Promise<IUpdateDelayRunTripsData>;
+    upsertMetroRunTrip: (runInput: IMetroRunInputForProcessing, gtfsTrip: IGtfsRunTripCache) => Promise<IUpdateDelayRunTripsData>;
     getPropagateDelayTripsWithPositions: (data: IPropagateDelay) => Promise<any[]>;
     hasOne: (model: any, options: any) => any;
     findAll: (options: any) => Promise<any>;

package/dist/integration-engine/vehicle-positions/models/VehiclePositionsTripsModel.js

@@ -387,15 +387,26 @@ class VehiclePositionsTripsModel extends models_1.PostgresModel {
                 endTimestamp,
             };
         };
-        this.upsertRunTrip = ({ run }, gtfsTrip) => __awaiter(this, void 0, void 0, function* () {
+        this.upsertCommonRunTrip = ({ run }, gtfsTrip) => __awaiter(this, void 0, void 0, function* () {
             try {
-                const [record] = yield this.sequelizeModel.upsert(VPTripsMapper_1.default.mapToDto(gtfsTrip, run), {
+                const [record] = yield this.sequelizeModel.upsert(VPTripsMapper_1.default.mapCommonRunToDto(gtfsTrip, run), {
                     returning: true,
                 });
                 return record.get({ plain: true });
             }
             catch (err) {
-                throw new golemio_errors_1.CustomError("upsertRunTrip: Error while saving to database.", true, this.name, 4001, err);
+                throw new golemio_errors_1.CustomError("upsertCommonRunTrip: Error while saving to database.", true, this.name, 4001, err);
+            }
+        });
+        this.upsertMetroRunTrip = (runInput, gtfsTrip) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                const [record] = yield this.sequelizeModel.upsert(VPTripsMapper_1.default.mapMetroRunToDto(gtfsTrip, runInput), {
+                    returning: true,
+                });
+                return record.get({ plain: true });
+            }
+            catch (err) {
+                throw new golemio_errors_1.CustomError("upsertMetroRunTrip: Error while saving to database.", true, this.name, 4001, err);
             }
         });
         this.getPropagateDelayTripsWithPositions = (data) => __awaiter(this, void 0, void 0, function* () {