@golemio/pid 3.9.4-dev.1734454364 → 3.9.4
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 +1 -2
- package/dist/input-gateway/vehicle-positions/VehiclePositionsController.js +1 -0
- package/dist/input-gateway/vehicle-positions/VehiclePositionsController.js.map +1 -1
- package/dist/integration-engine/jis/transformations/JISInfotextsTransformation.js +2 -2
- package/dist/integration-engine/jis/transformations/JISInfotextsTransformation.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/data-access/DeparturePresetsRepository.d.ts +0 -2
- package/dist/integration-engine/ropid-gtfs/data-access/DeparturePresetsRepository.js +6 -15
- package/dist/integration-engine/ropid-gtfs/data-access/DeparturePresetsRepository.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/facade/DeparturePresetsFacade.d.ts +1 -8
- package/dist/integration-engine/ropid-gtfs/facade/DeparturePresetsFacade.js +5 -39
- package/dist/integration-engine/ropid-gtfs/facade/DeparturePresetsFacade.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/ioc/Di.js +0 -6
- package/dist/integration-engine/ropid-gtfs/ioc/Di.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.d.ts +0 -2
- package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.js +0 -2
- package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/presets/tasks/DownloadDeparturesPresetsTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateTrainDelayTask.js.map +1 -1
- package/dist/output-gateway/pid/ioc/Di.js +0 -12
- package/dist/output-gateway/pid/ioc/Di.js.map +1 -1
- package/dist/output-gateway/pid/ioc/OgPidToken.d.ts +0 -6
- package/dist/output-gateway/pid/ioc/OgPidToken.js +0 -6
- package/dist/output-gateway/pid/ioc/OgPidToken.js.map +1 -1
- package/dist/output-gateway/pid/routers/v3/V3PIDRouter.d.ts +0 -1
- package/dist/output-gateway/pid/routers/v3/V3PIDRouter.js +0 -4
- package/dist/output-gateway/pid/routers/v3/V3PIDRouter.js.map +1 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopModel.d.ts +3 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopModel.js +30 -4
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopModel.js.map +1 -1
- package/dist/schema-definitions/jis/datasources/JISInfotextsJsonSchema.js +2 -2
- package/dist/schema-definitions/jis/datasources/JISInfotextsJsonSchema.js.map +1 -1
- package/dist/schema-definitions/jis/datasources/interfaces/IJISInfotextStop.d.ts +1 -1
- package/docs/openapi-output.yaml +0 -39
- package/package.json +3 -3
- package/db/example/21_ropid_departures_presets_ropidgtfs_stops.sql +0 -6
- package/db/migrations/postgresql/20250312125125-create-presets-ropidgtfs-stops-table.js +0 -53
- package/db/migrations/postgresql/sqls/20250312125125-create-presets-ropidgtfs-stops-table-down.sql +0 -1
- package/db/migrations/postgresql/sqls/20250312125125-create-presets-ropidgtfs-stops-table-up.sql +0 -7
- package/dist/helpers/GtfsStopParser.d.ts +0 -6
- package/dist/helpers/GtfsStopParser.js +0 -44
- package/dist/helpers/GtfsStopParser.js.map +0 -1
- package/dist/integration-engine/jis/repositories/RopidDeparturesPresetsRopidGTFSStopsRepository.d.ts +0 -13
- package/dist/integration-engine/jis/repositories/RopidDeparturesPresetsRopidGTFSStopsRepository.js +0 -39
- package/dist/integration-engine/jis/repositories/RopidDeparturesPresetsRopidGTFSStopsRepository.js.map +0 -1
- package/dist/output-gateway/pid/controllers/v3/V3DeparturesPresetController.d.ts +0 -8
- package/dist/output-gateway/pid/controllers/v3/V3DeparturesPresetController.js +0 -44
- package/dist/output-gateway/pid/controllers/v3/V3DeparturesPresetController.js.map +0 -1
- package/dist/output-gateway/pid/data-access/RopidDeparturesPresetRepository.d.ts +0 -14
- package/dist/output-gateway/pid/data-access/RopidDeparturesPresetRepository.js +0 -82
- package/dist/output-gateway/pid/data-access/RopidDeparturesPresetRepository.js.map +0 -1
- package/dist/output-gateway/pid/data-access/RopidDeparturesPresetsRopidGTFSStopsRepository.d.ts +0 -13
- package/dist/output-gateway/pid/data-access/RopidDeparturesPresetsRopidGTFSStopsRepository.js +0 -39
- package/dist/output-gateway/pid/data-access/RopidDeparturesPresetsRopidGTFSStopsRepository.js.map +0 -1
- package/dist/output-gateway/pid/domain/DeparturesPresetInterfaces.d.ts +0 -6
- package/dist/output-gateway/pid/domain/DeparturesPresetInterfaces.js +0 -3
- package/dist/output-gateway/pid/domain/DeparturesPresetInterfaces.js.map +0 -1
- package/dist/output-gateway/pid/service/facade/RopidDeparturesPresetFacade.d.ts +0 -9
- package/dist/output-gateway/pid/service/facade/RopidDeparturesPresetFacade.js +0 -37
- package/dist/output-gateway/pid/service/facade/RopidDeparturesPresetFacade.js.map +0 -1
- package/dist/output-gateway/pid/service/transformations/RopidDeparturesPresetTransformation.d.ts +0 -7
- package/dist/output-gateway/pid/service/transformations/RopidDeparturesPresetTransformation.js +0 -30
- package/dist/output-gateway/pid/service/transformations/RopidDeparturesPresetTransformation.js.map +0 -1
- package/dist/schema-definitions/jis/models/RopidDeparturesPresetsRopidGTFSStopsModel.d.ts +0 -12
- package/dist/schema-definitions/jis/models/RopidDeparturesPresetsRopidGTFSStopsModel.js +0 -41
- package/dist/schema-definitions/jis/models/RopidDeparturesPresetsRopidGTFSStopsModel.js.map +0 -1
- package/dist/schema-definitions/jis/models/interfaces/IPresetsGtfsStops.d.ts +0 -4
- package/dist/schema-definitions/jis/models/interfaces/IPresetsGtfsStops.js +0 -3
- package/dist/schema-definitions/jis/models/interfaces/IPresetsGtfsStops.js.map +0 -1
- package/dist/schema-definitions/jis/models/interfaces/IPresetsRopidGTFSStops.d.ts +0 -7
- package/dist/schema-definitions/jis/models/interfaces/IPresetsRopidGTFSStops.js +0 -3
- package/dist/schema-definitions/jis/models/interfaces/IPresetsRopidGTFSStops.js.map +0 -1
- package/dist/schema-definitions/ropid-departures-presets/models/RopidDeparturesPresetsModel.d.ts +0 -19
- package/dist/schema-definitions/ropid-departures-presets/models/RopidDeparturesPresetsModel.js +0 -64
- package/dist/schema-definitions/ropid-departures-presets/models/RopidDeparturesPresetsModel.js.map +0 -1
- package/dist/schema-definitions/ropid-departures-presets/models/interfaces/IRopidDeparturesPresets.d.ts +0 -9
- package/dist/schema-definitions/ropid-departures-presets/models/interfaces/IRopidDeparturesPresets.js +0 -3
- package/dist/schema-definitions/ropid-departures-presets/models/interfaces/IRopidDeparturesPresets.js.map +0 -1
|
@@ -34,8 +34,7 @@ TRUNCATE
|
|
|
34
34
|
"ropidgtfs_precomputed_trip_schedule_actual",
|
|
35
35
|
"ropidgtfs_precomputed_services_calendar_actual",
|
|
36
36
|
"ropidgtfs_precomputed_minmax_stop_sequences_actual",
|
|
37
|
-
"ropidgtfs_precomputed_departures"
|
|
38
|
-
"ropid_departures_presets_ropidgtfs_stops";
|
|
37
|
+
"ropidgtfs_precomputed_departures";
|
|
39
38
|
|
|
40
39
|
ALTER SEQUENCE ropid_departures_directions_id_seq RESTART;
|
|
41
40
|
ALTER SEQUENCE ropid_departures_presets_id_seq RESTART;
|
|
@@ -20,6 +20,7 @@ class VehiclePositionsController extends controllers_1.BaseController {
|
|
|
20
20
|
const dataBatches = this.splitData(inputData);
|
|
21
21
|
for (const batch of dataBatches) {
|
|
22
22
|
await this.sendMessageToExchange("input." + this.queuePrefix + ".saveDataToDB", JSON.stringify(batch), {
|
|
23
|
+
persistent: true,
|
|
23
24
|
timestamp: new Date().getTime(),
|
|
24
25
|
});
|
|
25
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VehiclePositionsController.js","sourceRoot":"","sources":["../../../src/input-gateway/vehicle-positions/VehiclePositionsController.ts"],"names":[],"mappings":";;;AAAA,kFAA0D;AAG1D,wEAAqE;AACrE,8EAA8E;AAC9E,8DAA6E;AAC7E,6EAA8F;AAC9F,mFAAkF;AAElF,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAE/B,MAAa,0BAA2B,SAAQ,4BAAc;IAM1D;QACI,KAAK,CACD,oCAAgB,CAAC,IAAI,EACrB,IAAI,uCAAmB,CAAC,oCAAgB,CAAC,IAAI,GAAG,YAAY,EAAE,oCAAgB,CAAC,oBAAoB,CAAC,CACvG,CAAC;QAMN;;WAEG;QACI,gBAAW,GAAG,KAAK,EAAE,SAA2B,EAAiB,EAAE;YACtE,IAAI;gBACA,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,kBAAkB;gBAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBAC9C,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE;oBAC7B,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,GAAG,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;wBACnG,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;qBAClC,CAAC,CAAC;iBACN;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,GAAG,YAAY,qCAAoB,EAAE;oBACrC,MAAM,GAAG,CAAC;iBACb;qBAAM;oBACH,MAAM,IAAI,6BAAY,CAAC,oCAAoC,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;iBACrF;aACJ;QACL,CAAC,CAAC;QAEM,cAAS,GAAG,CAAC,IAAsB,EAAsB,EAAE;YAC/D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;gBAC7B,OAAO,CAAC,IAAI,CAAC,CAAC;aACjB;YAED,MAAM,MAAM,GAAuB,EAAE,CAAC;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE;gBAChF,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;gBAClD,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;aACvC;YACD,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"VehiclePositionsController.js","sourceRoot":"","sources":["../../../src/input-gateway/vehicle-positions/VehiclePositionsController.ts"],"names":[],"mappings":";;;AAAA,kFAA0D;AAG1D,wEAAqE;AACrE,8EAA8E;AAC9E,8DAA6E;AAC7E,6EAA8F;AAC9F,mFAAkF;AAElF,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAE/B,MAAa,0BAA2B,SAAQ,4BAAc;IAM1D;QACI,KAAK,CACD,oCAAgB,CAAC,IAAI,EACrB,IAAI,uCAAmB,CAAC,oCAAgB,CAAC,IAAI,GAAG,YAAY,EAAE,oCAAgB,CAAC,oBAAoB,CAAC,CACvG,CAAC;QAMN;;WAEG;QACI,gBAAW,GAAG,KAAK,EAAE,SAA2B,EAAiB,EAAE;YACtE,IAAI;gBACA,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,kBAAkB;gBAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBAC9C,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE;oBAC7B,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,GAAG,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;wBACnG,UAAU,EAAE,IAAI;wBAChB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;qBAClC,CAAC,CAAC;iBACN;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,GAAG,YAAY,qCAAoB,EAAE;oBACrC,MAAM,GAAG,CAAC;iBACb;qBAAM;oBACH,MAAM,IAAI,6BAAY,CAAC,oCAAoC,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;iBACrF;aACJ;QACL,CAAC,CAAC;QAEM,cAAS,GAAG,CAAC,IAAsB,EAAsB,EAAE;YAC/D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;gBAC7B,OAAO,CAAC,IAAI,CAAC,CAAC;aACjB;YAED,MAAM,MAAM,GAAuB,EAAE,CAAC;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE;gBAChF,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;gBAClD,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;aACvC;YACD,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC;QAtCE,MAAM,MAAM,GAAG,2BAAqB,CAAC,OAAO,CAAgB,qBAAS,CAAC,YAAY,CAAC,CAAC;QACpF,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,4CAA4C,EAAE,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/G,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;CAoCJ;AAlDD,gEAkDC"}
|
|
@@ -24,9 +24,9 @@ let JISInfotextsTransformation = exports.JISInfotextsTransformation = class JISI
|
|
|
24
24
|
created_timestamp: new Date(data.created_timestamp),
|
|
25
25
|
updated_timestamp: new Date(data.last_modified_timestamp),
|
|
26
26
|
};
|
|
27
|
-
const infotextsRopidGTFSStops = data.informed_entity?.stops?.map(({
|
|
27
|
+
const infotextsRopidGTFSStops = data.informed_entity?.stops?.map(({ stop_id }) => ({
|
|
28
28
|
infotext_id: data.id,
|
|
29
|
-
stop_id
|
|
29
|
+
stop_id,
|
|
30
30
|
})) ?? [];
|
|
31
31
|
return {
|
|
32
32
|
infotext,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextsTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/transformations/JISInfotextsTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAKA,6GAA0G;AAC1G,iEAAgE;AASzD,IAAM,0BAA0B,wCAAhC,MAAM,0BAA2B,SAAQ,+CAAiD;IAA1F;;QACI,SAAI,GAAG,4BAA4B,CAAC;QAEjC,sBAAiB,GAAG,CAAC,IAAiB,EAAgB,EAAE;YAC9D,MAAM,QAAQ,GAAG;gBACb,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,mBAAmB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;gBACvD,iBAAiB,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;gBACnF,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,iBAAiB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBACnD,iBAAiB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC;aAC5D,CAAC;YACF,MAAM,uBAAuB,GACzB,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"JISInfotextsTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/transformations/JISInfotextsTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAKA,6GAA0G;AAC1G,iEAAgE;AASzD,IAAM,0BAA0B,wCAAhC,MAAM,0BAA2B,SAAQ,+CAAiD;IAA1F;;QACI,SAAI,GAAG,4BAA4B,CAAC;QAEjC,sBAAiB,GAAG,CAAC,IAAiB,EAAgB,EAAE;YAC9D,MAAM,QAAQ,GAAG;gBACb,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,mBAAmB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;gBACvD,iBAAiB,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;gBACnF,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,iBAAiB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBACnD,iBAAiB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC;aAC5D,CAAC;YACF,MAAM,uBAAuB,GACzB,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC/C,WAAW,EAAE,IAAI,CAAC,EAAE;gBACpB,OAAO;aACV,CAAC,CAAC,IAAI,EAAE,CAAC;YACd,OAAO;gBACH,QAAQ;gBACR,uBAAuB;aAC1B,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;qCAxBY,0BAA0B;IADtC,IAAA,qBAAU,GAAE;GACA,0BAA0B,CAwBtC"}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import { RopidDeparturesPresetsModel } from "../../../schema-definitions/ropid-departures-presets/models/RopidDeparturesPresetsModel";
|
|
2
1
|
import { PostgresModel } from "@golemio/core/dist/integration-engine";
|
|
3
2
|
export declare class DeparturePresetsRepository extends PostgresModel {
|
|
4
3
|
constructor();
|
|
5
|
-
getAll: () => Promise<RopidDeparturesPresetsModel[]>;
|
|
6
4
|
}
|
|
@@ -2,28 +2,19 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DeparturePresetsRepository = void 0;
|
|
4
4
|
const const_1 = require("../../../schema-definitions/const");
|
|
5
|
-
const
|
|
6
|
-
const RopidDeparturesPresetsModel_1 = require("../../../schema-definitions/ropid-departures-presets/models/RopidDeparturesPresetsModel");
|
|
7
|
-
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
5
|
+
const ropid_departures_presets_1 = require("../../../schema-definitions/ropid-departures-presets");
|
|
8
6
|
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
7
|
+
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
9
8
|
class DeparturePresetsRepository extends integration_engine_1.PostgresModel {
|
|
10
9
|
constructor() {
|
|
11
|
-
super("
|
|
10
|
+
super(ropid_departures_presets_1.RopidDeparturesPresets.name + "Model", {
|
|
12
11
|
hasTmpTable: true,
|
|
13
|
-
outputSequelizeAttributes:
|
|
14
|
-
pgTableName:
|
|
12
|
+
outputSequelizeAttributes: ropid_departures_presets_1.RopidDeparturesPresets.outputSequelizeAttributes,
|
|
13
|
+
pgTableName: ropid_departures_presets_1.RopidDeparturesPresets.pgTableName,
|
|
15
14
|
pgSchema: const_1.PG_SCHEMA,
|
|
16
15
|
savingType: "insertOnly",
|
|
17
16
|
addAuditAttributes: true,
|
|
18
|
-
}, new golemio_validator_1.JSONSchemaValidator("
|
|
19
|
-
this.getAll = async () => {
|
|
20
|
-
try {
|
|
21
|
-
return this.sequelizeModel.findAll();
|
|
22
|
-
}
|
|
23
|
-
catch (err) {
|
|
24
|
-
throw new golemio_errors_1.GeneralError("Database error", "DeparturePresetsRepository", err, 500);
|
|
25
|
-
}
|
|
26
|
-
};
|
|
17
|
+
}, new golemio_validator_1.JSONSchemaValidator(ropid_departures_presets_1.RopidDeparturesPresets.name + "ModelValidator", ropid_departures_presets_1.RopidDeparturesPresets.outputJsonSchema));
|
|
27
18
|
}
|
|
28
19
|
}
|
|
29
20
|
exports.DeparturePresetsRepository = DeparturePresetsRepository;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeparturePresetsRepository.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/data-access/DeparturePresetsRepository.ts"],"names":[],"mappings":";;;AAAA,6DAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"DeparturePresetsRepository.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/data-access/DeparturePresetsRepository.ts"],"names":[],"mappings":";;;AAAA,6DAAuC;AACvC,mGAAuE;AACvE,8EAAsE;AACtE,mFAAkF;AAElF,MAAa,0BAA2B,SAAQ,kCAAa;IACzD;QACI,KAAK,CACD,iDAAsB,CAAC,IAAI,GAAG,OAAO,EACrC;YACI,WAAW,EAAE,IAAI;YACjB,yBAAyB,EAAE,iDAAsB,CAAC,yBAAyB;YAC3E,WAAW,EAAE,iDAAsB,CAAC,WAAW;YAC/C,QAAQ,EAAE,iBAAS;YACnB,UAAU,EAAE,YAAY;YACxB,kBAAkB,EAAE,IAAI;SAC3B,EACD,IAAI,uCAAmB,CAAC,iDAAsB,CAAC,IAAI,GAAG,gBAAgB,EAAE,iDAAsB,CAAC,gBAAgB,CAAC,CACnH,CAAC;IACN,CAAC;CACJ;AAfD,gEAeC"}
|
|
@@ -3,18 +3,11 @@ import { ILogger } from "@golemio/core/dist/helpers/logger/LoggerProvider";
|
|
|
3
3
|
import { RopidGtfsMetadataRepository } from "../RopidGtfsMetadataRepository";
|
|
4
4
|
import { DeparturePresetsRepository } from "../data-access/DeparturePresetsRepository";
|
|
5
5
|
import { RopidDeparturesPresetsTransformation } from "../transformations/RopidDeparturesPresetsTransformation";
|
|
6
|
-
import { RopidGTFSStopsModel } from "../RopidGTFSStopsModel";
|
|
7
|
-
import { RopidDeparturesPresetsRopidGTFSStopsRepository } from "../../jis/repositories/RopidDeparturesPresetsRopidGTFSStopsRepository";
|
|
8
|
-
import { GtfsStopParser } from "../../../helpers/GtfsStopParser";
|
|
9
6
|
export declare class DeparturePresetsFacade {
|
|
10
7
|
private metadataRepository;
|
|
11
|
-
private ropidGTFSStopsModel;
|
|
12
8
|
private departurePresetsRepository;
|
|
13
|
-
private ropidDeparturesPresetsRopidGTFSStopsRepository;
|
|
14
9
|
private transformationDeparturesPresets;
|
|
15
|
-
private gtfsStopParser;
|
|
16
10
|
private logger;
|
|
17
|
-
constructor(metadataRepository: RopidGtfsMetadataRepository,
|
|
11
|
+
constructor(metadataRepository: RopidGtfsMetadataRepository, departurePresetsRepository: DeparturePresetsRepository, transformationDeparturesPresets: RopidDeparturesPresetsTransformation, logger: ILogger);
|
|
18
12
|
handleNewDeparturePresets(data: IRopidDeparturesPreset[], lastModified: string): Promise<void>;
|
|
19
|
-
private mapPresetsToGtfsStops;
|
|
20
13
|
}
|
|
@@ -22,17 +22,11 @@ const RopidGtfsMetadataRepository_1 = require("../RopidGtfsMetadataRepository");
|
|
|
22
22
|
const DeparturePresetsRepository_1 = require("../data-access/DeparturePresetsRepository");
|
|
23
23
|
const RopidGtfsContainerToken_1 = require("../ioc/RopidGtfsContainerToken");
|
|
24
24
|
const RopidDeparturesPresetsTransformation_1 = require("../transformations/RopidDeparturesPresetsTransformation");
|
|
25
|
-
const RopidGTFSStopsModel_1 = require("../RopidGTFSStopsModel");
|
|
26
|
-
const RopidDeparturesPresetsRopidGTFSStopsRepository_1 = require("../../jis/repositories/RopidDeparturesPresetsRopidGTFSStopsRepository");
|
|
27
|
-
const GtfsStopParser_1 = require("../../../helpers/GtfsStopParser");
|
|
28
25
|
let DeparturePresetsFacade = exports.DeparturePresetsFacade = class DeparturePresetsFacade {
|
|
29
|
-
constructor(metadataRepository,
|
|
26
|
+
constructor(metadataRepository, departurePresetsRepository, transformationDeparturesPresets, logger) {
|
|
30
27
|
this.metadataRepository = metadataRepository;
|
|
31
|
-
this.ropidGTFSStopsModel = ropidGTFSStopsModel;
|
|
32
28
|
this.departurePresetsRepository = departurePresetsRepository;
|
|
33
|
-
this.ropidDeparturesPresetsRopidGTFSStopsRepository = ropidDeparturesPresetsRopidGTFSStopsRepository;
|
|
34
29
|
this.transformationDeparturesPresets = transformationDeparturesPresets;
|
|
35
|
-
this.gtfsStopParser = gtfsStopParser;
|
|
36
30
|
this.logger = logger;
|
|
37
31
|
}
|
|
38
32
|
async handleNewDeparturePresets(data, lastModified) {
|
|
@@ -64,49 +58,21 @@ let DeparturePresetsFacade = exports.DeparturePresetsFacade = class DeparturePre
|
|
|
64
58
|
});
|
|
65
59
|
await this.metadataRepository.checkSavedRows(RopidGtfsFacade_1.DatasetEnum.DEPARTURES_PRESETS, dbLastModified.version + 1);
|
|
66
60
|
await this.metadataRepository.replaceTmpTables(RopidGtfsFacade_1.DatasetEnum.DEPARTURES_PRESETS, dbLastModified.version + 1);
|
|
67
|
-
const mappedPresetsWithGtfsStops = await this.mapPresetsToGtfsStops();
|
|
68
|
-
await this.ropidDeparturesPresetsRopidGTFSStopsRepository.sequelizeModel.bulkCreate(mappedPresetsWithGtfsStops);
|
|
69
61
|
}
|
|
70
62
|
catch (err) {
|
|
71
63
|
this.logger.error(err);
|
|
72
64
|
await this.metadataRepository.rollbackFailedSaving(RopidGtfsFacade_1.DatasetEnum.DEPARTURES_PRESETS, dbLastModified.version + 1);
|
|
73
65
|
}
|
|
74
66
|
}
|
|
75
|
-
async mapPresetsToGtfsStops() {
|
|
76
|
-
const presets = await this.departurePresetsRepository.getAll();
|
|
77
|
-
const mappedPresetsWithGtfsStops = [];
|
|
78
|
-
for (const preset of presets) {
|
|
79
|
-
const params = new URLSearchParams(preset.url_query_params);
|
|
80
|
-
const aswIds = params.getAll("aswIds");
|
|
81
|
-
const WhereOptions = this.gtfsStopParser.prepareAswWhereOptions(aswIds);
|
|
82
|
-
for (const WhereOption of WhereOptions) {
|
|
83
|
-
const stop = await this.ropidGTFSStopsModel.findOne({
|
|
84
|
-
where: WhereOption,
|
|
85
|
-
});
|
|
86
|
-
if (!stop) {
|
|
87
|
-
this.logger.warn(WhereOption, `cannot find gtfs stop with where options`);
|
|
88
|
-
continue;
|
|
89
|
-
}
|
|
90
|
-
mappedPresetsWithGtfsStops.push({ preset_id: preset.id, stop_id: stop.stop_id });
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
return mappedPresetsWithGtfsStops;
|
|
94
|
-
}
|
|
95
67
|
};
|
|
96
68
|
exports.DeparturePresetsFacade = DeparturePresetsFacade = __decorate([
|
|
97
69
|
(0, tsyringe_1.injectable)(),
|
|
98
70
|
__param(0, (0, tsyringe_1.inject)(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsMetadataRepository)),
|
|
99
|
-
__param(1, (0, tsyringe_1.inject)(
|
|
100
|
-
__param(2, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.
|
|
101
|
-
__param(3, (0, tsyringe_1.inject)(
|
|
102
|
-
__param(4, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.RopidDeparturesPresetsTransformation)),
|
|
103
|
-
__param(5, (0, tsyringe_1.inject)(RopidGtfsContainerToken_1.RopidGtfsContainerToken.GtfsStopParser)),
|
|
104
|
-
__param(6, (0, tsyringe_1.inject)(ContainerToken_1.ContainerToken.Logger)),
|
|
71
|
+
__param(1, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.DeparturePresetsRepository)),
|
|
72
|
+
__param(2, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.RopidDeparturesPresetsTransformation)),
|
|
73
|
+
__param(3, (0, tsyringe_1.inject)(ContainerToken_1.ContainerToken.Logger)),
|
|
105
74
|
__metadata("design:paramtypes", [RopidGtfsMetadataRepository_1.RopidGtfsMetadataRepository,
|
|
106
|
-
RopidGTFSStopsModel_1.RopidGTFSStopsModel,
|
|
107
75
|
DeparturePresetsRepository_1.DeparturePresetsRepository,
|
|
108
|
-
|
|
109
|
-
RopidDeparturesPresetsTransformation_1.RopidDeparturesPresetsTransformation,
|
|
110
|
-
GtfsStopParser_1.GtfsStopParser, Object])
|
|
76
|
+
RopidDeparturesPresetsTransformation_1.RopidDeparturesPresetsTransformation, Object])
|
|
111
77
|
], DeparturePresetsFacade);
|
|
112
78
|
//# sourceMappingURL=DeparturePresetsFacade.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeparturePresetsFacade.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/facade/DeparturePresetsFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yEAAoE;AACpE,wEAAoG;AAGpG,6FAA0F;AAC1F,iEAAwE;AACxE,wDAAiD;AACjD,gFAA6E;AAC7E,0FAAuF;AACvF,4EAAyE;AACzE,kHAA+G;
|
|
1
|
+
{"version":3,"file":"DeparturePresetsFacade.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/facade/DeparturePresetsFacade.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,8 +31,6 @@ const DeparturesDirectionDataSourceProvider_1 = require("../datasources/static-d
|
|
|
31
31
|
const MetroRailTrackDataSourceProvider_1 = require("../datasources/static-data/MetroRailTrackDataSourceProvider");
|
|
32
32
|
const SaveStaticDataTask_1 = require("../workers/timetables/tasks/SaveStaticDataTask");
|
|
33
33
|
const DeparturesDirectionTransformation_1 = require("../workers/timetables/tasks/transformations/DeparturesDirectionTransformation");
|
|
34
|
-
const RopidDeparturesPresetsRopidGTFSStopsRepository_1 = require("../../jis/repositories/RopidDeparturesPresetsRopidGTFSStopsRepository");
|
|
35
|
-
const GtfsStopParser_1 = require("../../../helpers/GtfsStopParser");
|
|
36
34
|
//#region Initialization
|
|
37
35
|
const RopidGtfsContainer = Di_1.PidContainer.createChildContainer();
|
|
38
36
|
exports.RopidGtfsContainer = RopidGtfsContainer;
|
|
@@ -50,7 +48,6 @@ RopidGtfsContainer.register(RopidGtfsContainerToken_1.RopidGtfsContainerToken.Ro
|
|
|
50
48
|
RopidGtfsContainer.register(RopidGtfsContainerToken_1.RopidGtfsContainerToken.DepartureRepository, precomputed_1.DeparturesRepository);
|
|
51
49
|
RopidGtfsContainer.register(RopidGtfsContainerToken_1.RopidGtfsContainerToken.PublicGtfsDepartureRepository, PublicGtfsDepartureRepository_1.PublicGtfsDepartureRepository);
|
|
52
50
|
RopidGtfsContainer.register(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGTFSStopsModel, RopidGTFSStopsModel_1.RopidGTFSStopsModel);
|
|
53
|
-
RopidGtfsContainer.register(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidDeparturesPresetsRopidGTFSStopsRepository, RopidDeparturesPresetsRopidGTFSStopsRepository_1.RopidDeparturesPresetsRopidGTFSStopsRepository);
|
|
54
51
|
RopidGtfsContainer.register(RopidGtfsContainerToken_1.RopidGtfsContainerToken.DeparturesDirectionRepository, DeparturesDirectionRepository_1.DeparturesDirectionRepository);
|
|
55
52
|
//#endregion
|
|
56
53
|
//#region Transformations
|
|
@@ -72,7 +69,4 @@ RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContaine
|
|
|
72
69
|
RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.DownloadDeparturesPresetsTask, DownloadDeparturesPresetsTask_1.DownloadDeparturesPresetsTask);
|
|
73
70
|
RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.CheckForNewDeparturesPresetsTask, CheckForNewDeparturesPresetsTask_1.CheckForNewDeparturesPresetsTask);
|
|
74
71
|
RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.SaveStaticDataTask, SaveStaticDataTask_1.SaveStaticDataTask);
|
|
75
|
-
//#endregion
|
|
76
|
-
// #regin Helpers
|
|
77
|
-
RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.GtfsStopParser, GtfsStopParser_1.GtfsStopParser);
|
|
78
72
|
//# sourceMappingURL=Di.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAC1C,uEAA4C;AAC5C,qFAA8F;AAC9F,iEAAoF;AACpF,wDAAqD;AACrD,gFAA6E;AAC7E,4EAAyE;AACzE,8FAA2F;AAC3F,sGAAmG;AACnG,8FAA2F;AAC3F,4DAAkE;AAClE,6EAA0E;AAC1E,8GAA2G;AAC3G,wFAAqF;AACrF,yHAAsH;AACtH,yGAAsG;AACtG,2FAAwF;AACxF,uEAAoE;AACpE,4GAAyG;AACzG,gHAA6G;AAC7G,0GAAuG;AACvG,gEAA6D;AAC7D,oFAAiF;AACjF,yHAAsH;AACtH,mIAAgI;AAChI,qHAAkH;AAClH,4HAAyH;AACzH,kHAA+G;AAC/G,uFAAoF;AACpF,qIAAkI;
|
|
1
|
+
{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/ioc/Di.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,5 @@ declare const RopidGtfsContainerToken: {
|
|
|
26
26
|
DeparturesDirectionDataSourceProvider: symbol;
|
|
27
27
|
SaveStaticDataTask: symbol;
|
|
28
28
|
DeparturesDirectionTransformation: symbol;
|
|
29
|
-
RopidDeparturesPresetsRopidGTFSStopsRepository: symbol;
|
|
30
|
-
GtfsStopParser: symbol;
|
|
31
29
|
};
|
|
32
30
|
export { RopidGtfsContainerToken };
|
|
@@ -29,8 +29,6 @@ const RopidGtfsContainerToken = {
|
|
|
29
29
|
DeparturesDirectionDataSourceProvider: Symbol(),
|
|
30
30
|
SaveStaticDataTask: Symbol(),
|
|
31
31
|
DeparturesDirectionTransformation: Symbol(),
|
|
32
|
-
RopidDeparturesPresetsRopidGTFSStopsRepository: Symbol(),
|
|
33
|
-
GtfsStopParser: Symbol(),
|
|
34
32
|
};
|
|
35
33
|
exports.RopidGtfsContainerToken = RopidGtfsContainerToken;
|
|
36
34
|
//# sourceMappingURL=RopidGtfsContainerToken.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidGtfsContainerToken.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,uBAAuB,GAAG;IAC5B,yBAAyB,EAAE,MAAM,EAAE;IACnC,2BAA2B,EAAE,MAAM,EAAE;IACrC,uBAAuB,EAAE,MAAM,EAAE;IACjC,yBAAyB,EAAE,MAAM,EAAE;IACnC,uBAAuB,EAAE,MAAM,EAAE;IACjC,kCAAkC,EAAE,MAAM,EAAE;IAC5C,gBAAgB,EAAE,MAAM,EAAE;IAC1B,kBAAkB,EAAE,MAAM,EAAE;IAC5B,mBAAmB,EAAE,MAAM,EAAE;IAC7B,mBAAmB,EAAE,MAAM,EAAE;IAC7B,6BAA6B,EAAE,MAAM,EAAE;IACvC,sBAAsB,EAAE,MAAM,EAAE;IAChC,eAAe,EAAE,MAAM,EAAE;IACzB,mCAAmC,EAAE,MAAM,EAAE;IAC7C,2BAA2B,EAAE,MAAM,EAAE;IACrC,gCAAgC,EAAE,MAAM,EAAE;IAC1C,6BAA6B,EAAE,MAAM,EAAE;IACvC,mBAAmB,EAAE,MAAM,EAAE;IAC7B,uBAAuB,EAAE,MAAM,EAAE;IACjC,uBAAuB,EAAE,MAAM,EAAE;IACjC,6BAA6B,EAAE,MAAM,EAAE;IACvC,gCAAgC,EAAE,MAAM,EAAE;IAC1C,2BAA2B,EAAE,MAAM,EAAE;IACrC,gCAAgC,EAAE,MAAM,EAAE;IAC1C,qCAAqC,EAAE,MAAM,EAAE;IAC/C,kBAAkB,EAAE,MAAM,EAAE;IAC5B,iCAAiC,EAAE,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"RopidGtfsContainerToken.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,uBAAuB,GAAG;IAC5B,yBAAyB,EAAE,MAAM,EAAE;IACnC,2BAA2B,EAAE,MAAM,EAAE;IACrC,uBAAuB,EAAE,MAAM,EAAE;IACjC,yBAAyB,EAAE,MAAM,EAAE;IACnC,uBAAuB,EAAE,MAAM,EAAE;IACjC,kCAAkC,EAAE,MAAM,EAAE;IAC5C,gBAAgB,EAAE,MAAM,EAAE;IAC1B,kBAAkB,EAAE,MAAM,EAAE;IAC5B,mBAAmB,EAAE,MAAM,EAAE;IAC7B,mBAAmB,EAAE,MAAM,EAAE;IAC7B,6BAA6B,EAAE,MAAM,EAAE;IACvC,sBAAsB,EAAE,MAAM,EAAE;IAChC,eAAe,EAAE,MAAM,EAAE;IACzB,mCAAmC,EAAE,MAAM,EAAE;IAC7C,2BAA2B,EAAE,MAAM,EAAE;IACrC,gCAAgC,EAAE,MAAM,EAAE;IAC1C,6BAA6B,EAAE,MAAM,EAAE;IACvC,mBAAmB,EAAE,MAAM,EAAE;IAC7B,uBAAuB,EAAE,MAAM,EAAE;IACjC,uBAAuB,EAAE,MAAM,EAAE;IACjC,6BAA6B,EAAE,MAAM,EAAE;IACvC,gCAAgC,EAAE,MAAM,EAAE;IAC1C,2BAA2B,EAAE,MAAM,EAAE;IACrC,gCAAgC,EAAE,MAAM,EAAE;IAC1C,qCAAqC,EAAE,MAAM,EAAE;IAC/C,kBAAkB,EAAE,MAAM,EAAE;IAC5B,iCAAiC,EAAE,MAAM,EAAE;CAC9C,CAAC;AAEO,0DAAuB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DownloadDeparturesPresetsTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/tasks/DownloadDeparturesPresetsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mFAAsF;AACtF,kFAAqF;AACrF,8EAA0E;AAC1E,6EAA8F;AAC9F,iEAAwE;AACxE,4FAAyF;
|
|
1
|
+
{"version":3,"file":"DownloadDeparturesPresetsTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/tasks/DownloadDeparturesPresetsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mFAAsF;AACtF,kFAAqF;AACrF,8EAA0E;AAC1E,6EAA8F;AAC9F,iEAAwE;AACxE,4FAAyF;AAEzF,6EAA4C;AAGrC,IAAM,6BAA6B,2CAAnC,MAAM,6BAA8B,SAAQ,sCAAiB;IAIhE,YAEI,2BAAgE,EACR,MAAsC;QAE9F,KAAK,CAAC,sBAAS,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAH5B,gCAA2B,GAA3B,2BAA2B,CAA6B;QACA,WAAM,GAAN,MAAM,CAAwB;QANlG,cAAS,GAAG,2BAA2B,CAAC;QACxC,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;IAQtC,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,IAAI;YACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,EAAE,CAAC;YAC7D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,eAAe,EAAE,CAAC;YAC9E,MAAM,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;SACxE;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,YAAY,qCAAoB,EAAE;gBACrC,MAAM,GAAG,CAAC;aACb;iBAAM;gBACH,MAAM,IAAI,6BAAY,CAAC,8CAA8C,GAAG,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACpH;SACJ;IACL,CAAC;CACJ,CAAA;wCAzBY,6BAA6B;IADzC,IAAA,qBAAU,GAAE;IAMJ,WAAA,IAAA,iBAAM,EAAC,iDAAuB,CAAC,2BAA2B,CAAC,CAAA;IAE3D,WAAA,IAAA,iBAAM,EAAC,iDAAuB,CAAC,sBAAsB,CAAC,CAAA;qCADlB,yDAA2B;QACQ,+CAAsB;GAPzF,6BAA6B,CAyBzC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PropagateTrainDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateTrainDelayTask.ts"],"names":[],"mappings":";;;AACA,sDAA2D;AAC3D,gGAAqF;AAErF,wEAAqE;AAErE,mEAAuF;AACvF,mEAAyD;AAGzD,mFAAqF;AACrF,sFAAmF;AAEnF,MAAa,uBAAwB,SAAQ,uDAAqD;IAU9F,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAVP,cAAS,GAAG,qBAAqB,CAAC;QAClC,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,0DAA8B,CAAC;QAiEhD,sBAAiB,GAAG,KAAK,EAC7B,aAAiC,EACjC,eAAuB,EACI,EAAE;YAC7B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;gBAC5C,UAAU,EAAE,CAAC,cAAc,CAAC;gBAC5B,KAAK,EAAE;oBACH,aAAa,EAAE,aAAa;oBAC5B,eAAe,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,eAAe,EAAE;iBAChD;gBACD,KAAK,EAAE,CAAC,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;gBACnC,GAAG,EAAE,IAAI;aACZ,CAAC,CAAC;YAEH,OAAO,IAAI,EAAE,YAAY,CAAC;QAC9B,CAAC,CAAC;QAvEE,IAAI,CAAC,MAAM,GAAG,gCAA0B,CAAC,OAAO,CAAU,qBAAS,CAAC,MAAM,CAAC,CAAC;QAC5E,IAAI,CAAC,oBAAoB,GAAG,uBAAkB,CAAC,OAAO,CAClD,iDAAuB,CAAC,yBAAyB,CACpD,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,gCAA0B,CAAC,OAAO,CAAgB,qBAAS,CAAC,YAAY,CAAC,CAAC;QACxF,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CACnD,sEAAsE,EACtE,CAAC,CACM,CAAC;IAChB,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,KAAgC;QACpD,KAAK,MAAM,gBAAgB,IAAI,KAAK,CAAC,IAAI,EAAE;YACvC,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,2BAA2B,EAAE,eAAe,EAAE,aAAa,EAAE,GAC9F,gBAAgB,CAAC,IAAI,CAAC;YAC1B,IAAI;gBACA,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;gBAEpF,IAAI,CAAC,cAAc,EAAE;oBACjB,SAAS;iBACZ;gBACD,MAAM,YAAY,GAAG,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,aAAc,CAAC,CAAsB,CAAC;gBAEhG,MAAM,mBAAmB,GAAG,YAAY,CAAC,YAAY,CAAC,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC;gBACpF,MAAM,iBAAiB,GAAG,YAAY,CAAC,cAAc,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC;gBACjF,MAAM,yBAAyB,GAC3B,mBAAmB,KAAK,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC;gBAErF,MAAM,IAAI,CAAC,yBAAyB,CAAC;oBACjC,iBAAiB,EAAE,YAAY;oBAC/B,kBAAkB,EAAE,aAAa,IAAI,IAAI;oBACzC,sBAAsB,EAAE,gBAAgB,CAAC,QAAQ,CAAC,eAAe;oBACjE,YAAY,EAAE,gBAAgB,CAAC,QAAQ,CAAC,cAAc;oBACtD,yBAAyB,EAAE,2BAA2B;oBACtD,gBAAgB,EAAE,eAAe;oBACjC,cAAc,EAAE,aAAc;oBAC9B,cAAc,EAAE,gBAAgB,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"PropagateTrainDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateTrainDelayTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,12 +19,6 @@ const JISInfotextOverviewTransformation_1 = require("../service/transformations/
|
|
|
19
19
|
const JISInfotextTransferTransformation_1 = require("../service/transformations/JISInfotextTransferTransformation");
|
|
20
20
|
const TransferDepartureTransformation_1 = require("../service/transformations/TransferDepartureTransformation");
|
|
21
21
|
const OgPidToken_1 = require("./OgPidToken");
|
|
22
|
-
const RopidDeparturesPresetFacade_1 = require("../service/facade/RopidDeparturesPresetFacade");
|
|
23
|
-
const V3DeparturesPresetController_1 = require("../controllers/v3/V3DeparturesPresetController");
|
|
24
|
-
const RopidDeparturesPresetRepository_1 = require("../data-access/RopidDeparturesPresetRepository");
|
|
25
|
-
const RopidDeparturesPresetsRopidGTFSStopsRepository_1 = require("../data-access/RopidDeparturesPresetsRopidGTFSStopsRepository");
|
|
26
|
-
const RopidDeparturesPresetTransformation_1 = require("../service/transformations/RopidDeparturesPresetTransformation");
|
|
27
|
-
const GtfsStopParser_1 = require("../../../helpers/GtfsStopParser");
|
|
28
22
|
const ogPidContainer = ioc_1.OutputGatewayContainer.createChildContainer();
|
|
29
23
|
exports.OgPidContainer = ogPidContainer;
|
|
30
24
|
//#region Repositories
|
|
@@ -35,28 +29,22 @@ ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.JISInfotextRepository,
|
|
|
35
29
|
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.DeparturesRepository, data_access_1.DeparturesRepository);
|
|
36
30
|
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.RunTripsRedisRepository, RunTripsRedisRepository_1.RunTripsRedisRepository);
|
|
37
31
|
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.PublicVehiclePositionsRepository, PublicVehiclePositionsRepository_1.PublicVehiclePositionsRepository);
|
|
38
|
-
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.RopidDeparturesPresetRepository, RopidDeparturesPresetRepository_1.RopidDeparturesPresetRepository);
|
|
39
|
-
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.RopidDeparturesPresetsRopidGTFSStopsRepository, RopidDeparturesPresetsRopidGTFSStopsRepository_1.RopidDeparturesPresetsRopidGTFSStopsRepository);
|
|
40
32
|
//#endregion
|
|
41
33
|
//#region Transformations
|
|
42
34
|
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.JISInfotextDepartureTransformation, JISInfotextDepartureTransformation_1.JISInfotextDepartureTransformation);
|
|
43
35
|
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.JISInfotextTransferTransformation, JISInfotextTransferTransformation_1.JISInfotextTransferTransformation);
|
|
44
36
|
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.JISInfotextOverviewTransformation, JISInfotextOverviewTransformation_1.JISInfotextOverviewTransformation);
|
|
45
37
|
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.TransferDepartureTransformation, TransferDepartureTransformation_1.TransferDepartureTransformation);
|
|
46
|
-
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.RopidDeparturesPresetTransformation, RopidDeparturesPresetTransformation_1.RopidDeparturesPresetTransformation);
|
|
47
38
|
//#endregion
|
|
48
39
|
//#region Facade
|
|
49
40
|
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.StopFacade, StopFacade_1.StopFacade);
|
|
50
41
|
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.InfotextFacade, InfotextFacade_1.InfotextFacade);
|
|
51
42
|
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.TransferFacade, TransferFacade_1.TransferFacade);
|
|
52
|
-
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.RopidDeparturesPresetFacade, RopidDeparturesPresetFacade_1.RopidDeparturesPresetFacade);
|
|
53
43
|
//#endregion
|
|
54
44
|
//#region Controllers
|
|
55
45
|
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.V3TransferBoardsController, V3TransferBoardsController_1.V3TransferBoardsController);
|
|
56
46
|
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.V3InfotextsController, V3InfotextsController_1.V3InfotextsController);
|
|
57
|
-
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.V3RopidDeparturesPresetController, V3DeparturesPresetController_1.V3RopidDeparturesPresetController);
|
|
58
47
|
//#endregion
|
|
59
48
|
//#region Helpers
|
|
60
49
|
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.JISInfotextStopSuppressionFilter, JISInfotextStopSuppressionFilter_1.JISInfotextStopSuppressionFilter);
|
|
61
|
-
ogPidContainer.registerSingleton(OgPidToken_1.OgPidToken.GtfsStopParser, GtfsStopParser_1.GtfsStopParser);
|
|
62
50
|
//# sourceMappingURL=Di.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,sHAAiH;AACjH,gGAA2F;AAC3F,wGAAmG;AACnG,+DAA+E;AAE/E,mFAAgF;AAChF,6FAA0F;AAC1F,gDAAsD;AACtD,gFAA6E;AAC7E,4GAAyG;AACzG,kGAA+F;AAC/F,qEAAkE;AAClE,6DAA0D;AAC1D,qEAAkE;AAClE,sHAAmH;AACnH,oHAAiH;AACjH,oHAAiH;AACjH,gHAA6G;AAC7G,6CAA0C;
|
|
1
|
+
{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,sHAAiH;AACjH,gGAA2F;AAC3F,wGAAmG;AACnG,+DAA+E;AAE/E,mFAAgF;AAChF,6FAA0F;AAC1F,gDAAsD;AACtD,gFAA6E;AAC7E,4GAAyG;AACzG,kGAA+F;AAC/F,qEAAkE;AAClE,6DAA0D;AAC1D,qEAAkE;AAClE,sHAAmH;AACnH,oHAAiH;AACjH,oHAAiH;AACjH,gHAA6G;AAC7G,6CAA0C;AAE1C,MAAM,cAAc,GAAwB,4BAAsB,CAAC,oBAAoB,EAAE,CAAC;AAkC/D,wCAAc;AAhCzC,sBAAsB;AACtB,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,sBAAsB,EAAE,+CAAsB,CAAC,CAAC;AAC5F,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,mCAAmC,EAAE,yEAAmC,CAAC,CAAC;AACtH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,mCAAmC,EAAE,yEAAmC,CAAC,CAAC;AACtH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,qBAAqB,EAAE,6CAAqB,CAAC,CAAC;AAC1F,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,oBAAoB,EAAE,kCAAoB,CAAC,CAAC;AACxF,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,uBAAuB,EAAE,iDAAuB,CAAC,CAAC;AAC9F,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,gCAAgC,EAAE,mEAAgC,CAAC,CAAC;AAChH,YAAY;AAEZ,yBAAyB;AACzB,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,kCAAkC,EAAE,uEAAkC,CAAC,CAAC;AACpH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,iCAAiC,EAAE,qEAAiC,CAAC,CAAC;AAClH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,iCAAiC,EAAE,qEAAiC,CAAC,CAAC;AAClH,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,+BAA+B,EAAE,iEAA+B,CAAC,CAAC;AAC9G,YAAY;AAEZ,gBAAgB;AAChB,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,UAAU,EAAE,uBAAU,CAAC,CAAC;AACpE,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,cAAc,EAAE,+BAAc,CAAC,CAAC;AAC5E,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,cAAc,EAAE,+BAAc,CAAC,CAAC;AAC5E,YAAY;AAEZ,qBAAqB;AACrB,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,0BAA0B,EAAE,uDAA0B,CAAC,CAAC;AACpG,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,qBAAqB,EAAE,6CAAqB,CAAC,CAAC;AAC1F,YAAY;AAEZ,iBAAiB;AACjB,cAAc,CAAC,iBAAiB,CAAC,uBAAU,CAAC,gCAAgC,EAAE,mEAAgC,CAAC,CAAC"}
|
|
@@ -5,20 +5,14 @@ export declare const OgPidToken: {
|
|
|
5
5
|
DeparturesRepository: symbol;
|
|
6
6
|
RunTripsRedisRepository: symbol;
|
|
7
7
|
PublicVehiclePositionsRepository: symbol;
|
|
8
|
-
RopidDeparturesPresetRepository: symbol;
|
|
9
|
-
RopidDeparturesPresetsRopidGTFSStopsRepository: symbol;
|
|
10
8
|
JISInfotextDepartureTransformation: symbol;
|
|
11
9
|
JISInfotextTransferTransformation: symbol;
|
|
12
10
|
JISInfotextOverviewTransformation: symbol;
|
|
13
11
|
TransferDepartureTransformation: symbol;
|
|
14
|
-
RopidDeparturesPresetTransformation: symbol;
|
|
15
12
|
StopFacade: symbol;
|
|
16
13
|
InfotextFacade: symbol;
|
|
17
14
|
TransferFacade: symbol;
|
|
18
|
-
RopidDeparturesPresetFacade: symbol;
|
|
19
15
|
V3TransferBoardsController: symbol;
|
|
20
16
|
V3InfotextsController: symbol;
|
|
21
|
-
V3RopidDeparturesPresetController: symbol;
|
|
22
17
|
JISInfotextStopSuppressionFilter: symbol;
|
|
23
|
-
GtfsStopParser: symbol;
|
|
24
18
|
};
|
|
@@ -9,30 +9,24 @@ exports.OgPidToken = {
|
|
|
9
9
|
DeparturesRepository: Symbol(),
|
|
10
10
|
RunTripsRedisRepository: Symbol(),
|
|
11
11
|
PublicVehiclePositionsRepository: Symbol(),
|
|
12
|
-
RopidDeparturesPresetRepository: Symbol(),
|
|
13
|
-
RopidDeparturesPresetsRopidGTFSStopsRepository: Symbol(),
|
|
14
12
|
//#endregion
|
|
15
13
|
//#region Transformations
|
|
16
14
|
JISInfotextDepartureTransformation: Symbol(),
|
|
17
15
|
JISInfotextTransferTransformation: Symbol(),
|
|
18
16
|
JISInfotextOverviewTransformation: Symbol(),
|
|
19
17
|
TransferDepartureTransformation: Symbol(),
|
|
20
|
-
RopidDeparturesPresetTransformation: Symbol(),
|
|
21
18
|
//#endregion
|
|
22
19
|
//#region Facade
|
|
23
20
|
StopFacade: Symbol(),
|
|
24
21
|
InfotextFacade: Symbol(),
|
|
25
22
|
TransferFacade: Symbol(),
|
|
26
|
-
RopidDeparturesPresetFacade: Symbol(),
|
|
27
23
|
//#endregion
|
|
28
24
|
//#region Controllers
|
|
29
25
|
V3TransferBoardsController: Symbol(),
|
|
30
26
|
V3InfotextsController: Symbol(),
|
|
31
|
-
V3RopidDeparturesPresetController: Symbol(),
|
|
32
27
|
//#endregion
|
|
33
28
|
//#region Helpers
|
|
34
29
|
JISInfotextStopSuppressionFilter: Symbol(),
|
|
35
|
-
GtfsStopParser: Symbol(),
|
|
36
30
|
//#endregion
|
|
37
31
|
};
|
|
38
32
|
//# sourceMappingURL=OgPidToken.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OgPidToken.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/ioc/OgPidToken.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAG;IACtB,sBAAsB;IACtB,sBAAsB,EAAE,MAAM,EAAE;IAChC,mCAAmC,EAAE,MAAM,EAAE;IAC7C,qBAAqB,EAAE,MAAM,EAAE;IAC/B,oBAAoB,EAAE,MAAM,EAAE;IAC9B,uBAAuB,EAAE,MAAM,EAAE;IACjC,gCAAgC,EAAE,MAAM,EAAE;IAC1C
|
|
1
|
+
{"version":3,"file":"OgPidToken.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/ioc/OgPidToken.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAG;IACtB,sBAAsB;IACtB,sBAAsB,EAAE,MAAM,EAAE;IAChC,mCAAmC,EAAE,MAAM,EAAE;IAC7C,qBAAqB,EAAE,MAAM,EAAE;IAC/B,oBAAoB,EAAE,MAAM,EAAE;IAC9B,uBAAuB,EAAE,MAAM,EAAE;IACjC,gCAAgC,EAAE,MAAM,EAAE;IAC1C,YAAY;IAEZ,yBAAyB;IACzB,kCAAkC,EAAE,MAAM,EAAE;IAC5C,iCAAiC,EAAE,MAAM,EAAE;IAC3C,iCAAiC,EAAE,MAAM,EAAE;IAC3C,+BAA+B,EAAE,MAAM,EAAE;IACzC,YAAY;IAEZ,gBAAgB;IAChB,UAAU,EAAE,MAAM,EAAE;IACpB,cAAc,EAAE,MAAM,EAAE;IACxB,cAAc,EAAE,MAAM,EAAE;IACxB,YAAY;IAEZ,qBAAqB;IACrB,0BAA0B,EAAE,MAAM,EAAE;IACpC,qBAAqB,EAAE,MAAM,EAAE;IAC/B,YAAY;IAEZ,iBAAiB;IACjB,gCAAgC,EAAE,MAAM,EAAE;IAC1C,YAAY;CACf,CAAC"}
|
|
@@ -4,7 +4,6 @@ export declare class V3PIDRouter extends AbstractRouter {
|
|
|
4
4
|
private readonly cacheHeaderMiddleware;
|
|
5
5
|
private readonly transferBoardsController;
|
|
6
6
|
private readonly infotextsController;
|
|
7
|
-
private readonly ropidDeparturesPresetController;
|
|
8
7
|
constructor();
|
|
9
8
|
protected initRoutes: () => void;
|
|
10
9
|
private registerInfotextsRoutes;
|
|
@@ -29,14 +29,10 @@ class V3PIDRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
29
29
|
this.router.get("/infotexts", Validation_1.checkErrors,
|
|
30
30
|
// max-age 10 seconds, stale-while-revalidate 10 seconds
|
|
31
31
|
this.cacheHeaderMiddleware.getMiddleware(10, 10), this.infotextsController.getJisInfotexts);
|
|
32
|
-
this.router.get("/departurepresets", Validation_1.checkErrors,
|
|
33
|
-
// max-age 10 seconds, stale-while-revalidate 10 seconds
|
|
34
|
-
this.cacheHeaderMiddleware.getMiddleware(10, 10), this.ropidDeparturesPresetController.getDeparturesPresets);
|
|
35
32
|
};
|
|
36
33
|
this.cacheHeaderMiddleware = Di_1.OgPidContainer.resolve(ioc_1.ContainerToken.CacheHeaderMiddleware);
|
|
37
34
|
this.transferBoardsController = Di_1.OgPidContainer.resolve(OgPidToken_1.OgPidToken.V3TransferBoardsController);
|
|
38
35
|
this.infotextsController = Di_1.OgPidContainer.resolve(OgPidToken_1.OgPidToken.V3InfotextsController);
|
|
39
|
-
this.ropidDeparturesPresetController = Di_1.OgPidContainer.resolve(OgPidToken_1.OgPidToken.V3RopidDeparturesPresetController);
|
|
40
36
|
this.initRoutes();
|
|
41
37
|
}
|
|
42
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V3PIDRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/routers/v3/V3PIDRouter.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"V3PIDRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/routers/v3/V3PIDRouter.ts"],"names":[],"mappings":";;;AAEA,+EAA8E;AAC9E,qCAAgD;AAChD,qDAAoD;AACpD,yDAAoD;AACpD,sFAAmF;AAEnF,6EAA2E;AAC3E,+DAAuE;AACvE,+DAA2D;AAC3D,mFAAoE;AACpE,6CAAmD;AAEnD,MAAa,WAAY,SAAQ,+BAAc;IAM3C;QACI,KAAK,CAAC,wBAAY,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QANlB,WAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;QAaxB,eAAU,GAAG,GAAS,EAAE;YAC9B,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACnC,CAAC,CAAC;QAEM,4BAAuB,GAAG,GAAG,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,iBAAiB,EACjB;gBACI,IAAA,yBAAK,EAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,kBAAU,EAAE,GAAG,EAAE,kBAAU,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBACnF,IAAA,yBAAK,EAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBAChE,IAAA,yBAAK,EAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,6CAAqB,CAAC,oBAAoB,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;aAChH,EACD,wBAAW;YACX,sDAAsD;YACtD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAC9C,IAAI,CAAC,wBAAwB,CAAC,qBAAqB,CACtD,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,YAAY,EACZ,wBAAW;YACX,wDAAwD;YACxD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,CAAC,EAChD,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAC3C,CAAC;QACN,CAAC,CAAC;QA/BE,IAAI,CAAC,qBAAqB,GAAG,mBAAc,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACjH,IAAI,CAAC,wBAAwB,GAAG,mBAAc,CAAC,OAAO,CAA6B,uBAAU,CAAC,0BAA0B,CAAC,CAAC;QAC1H,IAAI,CAAC,mBAAmB,GAAG,mBAAc,CAAC,OAAO,CAAwB,uBAAU,CAAC,qBAAqB,CAAC,CAAC;QAC3G,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;CA4BJ;AAxCD,kCAwCC;AAED,MAAM,WAAW,GAAmB,IAAI,WAAW,EAAE,CAAC;AAC7C,kCAAW"}
|
|
@@ -4,7 +4,6 @@ import { GetAllOptions, IGTFSStopGetAllOutput } from "./GTFSStopModelInterfaces"
|
|
|
4
4
|
export declare class GTFSStopModel extends SequelizeModel {
|
|
5
5
|
private readonly outputAttributes;
|
|
6
6
|
private cisStopsModel;
|
|
7
|
-
private gtfsStopParser;
|
|
8
7
|
constructor();
|
|
9
8
|
Associate: () => void;
|
|
10
9
|
/**
|
|
@@ -19,6 +18,9 @@ export declare class GTFSStopModel extends SequelizeModel {
|
|
|
19
18
|
* Retrieve specific gtfs stop
|
|
20
19
|
*/
|
|
21
20
|
GetOne: (id: string) => Promise<IGeoJSONFeature | null>;
|
|
21
|
+
private isValidInteger;
|
|
22
|
+
private validateAswId;
|
|
23
|
+
private prepareAswWhereOptions;
|
|
22
24
|
private prepareCisStops;
|
|
23
25
|
private prepareFindOptionsForMetro;
|
|
24
26
|
}
|
|
@@ -14,8 +14,7 @@ const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
|
|
|
14
14
|
const models_1 = require("@golemio/core/dist/output-gateway/models");
|
|
15
15
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
16
16
|
const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
|
|
17
|
-
const
|
|
18
|
-
const Di_1 = require("../../pid/ioc/Di");
|
|
17
|
+
const const_2 = require("../../../const");
|
|
19
18
|
class GTFSStopModel extends models_1.SequelizeModel {
|
|
20
19
|
constructor() {
|
|
21
20
|
super(ropid_gtfs_1.RopidGTFS.stops.name, ropid_gtfs_1.RopidGTFS.stops.pgTableName, StopDto_1.StopDto.attributeModel, {
|
|
@@ -74,7 +73,6 @@ class GTFSStopModel extends models_1.SequelizeModel {
|
|
|
74
73
|
return stops;
|
|
75
74
|
};
|
|
76
75
|
const connector = ioc_1.OutputGatewayContainer.resolve(CoreToken_1.CoreToken.PostgresConnector);
|
|
77
|
-
this.gtfsStopParser = Di_1.OgPidContainer.resolve(OgPidToken_1.OgPidToken.GtfsStopParser);
|
|
78
76
|
this.outputAttributes = Object.keys(StopDto_1.StopDto.attributeModel);
|
|
79
77
|
const notUsedColumns = [
|
|
80
78
|
"stop_code",
|
|
@@ -101,7 +99,7 @@ class GTFSStopModel extends models_1.SequelizeModel {
|
|
|
101
99
|
let where = {};
|
|
102
100
|
let allGtfsIds = [];
|
|
103
101
|
if (options.aswIds && options.aswIds.length > 0) {
|
|
104
|
-
where[sequelize_1.default.Op.or] = this.
|
|
102
|
+
where[sequelize_1.default.Op.or] = this.prepareAswWhereOptions(options.aswIds);
|
|
105
103
|
}
|
|
106
104
|
if (options.cisIds && options.cisIds.length > 0) {
|
|
107
105
|
let stops;
|
|
@@ -184,6 +182,34 @@ class GTFSStopModel extends models_1.SequelizeModel {
|
|
|
184
182
|
}
|
|
185
183
|
return options.returnRaw ? data : (0, Geo_1.buildGeojsonFeatureCollection)(data, "stop_lon", "stop_lat", true);
|
|
186
184
|
}
|
|
185
|
+
isValidInteger(value) {
|
|
186
|
+
if (value === null)
|
|
187
|
+
return true;
|
|
188
|
+
return value >= const_2.PG_INT_MIN && value <= const_2.PG_INT_MAX;
|
|
189
|
+
}
|
|
190
|
+
validateAswId(aswId, nodeId, stopId) {
|
|
191
|
+
const nodeIdNum = Number(nodeId);
|
|
192
|
+
const stopIdNum = stopId ? Number(stopId) : null;
|
|
193
|
+
if (!this.isValidInteger(nodeIdNum) || !this.isValidInteger(stopIdNum)) {
|
|
194
|
+
throw new golemio_errors_1.GeneralError(`Invalid ASW ID: ${aswId}`, this.constructor.name, `Invalid ASW ID: ${aswId}`, 400);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
prepareAswWhereOptions(aswIds) {
|
|
198
|
+
let aswWhereOptions = [];
|
|
199
|
+
for (const aswId of aswIds) {
|
|
200
|
+
let aswIdLike = aswId.replaceAll("_", "/");
|
|
201
|
+
if (aswIdLike.slice(-1) === "/") {
|
|
202
|
+
aswIdLike = aswIdLike.slice(0, -1);
|
|
203
|
+
}
|
|
204
|
+
const [nodeId, stopId] = aswIdLike.split("/");
|
|
205
|
+
if (!nodeId) {
|
|
206
|
+
continue;
|
|
207
|
+
}
|
|
208
|
+
this.validateAswId(aswId, nodeId, stopId);
|
|
209
|
+
aswWhereOptions.push(sequelize_1.default.and(sequelize_1.default.where(sequelize_1.default.col("asw_node_id"), "=", nodeId), stopId && sequelize_1.default.where(sequelize_1.default.col("asw_stop_id"), "=", stopId)));
|
|
210
|
+
}
|
|
211
|
+
return aswWhereOptions;
|
|
212
|
+
}
|
|
187
213
|
prepareFindOptionsForMetro(innerWhere) {
|
|
188
214
|
// Select metro and train stops within a node
|
|
189
215
|
// matching the previous where criteria
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTFSStopModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSStopModel.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA0D;AAC1D,6DAAuC;AACvC,uEAA4C;AAC5C,mFAAyD;AAEzD,wEAAqE;AACrE,+DAK+C;AAC/C,+DAA+E;AAC/E,qEAA0E;AAC1E,6EAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"GTFSStopModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSStopModel.ts"],"names":[],"mappings":"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"}
|