@golemio/pid 2.17.0 → 2.17.1-dev.1412857437

package/dist/integration-engine/jis/workers/JISWorker.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JISWorker = void 0;
+const workers_1 = require("@golemio/core/dist/integration-engine/workers");
+const Di_1 = require("../ioc/Di");
+const JISContainerToken_1 = require("../ioc/JISContainerToken");
+const constants_1 = require("./constants");
+class JISWorker extends workers_1.AbstractWorker {
+    constructor() {
+        super();
+        this.name = constants_1.JIS_WORKER_NAME.toLowerCase();
+        this.registerTask = (task) => {
+            super.registerTask(task);
+            task.queuePrefix = this.getQueuePrefix();
+        };
+        // Register tasks
+        this.registerTask(Di_1.JISContainer.resolve(JISContainerToken_1.JISContainerToken.RefreshJISInfotextsTask));
+    }
+}
+exports.JISWorker = JISWorker;
+//# sourceMappingURL=JISWorker.js.map

package/dist/integration-engine/jis/workers/JISWorker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"JISWorker.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/workers/JISWorker.ts"],"names":[],"mappings":";;;AAAA,2EAA+E;AAE/E,kCAAyC;AACzC,gEAA6D;AAC7D,2CAA8C;AAG9C,MAAa,SAAU,SAAQ,wBAAc;IAGzC;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,2BAAe,CAAC,WAAW,EAAE,CAAC;QASxC,iBAAY,GAAG,CAAC,IAAW,EAAQ,EAAE;YACxC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QAPE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,iBAAY,CAAC,OAAO,CAA0B,qCAAiB,CAAC,uBAAuB,CAAC,CAAC,CAAC;IAChH,CAAC;CAMJ;AAdD,8BAcC"}

package/dist/integration-engine/jis/workers/constants.d.ts

@@ -0,0 +1 @@
+export declare const JIS_WORKER_NAME = "jis";

package/dist/integration-engine/jis/workers/constants.js

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

package/dist/integration-engine/jis/workers/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/workers/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,KAAK,CAAC"}

package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsTask.d.ts

@@ -0,0 +1,14 @@
+import { JISInfotextsDataSourceFactory } from "../../datasources/JISInfotextsDataSourceFactory";
+import { JISInfotextsDataService } from "../../services/JISInfotextsDataService";
+import { JISInfotextsTransformation } from "../../transformations/JISInfotextsTransformation";
+import { AbstractEmptyTask } from "@golemio/core/dist/integration-engine";
+export declare class RefreshJISInfotextsTask extends AbstractEmptyTask {
+    private dataSourceFactory;
+    private infotextsDataService;
+    private infotextsTransformation;
+    readonly queueName = "refreshJISInfotexts";
+    readonly queueTtl: number;
+    constructor(dataSourceFactory: JISInfotextsDataSourceFactory, infotextsDataService: JISInfotextsDataService, infotextsTransformation: JISInfotextsTransformation);
+    protected execute(): Promise<void>;
+    private getEntitiesFromTransformationResult;
+}

package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsTask.js

@@ -0,0 +1,72 @@
+"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); }
+};
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RefreshJISInfotextsTask = void 0;
+const JISInfotextsDataSourceFactory_1 = require("../../datasources/JISInfotextsDataSourceFactory");
+const JISContainerToken_1 = require("../../ioc/JISContainerToken");
+const JISInfotextsDataService_1 = require("../../services/JISInfotextsDataService");
+const JISInfotextsTransformation_1 = require("../../transformations/JISInfotextsTransformation");
+const integration_engine_1 = require("@golemio/core/dist/integration-engine");
+const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
+const constants_1 = require("../constants");
+let RefreshJISInfotextsTask = exports.RefreshJISInfotextsTask = class RefreshJISInfotextsTask extends integration_engine_1.AbstractEmptyTask {
+    constructor(dataSourceFactory, infotextsDataService, infotextsTransformation) {
+        super(constants_1.JIS_WORKER_NAME.toLowerCase());
+        this.dataSourceFactory = dataSourceFactory;
+        this.infotextsDataService = infotextsDataService;
+        this.infotextsTransformation = infotextsTransformation;
+        this.queueName = "refreshJISInfotexts";
+        this.queueTtl = 1 * 60 * 1000; // 1 minute;
+    }
+    execute() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const dataSource = this.dataSourceFactory.getDataSource();
+            const data = yield dataSource.getAll();
+            const transformedData = yield this.infotextsTransformation.transformArray(data);
+            const { infotexts, infotextsRopidGTFSStops } = this.getEntitiesFromTransformationResult(transformedData);
+            yield this.infotextsDataService.refreshData(infotexts, infotextsRopidGTFSStops);
+        });
+    }
+    getEntitiesFromTransformationResult(transformedData) {
+        const infotextEntities = [];
+        const infotextsRopidGTFSStopsEntities = [];
+        for (const { infotext, infotextsRopidGTFSStops } of transformedData) {
+            infotextEntities.push(infotext);
+            infotextsRopidGTFSStopsEntities.push(...infotextsRopidGTFSStops);
+        }
+        return {
+            infotexts: infotextEntities,
+            infotextsRopidGTFSStops: infotextsRopidGTFSStopsEntities,
+        };
+    }
+};
+exports.RefreshJISInfotextsTask = RefreshJISInfotextsTask = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(JISContainerToken_1.JISContainerToken.JISInfotextsDataSourceFactory)),
+    __param(1, (0, tsyringe_1.inject)(JISContainerToken_1.JISContainerToken.JISInfotextsDataService)),
+    __param(2, (0, tsyringe_1.inject)(JISContainerToken_1.JISContainerToken.JISInfotextsTransformation)),
+    __metadata("design:paramtypes", [JISInfotextsDataSourceFactory_1.JISInfotextsDataSourceFactory,
+        JISInfotextsDataService_1.JISInfotextsDataService,
+        JISInfotextsTransformation_1.JISInfotextsTransformation])
+], RefreshJISInfotextsTask);
+//# sourceMappingURL=RefreshJISInfotextsTask.js.map

package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsTask.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RefreshJISInfotextsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/jis/workers/tasks/RefreshJISInfotextsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,mGAAkG;AAClG,mEAAkE;AAClE,oFAAmF;AACnF,iGAAgG;AAEhG,8EAA0E;AAC1E,iEAAwE;AACxE,4CAA+C;AAGxC,IAAM,uBAAuB,qCAA7B,MAAM,uBAAwB,SAAQ,sCAAiB;IAI1D,YAEI,iBAAwD,EAExD,oBAAqD,EAErD,uBAA2D;QAE3D,KAAK,CAAC,2BAAe,CAAC,WAAW,EAAE,CAAC,CAAC;QAN7B,sBAAiB,GAAjB,iBAAiB,CAA+B;QAEhD,yBAAoB,GAApB,oBAAoB,CAAyB;QAE7C,4BAAuB,GAAvB,uBAAuB,CAA4B;QAT/C,cAAS,GAAG,qBAAqB,CAAC;QAClC,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;IAWtD,CAAC;IAEe,OAAO;;YACnB,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC;YAC1D,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;YACvC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAChF,MAAM,EAAE,SAAS,EAAE,uBAAuB,EAAE,GAAG,IAAI,CAAC,mCAAmC,CAAC,eAAe,CAAC,CAAC;YACzG,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC;QACpF,CAAC;KAAA;IAEO,mCAAmC,CAAC,eAAyE;QACjH,MAAM,gBAAgB,GAAmB,EAAE,CAAC;QAC5C,MAAM,+BAA+B,GAAkC,EAAE,CAAC;QAC1E,KAAK,MAAM,EAAE,QAAQ,EAAE,uBAAuB,EAAE,IAAI,eAAe,EAAE;YACjE,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAChC,+BAA+B,CAAC,IAAI,CAAC,GAAG,uBAAuB,CAAC,CAAC;SACpE;QACD,OAAO;YACH,SAAS,EAAE,gBAAgB;YAC3B,uBAAuB,EAAE,+BAA+B;SAC3D,CAAC;IACN,CAAC;CACJ,CAAA;kCAnCY,uBAAuB;IADnC,IAAA,qBAAU,GAAE;IAMJ,WAAA,IAAA,iBAAM,EAAC,qCAAiB,CAAC,6BAA6B,CAAC,CAAA;IAEvD,WAAA,IAAA,iBAAM,EAAC,qCAAiB,CAAC,uBAAuB,CAAC,CAAA;IAEjD,WAAA,IAAA,iBAAM,EAAC,qCAAiB,CAAC,0BAA0B,CAAC,CAAA;qCAH1B,6DAA6B;QAE1B,iDAAuB;QAEpB,uDAA0B;GAVtD,uBAAuB,CAmCnC"}

package/dist/integration-engine/ropid-gtfs/data-access/helpers/RawQueryProvider.d.ts

@@ -0,0 +1,3 @@
+export declare class RawQueryProvider {
+    static getFindGtfsCommonTripsQuery(): string;
+}

package/dist/integration-engine/ropid-gtfs/data-access/helpers/RawQueryProvider.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RawQueryProvider = void 0;
+const const_1 = require("../../../../schema-definitions/const");
+class RawQueryProvider {
+    static getFindGtfsCommonTripsQuery() {
+        /* eslint-disable max-len */
+        return `
+            set local search_path to ${const_1.PG_SCHEMA};
+            with trip_schedule as (
+                select
+                    block_id,
+                    trip_id
+                from
+                    ropidgtfs_precomputed_trip_schedule
+                where
+                    route_licence_number = :routeLicenceNumber
+                    and (case when :tripNumber::int is null then trip_number is null else trip_number = :tripNumber::int end)
+                    and start_timestamp::date = :startTimestamp::date
+            ),
+            trip_ids as (
+                select
+                    array_agg(trip.trip_id) as trip_ids
+                from
+                    ropidgtfs_trips as trip
+                cross join
+                    trip_schedule
+                where
+                    trip.block_id = trip_schedule.block_id
+                    or (trip_schedule.block_id is null and trip.trip_id = trip_schedule.trip_id)
+            )
+            select distinct on (ord)
+                trip_id as gtfs_trip_id,
+                trip_headsign as gtfs_trip_headsign,
+                route_id as gtfs_route_id,
+                route_short_name as gtfs_route_short_name,
+                direction_id as gtfs_direction_id,
+                shape_id as gtfs_shape_id,
+                min_stop_time::varchar as min_stop_time,
+                max_stop_time::varchar as max_stop_time,
+                block_id as gtfs_block_id,
+                trip_short_name as gtfs_trip_short_name,
+                route_type as gtfs_route_type,
+                trip_number as cis_trip_number,
+                run_number as internal_run_number,
+                origin_route_name as internal_route_name
+            from
+                ropidgtfs_precomputed_trip_schedule trip_schedule
+            cross join
+                trip_ids
+            join
+                unnest(trip_ids) with ordinality t(trip_id, ord) using (trip_id)
+            where
+                start_timestamp >= :startTimestamp::timestamptz
+                and start_timestamp < :startTimestamp::timestamptz + interval '12 hours'
+            order by ord, start_timestamp asc;
+        `;
+        /* eslint-enable max-len */
+    }
+}
+exports.RawQueryProvider = RawQueryProvider;
+//# sourceMappingURL=RawQueryProvider.js.map

package/dist/integration-engine/ropid-gtfs/data-access/helpers/RawQueryProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RawQueryProvider.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/helpers/RawQueryProvider.ts"],"names":[],"mappings":";;;AAAA,gEAAuC;AAEvC,MAAa,gBAAgB;IAClB,MAAM,CAAC,2BAA2B;QACrC,4BAA4B;QAC5B,OAAO;uCACwB,iBAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAgDvC,CAAC;QACF,2BAA2B;IAC/B,CAAC;CACJ;AAvDD,4CAuDC"}

package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.d.ts

@@ -1,3 +1,4 @@
+import { ILookupTripSchedule, ILookupTripScheduleInput } from "../../interfaces/TripScheduleInterfaces";
 import { IScheduleDto } from "../../../../schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto";
 import { IModel, PostgresModel } from "@golemio/core/dist/integration-engine/models";
 import { FindOptions } from "@golemio/core/dist/shared/sequelize";
@@ -6,4 +7,5 @@ export declare class TripScheduleRepository extends PostgresModel implements IMo
     constructor();
     findAll: (options: FindOptions) => Promise<IScheduleDto[]>;
     populate: (sourceTableSuffix: SourceTableSuffixEnum) => Promise<void>;
+    findTripsByRouteAndTripNumber: (trip: ILookupTripScheduleInput) => Promise<ILookupTripSchedule[]>;
 }

package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js

@@ -14,8 +14,11 @@ const const_1 = require("../../../../schema-definitions/const");
 const ropid_gtfs_1 = require("../../../../schema-definitions/ropid-gtfs");
 const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
 const models_1 = require("@golemio/core/dist/integration-engine/models");
+const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
+const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
 const SourceTableSuffixEnum_1 = require("../../helpers/SourceTableSuffixEnum");
+const RawQueryProvider_1 = require("../helpers/RawQueryProvider");
 class TripScheduleRepository extends models_1.PostgresModel {
     constructor() {
         super("TripScheduleRepository", {
@@ -105,6 +108,24 @@ class TripScheduleRepository extends models_1.PostgresModel {
                 throw err;
             }
         });
+        this.findTripsByRouteAndTripNumber = (trip) => __awaiter(this, void 0, void 0, function* () {
+            const connection = this.sequelizeModel.sequelize;
+            const sqlQuery = RawQueryProvider_1.RawQueryProvider.getFindGtfsCommonTripsQuery();
+            try {
+                return yield connection.query(sqlQuery, {
+                    type: sequelize_1.QueryTypes.SELECT,
+                    replacements: {
+                        routeLicenceNumber: trip.routeLicenseNumber,
+                        tripNumber: trip.tripNumber,
+                        startTimestamp: trip.startTimestamp,
+                    },
+                });
+            }
+            catch (err) {
+                // Explicit module name is needed here for the error to be properly logged by the custom logger
+                throw new golemio_errors_1.GeneralError("Failed to find trips by route and trip number", this.constructor.name, err, undefined, "pid");
+            }
+        });
     }
 }
 exports.TripScheduleRepository = TripScheduleRepository;

package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"TripScheduleRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAAuC;AACvC,0EAA4C;AAE5C,2EAAoE;AACpE,yEAAqF;AACrF,mFAAkF;AAElF,+EAA4E;AAE5E,MAAa,sBAAuB,SAAQ,sBAAa;IACrD;QACI,KAAK,CACD,wBAAwB,EACxB;YACI,yBAAyB,EAAE,sBAAS,CAAC,YAAY,CAAC,yBAAyB;YAC3E,WAAW,EAAE,sBAAS,CAAC,YAAY,CAAC,WAAW;YAC/C,QAAQ,EAAE,iBAAS;YACnB,UAAU,EAAE,YAAY;YACxB,kBAAkB,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC;SACzD,EACD,IAAI,uCAAmB,CAAC,iCAAiC,EAAE,sBAAS,CAAC,YAAY,CAAC,gBAAgB,CAAC,CACtG,CAAC;QAGC,YAAO,GAAG,CAAC,OAAoB,EAA2B,EAAE;YAC/D,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,iBAAG,GAAG,EAAE,IAAI,IAAK,OAAO,EAAG,CAAC;QAClE,CAAC,CAAC;QAEK,aAAQ,GAAG,CAAO,iBAAwC,EAAiB,EAAE;YAChF,4BAA4B;YAC5B,MAAM,GAAG,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAqDI,iBAAS,0BAA0B,iBAAiB;8BAC9C,iBAAS;8BACT,iBAAS;6BACV,iBAAS,oBAAoB,iBAAiB;6BAC9C,iBAAS,qBAAqB,iBAAiB;6BAC/C,iBAAS,yBAAyB,iBAAiB;6BACnD,iBAAS,yBAAyB,iBAAiB;;SAEvE,CAAC;YACF,2BAA2B;YAE3B,IAAI;gBACA,MAAM,QAAQ,GAAG,sBAAS,CAAC,YAAY,CAAC,WAAW,GAAG,6CAAqB,CAAC,GAAG,CAAC;gBAEhF,MAAM,IAAI,CAAC,cAAc,CAAC,SAAU,CAAC,KAAK,CAAC;2CACZ,iBAAS;+BACrB,QAAQ,KAAK,GAAG;aAClC,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM,GAAG,CAAC;aACb;QACL,CAAC,CAAA,CAAC;IAnFF,CAAC;CAoFJ;AAjGD,wDAiGC"}
+{"version":3,"file":"TripScheduleRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gEAAuC;AACvC,0EAA4C;AAE5C,2EAAoE;AACpE,yEAAqF;AACrF,6EAAwE;AACxE,mFAAkF;AAClF,mEAA8E;AAC9E,+EAA4E;AAC5E,kEAA+D;AAE/D,MAAa,sBAAuB,SAAQ,sBAAa;IACrD;QACI,KAAK,CACD,wBAAwB,EACxB;YACI,yBAAyB,EAAE,sBAAS,CAAC,YAAY,CAAC,yBAAyB;YAC3E,WAAW,EAAE,sBAAS,CAAC,YAAY,CAAC,WAAW;YAC/C,QAAQ,EAAE,iBAAS;YACnB,UAAU,EAAE,YAAY;YACxB,kBAAkB,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC;SACzD,EACD,IAAI,uCAAmB,CAAC,iCAAiC,EAAE,sBAAS,CAAC,YAAY,CAAC,gBAAgB,CAAC,CACtG,CAAC;QAGC,YAAO,GAAG,CAAC,OAAoB,EAA2B,EAAE;YAC/D,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,iBAAG,GAAG,EAAE,IAAI,IAAK,OAAO,EAAG,CAAC;QAClE,CAAC,CAAC;QAEK,aAAQ,GAAG,CAAO,iBAAwC,EAAiB,EAAE;YAChF,4BAA4B;YAC5B,MAAM,GAAG,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAqDI,iBAAS,0BAA0B,iBAAiB;8BAC9C,iBAAS;8BACT,iBAAS;6BACV,iBAAS,oBAAoB,iBAAiB;6BAC9C,iBAAS,qBAAqB,iBAAiB;6BAC/C,iBAAS,yBAAyB,iBAAiB;6BACnD,iBAAS,yBAAyB,iBAAiB;;SAEvE,CAAC;YACF,2BAA2B;YAE3B,IAAI;gBACA,MAAM,QAAQ,GAAG,sBAAS,CAAC,YAAY,CAAC,WAAW,GAAG,6CAAqB,CAAC,GAAG,CAAC;gBAEhF,MAAM,IAAI,CAAC,cAAc,CAAC,SAAU,CAAC,KAAK,CAAC;2CACZ,iBAAS;+BACrB,QAAQ,KAAK,GAAG;aAClC,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM,GAAG,CAAC;aACb;QACL,CAAC,CAAA,CAAC;QAEK,kCAA6B,GAAG,CAAO,IAA8B,EAAkC,EAAE;YAC5G,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,SAAU,CAAC;YAClD,MAAM,QAAQ,GAAG,mCAAgB,CAAC,2BAA2B,EAAE,CAAC;YAEhE,IAAI;gBACA,OAAO,MAAM,UAAU,CAAC,KAAK,CAAsB,QAAQ,EAAE;oBACzD,IAAI,EAAE,sBAAU,CAAC,MAAM;oBACvB,YAAY,EAAE;wBACV,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;wBAC3C,UAAU,EAAE,IAAI,CAAC,UAAU;wBAC3B,cAAc,EAAE,IAAI,CAAC,cAAc;qBACtC;iBACJ,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,+FAA+F;gBAC/F,MAAM,IAAI,6BAAY,CAAC,+CAA+C,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;aACzH;QACL,CAAC,CAAA,CAAC;IAtGF,CAAC;CAuGJ;AApHD,wDAoHC"}

package/dist/integration-engine/ropid-gtfs/interfaces/TripScheduleInterfaces.d.ts

@@ -0,0 +1,22 @@
+export interface ILookupTripScheduleInput {
+    routeLicenseNumber: string | null;
+    tripNumber: number | null;
+    startTimestamp: string | null;
+}
+export interface ILookupTripSchedule {
+    id?: string;
+    gtfs_trip_id: string;
+    gtfs_trip_headsign: string;
+    gtfs_route_id: string;
+    gtfs_route_short_name: string;
+    gtfs_direction_id: number;
+    gtfs_shape_id: string;
+    min_stop_time: string;
+    max_stop_time: string;
+    gtfs_block_id?: string;
+    gtfs_trip_short_name?: string;
+    gtfs_route_type?: number;
+    cis_trip_number?: number;
+    internal_run_number?: number;
+    internal_route_name?: string;
+}

package/dist/integration-engine/ropid-gtfs/interfaces/TripScheduleInterfaces.js

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

package/dist/integration-engine/ropid-gtfs/interfaces/TripScheduleInterfaces.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TripScheduleInterfaces.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/interfaces/TripScheduleInterfaces.ts"],"names":[],"mappings":""}

package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusMessageFilter.d.ts

@@ -1,16 +1,13 @@
 import { IRegionalBusRunsMessagesModel } from "../../../../../../schema-definitions/vehicle-positions/models/interfaces/IRegionalBusRunsMessagesModel";
-import { ISimpleConfig } from "@golemio/core/dist/helpers/configuration/ISimpleConfig";
 import { ILogger } from "@golemio/core/dist/helpers/logger";
 import { IRegionalBusMessageFilter } from "./interfaces/IRegionalBusMessageFilter";
 import { TimestampValidator } from "../TimestampValidator";
 export declare class RegionalBusMessageFilter implements IRegionalBusMessageFilter {
-    private config;
     private logger;
     private timestampValidator;
-    constructor(config: ISimpleConfig, logger: ILogger, timestampValidator: TimestampValidator);
+    constructor(logger: ILogger, timestampValidator: TimestampValidator);
     /**
      * Get messages that are valid for processing
      */
     getFilteredMessages(messages: IRegionalBusRunsMessagesModel[], timestamp: number): IRegionalBusRunsMessagesModel[];
-    private get regNumberWhitelist();
 }

package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusMessageFilter.js

@@ -19,8 +19,7 @@ const VPContainerToken_1 = require("../../../../ioc/VPContainerToken");
 const TimestampValidator_1 = require("../TimestampValidator");
 const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 let RegionalBusMessageFilter = exports.RegionalBusMessageFilter = class RegionalBusMessageFilter {
-    constructor(config, logger, timestampValidator) {
-        this.config = config;
+    constructor(logger, timestampValidator) {
         this.logger = logger;
         this.timestampValidator = timestampValidator;
     }
@@ -30,18 +29,13 @@ let RegionalBusMessageFilter = exports.RegionalBusMessageFilter = class Regional
     getFilteredMessages(messages, timestamp) {
         let filteredMessages = [];
         for (const message of messages) {
-            if (message.cis_line_id && message.cis_trip_number && message.registration_number && message.events !== "") {
-                if (this.regNumberWhitelist && !this.regNumberWhitelist.includes(message.registration_number.toString())) {
-                    this.logger.verbose(
-                    // eslint-disable-next-line max-len
-                    `getFilteredMessages: message with registration_number=${message.registration_number} is not in whitelist, skipping`);
-                    continue;
-                }
-                if (!this.timestampValidator.isTimestampValid(timestamp, message.timestamp)) {
-                    this.logger.error(new golemio_errors_1.GeneralError(`Message timestamp 'tm' of value ${message.timestamp} is not valid ` +
-                        `(line ${message.cis_line_id}, trip id ${message.cis_trip_number})`, this.constructor.name, undefined, undefined, "pid"));
-                    continue;
-                }
+            const isValidMessage = message.cis_line_id && message.cis_trip_number && message.registration_number && message.events !== "";
+            if (!this.timestampValidator.isTimestampValid(timestamp, message.timestamp)) {
+                this.logger.error(new golemio_errors_1.GeneralError(`Message timestamp 'tm' of value ${message.timestamp} is not valid ` +
+                    `(line ${message.cis_line_id}, trip id ${message.cis_trip_number})`, this.constructor.name, undefined, undefined, "pid"));
+                continue;
+            }
+            if (isValidMessage) {
                 filteredMessages.push(message);
             }
         }
@@ -50,21 +44,11 @@ let RegionalBusMessageFilter = exports.RegionalBusMessageFilter = class Regional
         }
         return filteredMessages;
     }
-    get regNumberWhitelist() {
-        const valuePath = "old.datasources.pid.vehicle-positions.regNumberWhitelist.regionalBus";
-        const whitelistDict = this.config.getValue(valuePath, {});
-        const whitelist = Object.values(whitelistDict);
-        if (whitelist[0] !== "*") {
-            return whitelist;
-        }
-        return null;
-    }
 };
 exports.RegionalBusMessageFilter = RegionalBusMessageFilter = __decorate([
     (0, tsyringe_1.injectable)(),
-    __param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.SimpleConfig)),
-    __param(1, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
-    __param(2, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.TimestampValidator)),
-    __metadata("design:paramtypes", [Object, Object, TimestampValidator_1.TimestampValidator])
+    __param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
+    __param(1, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.TimestampValidator)),
+    __metadata("design:paramtypes", [Object, TimestampValidator_1.TimestampValidator])
 ], RegionalBusMessageFilter);
 //# sourceMappingURL=RegionalBusMessageFilter.js.map

package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusMessageFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"RegionalBusMessageFilter.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusMessageFilter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,wEAAqE;AAErE,iEAAwE;AAExE,uEAA8E;AAC9E,8DAA2D;AAC3D,6EAAwE;AAGjE,IAAM,wBAAwB,sCAA9B,MAAM,wBAAwB;IACjC,YAC4C,MAAqB,EAC3B,MAAe,EACI,kBAAsC;QAFnD,WAAM,GAAN,MAAM,CAAe;QAC3B,WAAM,GAAN,MAAM,CAAS;QACI,uBAAkB,GAAlB,kBAAkB,CAAoB;IAC5F,CAAC;IAEJ;;OAEG;IACI,mBAAmB,CAAC,QAAyC,EAAE,SAAiB;QACnF,IAAI,gBAAgB,GAAoC,EAAE,CAAC;QAC3D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,MAAM,KAAK,EAAE,EAAE;gBACxG,IAAI,IAAI,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC,EAAE;oBACtG,IAAI,CAAC,MAAM,CAAC,OAAO;oBACf,mCAAmC;oBACnC,yDAAyD,OAAO,CAAC,mBAAmB,gCAAgC,CACvH,CAAC;oBACF,SAAS;iBACZ;gBACD,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,SAAU,CAAC,EAAE;oBAC1E,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,IAAI,6BAAY,CACZ,mCAAmC,OAAO,CAAC,SAAS,gBAAgB;wBAChE,SAAS,OAAO,CAAC,WAAW,aAAa,OAAO,CAAC,eAAe,GAAG,EACvE,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,SAAS,EACT,SAAS,EACT,KAAK,CACR,CACJ,CAAC;oBACF,SAAS;iBACZ;gBAED,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAClC;SACJ;QAED,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,uDAAuD,CAAC,CAAC;SAChF;QAED,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAED,IAAY,kBAAkB;QAC1B,MAAM,SAAS,GAAG,sEAAsE,CAAC;QACzF,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAyB,SAAS,EAAE,EAAE,CAAC,CAAC;QAClF,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAE/C,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACtB,OAAO,SAAS,CAAC;SACpB;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;mCAzDY,wBAAwB;IADpC,IAAA,qBAAU,GAAE;IAGJ,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,YAAY,CAAC,CAAA;IAC9B,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;IACxB,WAAA,IAAA,iBAAM,EAAC,mCAAgB,CAAC,kBAAkB,CAAC,CAAA;qDAA6B,uCAAkB;GAJtF,wBAAwB,CAyDpC"}
+{"version":3,"file":"RegionalBusMessageFilter.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusMessageFilter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,wEAAqE;AAErE,iEAAwE;AAExE,uEAA8E;AAC9E,8DAA2D;AAC3D,6EAAwE;AAGjE,IAAM,wBAAwB,sCAA9B,MAAM,wBAAwB;IACjC,YACsC,MAAe,EACI,kBAAsC;QADzD,WAAM,GAAN,MAAM,CAAS;QACI,uBAAkB,GAAlB,kBAAkB,CAAoB;IAC5F,CAAC;IAEJ;;OAEG;IACI,mBAAmB,CAAC,QAAyC,EAAE,SAAiB;QACnF,IAAI,gBAAgB,GAAoC,EAAE,CAAC;QAC3D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,MAAM,cAAc,GAChB,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,MAAM,KAAK,EAAE,CAAC;YAC3G,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,SAAU,CAAC,EAAE;gBAC1E,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,IAAI,6BAAY,CACZ,mCAAmC,OAAO,CAAC,SAAS,gBAAgB;oBAChE,SAAS,OAAO,CAAC,WAAW,aAAa,OAAO,CAAC,eAAe,GAAG,EACvE,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,SAAS,EACT,SAAS,EACT,KAAK,CACR,CACJ,CAAC;gBACF,SAAS;aACZ;YAED,IAAI,cAAc,EAAE;gBAChB,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAClC;SACJ;QAED,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,uDAAuD,CAAC,CAAC;SAChF;QAED,OAAO,gBAAgB,CAAC;IAC5B,CAAC;CACJ,CAAA;mCAvCY,wBAAwB;IADpC,IAAA,qBAAU,GAAE;IAGJ,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;IACxB,WAAA,IAAA,iBAAM,EAAC,mCAAgB,CAAC,kBAAkB,CAAC,CAAA;6CAA6B,uCAAkB;GAHtF,wBAAwB,CAuCpC"}

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.d.ts

@@ -14,6 +14,7 @@ export declare class TripsRepository extends PostgresModel implements IModel {
     private connector;
     private positionsRepository;
     private descriptorRepository;
+    private readonly tripScheduleRepository;
     constructor();
     findAllAssocTripIds: (tripIds: string[]) => Promise<IUpdateDelayTripsIdsData[]>;
     findGTFSTripId: (trip: IUpdateGTFSTripIdData) => Promise<IUpdateDelayTripsIdsData | IUpdateDelayTripsIdsData[] | undefined>;
@@ -27,7 +28,6 @@ export declare class TripsRepository extends PostgresModel implements IModel {
     }>>;
     hasOne: (model: any, options: any) => any;
     findAll: (options: Sequelize.FindOptions<any> | undefined) => Promise<any>;
-    private findGTFSTripIdBasic;
     private findGTFSTripIdsTrain;
     /**
      * Return all valid trips for GTFS Realtime feed

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js

@@ -45,14 +45,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TripsRepository = void 0;
+const precomputed_1 = require("../../../../ropid-gtfs/data-access/precomputed");
 const Di_1 = require("../../../ioc/Di");
+const VPContainerToken_1 = require("../../../ioc/VPContainerToken");
 const const_1 = require("../../../../../schema-definitions/const");
 const VPTripsModel_1 = require("../../../../../schema-definitions/vehicle-positions/models/VPTripsModel");
 const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
 const models_1 = require("@golemio/core/dist/integration-engine/models");
 const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
-const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
 const sequelize_1 = __importStar(require("@golemio/core/dist/shared/sequelize"));
 const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
 const const_2 = require("../../../../../const");
@@ -60,7 +61,6 @@ const DateTimeUtils_1 = require("../helpers/DateTimeUtils");
 const PositionsRepository_1 = require("./PositionsRepository");
 const RawQueryProvider_1 = require("./helpers/RawQueryProvider");
 const TripsMapper_1 = __importDefault(require("./helpers/TripsMapper"));
-const VPContainerToken_1 = require("../../../ioc/VPContainerToken");
 let TripsRepository = exports.TripsRepository = class TripsRepository extends models_1.PostgresModel {
     constructor() {
         super("VPTripsRepository", {
@@ -91,7 +91,7 @@ let TripsRepository = exports.TripsRepository = class TripsRepository extends mo
                 : [];
         });
         this.findGTFSTripId = (trip) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             let foundGtfsTrips = [];
             if (Number(trip.start_cis_stop_id) >= 5400000 && Number(trip.start_cis_stop_id) < 5500000) {
                 // trains
@@ -100,15 +100,24 @@ let TripsRepository = exports.TripsRepository = class TripsRepository extends mo
             }
             else {
                 // other
-                foundGtfsTrips = yield this.findGTFSTripIdBasic(trip);
+                foundGtfsTrips = yield this.tripScheduleRepository.findTripsByRouteAndTripNumber({
+                    routeLicenseNumber: (_a = trip.cis_line_id) !== null && _a !== void 0 ? _a : null,
+                    tripNumber: (_b = trip.cis_trip_number) !== null && _b !== void 0 ? _b : null,
+                    startTimestamp: trip.start_timestamp,
+                });
             }
             if (foundGtfsTrips.length < 1) {
+                this.logger.verbose(`Model data was not found for id '${trip.id}'`, true, this.constructor.name, 5001);
+                return;
+            }
+            else if (foundGtfsTrips.length > 10) {
+                this.logger.verbose(`There are too many gtfs trips (${foundGtfsTrips.length}) linked with id '${trip.id}'`);
                 return;
             }
             // update existing trip with gtfs_trip_id, gtfs_block_id and other gtfs data
             const firstFoundGtfsTrip = foundGtfsTrips.shift();
             const { startTimestamp, endTimestamp } = this.deduceTimestamps(firstFoundGtfsTrip.min_stop_time, firstFoundGtfsTrip.max_stop_time, trip.start_timestamp);
-            yield this.update(Object.assign(Object.assign({}, firstFoundGtfsTrip), { internal_run_number: (_a = firstFoundGtfsTrip.internal_run_number) !== null && _a !== void 0 ? _a : trip.run_number, internal_route_name: (_b = firstFoundGtfsTrip.internal_route_name) !== null && _b !== void 0 ? _b : trip.origin_route_name, start_timestamp: startTimestamp, end_timestamp: endTimestamp }), {
+            yield this.update(Object.assign(Object.assign({}, firstFoundGtfsTrip), { internal_run_number: (_c = firstFoundGtfsTrip.internal_run_number) !== null && _c !== void 0 ? _c : trip.run_number, internal_route_name: (_d = firstFoundGtfsTrip.internal_route_name) !== null && _d !== void 0 ? _d : trip.origin_route_name, start_timestamp: startTimestamp, end_timestamp: endTimestamp }), {
                 where: {
                     id: trip.id,
                 },
@@ -119,8 +128,8 @@ let TripsRepository = exports.TripsRepository = class TripsRepository extends mo
                     gtfs_trip_id: firstFoundGtfsTrip.gtfs_trip_id,
                     gtfs_block_id: firstFoundGtfsTrip.gtfs_block_id,
                     gtfs_route_type: firstFoundGtfsTrip.gtfs_route_type,
-                    internal_run_number: (_c = firstFoundGtfsTrip.internal_run_number) !== null && _c !== void 0 ? _c : trip.run_number,
-                    internal_route_name: (_d = firstFoundGtfsTrip.internal_route_name) !== null && _d !== void 0 ? _d : trip.origin_route_name,
+                    internal_run_number: (_e = firstFoundGtfsTrip.internal_run_number) !== null && _e !== void 0 ? _e : trip.run_number,
+                    internal_route_name: (_f = firstFoundGtfsTrip.internal_route_name) !== null && _f !== void 0 ? _f : trip.origin_route_name,
                     start_timestamp: startTimestamp.toISOString(),
                     end_timestamp: endTimestamp.toISOString(),
                 },
@@ -130,7 +139,7 @@ let TripsRepository = exports.TripsRepository = class TripsRepository extends mo
                 const newId = `${trip.id}_gtfs_trip_id_${foundTrip.gtfs_trip_id}`;
                 foundTrip.id = newId;
                 const { startTimestamp, endTimestamp } = this.deduceTimestamps(foundTrip.min_stop_time, foundTrip.max_stop_time, trip.start_timestamp);
-                yield this.save(Object.assign(Object.assign(Object.assign({}, trip), foundTrip), { internal_run_number: (_e = foundTrip.internal_run_number) !== null && _e !== void 0 ? _e : trip.run_number, internal_route_name: (_f = foundTrip.internal_route_name) !== null && _f !== void 0 ? _f : trip.origin_route_name, start_timestamp: startTimestamp, end_timestamp: endTimestamp }));
+                yield this.save(Object.assign(Object.assign(Object.assign({}, trip), foundTrip), { internal_run_number: (_g = foundTrip.internal_run_number) !== null && _g !== void 0 ? _g : trip.run_number, internal_route_name: (_h = foundTrip.internal_route_name) !== null && _h !== void 0 ? _h : trip.origin_route_name, start_timestamp: startTimestamp, end_timestamp: endTimestamp }));
                 newIds.push({
                     id: newId,
                     gtfs_trip_id: foundTrip.gtfs_trip_id,
@@ -139,8 +148,8 @@ let TripsRepository = exports.TripsRepository = class TripsRepository extends mo
                     start_timestamp: startTimestamp.toISOString(),
                     end_timestamp: endTimestamp.toISOString(),
                     run_number: trip.run_number,
-                    internal_run_number: (_g = foundTrip.internal_run_number) !== null && _g !== void 0 ? _g : trip.run_number,
-                    internal_route_name: (_h = foundTrip.internal_route_name) !== null && _h !== void 0 ? _h : trip.origin_route_name,
+                    internal_run_number: (_j = foundTrip.internal_run_number) !== null && _j !== void 0 ? _j : trip.run_number,
+                    internal_route_name: (_k = foundTrip.internal_route_name) !== null && _k !== void 0 ? _k : trip.origin_route_name,
                     origin_route_name: trip.origin_route_name,
                     vehicle_registration_number: trip.vehicle_registration_number,
                 });
@@ -228,52 +237,15 @@ let TripsRepository = exports.TripsRepository = class TripsRepository extends mo
         this.findAll = (options) => __awaiter(this, void 0, void 0, function* () {
             return this.sequelizeModel.findAll(options);
         });
-        this.findGTFSTripIdBasic = (trip) => __awaiter(this, void 0, void 0, function* () {
-            const connection = this.connector.getConnection();
-            const startDate = (0, moment_timezone_1.default)(trip.start_timestamp).tz("Europe/Prague");
-            const startDateDayBefore = startDate.clone().subtract(1, "day");
-            const startDateYMD = startDate.format("YYYY-MM-DD");
-            const startDateDayName = startDate.format("dddd").toLowerCase();
-            const startDateDayBeforeYMD = startDateDayBefore.format("YYYY-MM-DD");
-            const startDateDayBeforeDayName = startDateDayBefore.format("dddd").toLowerCase();
-            const sqlQuery = RawQueryProvider_1.RawQueryProvider.getFindGtfsCommonTripsQuery(startDateDayName, startDateDayBeforeDayName);
-            let result = (yield connection.query(sqlQuery, {
-                type: sequelize_1.default.QueryTypes.SELECT,
-                bind: {
-                    startDateDayBeforeYMD,
-                    startDateYMD,
-                    cisLineShortName: trip.cis_line_short_name,
-                    startCisStopId: trip.start_cis_stop_id || 0,
-                    startAswStopId: trip.start_asw_stop_id || "",
-                    startCisStopPlatformCode: trip.start_cis_stop_platform_code,
-                    startDateFormated: startDate.utc().format(),
-                },
-            }));
-            if (result.length < 1) {
-                this.logger.verbose(`${this.constructor.name}: Model data was not found for id '${trip.id}' (basic).`);
-            }
-            else if (result.length > 1) {
-                this.logger.verbose(`There are too many gtfs trips (${result.length}) linked with id '${trip.id}' (trip).`);
-                result = [];
-            }
-            return result;
-        });
         this.findGTFSTripIdsTrain = (trip) => __awaiter(this, void 0, void 0, function* () {
             const connection = this.connector.getConnection();
             const sqlQuery = RawQueryProvider_1.RawQueryProvider.getFindGtfsTrainTripsQuery();
-            let results = (yield connection.query(sqlQuery, {
+            let results = yield connection.query(sqlQuery, {
                 type: sequelize_1.default.QueryTypes.SELECT,
                 bind: {
                     tripId: trip.id,
                 },
-            }));
-            if (results.length < 1) {
-                this.logger.verbose(`Model data was not found for id '${trip.id}' (train).`, true, this.constructor.name, 5001);
-            }
-            else if (results.length > 10) {
-                this.logger.verbose(`There are too many gtfs trips (${results.length}) linked with id '${trip.id}' (train).`);
-                results = [];
-            }
+            });
             return results;
         });
         /**
@@ -327,8 +299,18 @@ let TripsRepository = exports.TripsRepository = class TripsRepository extends mo
                             valid_to: {
                                 [sequelize_1.default.Op.or]: [null, { [sequelize_1.default.Op.gte]: minValidToDateTime }],
                             },
-                            lat: { [sequelize_1.default.Op.not]: null },
-                            lng: { [sequelize_1.default.Op.not]: null },
+                            lat: {
+                                [sequelize_1.default.Op.and]: {
+                                    [sequelize_1.default.Op.ne]: null,
+                                    [sequelize_1.default.Op.ne]: 0,
+                                },
+                            },
+                            lng: {
+                                [sequelize_1.default.Op.and]: {
+                                    [sequelize_1.default.Op.ne]: null,
+                                    [sequelize_1.default.Op.ne]: 0,
+                                },
+                            },
                         },
                     },
                     {
@@ -448,6 +430,7 @@ let TripsRepository = exports.TripsRepository = class TripsRepository extends mo
         this.connector = Di_1.VPContainer.resolve(CoreToken_1.CoreToken.PostgresConnector);
         this.positionsRepository = new PositionsRepository_1.PositionsRepository();
         this.descriptorRepository = Di_1.VPContainer.resolve(VPContainerToken_1.VPContainerToken.DescriptorRepository);
+        this.tripScheduleRepository = new precomputed_1.TripScheduleRepository();
         this.sequelizeModel.belongsTo(this.positionsRepository["sequelizeModel"], {
             as: "last_position",
             foreignKey: "last_position_id",