@golemio/public-transport 0.1.0

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.d.ts

@@ -0,0 +1,56 @@
+import { GtfsStopTimesModel } from "../../../../gtfs/GtfsStopTimesModel";
+import { GtfsTripsModel } from "../../../../gtfs/GtfsTripsModel";
+import { BlockStopsRedisRepository, DelayComputationRedisRepository } from "../../../../gtfs/data-access/cache";
+import { ILogger } from "@golemio/core/dist/helpers/logger";
+import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
+import { MessageProperties } from "@golemio/core/dist/shared/amqplib";
+import { PositionsRepository } from "../data-access/PositionsRepository";
+import type { TripsRepository } from "../data-access/TripsRepository";
+import { PositionsManager } from "../helpers/PositionsManager";
+import { MetroShapePointsFixer } from "../helpers/metro/MetroShapePointsFixer";
+import { IUpdateDelayInput } from "../interfaces/IUpdateDelayInput";
+import { UpdateDelayValidationSchema } from "../schema/UpdateDelaySchema";
+export declare class UpdateDelayTask extends AbstractTask<IUpdateDelayInput> {
+    readonly queueName = "updateDelay";
+    readonly queueTtl: number;
+    readonly schema: typeof UpdateDelayValidationSchema;
+    private readonly logger;
+    private readonly tripsRepository;
+    private readonly positionsRepository;
+    private readonly delayComputationRedisRepository;
+    private readonly tripStopsManager;
+    private readonly delayComputationManager;
+    private readonly metroShapePointsFixer;
+    private readonly updateDelayLimiter;
+    private readonly positionsManager;
+    constructor(logger: ILogger, tripsRepository: TripsRepository, positionsRepository: PositionsRepository, delayComputationRedisRepository: DelayComputationRedisRepository, gtfsStopTimesRepository: GtfsStopTimesModel, gtfsTripsRepository: GtfsTripsModel, blockStopsRedisRepository: BlockStopsRedisRepository, metroShapePointsFixer: MetroShapePointsFixer, positionsManager: PositionsManager);
+    protected execute(data: IUpdateDelayInput, messageProperties?: MessageProperties): Promise<void>;
+    private enrichTripWithGtfsComputationData;
+    /**
+     * Propagate known position properties from trips positions to processed positions, when the processed position property is
+     * `undefined`
+     *
+     * @param tripsPositions Trips positions to propagate properties from
+     * @param processedPositions Processed positions to propagate properties to
+     */
+    private propagateKnownPositionProperties;
+    /**
+     * Take all newly computed positions and save it, then save the last ones to the trips
+     *
+     * @param processedPositions - Arrays of all newly computed positions
+     */
+    private updateComputedPositionsAndTrips;
+    /**
+     * Expire delay computation cache for given trips
+     */
+    private expireDelayComputationCache;
+    private savePositions;
+    /**
+     * Invalidate positions after the last stop sequence of backtracked positions
+     * We do this to improve historical data quality
+     * as well as to prevent serving of incorrect stop times to API clients
+     * (vehicle is expected to repeat some part of the trip)
+     */
+    private invalidateBacktrackedPositions;
+    private getMaxStopSequence;
+}

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js

@@ -0,0 +1,314 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UpdateDelayTask = void 0;
+const RouteTypeEnums_1 = require("../../../../../helpers/RouteTypeEnums");
+const GtfsStopTimesModel_1 = require("../../../../gtfs/GtfsStopTimesModel");
+const GtfsTripsModel_1 = require("../../../../gtfs/GtfsTripsModel");
+const cache_1 = require("../../../../gtfs/data-access/cache");
+const VPContainerToken_1 = require("../../../ioc/VPContainerToken");
+const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
+const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
+const queueprocessors_1 = require("@golemio/core/dist/integration-engine/queueprocessors");
+const workers_1 = require("@golemio/core/dist/integration-engine/workers");
+const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
+const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
+const PositionsRepository_1 = require("../data-access/PositionsRepository");
+const DelayComputationManager_1 = require("../helpers/DelayComputationManager");
+const PositionsManager_1 = require("../helpers/PositionsManager");
+const TripStopsManager_1 = require("../helpers/TripStopsManager");
+const VPUtils_1 = require("../helpers/VPUtils");
+const MetroShapePointsFixer_1 = require("../helpers/metro/MetroShapePointsFixer");
+const UpdateDelaySchema_1 = require("../schema/UpdateDelaySchema");
+const UpdateDelayLimiter_1 = require("./helpers/UpdateDelayLimiter");
+const constants_1 = require("../constants");
+let UpdateDelayTask = class UpdateDelayTask extends workers_1.AbstractTask {
+    constructor(logger, tripsRepository, positionsRepository, delayComputationRedisRepository, gtfsStopTimesRepository, gtfsTripsRepository, blockStopsRedisRepository, metroShapePointsFixer, positionsManager) {
+        super(constants_1.WORKER_NAME);
+        this.queueName = "updateDelay";
+        this.queueTtl = 50 * 1000; // 50 seconds
+        this.schema = UpdateDelaySchema_1.UpdateDelayValidationSchema;
+        this.enrichTripWithGtfsComputationData = async (trip, feedId) => {
+            try {
+                let gtfsComputationData = await this.delayComputationManager.getComputationObject(trip.gtfs_trip_id, feedId);
+                if (!gtfsComputationData) {
+                    return trip;
+                }
+                if (trip.gtfs_route_type === RouteTypeEnums_1.GTFSRouteTypeEnum.METRO) {
+                    gtfsComputationData = await this.metroShapePointsFixer.fix(gtfsComputationData);
+                }
+                trip.gtfsData = gtfsComputationData;
+            }
+            catch (err) {
+                if (err instanceof golemio_errors_1.GeneralError) {
+                    this.logger.warn(err);
+                }
+                else {
+                    this.logger.error(new golemio_errors_1.GeneralError("Error while getting delay computation data for trip " + trip.gtfs_trip_id, this.constructor.name, err));
+                }
+            }
+            return trip;
+        };
+        /**
+         * Propagate known position properties from trips positions to processed positions, when the processed position property is
+         * `undefined`
+         *
+         * @param tripsPositions Trips positions to propagate properties from
+         * @param processedPositions Processed positions to propagate properties to
+         */
+        this.propagateKnownPositionProperties = (tripPositions, processedPositions) => {
+            for (let i = 0; i < processedPositions.positions.length; i++) {
+                if (processedPositions.positions[i] === null)
+                    continue;
+                processedPositions.positions[i] = {
+                    ...tripPositions.positions[i],
+                    ...processedPositions.positions[i],
+                };
+            }
+        };
+        /**
+         * Take all newly computed positions and save it, then save the last ones to the trips
+         *
+         * @param processedPositions - Arrays of all newly computed positions
+         */
+        this.updateComputedPositionsAndTrips = async (processedPositions) => {
+            let positions = [];
+            let trips = new Map();
+            for (const processedPosition of processedPositions) {
+                positions = positions.concat(processedPosition.positions.filter((position) => position !== null));
+                trips.set(processedPosition.context.tripId, {
+                    id: processedPosition.context.tripId,
+                    last_position_id: processedPosition.context.lastPositionId ?? null,
+                    last_position_context: processedPosition.context,
+                    is_canceled: processedPosition.context.lastPositionCanceled,
+                });
+            }
+            await this.positionsRepository.bulkSave(positions);
+            await this.tripsRepository.bulkSave(Array.from(trips.values()));
+        };
+        this.logger = logger;
+        this.tripsRepository = tripsRepository;
+        this.positionsRepository = positionsRepository;
+        this.delayComputationRedisRepository = delayComputationRedisRepository;
+        this.tripStopsManager = new TripStopsManager_1.TripStopsManager(gtfsStopTimesRepository, blockStopsRedisRepository);
+        this.delayComputationManager = new DelayComputationManager_1.DelayComputationManager(gtfsTripsRepository);
+        this.metroShapePointsFixer = metroShapePointsFixer;
+        this.updateDelayLimiter = new UpdateDelayLimiter_1.UpdateDelayLimiter("UpdateDelayTask", this.queueTtl);
+        this.positionsManager = positionsManager;
+    }
+    async execute(data, messageProperties) {
+        const feedId = data.feed_id ?? 1;
+        const tripIds = data.updatedTrips.map((trip) => trip.id);
+        if (tripIds.length === 0) {
+            return;
+        }
+        if (data.positions.length > 0) {
+            await this.savePositions(data);
+        }
+        if (!this.updateDelayLimiter.isActualMessage(messageProperties)) {
+            return; // skip processing of old messages
+        }
+        let gtfsComputationTrips = [];
+        let tripsPositionsWithGtfsData = [];
+        try {
+            const tripsPositionsToUpdate = await this.positionsRepository.getPositionsForUpdateDelay(tripIds);
+            gtfsComputationTrips =
+                await this.delayComputationRedisRepository.getTripPropertiesBatch(tripsPositionsToUpdate.map((trip) => trip.gtfs_trip_id), ["shapes_anchor_points", "stop_times"], feedId);
+            for (let i = 0; i < tripsPositionsToUpdate.length; i++) {
+                const trip = tripsPositionsToUpdate[i];
+                const gtfsData = gtfsComputationTrips[i];
+                tripsPositionsWithGtfsData.push({
+                    ...trip,
+                    gtfsData,
+                });
+            }
+            const tripsWithNewlyCreatedCache = [];
+            const tripsWithExistingCache = [];
+            const processedPositions = await Promise.all(tripsPositionsWithGtfsData.map(async (trip) => {
+                if (trip.gtfsData === null) {
+                    trip = await this.enrichTripWithGtfsComputationData(trip, feedId);
+                    if (trip.gtfsData === null) {
+                        return null;
+                    }
+                    tripsWithNewlyCreatedCache.push(trip);
+                }
+                else {
+                    tripsWithExistingCache.push(trip);
+                }
+                const computedPositions = this.positionsManager.computePositions(trip, data.schedule);
+                this.propagateKnownPositionProperties(trip, computedPositions);
+                return computedPositions;
+            }));
+            const validProcessedPositions = processedPositions.filter((e) => !!e);
+            await this.updateComputedPositionsAndTrips(validProcessedPositions);
+            await Promise.all([
+                this.invalidateBacktrackedPositions(validProcessedPositions),
+                this.delayComputationRedisRepository.cacheTripDataBatch(tripsWithNewlyCreatedCache, validProcessedPositions, feedId),
+                this.expireDelayComputationCache(tripsWithExistingCache, validProcessedPositions, feedId),
+            ]);
+            await queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "propagateDelay", {
+                processedPositions: validProcessedPositions,
+                trips: data.updatedTrips,
+                feed_id: feedId,
+            });
+        }
+        catch (err) {
+            if (err instanceof golemio_errors_1.AbstractGolemioError) {
+                throw err;
+            }
+            throw new golemio_errors_1.GeneralError(`Error while updating delay. For trip ids:${tripIds.slice(0, 10).join(",")}`, this.constructor.name, err);
+        }
+    }
+    /**
+     * Expire delay computation cache for given trips
+     */
+    async expireDelayComputationCache(tripWithExistingCache, positions, feedId) {
+        const tripIdsWithTtl = [];
+        for (const trip of tripWithExistingCache) {
+            const expirationTtl = this.delayComputationRedisRepository.calculateExpirationTtl(positions, trip.id);
+            if (trip.gtfsData) {
+                tripIdsWithTtl.push({
+                    tripId: trip.gtfs_trip_id,
+                    expirationTtl,
+                });
+            }
+        }
+        try {
+            await this.delayComputationRedisRepository.expirePxat(tripIdsWithTtl, feedId);
+        }
+        catch (err) {
+            this.logger.error(err);
+        }
+    }
+    async savePositions(data) {
+        const feedId = data.feed_id ?? 1;
+        // unique ids in input data in key-value (id-positions) structure
+        let tripIdToPositionDict = {};
+        for (const position of data.positions) {
+            position.valid_to ??= null;
+            tripIdToPositionDict[position.trips_id] = position;
+        }
+        // unique block_ids and its parent input trips_id in key-value structure
+        let tripsIdsByBlockIds = {};
+        // unique block_ids and its parent gtfs_trip_id in key-value structure
+        let blockIdToTripIdsDict = {};
+        for (const trip of data.updatedTrips) {
+            if (!trip.gtfs_block_id) {
+                continue;
+            }
+            if (!tripsIdsByBlockIds[trip.gtfs_block_id]) {
+                tripsIdsByBlockIds[trip.gtfs_block_id] = trip.id;
+            }
+            else {
+                // save only the shorter trip_id (it is the raw input id with no suffixes)
+                tripsIdsByBlockIds[trip.gtfs_block_id] =
+                    tripsIdsByBlockIds[trip.gtfs_block_id] > trip.id ? trip.id : tripsIdsByBlockIds[trip.gtfs_block_id];
+            }
+            if (!blockIdToTripIdsDict[trip.gtfs_block_id]) {
+                blockIdToTripIdsDict[trip.gtfs_block_id] = new Set();
+            }
+            if (trip.gtfs_trip_id) {
+                blockIdToTripIdsDict[trip.gtfs_block_id].add(trip.gtfs_trip_id);
+            }
+        }
+        // Get cached schedule for each unique block_id
+        const blockIdToTripStopScheduleDict = await Object.entries(blockIdToTripIdsDict).reduce(async (acc, [blockId, gtfsTripIds]) => {
+            const tripStops = await acc;
+            try {
+                const schedule = await this.tripStopsManager.setAndReturnTripStopsSchedule(blockId, [...gtfsTripIds], feedId);
+                tripStops[blockId] = schedule;
+            }
+            catch (err) {
+                helpers_1.IntegrationErrorHandler.handle(err);
+            }
+            return acc;
+        }, Promise.resolve({}));
+        // duplicate positions for trips with block_ids
+        for (const trip of data.updatedTrips) {
+            if (tripIdToPositionDict[trip.id]) {
+                if (trip.gtfs_block_id) {
+                    // Determine current position tracking status
+                    tripIdToPositionDict[trip.id].is_tracked = VPUtils_1.VPUtils.determineTrackingStatus(trip.gtfs_trip_id, blockIdToTripStopScheduleDict[trip.gtfs_block_id], tripIdToPositionDict[trip.id]);
+                }
+                continue;
+            }
+            const currentPosition = data.positions.find((position) => {
+                return position.trips_id === tripsIdsByBlockIds[trip.gtfs_block_id];
+            });
+            if (!currentPosition) {
+                continue;
+            }
+            // Determine position duplication and new position tracking status
+            const newPositionTrackingStatus = VPUtils_1.VPUtils.determineNewPositionTracking(blockIdToTripStopScheduleDict[trip.gtfs_block_id], trip, currentPosition);
+            // duplicate position with new created trip for second trip
+            const newPosition = {
+                valid_to: null, // temporarily as fallback conversion to null
+                ...currentPosition,
+                trips_id: trip.id,
+                is_tracked: newPositionTrackingStatus,
+            };
+            data.positions.push(newPosition);
+        }
+        // save all new positions
+        await this.positionsRepository.bulkSave(data.positions);
+    }
+    /**
+     * Invalidate positions after the last stop sequence of backtracked positions
+     * We do this to improve historical data quality
+     * as well as to prevent serving of incorrect stop times to API clients
+     * (vehicle is expected to repeat some part of the trip)
+     */
+    async invalidateBacktrackedPositions(processedPositions) {
+        const tripWithStopSequenceTuples = processedPositions
+            .filter(({ isBacktrackingDetected }) => !!isBacktrackingDetected)
+            .map(({ context, positions }) => {
+            const tripId = context.tripId;
+            const maxStopSequence = this.getMaxStopSequence(positions);
+            return [tripId, maxStopSequence];
+        });
+        if (tripWithStopSequenceTuples.length === 0) {
+            return;
+        }
+        const count = await this.positionsRepository.invalidatePositionsAfterStopSequence(tripWithStopSequenceTuples);
+        this.logger.info(`Invalidated ${count} backtracked positions`);
+    }
+    getMaxStopSequence(positions) {
+        const maxStopSequence = Math.max(...positions.map((position) => position?.last_stop_sequence ?? 0));
+        if (maxStopSequence === 0) {
+            throw new golemio_errors_1.GeneralError("Max stop sequence must be greater than 0", this.constructor.name);
+        }
+        return maxStopSequence;
+    }
+};
+exports.UpdateDelayTask = UpdateDelayTask;
+exports.UpdateDelayTask = UpdateDelayTask = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
+    __param(1, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.TripRepository)),
+    __param(2, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.PositionsRepository)),
+    __param(3, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.DelayComputationRedisRepository)),
+    __param(4, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.GtfsStopTimesModel)),
+    __param(5, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.GtfsTripsModel)),
+    __param(6, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.BlockStopsRedisRepository)),
+    __param(7, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.MetroShapePointsFixer)),
+    __param(8, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.PositionsManager)),
+    __metadata("design:paramtypes", [Object, Function, PositionsRepository_1.PositionsRepository,
+        cache_1.DelayComputationRedisRepository,
+        GtfsStopTimesModel_1.GtfsStopTimesModel,
+        GtfsTripsModel_1.GtfsTripsModel,
+        cache_1.BlockStopsRedisRepository,
+        MetroShapePointsFixer_1.MetroShapePointsFixer,
+        PositionsManager_1.PositionsManager])
+], UpdateDelayTask);
+//# sourceMappingURL=UpdateDelayTask.js.map

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js.map

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

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.d.ts

@@ -0,0 +1,25 @@
+import { GtfsStopTimesModel } from "../../../../gtfs/GtfsStopTimesModel";
+import { BlockStopsRedisRepository, RunTripsRedisRepository } from "../../../../gtfs/data-access/cache";
+import { CommonRunsRepository } from "../../runs/data-access/CommonRunsRepository";
+import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
+import { MessageProperties } from "@golemio/core/dist/shared/amqplib";
+import { PositionsRepository } from "../data-access/PositionsRepository";
+import type { TripsRepository } from "../data-access/TripsRepository";
+import { IUpdateGtfsTripIdInput } from "../interfaces/IUpdateGtfsTripIdInput";
+import { UpdateGtfsTripIdValidationSchema } from "../schema/UpdateGtfsTripIdSchema";
+export declare class UpdateGtfsTripIdTask extends AbstractTask<IUpdateGtfsTripIdInput> {
+    readonly queueName = "updateGTFSTripId";
+    readonly queueTtl: number;
+    readonly schema: typeof UpdateGtfsTripIdValidationSchema;
+    private readonly tripsRepository;
+    private readonly positionsRepository;
+    private readonly gtfsStopTimesRepository;
+    private readonly gtfsTripRunManager;
+    private readonly tripStopsManager;
+    constructor(tripsRepository: TripsRepository, positionsRepository: PositionsRepository, gtfsStopTimesRepository: GtfsStopTimesModel, commonRunsRepository: CommonRunsRepository, runTripsRedisRepository: RunTripsRedisRepository, blockStopsRedisRepository: BlockStopsRedisRepository);
+    /**
+     * Take all newly computed positions and save it, then save the last ones to the trips
+     */
+    protected execute(data: IUpdateGtfsTripIdInput, messageProperties?: MessageProperties): Promise<void>;
+    private generateAndSaveScheduledTrips;
+}

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.js

@@ -0,0 +1,188 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UpdateGtfsTripIdTask = void 0;
+const GtfsStopTimesModel_1 = require("../../../../gtfs/GtfsStopTimesModel");
+const cache_1 = require("../../../../gtfs/data-access/cache");
+const CommonRunsRepository_1 = require("../../runs/data-access/CommonRunsRepository");
+const VPContainerToken_1 = require("../../../ioc/VPContainerToken");
+const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
+const queueprocessors_1 = require("@golemio/core/dist/integration-engine/queueprocessors");
+const workers_1 = require("@golemio/core/dist/integration-engine/workers");
+const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
+const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
+const PositionsRepository_1 = require("../data-access/PositionsRepository");
+const TripStopsManager_1 = require("../helpers/TripStopsManager");
+const VPUtils_1 = require("../helpers/VPUtils");
+const GTFSTripRunManagerFactory_1 = require("../helpers/gtfs-trip-run/GTFSTripRunManagerFactory");
+const UpdateGtfsTripIdSchema_1 = require("../schema/UpdateGtfsTripIdSchema");
+const constants_1 = require("../constants");
+let UpdateGtfsTripIdTask = class UpdateGtfsTripIdTask extends workers_1.AbstractTask {
+    constructor(tripsRepository, positionsRepository, gtfsStopTimesRepository, commonRunsRepository, runTripsRedisRepository, blockStopsRedisRepository) {
+        super(constants_1.WORKER_NAME);
+        this.queueName = "updateGTFSTripId";
+        this.queueTtl = 5 * 60 * 1000; // 5 minutes
+        this.schema = UpdateGtfsTripIdSchema_1.UpdateGtfsTripIdValidationSchema;
+        this.tripsRepository = tripsRepository;
+        this.positionsRepository = positionsRepository;
+        this.gtfsStopTimesRepository = gtfsStopTimesRepository;
+        this.gtfsTripRunManager = GTFSTripRunManagerFactory_1.GTFSTripRunManagerFactory.create(GTFSTripRunManagerFactory_1.GTFSTripRunType.Common, positionsRepository, tripsRepository, commonRunsRepository, runTripsRedisRepository);
+        this.tripStopsManager = new TripStopsManager_1.TripStopsManager(gtfsStopTimesRepository, blockStopsRedisRepository);
+    }
+    /**
+     * Take all newly computed positions and save it, then save the last ones to the trips
+     */
+    async execute(data, messageProperties) {
+        // feed the positions belong to (SaveDataToDBTask resolves it); default PID (feed_id 1) for
+        // messages produced before this field existed.
+        const feedId = data.feed_id ?? 1;
+        // unique ids in input data in key-value (id-positions) structure
+        let tripIdToPositionDict = {};
+        for (const position of data.positions) {
+            if (position.valid_to) {
+                position.valid_to = new Date(position.valid_to);
+            }
+            tripIdToPositionDict[position.trips_id] = position;
+        }
+        // find gtfs data for each trip
+        const foundTrips = await Promise.all(data.trips.map(async (trip) => {
+            if (!trip.start_timestamp) {
+                return;
+            }
+            try {
+                return await this.tripsRepository.findGTFSTripId(trip, feedId);
+            }
+            catch (err) {
+                helpers_1.log.error(err);
+                return err;
+            }
+        }));
+        let existingTrips = [], existingTripErrors = [];
+        // filter only trips with found gtfs data
+        for (const trip of foundTrips) {
+            if (trip instanceof golemio_errors_1.AbstractGolemioError) {
+                existingTripErrors.push(trip);
+            }
+            else if (trip instanceof Array) {
+                existingTrips.push(...trip);
+            }
+            else if (trip?.constructor === Object) {
+                existingTrips.push(trip);
+            }
+        }
+        let blockIdToTripIdsDict = {};
+        for (const trip of existingTrips) {
+            if (!trip.gtfs_block_id || !trip.gtfs_trip_id)
+                continue;
+            if (!blockIdToTripIdsDict[trip.gtfs_block_id]) {
+                blockIdToTripIdsDict[trip.gtfs_block_id] = new Set();
+            }
+            blockIdToTripIdsDict[trip.gtfs_block_id].add(trip.gtfs_trip_id);
+        }
+        // create cache for trip stops (grouped by block id)
+        const blockIdToTripStopScheduleDict = await Object.entries(blockIdToTripIdsDict).reduce(async (acc, [blockId, gtfsTripIds]) => {
+            const tripStops = await acc;
+            try {
+                tripStops[blockId] = await this.tripStopsManager.setAndReturnTripStopsSchedule(blockId, [...gtfsTripIds], feedId);
+            }
+            catch (err) {
+                helpers_1.IntegrationErrorHandler.handle(err);
+            }
+            return acc;
+        }, Promise.resolve({}));
+        let currentPosition;
+        for (const trip of existingTrips) {
+            if (tripIdToPositionDict[trip.id]) {
+                currentPosition = tripIdToPositionDict[trip.id];
+                if (trip.gtfs_block_id) {
+                    // Determine current position tracking status
+                    currentPosition.is_tracked = VPUtils_1.VPUtils.determineTrackingStatus(trip.gtfs_trip_id, blockIdToTripStopScheduleDict[trip.gtfs_block_id], currentPosition);
+                }
+                continue;
+            }
+            if (!currentPosition) {
+                continue;
+            }
+            // Determine new position tracking status
+            const newPositionTrackingStatus = VPUtils_1.VPUtils.determineNewPositionTracking(blockIdToTripStopScheduleDict[trip.gtfs_block_id], trip, currentPosition);
+            // duplicate position with new created trip for second trip
+            const newPosition = {
+                ...currentPosition,
+                trips_id: trip.id,
+                is_tracked: newPositionTrackingStatus,
+            };
+            data.positions.push(newPosition);
+        }
+        await this.positionsRepository.bulkSave(data.positions);
+        await this.generateAndSaveScheduledTrips(tripIdToPositionDict, data.trips, existingTrips, feedId);
+        // successfully updated gtfs ids
+        for (let i = 0, chunkSize = 100, imax = existingTrips.length; i < imax; i += chunkSize) {
+            await queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "updateDelay", {
+                positions: [],
+                updatedTrips: existingTrips.slice(i, i + chunkSize),
+                feed_id: feedId,
+            }, { timestamp: messageProperties?.timestamp });
+        }
+        // gtfsId updating errors
+        for (let i = 0, imax = existingTripErrors.length; i < imax; i++) {
+            helpers_1.IntegrationErrorHandler.handle(existingTripErrors[i]);
+        }
+    }
+    generateAndSaveScheduledTrips(tripIdToPositionDict, inputTrips, existingTrips, feedId) {
+        let operationPromises = [];
+        for (const inputTrip of inputTrips) {
+            if (!tripIdToPositionDict[inputTrip.id]?.origin_timestamp) {
+                continue;
+            }
+            const existingTrip = existingTrips.find((existingTrip) => existingTrip.id === inputTrip.id);
+            const lastPositionIsoTimestamp = new Date(tripIdToPositionDict[inputTrip.id].origin_timestamp).toISOString();
+            let routeId = inputTrip.origin_route_name;
+            let runNumber = inputTrip.run_number;
+            // We don't trust the run number and route name from the input data
+            // so we use the ones from the scheduled/existing trip if they exist
+            if (existingTrip?.internal_run_number && existingTrip?.internal_route_name) {
+                routeId = existingTrip.internal_route_name;
+                runNumber = existingTrip.internal_run_number;
+            }
+            if (!routeId || !runNumber) {
+                continue;
+            }
+            const operationPromise = this.gtfsTripRunManager
+                .setAndReturnScheduledTrips({
+                route_id: routeId,
+                run_number: runNumber,
+                msg_last_timestamp: lastPositionIsoTimestamp,
+            }, feedId)
+                .then((scheduledTrips) => void scheduledTrips);
+            operationPromises.push(operationPromise);
+        }
+        return Promise.all(operationPromises);
+    }
+};
+exports.UpdateGtfsTripIdTask = UpdateGtfsTripIdTask;
+exports.UpdateGtfsTripIdTask = UpdateGtfsTripIdTask = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.TripRepository)),
+    __param(1, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.PositionsRepository)),
+    __param(2, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.GtfsStopTimesModel)),
+    __param(3, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.CommonRunsRepository)),
+    __param(4, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.RunTripsRedisRepository)),
+    __param(5, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.BlockStopsRedisRepository)),
+    __metadata("design:paramtypes", [Function, PositionsRepository_1.PositionsRepository,
+        GtfsStopTimesModel_1.GtfsStopTimesModel,
+        CommonRunsRepository_1.CommonRunsRepository,
+        cache_1.RunTripsRedisRepository,
+        cache_1.BlockStopsRedisRepository])
+], UpdateGtfsTripIdTask);
+//# sourceMappingURL=UpdateGtfsTripIdTask.js.map

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.js.map

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

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.d.ts

@@ -0,0 +1,27 @@
+import { RunTripsRedisRepository } from "../../../../gtfs/data-access/cache";
+import { CommonRunsRepository } from "../../runs/data-access/CommonRunsRepository";
+import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
+import { MessageProperties } from "@golemio/core/dist/shared/amqplib";
+import { PositionsRepository } from "../data-access/PositionsRepository";
+import type { TripsRepository } from "../data-access/TripsRepository";
+import { IUpdateRunsGtfsTripInput } from "../interfaces/IUpdateRunsGtfsTripInput";
+import { UpdateRunsGtfsTripIdValidationSchema } from "../schema/UpdateRunsGtfsTripIdSchema";
+export declare class UpdateRunsGtfsTripIdTask extends AbstractTask<IUpdateRunsGtfsTripInput> {
+    readonly queueName = "updateRunsGTFSTripId";
+    readonly queueTtl: number;
+    readonly schema: typeof UpdateRunsGtfsTripIdValidationSchema;
+    private readonly tripsRepository;
+    private readonly positionsRepository;
+    private readonly commonRunsRepository;
+    private readonly runTripsRedisRepository;
+    private readonly gtfsTripRunManager;
+    constructor(tripsRepository: TripsRepository, positionsRepository: PositionsRepository, commonRunsRepository: CommonRunsRepository, runTripsRedisRepository: RunTripsRedisRepository);
+    /**
+     * Process trips from runs data
+     */
+    protected execute(data: IUpdateRunsGtfsTripInput, messageProperties?: MessageProperties): Promise<void>;
+    /**
+     * Process not public trips from runs data
+     */
+    private updateNotPublicRunTrip;
+}