@golemio/pid 2.6.6 → 2.6.7-dev.839499227
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/db/example/00_clear_test_data.sql +4 -4
- package/db/example/03_ropidgtfs_dump.sql +10 -1
- package/db/example/14_nightDelays.sql +16 -8
- package/db/migrations/postgresql/20230327121511-departure-view.js +53 -0
- package/db/migrations/postgresql/sqls/20220915123941-partitioned-departures-down.sql +2 -0
- package/db/migrations/postgresql/sqls/20230307124639-positions-internal-down.sql +1 -1
- package/db/migrations/postgresql/sqls/20230327121511-departure-view-down.sql +81 -0
- package/db/migrations/postgresql/sqls/20230327121511-departure-view-up.sql +37 -0
- package/dist/integration-engine/queueDefinitions.js +10 -0
- package/dist/integration-engine/queueDefinitions.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMetadataModel.d.ts +13 -7
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMetadataModel.js +50 -45
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMetadataModel.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSWorker.d.ts +6 -4
- package/dist/integration-engine/ropid-gtfs/RopidGTFSWorker.js +61 -30
- package/dist/integration-engine/ropid-gtfs/RopidGTFSWorker.js.map +1 -1
- package/dist/integration-engine/{vehicle-positions/workers/vehicle-positions/data-access/TripStopsRedisRepository.d.ts → ropid-gtfs/data-access/cache/BlockStopsRedisRepository.d.ts} +2 -1
- package/dist/integration-engine/ropid-gtfs/data-access/cache/BlockStopsRedisRepository.js +19 -0
- package/dist/integration-engine/ropid-gtfs/data-access/cache/BlockStopsRedisRepository.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/{DelayComputationRedisRepository.d.ts → cache/DelayComputationRedisRepository.d.ts} +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/{DelayComputationRedisRepository.js → cache/DelayComputationRedisRepository.js} +5 -5
- package/dist/integration-engine/ropid-gtfs/data-access/cache/DelayComputationRedisRepository.js.map +1 -0
- package/dist/integration-engine/{vehicle-positions/workers/runs/data-access → ropid-gtfs/data-access/cache}/RunTripsRedisRepository.d.ts +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/cache/RunTripsRedisRepository.js +19 -0
- package/dist/integration-engine/ropid-gtfs/data-access/cache/RunTripsRedisRepository.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/cache/StaticFileRedisRepository.d.ts +5 -0
- package/dist/integration-engine/ropid-gtfs/data-access/cache/StaticFileRedisRepository.js +15 -0
- package/dist/integration-engine/ropid-gtfs/data-access/cache/StaticFileRedisRepository.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/cache/index.d.ts +4 -0
- package/dist/integration-engine/ropid-gtfs/data-access/cache/index.js +21 -0
- package/dist/integration-engine/ropid-gtfs/data-access/cache/index.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/{DeparturesRepository.d.ts → precomputed/DeparturesRepository.d.ts} +2 -1
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.js +132 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/MinMaxStopSequencesRepository.d.ts +9 -0
- package/dist/integration-engine/ropid-gtfs/{RopidGTFSMinMaxSequencesModel.js → data-access/precomputed/MinMaxStopSequencesRepository.js} +34 -33
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/MinMaxStopSequencesRepository.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/ServicesCalendarRepository.d.ts +9 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/ServicesCalendarRepository.js +135 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/ServicesCalendarRepository.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.d.ts +11 -0
- package/dist/integration-engine/ropid-gtfs/{RopidGTFSScheduledTripsModel.js → data-access/precomputed/TripScheduleRepository.js} +27 -26
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/index.d.ts +4 -0
- package/dist/integration-engine/ropid-gtfs/data-access/{index.js → precomputed/index.js} +3 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/index.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/helpers/DataCacheManager.d.ts +11 -0
- package/dist/integration-engine/ropid-gtfs/helpers/DataCacheManager.js +43 -0
- package/dist/integration-engine/ropid-gtfs/helpers/DataCacheManager.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/helpers/SourceTableSuffixEnum.d.ts +5 -0
- package/dist/integration-engine/ropid-gtfs/helpers/SourceTableSuffixEnum.js +10 -0
- package/dist/integration-engine/ropid-gtfs/helpers/SourceTableSuffixEnum.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/helpers/interfaces/IDataCacheManager.d.ts +3 -0
- package/dist/integration-engine/ropid-gtfs/helpers/interfaces/IDataCacheManager.js +3 -0
- package/dist/integration-engine/ropid-gtfs/helpers/interfaces/IDataCacheManager.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/index.d.ts +0 -3
- package/dist/integration-engine/ropid-gtfs/index.js +0 -3
- package/dist/integration-engine/ropid-gtfs/index.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/utils.js +5 -4
- package/dist/integration-engine/ropid-gtfs/utils.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js +3 -3
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunsMessagesTask.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunsMessagesTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js +18 -18
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/TripStopsManager.d.ts +3 -3
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/TripStopsManager.js +4 -4
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/TripStopsManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/AbstractGTFSTripRunManager.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js +4 -5
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.js +5 -6
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.js.map +1 -1
- package/dist/output-gateway/departure-boards/DepartureBoardsRouter.js +1 -1
- package/dist/output-gateway/pid/data-access/DeparturesRepository.js +0 -6
- package/dist/output-gateway/pid/data-access/DeparturesRepository.js.map +1 -1
- package/dist/output-gateway/pid/middleware/checkTimeFromMiddleware.js +2 -2
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.d.ts +3 -6
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js +30 -33
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/index.js +1 -4
- package/dist/schema-definitions/ropid-gtfs/index.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.d.ts +0 -1
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.js +5 -18
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/interfaces/IDeparturesModel.d.ts +0 -1
- package/dist/schema-definitions/vehicle-positions/index.d.ts +0 -4
- package/dist/schema-definitions/vehicle-positions/index.js +0 -4
- package/dist/schema-definitions/vehicle-positions/index.js.map +1 -1
- package/docs/implementation_documentation.md +30 -10
- package/docs/openapi-output.yaml +1 -1
- package/package.json +4 -3
- package/db/example/99_precomputed_tables.sql +0 -169
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMinMaxSequencesModel.d.ts +0 -19
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMinMaxSequencesModel.js.map +0 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSScheduledTripsModel.d.ts +0 -21
- package/dist/integration-engine/ropid-gtfs/RopidGTFSScheduledTripsModel.js.map +0 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSServicesFirst14daysModel.d.ts +0 -19
- package/dist/integration-engine/ropid-gtfs/RopidGTFSServicesFirst14daysModel.js +0 -142
- package/dist/integration-engine/ropid-gtfs/RopidGTFSServicesFirst14daysModel.js.map +0 -1
- package/dist/integration-engine/ropid-gtfs/data-access/DelayComputationRedisRepository.js.map +0 -1
- package/dist/integration-engine/ropid-gtfs/data-access/DeparturesRepository.js +0 -162
- package/dist/integration-engine/ropid-gtfs/data-access/DeparturesRepository.js.map +0 -1
- package/dist/integration-engine/ropid-gtfs/data-access/index.d.ts +0 -1
- package/dist/integration-engine/ropid-gtfs/data-access/index.js.map +0 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/RunTripsRedisRepository.js +0 -19
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/RunTripsRedisRepository.js.map +0 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripStopsRedisRepository.js +0 -19
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripStopsRedisRepository.js.map +0 -1
package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js
CHANGED
|
@@ -44,7 +44,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
44
44
|
};
|
|
45
45
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
46
46
|
exports.CommonRunsRepository = void 0;
|
|
47
|
-
const
|
|
47
|
+
const precomputed_1 = require("../../../../ropid-gtfs/data-access/precomputed");
|
|
48
48
|
const vehicle_positions_1 = require("../../../../../schema-definitions/vehicle-positions");
|
|
49
49
|
const models_1 = require("../../../../../schema-definitions/vehicle-positions/models");
|
|
50
50
|
const connectors_1 = require("@golemio/core/dist/integration-engine/connectors");
|
|
@@ -148,7 +148,7 @@ class CommonRunsRepository extends models_2.PostgresModel {
|
|
|
148
148
|
}
|
|
149
149
|
});
|
|
150
150
|
this.getScheduledTrips = (origin_route_name, run_number, msg_last_timestamp) => {
|
|
151
|
-
return this.
|
|
151
|
+
return this.tripScheduleRepository.findAll({
|
|
152
152
|
attributes: {
|
|
153
153
|
include: [
|
|
154
154
|
[sequelize_1.default.cast(sequelize_1.default.col("start_timestamp"), "varchar"), "start_timestamp"],
|
|
@@ -181,7 +181,7 @@ class CommonRunsRepository extends models_2.PostgresModel {
|
|
|
181
181
|
foreignKey: "runs_id",
|
|
182
182
|
as: "run_messages",
|
|
183
183
|
});
|
|
184
|
-
this.
|
|
184
|
+
this.tripScheduleRepository = new precomputed_1.TripScheduleRepository();
|
|
185
185
|
}
|
|
186
186
|
}
|
|
187
187
|
exports.CommonRunsRepository = CommonRunsRepository;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommonRunsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"CommonRunsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gFAAgF;AAChF,2FAA0D;AAC1D,uFAAgE;AAEhE,iFAAqF;AACrF,2EAAoE;AACpE,yEAAqF;AACrF,6EAAuE;AACvE,mFAAkF;AAClF,iFAAoE;AAEpE,iFAA8E;AAE9E,MAAa,oBAAqB,SAAQ,sBAAa;IAgBnD;QACI,KAAK,CACD,sBAAsB,EACtB;YACI,WAAW,EAAE,wBAAe,CAAC,UAAU;YACvC,QAAQ,EAAE,oCAAgB,CAAC,QAAQ;YACnC,yBAAyB,EAAE,wBAAe,CAAC,cAAc;YACzD,UAAU,EAAE,YAAY;YACxB,2BAA2B,EAAE;gBACzB,OAAO,EAAE;oBACL;wBACI,MAAM,EAAE,CAAC,IAAI,CAAC;wBACd,IAAI,EAAE,4BAA4B;qBACrC;oBACD;wBACI,MAAM,EAAE,CAAC,UAAU,EAAE,YAAY,EAAE,qBAAqB,EAAE,qBAAqB,CAAC;wBAChF,IAAI,EAAE,2BAA2B;qBACpC;iBACJ;aACJ;SACJ,EACD,IAAI,uCAAmB,CAAC,+BAA+B,EAAE,wBAAe,CAAC,UAAU,CAAC,CACvF,CAAC;QAiBC,0BAAqB,GAAG,CAAC,GAAqB,EAAoC,EAAE;YACvF,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC/B,KAAK,EAAE;oBACH,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,UAAU,EAAE,GAAG,CAAC,UAAU;oBAC1B,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;oBAC5C,kBAAkB,EAAE;wBAChB,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,mBAAS,CAAC,OAAO,CAAC,4BAA4B,CAAC;qBAC3D;iBACJ;gBACD,KAAK,EAAE,CAAC,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;gBACvC,GAAG,EAAE,IAAI;aACZ,CAAC,CAAC;QACP,CAAC,CAAC;QAEK,uBAAkB,GAAG,CAAO,EAAE,GAAG,EAAE,WAAW,EAAyB,EAAkC,EAAE;YAC9G,MAAM,UAAU,GAAG,8BAAiB,CAAC,aAAa,EAAE,CAAC;YACrD,MAAM,CAAC,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,CAAC;YACzC,IAAI;gBACA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,iCAEpC,GAAG,KACN,YAAY,EAAE,CAAC,WAAW,CAAC,KAE/B;oBACI,OAAO,EAAE;wBACL,EAAE,EAAE,cAAc;wBAClB,KAAK,EAAE,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC;qBACvD;oBACD,WAAW,EAAE,CAAC;iBACjB,CACJ,CAAC;gBACF,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;gBACjB,MAAM,KAAmD,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAA9E,EAAE,YAAY,EAAE,gBAAgB,OAA8C,EAAzC,SAAS,cAA9C,gBAAgD,CAA8B,CAAC;gBACrF,OAAO;oBACH,GAAG,EAAE,SAAS;oBACd,WAAW,oBAAO,gBAAgB,CAAC,CAAC,CAAC,CAAE;iBAC1C,CAAC;aACL;YAAC,OAAO,GAAG,EAAE;gBACV,aAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,6BAA6B,EAAE,GAAG,CAAC,CAAC;gBAC1D,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACnB,MAAM,IAAI,4BAAW,CAAC,iCAAiC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;aACxF;QACL,CAAC,CAAA,CAAC;QAEK,uBAAkB,GAAG,CAAO,EAAE,GAAG,EAAE,WAAW,EAAyB,EAAE,KAAa,EAAE,EAAE;YAC7F,MAAM,UAAU,GAAG,8BAAiB,CAAC,aAAa,EAAE,CAAC;YACrD,MAAM,CAAC,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,CAAC;YACzC,IAAI;gBACA,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,gBAAgB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBACxD,IAAI,CAAC,MAAM,CACP,EAAE,kBAAkB,EAAE,GAAG,CAAC,kBAAkB,EAAE,EAC9C,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CACzD;oBACD,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC,MAAM,iCAAM,WAAW,KAAE,OAAO,EAAE,KAAK,IAAG;iBAC3F,CAAC,CAAC;gBACH,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;gBACjB,OAAO;oBACH,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;oBACnC,WAAW,EAAE,gBAAgB,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;iBACrD,CAAC;aACL;YAAC,OAAO,GAAG,EAAE;gBACV,aAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,6BAA6B,EAAE,GAAG,CAAC,CAAC;gBAC1D,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACnB,MAAM,IAAI,4BAAW,CAAC,iCAAiC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;aACxF;QACL,CAAC,CAAA,CAAC;QAEK,wBAAmB,GAAG,CAAO,KAAa,EAAmB,EAAE;YAClE,IAAI;gBACA,4DAA4D;gBAC5D,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBACrC,KAAK,EAAE;wBACH,kBAAkB,EAAE;4BAChB,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,sBAAiB,GAAG,CACvB,iBAAyB,EACzB,UAA2B,EAC3B,kBAA0B,EACE,EAAE;YAC9B,OAAO,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC;gBACvC,UAAU,EAAE;oBACR,OAAO,EAAE;wBACL,CAAC,mBAAS,CAAC,IAAI,CAAC,mBAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,SAAS,CAAC,EAAE,iBAAiB,CAAC;wBAChF,CAAC,mBAAS,CAAC,IAAI,CAAC,mBAAS,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,SAAS,CAAC,EAAE,eAAe,CAAC;qBAC/E;oBACD,OAAO,EAAE,CAAC,YAAY,EAAE,iBAAiB,EAAE,eAAe,CAAC;iBAC9D;gBACD,KAAK,EAAE;oBACH,iBAAiB;oBACjB,UAAU;oBACV,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;wBACf,mBAAS,CAAC,OAAO,CAAC,WAAW,kBAAkB,SAAS,CAAC;wBACzD,mBAAS,CAAC,OAAO,CAAC,YAAY,kBAAkB,wCAAwC,CAAC;wBACzF,mBAAS,CAAC,OAAO,CAAC,YAAY,kBAAkB,wCAAwC,CAAC;qBAC5F;iBACJ;gBACD,KAAK,EAAE;oBACH,CAAC,MAAM,EAAE,KAAK,CAAC;oBACf,CAAC,eAAe,EAAE,KAAK,CAAC;iBAC3B;aACJ,CAAC,CAAC;QACP,CAAC,CAAC;QA7HE,IAAI,CAAC,sBAAsB,GAAG,IAAI,2DAA4B,EAAE,CAAC;QACjE,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE;YACzE,UAAU,EAAE,SAAS;YACrB,QAAQ,EAAE,SAAS;SACtB,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,EAAE;YACvE,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,SAAS;YACrB,EAAE,EAAE,cAAc;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,sBAAsB,GAAG,IAAI,oCAAsB,EAAE,CAAC;IAC/D,CAAC;CAiHJ;AAtKD,oDAsKC"}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunsMessagesTask.js
CHANGED
|
@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.ProcessMetroRunsMessagesTask = void 0;
|
|
13
|
+
const cache_1 = require("../../../../ropid-gtfs/data-access/cache");
|
|
13
14
|
const MetroRailtrackGPSRepository_1 = require("../../../../ropid-gtfs/workers/railtrack/tasks/data-access/MetroRailtrackGPSRepository");
|
|
14
15
|
const PositionsRepository_1 = require("../../vehicle-positions/data-access/PositionsRepository");
|
|
15
16
|
const TripsRepository_1 = require("../../vehicle-positions/data-access/TripsRepository");
|
|
@@ -18,7 +19,6 @@ const vehicle_positions_1 = require("../../../../../schema-definitions/vehicle-p
|
|
|
18
19
|
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
19
20
|
const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
20
21
|
const CommonRunsRepository_1 = require("../data-access/CommonRunsRepository");
|
|
21
|
-
const RunTripsRedisRepository_1 = require("../data-access/RunTripsRedisRepository");
|
|
22
22
|
const MetroMessageFilter_1 = require("../helpers/MetroMessageFilter");
|
|
23
23
|
const MetroTransformedRunsSchema_1 = require("../schema/MetroTransformedRunsSchema");
|
|
24
24
|
const MetroRunsMessageProcessingTransformation_1 = require("../transformations/MetroRunsMessageProcessingTransformation");
|
|
@@ -33,7 +33,7 @@ class ProcessMetroRunsMessagesTask extends integration_engine_1.AbstractTask {
|
|
|
33
33
|
this.positionsRepository = new PositionsRepository_1.PositionsRepository();
|
|
34
34
|
this.tripsRepository = new TripsRepository_1.TripsRepository();
|
|
35
35
|
this.runsRepository = new CommonRunsRepository_1.CommonRunsRepository();
|
|
36
|
-
this.runTripsRedisRepository = new
|
|
36
|
+
this.runTripsRedisRepository = new cache_1.RunTripsRedisRepository();
|
|
37
37
|
this.gtfsTripRunManager = GTFSTripRunManagerFactory_1.GTFSTripRunManagerFactory.create(GTFSTripRunManagerFactory_1.GTFSTripRunType.Metro, this.positionsRepository, this.tripsRepository, this.runsRepository, this.runTripsRedisRepository);
|
|
38
38
|
}
|
|
39
39
|
execute({ routeName, messages }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProcessMetroRunsMessagesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunsMessagesTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wIAA6H;AAE7H,iGAAsH;AACtH,yFAA8G;AAE9G,uHAGyG;AACzG,2FAA0D;AAE1D,8EAA2F;AAC3F,2EAAoE;AACpE,8EAA2E;AAC3E,
|
|
1
|
+
{"version":3,"file":"ProcessMetroRunsMessagesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunsMessagesTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oEAA2E;AAC3E,wIAA6H;AAE7H,iGAAsH;AACtH,yFAA8G;AAE9G,uHAGyG;AACzG,2FAA0D;AAE1D,8EAA2F;AAC3F,2EAAoE;AACpE,8EAA2E;AAC3E,sEAAmE;AAEnE,qFAA4F;AAC5F,0HAAuH;AAEvH,MAAa,4BAA6B,SAAQ,iCAA4C;IAa1F,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAbP,cAAS,GAAG,yBAAyB,CAAC;QACtC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QACxC,WAAM,GAAG,iEAAoC,CAAC;QAY1D,IAAI,CAAC,wBAAwB,GAAG,IAAI,mFAAwC,EAAE,CAAC;QAC/E,IAAI,CAAC,sBAAsB,GAAG,IAAI,yDAA2B,EAAE,CAAC;QAChE,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,EAAE,CAAC;QACrD,IAAI,CAAC,eAAe,GAAG,IAAI,iCAAe,EAAE,CAAC;QAC7C,IAAI,CAAC,cAAc,GAAG,IAAI,2CAAoB,EAAE,CAAC;QACjD,IAAI,CAAC,uBAAuB,GAAG,IAAI,+BAAuB,EAAE,CAAC;QAE7D,IAAI,CAAC,kBAAkB,GAAG,qDAAyB,CAAC,MAAM,CACtD,2CAAe,CAAC,KAAK,EACrB,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,uBAAuB,CAC/B,CAAC;IACN,CAAC;IAEe,OAAO,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAkC;;YAC3E,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,GAAG,uCAAkB,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;YACjG,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC/B,OAAO;aACV;YAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAEvF,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE;gBACpC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;aAC/C;QACL,CAAC;KAAA;IAEa,cAAc,CAAC,OAAgC,EAAE,OAA2C;;YACtG,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YACjF,IAAI,CAAC,IAAI,EAAE;gBACP,OAAO;aACV;YAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAClG,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC7B,aAAG,CAAC,OAAO,CAAC,8CAA8C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBAC9F,OAAO;aACV;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/F,IAAI,QAAQ,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClC,MAAM,iCAAY,CAAC,qBAAqB,CACpC,GAAG,2BAAM,CAAC,oBAAoB,IAAI,oCAAgB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,EACvE,aAAa,EACb,QAAQ,CACX,CAAC;aACL;QACL,CAAC;KAAA;CACJ;AAjED,oEAiEC"}
|
|
@@ -461,22 +461,22 @@ class TripsRepository extends models_2.PostgresModel {
|
|
|
461
461
|
const sqlQuery = `
|
|
462
462
|
SELECT DISTINCT
|
|
463
463
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id as gtfs_trip_id,
|
|
464
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
464
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule.date as gtfs_date,
|
|
465
465
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_headsign as gtfs_trip_headsign,
|
|
466
466
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes.route_id as gtfs_route_id,
|
|
467
467
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes.route_type as gtfs_route_type,
|
|
468
468
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes.route_short_name as gtfs_route_short_name,
|
|
469
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
470
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
471
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
472
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
469
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_minmax_stop_sequences.min_stop_time,
|
|
470
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_minmax_stop_sequences.max_stop_time,
|
|
471
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule.run_number as internal_run_number,
|
|
472
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule.origin_route_name as internal_route_name
|
|
473
473
|
FROM "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips
|
|
474
474
|
INNER JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.route_id=ropidgtfs_routes.route_id
|
|
475
475
|
INNER JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_stop_times ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id=ropidgtfs_stop_times.trip_id
|
|
476
|
-
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
477
|
-
ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id=
|
|
478
|
-
AND
|
|
479
|
-
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
476
|
+
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule
|
|
477
|
+
ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id=ropidgtfs_precomputed_trip_schedule.trip_id
|
|
478
|
+
AND ropidgtfs_precomputed_trip_schedule.start_timestamp::date = current_date
|
|
479
|
+
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_minmax_stop_sequences ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id=ropidgtfs_precomputed_minmax_stop_sequences.trip_id
|
|
480
480
|
WHERE
|
|
481
481
|
( "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes.route_short_name LIKE $cisLineShortName
|
|
482
482
|
OR CASE WHEN ($cisLineShortName = 'IKEA')
|
|
@@ -574,7 +574,7 @@ class TripsRepository extends models_2.PostgresModel {
|
|
|
574
574
|
LIMIT 1)
|
|
575
575
|
SELECT DISTINCT
|
|
576
576
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id as gtfs_trip_id,
|
|
577
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
577
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule.date as gtfs_date,
|
|
578
578
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.block_id as gtfs_block_id,
|
|
579
579
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_headsign as gtfs_trip_headsign,
|
|
580
580
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_short_name as gtfs_trip_short_name,
|
|
@@ -582,18 +582,18 @@ class TripsRepository extends models_2.PostgresModel {
|
|
|
582
582
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes.route_type as gtfs_route_type,
|
|
583
583
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes.route_short_name as gtfs_route_short_name,
|
|
584
584
|
wanted_trip.cis_trip_number,
|
|
585
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
586
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
587
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
588
|
-
"${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
585
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_minmax_stop_sequences.min_stop_time,
|
|
586
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_minmax_stop_sequences.max_stop_time,
|
|
587
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule.run_number as internal_run_number,
|
|
588
|
+
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule.origin_route_name as internal_route_name
|
|
589
589
|
FROM "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips
|
|
590
590
|
INNER JOIN wanted_trip ON 1 = 1
|
|
591
591
|
INNER JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.route_id=ropidgtfs_routes.route_id
|
|
592
592
|
INNER JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_stop_times ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id=ropidgtfs_stop_times.trip_id
|
|
593
|
-
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
594
|
-
ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id=
|
|
595
|
-
AND
|
|
596
|
-
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".
|
|
593
|
+
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_trip_schedule
|
|
594
|
+
ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id=ropidgtfs_precomputed_trip_schedule.trip_id
|
|
595
|
+
AND ropidgtfs_precomputed_trip_schedule.start_timestamp::date = current_date
|
|
596
|
+
LEFT JOIN "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_minmax_stop_sequences ON "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id="${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_precomputed_minmax_stop_sequences.trip_id
|
|
597
597
|
WHERE
|
|
598
598
|
"${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_trips.trip_id ~ CONCAT('\\d+_', wanted_trip.cis_trip_number, '_\\d+')
|
|
599
599
|
AND "${vehicle_positions_1.VehiclePositions.pgSchema}".ropidgtfs_routes.route_type = '2'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TripsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"TripsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { RopidGTFSStopTimesModel } from "../../../../ropid-gtfs/RopidGTFSStopTimesModel";
|
|
2
|
-
import {
|
|
2
|
+
import { BlockStopsRedisRepository } from "../../../../ropid-gtfs/data-access/cache";
|
|
3
3
|
import { TripStopsSchedule } from "../interfaces/VPInterfaces";
|
|
4
4
|
export declare class TripStopsManager {
|
|
5
5
|
private readonly gtfsStopTimesRepository;
|
|
6
|
-
private readonly
|
|
7
|
-
constructor(gtfsStopTimesRepository: RopidGTFSStopTimesModel,
|
|
6
|
+
private readonly blockStopsRedisRepository;
|
|
7
|
+
constructor(gtfsStopTimesRepository: RopidGTFSStopTimesModel, blockStopsRedisRepository: BlockStopsRedisRepository);
|
|
8
8
|
/**
|
|
9
9
|
* Get trip stops schedule by block id
|
|
10
10
|
*
|
|
@@ -13,9 +13,9 @@ exports.TripStopsManager = void 0;
|
|
|
13
13
|
const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
14
14
|
const VPUtils_1 = require("../helpers/VPUtils");
|
|
15
15
|
class TripStopsManager {
|
|
16
|
-
constructor(gtfsStopTimesRepository,
|
|
16
|
+
constructor(gtfsStopTimesRepository, blockStopsRedisRepository) {
|
|
17
17
|
this.gtfsStopTimesRepository = gtfsStopTimesRepository;
|
|
18
|
-
this.
|
|
18
|
+
this.blockStopsRedisRepository = blockStopsRedisRepository;
|
|
19
19
|
/**
|
|
20
20
|
* Get trip stops schedule by block id
|
|
21
21
|
*
|
|
@@ -23,7 +23,7 @@ class TripStopsManager {
|
|
|
23
23
|
* @param {string} tripIds - List of inserted gtfs trip ids
|
|
24
24
|
*/
|
|
25
25
|
this.setAndReturnTripStopsSchedule = (blockId, tripIds) => __awaiter(this, void 0, void 0, function* () {
|
|
26
|
-
const schedule = yield this.
|
|
26
|
+
const schedule = yield this.blockStopsRedisRepository.get(blockId);
|
|
27
27
|
if (schedule) {
|
|
28
28
|
return schedule;
|
|
29
29
|
}
|
|
@@ -33,7 +33,7 @@ class TripStopsManager {
|
|
|
33
33
|
acc[curr.trip_id] = { trip_stops: curr.trip_stops };
|
|
34
34
|
return acc;
|
|
35
35
|
}, {});
|
|
36
|
-
yield this.
|
|
36
|
+
yield this.blockStopsRedisRepository.set(blockId, tripStopsSchedule, undefined, VPUtils_1.VPUtils.getNextExpireTimestamp());
|
|
37
37
|
return tripStopsSchedule;
|
|
38
38
|
}
|
|
39
39
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TripStopsManager.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/TripStopsManager.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"TripStopsManager.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/TripStopsManager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,2EAAoE;AACpE,gDAA6C;AAG7C,MAAa,gBAAgB;IACzB,YACqB,uBAAgD,EAChD,yBAAoD;QADpD,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,8BAAyB,GAAzB,yBAAyB,CAA2B;QAGzE;;;;;WAKG;QACI,kCAA6B,GAAG,CAAO,OAAe,EAAE,OAAiB,EAA8B,EAAE;YAC5G,MAAM,QAAQ,GAAsB,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACtF,IAAI,QAAQ,EAAE;gBACV,OAAO,QAAQ,CAAC;aACnB;YAED,IAAI;gBACA,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBAC5E,MAAM,iBAAiB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;oBACrD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;oBACpD,OAAO,GAAG,CAAC;gBACf,CAAC,EAAE,EAAuB,CAAC,CAAC;gBAE5B,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,iBAAO,CAAC,sBAAsB,EAAE,CAAC,CAAC;gBAClH,OAAO,iBAAiB,CAAC;aAC5B;YAAC,OAAO,GAAG,EAAE;gBACV,aAAG,CAAC,IAAI,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAC;gBAC/C,OAAO,EAAE,CAAC;aACb;QACL,CAAC,CAAA,CAAC;IA3BC,CAAC;CA4BP;AAhCD,4CAgCC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { RunTripsRedisRepository } from "../../../../../ropid-gtfs/data-access/cache";
|
|
1
2
|
import { IGtfsRunTripCache } from "../../../../../ropid-gtfs/interfaces/IGtfsRunTripCache";
|
|
2
3
|
import { CommonRunsRepository } from "../../../runs/data-access/CommonRunsRepository";
|
|
3
|
-
import { RunTripsRedisRepository } from "../../../runs/data-access/RunTripsRedisRepository";
|
|
4
4
|
import { ICommonRunWithMessage } from "../../../runs/interfaces/ICommonRunWithMessage";
|
|
5
5
|
import { IMetroRunInputForProcessing } from "../../../runs/interfaces/IMetroRunInputForProcessing";
|
|
6
6
|
import { PositionsRepository } from "../../data-access/PositionsRepository";
|
|
@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.PropagateDelayTask = void 0;
|
|
16
|
-
const
|
|
16
|
+
const cache_1 = require("../../../../ropid-gtfs/data-access/cache");
|
|
17
17
|
const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
18
18
|
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
19
19
|
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
@@ -83,7 +83,7 @@ class PropagateDelayTask extends workers_1.AbstractTask {
|
|
|
83
83
|
yield this.tripsRepository.bulkUpdatePropagatedDelay(rowsToUpdate);
|
|
84
84
|
});
|
|
85
85
|
this.tripsRepository = new TripsRepository_1.TripsRepository();
|
|
86
|
-
this.runTripsRedisRepository = new
|
|
86
|
+
this.runTripsRedisRepository = new cache_1.RunTripsRedisRepository();
|
|
87
87
|
}
|
|
88
88
|
execute(data) {
|
|
89
89
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PropagateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"PropagateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.ts"],"names":[],"mappings":"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"}
|
package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js
CHANGED
|
@@ -13,16 +13,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.UpdateDelayTask = void 0;
|
|
16
|
-
const DelayComputationRedisRepository_1 = require("../../../../ropid-gtfs/data-access/DelayComputationRedisRepository");
|
|
17
16
|
const RopidGTFSStopTimesModel_1 = require("../../../../ropid-gtfs/RopidGTFSStopTimesModel");
|
|
18
17
|
const RopidGTFSTripsModel_1 = require("../../../../ropid-gtfs/RopidGTFSTripsModel");
|
|
18
|
+
const cache_1 = require("../../../../ropid-gtfs/data-access/cache");
|
|
19
19
|
const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
20
20
|
const queueprocessors_1 = require("@golemio/core/dist/integration-engine/queueprocessors");
|
|
21
21
|
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
22
22
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
23
23
|
const PositionsRepository_1 = require("../data-access/PositionsRepository");
|
|
24
24
|
const TripsRepository_1 = require("../data-access/TripsRepository");
|
|
25
|
-
const TripStopsRedisRepository_1 = require("../data-access/TripStopsRedisRepository");
|
|
26
25
|
const DelayComputationManager_1 = require("../helpers/DelayComputationManager");
|
|
27
26
|
const PositionsManager_1 = __importDefault(require("../helpers/PositionsManager"));
|
|
28
27
|
const TripStopsManager_1 = require("../helpers/TripStopsManager");
|
|
@@ -55,11 +54,11 @@ class UpdateDelayTask extends workers_1.AbstractTask {
|
|
|
55
54
|
});
|
|
56
55
|
this.tripsRepository = new TripsRepository_1.TripsRepository();
|
|
57
56
|
this.positionsRepository = new PositionsRepository_1.PositionsRepository();
|
|
58
|
-
this.delayComputationRedisRepository = new
|
|
57
|
+
this.delayComputationRedisRepository = new cache_1.DelayComputationRedisRepository();
|
|
59
58
|
const gtfsStopTimesRepository = new RopidGTFSStopTimesModel_1.RopidGTFSStopTimesModel();
|
|
60
59
|
const gtfsTripsRepository = new RopidGTFSTripsModel_1.RopidGTFSTripsModel();
|
|
61
|
-
const
|
|
62
|
-
this.tripStopsManager = new TripStopsManager_1.TripStopsManager(gtfsStopTimesRepository,
|
|
60
|
+
const blockStopsRedisRepository = new cache_1.BlockStopsRedisRepository();
|
|
61
|
+
this.tripStopsManager = new TripStopsManager_1.TripStopsManager(gtfsStopTimesRepository, blockStopsRedisRepository);
|
|
63
62
|
this.delayComputationManager = new DelayComputationManager_1.DelayComputationManager(gtfsTripsRepository);
|
|
64
63
|
}
|
|
65
64
|
execute(data) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"UpdateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4FAAiF;AACjF,oFAAyE;AACzE,oEAA8G;AAC9G,2EAA6F;AAC7F,2FAAqF;AACrF,2EAA6E;AAC7E,6EAAuE;AACvE,4EAAyF;AACzF,oEAAiE;AACjE,gFAA6E;AAC7E,mFAA2D;AAC3D,kEAA+D;AAC/D,gDAA6C;AAU7C,mEAA0E;AAE1E,MAAa,eAAgB,SAAQ,sBAA+B;IAWhE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAXP,cAAS,GAAG,aAAa,CAAC;QAC1B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,+CAA2B,CAAC;QAoLrD;;;;;WAKG;QACK,oCAA+B,GAAG,CAAO,cAAqC,EAAE,EAAE;YACtF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YAC/G,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CACtD,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACvB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM;gBACpB,gBAAgB,EAAE,CAAC,CAAC,OAAO,CAAC,cAAc;gBAC1C,qBAAqB,EAAE,CAAC,CAAC,OAAO;gBAChC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,oBAAoB;aAC9C,CAAC,CAAC,CACN,CAAC;YAEF,OAAO;gBACH,gBAAgB;gBAChB,YAAY;aACf,CAAC;QACN,CAAC,CAAA,CAAC;QA/LE,IAAI,CAAC,eAAe,GAAG,IAAI,iCAAe,EAAE,CAAC;QAC7C,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,EAAE,CAAC;QACrD,IAAI,CAAC,+BAA+B,GAAG,IAAI,uCAA+B,EAAE,CAAC;QAE7E,MAAM,uBAAuB,GAAG,IAAI,iDAAuB,EAAE,CAAC;QAC9D,MAAM,mBAAmB,GAAG,IAAI,yCAAmB,EAAE,CAAC;QACtD,MAAM,yBAAyB,GAAG,IAAI,iCAAyB,EAAE,CAAC;QAElE,IAAI,CAAC,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,uBAAuB,EAAE,yBAAyB,CAAC,CAAC;QACjG,IAAI,CAAC,uBAAuB,GAAG,IAAI,iDAAuB,CAAC,mBAAmB,CAAC,CAAC;IACpF,CAAC;IAEe,OAAO,CAAC,IAAuB;;;YAC3C,MAAM,OAAO,GAAa,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAEnE,IAAI,CAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,MAAM,IAAG,CAAC,EAAE;gBAC5B,iEAAiE;gBACjE,IAAI,oBAAoB,GAAkD,EAAE,CAAC;gBAC7E,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE;oBACnC,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;iBACtD;gBAED,wEAAwE;gBACxE,IAAI,kBAAkB,GAA2B,EAAE,CAAC;gBAEpD,sEAAsE;gBACtE,IAAI,oBAAoB,GAAgC,EAAE,CAAC;gBAE3D,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE;oBAClC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;wBACrB,SAAS;qBACZ;oBAED,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;wBACzC,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;qBACpD;yBAAM;wBACH,0EAA0E;wBAC1E,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC;4BAClC,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;qBAC3G;oBAED,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;wBAC3C,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,GAAG,EAAE,CAAC;qBACxD;oBAED,IAAI,IAAI,CAAC,YAAY,EAAE;wBACnB,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;qBACnE;iBACJ;gBAED,+CAA+C;gBAC/C,MAAM,6BAA6B,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,MAAM,CACnF,CAAO,GAAG,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,EAAE;oBAClC,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC;oBAC5B,IAAI;wBACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,OAAO,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;wBACtG,SAAS,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC;qBACjC;oBAAC,OAAO,GAAG,EAAE;wBACV,iCAAuB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;qBACvC;oBAED,OAAO,GAAG,CAAC;gBACf,CAAC,CAAA,EACD,OAAO,CAAC,OAAO,CAAC,EAAuC,CAAC,CAC3D,CAAC;gBAEF,+CAA+C;gBAC/C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE;oBAClC,IAAI,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;wBAC/B,IAAI,IAAI,CAAC,aAAa,EAAE;4BACpB,6CAA6C;4BAC7C,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,GAAG,iBAAO,CAAC,uBAAuB,CACpE,IAAI,CAAC,YAAa,EAClB,6BAA6B,CAAC,IAAI,CAAC,aAAa,CAAC,EACjD,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,CAChC,CAAC;yBACL;wBAED,SAAS;qBACZ;oBAED,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;wBACrD,OAAO,QAAQ,CAAC,QAAQ,KAAK,kBAAkB,CAAC,IAAI,CAAC,aAAc,CAAC,CAAC;oBACzE,CAAC,CAAC,CAAC;oBAEH,IAAI,CAAC,eAAe,EAAE;wBAClB,SAAS;qBACZ;oBAED,kEAAkE;oBAClE,MAAM,yBAAyB,GAAG,iBAAO,CAAC,4BAA4B,CAClE,6BAA6B,CAAC,IAAI,CAAC,aAAc,CAAC,EAClD,IAAI,EACJ,eAAe,CAClB,CAAC;oBAEF,2DAA2D;oBAC3D,MAAM,WAAW,qBAAQ,eAAe,CAAE,CAAC;oBAC3C,WAAW,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;oBAC/B,WAAW,CAAC,QAAQ,GAAG,yBAAyB,CAAC;oBACjD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;iBACpC;gBAED,yBAAyB;gBACzB,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACvD;YAED,IAAI,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,MAAM,IAAG,CAAC,EAAE;gBAC/B,IAAI;oBACA,kCAAkC;oBAClC,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;oBAElG,gCAAgC;oBAChC,MAAM,2CAA2C,GAAsC,MAAM,OAAO,CAAC,GAAG,CACpG,sBAAsB,CAAC,GAAG,CAAC,CAAO,IAAoB,EAAE,EAAE;wBACtD,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAC5D,IAAI,CAAC,YAAY,CACpB,CAA4B,CAAC;wBAC9B,uCACO,IAAI,KACP,QAAQ,IACV;oBACN,CAAC,CAAA,CAAC,CACL,CAAC;oBAEF,yBAAyB;oBACzB,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,GAAG,CACxC,2CAA2C,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;wBAC3D,2EAA2E;wBAC3E,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,EAAE;4BACxB,aAAG,CAAC,KAAK,CAAC,8DAA8D,GAAG,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,CAAC;4BACpG,IAAI;gCACA,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,oBAAoB,CAC/E,IAAI,CAAC,YAAY,CACpB,CAAC;gCAEF,MAAM,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAC1C,SAAS,EACT,mBAAmB,EACnB,iBAAO,CAAC,2BAA2B,CACtC,CAAC;gCAEF,IAAI,CAAC,QAAQ,GAAG,mBAAmB,CAAC;6BACvC;4BAAC,OAAO,GAAG,EAAE;gCACV,OAAO;6BACV;yBACJ;wBACD,OAAO,0BAAgB,CAAC,gBAAgB,CAAC,IAA8B,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAC5F,CAAC,CAAA,CAAC,CACL,CAAC;oBAEF,MAAM,uBAAuB,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,EAA4B,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAChG,MAAM,IAAI,CAAC,+BAA+B,CAAC,uBAAuB,CAAC,CAAC;oBAEpE,MAAM,8BAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,EAAE;wBACzE,kBAAkB,EAAE,uBAAuB;wBAC3C,KAAK,EAAE,IAAI,CAAC,YAAY;qBAC3B,CAAC,CAAC;iBACN;gBAAC,OAAO,GAAG,EAAE;oBACV,MAAM,IAAI,4BAAW,CACjB,4CAA4C,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAC5E,IAAI,EACJ,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,IAAI,EACJ,GAAG,CACN,CAAC;iBACL;aACJ;;KACJ;CAwBJ;AA7MD,0CA6MC"}
|
|
@@ -11,18 +11,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.UpdateGtfsTripIdTask = void 0;
|
|
13
13
|
const RopidGTFSStopTimesModel_1 = require("../../../../ropid-gtfs/RopidGTFSStopTimesModel");
|
|
14
|
+
const cache_1 = require("../../../../ropid-gtfs/data-access/cache");
|
|
14
15
|
const CommonRunsRepository_1 = require("../../runs/data-access/CommonRunsRepository");
|
|
15
|
-
const RunTripsRedisRepository_1 = require("../../runs/data-access/RunTripsRedisRepository");
|
|
16
16
|
const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
17
17
|
const queueprocessors_1 = require("@golemio/core/dist/integration-engine/queueprocessors");
|
|
18
18
|
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
19
19
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
20
20
|
const PositionsRepository_1 = require("../data-access/PositionsRepository");
|
|
21
21
|
const TripsRepository_1 = require("../data-access/TripsRepository");
|
|
22
|
-
const TripStopsRedisRepository_1 = require("../data-access/TripStopsRedisRepository");
|
|
23
|
-
const GTFSTripRunManagerFactory_1 = require("../helpers/gtfs-trip-run/GTFSTripRunManagerFactory");
|
|
24
22
|
const TripStopsManager_1 = require("../helpers/TripStopsManager");
|
|
25
23
|
const VPUtils_1 = require("../helpers/VPUtils");
|
|
24
|
+
const GTFSTripRunManagerFactory_1 = require("../helpers/gtfs-trip-run/GTFSTripRunManagerFactory");
|
|
26
25
|
const UpdateGtfsTripIdSchema_1 = require("../schema/UpdateGtfsTripIdSchema");
|
|
27
26
|
class UpdateGtfsTripIdTask extends workers_1.AbstractTask {
|
|
28
27
|
constructor(queuePrefix) {
|
|
@@ -34,10 +33,10 @@ class UpdateGtfsTripIdTask extends workers_1.AbstractTask {
|
|
|
34
33
|
this.positionsRepository = new PositionsRepository_1.PositionsRepository();
|
|
35
34
|
this.gtfsStopTimesRepository = new RopidGTFSStopTimesModel_1.RopidGTFSStopTimesModel();
|
|
36
35
|
const commonRunsRepository = new CommonRunsRepository_1.CommonRunsRepository();
|
|
37
|
-
const runTripsRedisRepository = new
|
|
38
|
-
const
|
|
36
|
+
const runTripsRedisRepository = new cache_1.RunTripsRedisRepository();
|
|
37
|
+
const blockStopsRedisRepository = new cache_1.BlockStopsRedisRepository();
|
|
39
38
|
this.gtfsTripRunManager = GTFSTripRunManagerFactory_1.GTFSTripRunManagerFactory.create(GTFSTripRunManagerFactory_1.GTFSTripRunType.Common, this.positionsRepository, this.tripsRepository, commonRunsRepository, runTripsRedisRepository);
|
|
40
|
-
this.tripStopsManager = new TripStopsManager_1.TripStopsManager(this.gtfsStopTimesRepository,
|
|
39
|
+
this.tripStopsManager = new TripStopsManager_1.TripStopsManager(this.gtfsStopTimesRepository, blockStopsRedisRepository);
|
|
41
40
|
}
|
|
42
41
|
/**
|
|
43
42
|
* Take all newly computed positions and save it, then save the last ones to the trips
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateGtfsTripIdTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4FAAiF;AACjF,sFAA2G;AAC3G,
|
|
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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"}
|
|
@@ -10,8 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.UpdateRunsGtfsTripIdTask = void 0;
|
|
13
|
+
const cache_1 = require("../../../../ropid-gtfs/data-access/cache");
|
|
13
14
|
const CommonRunsRepository_1 = require("../../runs/data-access/CommonRunsRepository");
|
|
14
|
-
const RunTripsRedisRepository_1 = require("../../runs/data-access/RunTripsRedisRepository");
|
|
15
15
|
const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
16
16
|
const queueprocessors_1 = require("@golemio/core/dist/integration-engine/queueprocessors");
|
|
17
17
|
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
@@ -39,7 +39,7 @@ class UpdateRunsGtfsTripIdTask extends workers_1.AbstractTask {
|
|
|
39
39
|
this.tripsRepository = new TripsRepository_1.TripsRepository();
|
|
40
40
|
this.positionsRepository = new PositionsRepository_1.PositionsRepository();
|
|
41
41
|
this.commonRunsRepository = new CommonRunsRepository_1.CommonRunsRepository();
|
|
42
|
-
this.runTripsRedisRepository = new
|
|
42
|
+
this.runTripsRedisRepository = new cache_1.RunTripsRedisRepository();
|
|
43
43
|
this.gtfsTripRunManager = GTFSTripRunManagerFactory_1.GTFSTripRunManagerFactory.create(GTFSTripRunManagerFactory_1.GTFSTripRunType.Common, this.positionsRepository, this.tripsRepository, this.commonRunsRepository, this.runTripsRedisRepository);
|
|
44
44
|
}
|
|
45
45
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateRunsGtfsTripIdTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"UpdateRunsGtfsTripIdTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oEAA2E;AAC3E,sFAA2G;AAE3G,2EAAoE;AACpE,2FAAqF;AACrF,2EAA6E;AAC7E,gDAA8D;AAC9D,4EAAyE;AACzE,oEAAiE;AAEjE,kGAAgH;AAChH,qFAA4F;AAE5F,MAAa,wBAAyB,SAAQ,sBAAmC;IAW7E,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAXP,cAAS,GAAG,sBAAsB,CAAC;QACnC,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,iEAAoC,CAAC;QAsD9D;;WAEG;QACK,2BAAsB,GAAG,CAAO,KAA4B,EAAE,EAAE;YACpE,MAAM,EAAE,GACJ,cAAc,KAAK,CAAC,GAAG,CAAC,QAAQ,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,GAAG;gBAC3D,GAAG,KAAK,CAAC,GAAG,CAAC,mBAAmB,IAAI,KAAK,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;YACxE,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAClF,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,EAAE,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YACnF,OAAO;QACX,CAAC,CAAA,CAAC;QAtDE,IAAI,CAAC,eAAe,GAAG,IAAI,iCAAe,EAAE,CAAC;QAC7C,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,EAAE,CAAC;QACrD,IAAI,CAAC,oBAAoB,GAAG,IAAI,2CAAoB,EAAE,CAAC;QACvD,IAAI,CAAC,uBAAuB,GAAG,IAAI,+BAAuB,EAAE,CAAC;QAE7D,IAAI,CAAC,kBAAkB,GAAG,qDAAyB,CAAC,MAAM,CACtD,2CAAe,CAAC,MAAM,EACtB,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,uBAAuB,CAC/B,CAAC;IACN,CAAC;IAED;;OAEG;IACa,OAAO,CAAC,IAA2B;;YAC/C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEpF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvB,IAAI,yCAAiC,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE;oBAC1E,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;iBAC3C;qBAAM;oBACH,aAAG,CAAC,OAAO,CAAC,8CAA8C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;iBACzF;gBACD,OAAO;aACV;YAED,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,+BAA+B,EAAE;gBACnD,aAAG,CAAC,IAAI,CACJ,uFAAuF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACpH,CAAC;gBACF,OAAO;aACV;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAEhF,2DAA2D;YAC3D,IAAI,QAAQ,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClC,MAAM,8BAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;aACvF;QACL,CAAC;KAAA;CAaJ;AApED,4DAoEC"}
|
|
@@ -47,7 +47,7 @@ class DepartureBoardsRouter extends BaseRouter_1.BaseRouter {
|
|
|
47
47
|
minutesBefore: 0,
|
|
48
48
|
timeFromValidRange: {
|
|
49
49
|
hoursBefore: 6,
|
|
50
|
-
hoursAfter:
|
|
50
|
+
hoursAfter: 2 * 24,
|
|
51
51
|
},
|
|
52
52
|
};
|
|
53
53
|
this.GetDepartureBoard = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -184,7 +184,6 @@ class DeparturesRepository extends output_gateway_1.SequelizeModel {
|
|
|
184
184
|
conditionMode,
|
|
185
185
|
],
|
|
186
186
|
};
|
|
187
|
-
const stopPrefixes = new Set(options.stopsIds.map((stopId) => stopId.substring(0, 4)));
|
|
188
187
|
return this.sequelizeModel.findAll({
|
|
189
188
|
attributes: {
|
|
190
189
|
include: [
|
|
@@ -199,11 +198,6 @@ class DeparturesRepository extends output_gateway_1.SequelizeModel {
|
|
|
199
198
|
},
|
|
200
199
|
where: {
|
|
201
200
|
[sequelize_1.default.Op.and]: [
|
|
202
|
-
{
|
|
203
|
-
part_index: {
|
|
204
|
-
[sequelize_1.default.Op.in]: [...stopPrefixes],
|
|
205
|
-
},
|
|
206
|
-
},
|
|
207
201
|
{
|
|
208
202
|
stop_id: {
|
|
209
203
|
[sequelize_1.default.Op.in]: options.stopsIds,
|