@golemio/pid 4.0.2-dev.1988913536 → 4.0.2
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/README.md +1 -1
- package/dist/helpers/GtfsStopParser.d.ts +0 -2
- package/dist/helpers/GtfsStopParser.js +8 -11
- package/dist/helpers/GtfsStopParser.js.map +1 -1
- package/dist/input-gateway/jis/controllers/JISEventsController.js +2 -1
- package/dist/input-gateway/jis/controllers/JISEventsController.js.map +1 -1
- package/dist/input-gateway/jis/controllers/JISInfotextsController.js +2 -1
- package/dist/input-gateway/jis/controllers/JISInfotextsController.js.map +1 -1
- 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/ioc/Di.js +0 -10
- package/dist/integration-engine/jis/ioc/Di.js.map +1 -1
- package/dist/integration-engine/jis/ioc/JISContainerToken.d.ts +0 -4
- package/dist/integration-engine/jis/ioc/JISContainerToken.js +0 -5
- package/dist/integration-engine/jis/ioc/JISContainerToken.js.map +1 -1
- package/dist/integration-engine/jis/repositories/JISInfotextsRepository.d.ts +1 -6
- package/dist/integration-engine/jis/repositories/JISInfotextsRepository.js +2 -50
- package/dist/integration-engine/jis/repositories/JISInfotextsRepository.js.map +1 -1
- package/dist/integration-engine/jis/repositories/JISMetadataRepository.d.ts +1 -4
- package/dist/integration-engine/jis/repositories/JISMetadataRepository.js +12 -37
- package/dist/integration-engine/jis/repositories/JISMetadataRepository.js.map +1 -1
- package/dist/integration-engine/jis/workers/JISWorker.js +0 -1
- package/dist/integration-engine/jis/workers/JISWorker.js.map +1 -1
- package/dist/integration-engine/jis/workers/tasks/FetchJISEventsTask.d.ts +4 -10
- package/dist/integration-engine/jis/workers/tasks/FetchJISEventsTask.js +22 -15
- package/dist/integration-engine/jis/workers/tasks/FetchJISEventsTask.js.map +1 -1
- package/dist/integration-engine/jis/workers/tasks/FetchJISInfotextsTask.d.ts +5 -10
- package/dist/integration-engine/jis/workers/tasks/FetchJISInfotextsTask.js +23 -15
- package/dist/integration-engine/jis/workers/tasks/FetchJISInfotextsTask.js.map +1 -1
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsTask.d.ts +2 -1
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsTask.js +4 -5
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsTask.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSStopsModel.d.ts +1 -5
- package/dist/integration-engine/ropid-gtfs/RopidGTFSStopsModel.js +0 -24
- package/dist/integration-engine/ropid-gtfs/RopidGTFSStopsModel.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/data-access/cache/DelayComputationRedisRepository.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/index.d.ts +0 -1
- package/dist/integration-engine/ropid-gtfs/index.js +0 -1
- package/dist/integration-engine/ropid-gtfs/index.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/ioc/Di.js +0 -8
- package/dist/integration-engine/ropid-gtfs/ioc/Di.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.d.ts +0 -3
- package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.js +0 -3
- package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/transformations/RopidDeparturesPresetsTransformation.js +1 -1
- package/dist/integration-engine/ropid-gtfs/transformations/RopidDeparturesPresetsTransformation.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/TimetableWorker.js +0 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/TimetableWorker.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.js +5 -8
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js +0 -1
- 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/data-access/interfaces/TripRepositoryInterfaces.d.ts +1 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateTrainDelayTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/RefreshPublicStopTimeCacheTask.js +0 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/RefreshPublicStopTimeCacheTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PublicApiTripTransformation.js +0 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PublicApiTripTransformation.js.map +1 -1
- package/dist/output-gateway/index.js +0 -1
- package/dist/output-gateway/index.js.map +1 -1
- package/dist/output-gateway/jis/ioc/Di.js +2 -2
- package/dist/output-gateway/jis/ioc/Di.js.map +1 -1
- package/dist/output-gateway/jis/ioc/OgJisToken.d.ts +0 -2
- package/dist/output-gateway/jis/ioc/OgJisToken.js +0 -2
- package/dist/output-gateway/jis/ioc/OgJisToken.js.map +1 -1
- package/dist/output-gateway/pid/controllers/v3/V3TransferBoardsController.js.map +1 -1
- package/dist/output-gateway/pid/domain/InfotextInterfaces.d.ts +0 -5
- package/dist/output-gateway/pid/helpers/JISInfotextStopSuppressionFilter.d.ts +1 -4
- package/dist/output-gateway/pid/helpers/JISInfotextStopSuppressionFilter.js +1 -7
- package/dist/output-gateway/pid/helpers/JISInfotextStopSuppressionFilter.js.map +1 -1
- package/dist/output-gateway/pid/index.d.ts +0 -50
- package/dist/output-gateway/pid/index.js.map +1 -1
- package/dist/output-gateway/pid/ioc/Di.js +6 -62
- package/dist/output-gateway/pid/ioc/Di.js.map +1 -1
- package/dist/output-gateway/pid/ioc/OgPidToken.d.ts +0 -11
- package/dist/output-gateway/pid/ioc/OgPidToken.js +0 -11
- package/dist/output-gateway/pid/ioc/OgPidToken.js.map +1 -1
- package/dist/output-gateway/pid/routers/index.d.ts +0 -1
- package/dist/output-gateway/pid/routers/index.js +1 -3
- package/dist/output-gateway/pid/routers/index.js.map +1 -1
- package/dist/output-gateway/pid/service/facade/InfotextFacade.d.ts +2 -7
- package/dist/output-gateway/pid/service/facade/InfotextFacade.js +4 -29
- package/dist/output-gateway/pid/service/facade/InfotextFacade.js.map +1 -1
- package/dist/output-gateway/pid/service/facade/StopFacade.d.ts +3 -12
- package/dist/output-gateway/pid/service/facade/StopFacade.js +7 -43
- package/dist/output-gateway/pid/service/facade/StopFacade.js.map +1 -1
- package/dist/output-gateway/pid/service/facade/TransferFacade.d.ts +9 -11
- package/dist/output-gateway/pid/service/facade/TransferFacade.js +14 -117
- package/dist/output-gateway/pid/service/facade/TransferFacade.js.map +1 -1
- package/dist/output-gateway/pid/service/helpers/PlatformCodeResolver.d.ts +1 -7
- package/dist/output-gateway/pid/service/helpers/PlatformCodeResolver.js +0 -12
- package/dist/output-gateway/pid/service/helpers/PlatformCodeResolver.js.map +1 -1
- package/dist/output-gateway/public/data-access/redis/PublicGtfsDepartureRepository.d.ts +1 -1
- package/dist/output-gateway/public/data-access/redis/PublicGtfsDepartureRepository.js +4 -4
- package/dist/output-gateway/public/data-access/redis/PublicGtfsDepartureRepository.js.map +1 -1
- package/dist/output-gateway/public/ioc/Di.js +1 -1
- package/dist/output-gateway/public/ioc/Di.js.map +1 -1
- package/dist/output-gateway/{shared → public}/service/VPSubscriber.d.ts +2 -4
- package/dist/output-gateway/{shared → public}/service/VPSubscriber.js +1 -1
- package/dist/output-gateway/public/service/VPSubscriber.js.map +1 -0
- package/dist/output-gateway/shared/constants/route-version.d.ts +1 -2
- package/dist/output-gateway/shared/constants/route-version.js +0 -1
- package/dist/output-gateway/shared/constants/route-version.js.map +1 -1
- package/dist/schema-definitions/jis/redis/const.d.ts +0 -1
- package/dist/schema-definitions/jis/redis/const.js +1 -2
- package/dist/schema-definitions/jis/redis/const.js.map +1 -1
- package/dist/schema-definitions/jis/redis/interfaces/IJISMetadataDto.d.ts +5 -1
- package/dist/schema-definitions/jis/redis/schemas/JISMetadataDtoSchema.js +11 -5
- package/dist/schema-definitions/jis/redis/schemas/JISMetadataDtoSchema.js.map +1 -1
- package/dist/schema-definitions/ropid-departures-presets/index.d.ts +0 -1
- package/dist/schema-definitions/ropid-departures-presets/index.js +0 -3
- package/dist/schema-definitions/ropid-departures-presets/index.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/interfaces/IStopDto.d.ts +0 -1
- package/dist/schema-definitions/ropid-gtfs/redis/const.d.ts +0 -1
- package/dist/schema-definitions/ropid-gtfs/redis/const.js +1 -2
- package/dist/schema-definitions/ropid-gtfs/redis/const.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/views/PublicStopTimeModel.d.ts +2 -3
- package/dist/schema-definitions/vehicle-positions/models/views/PublicStopTimeModel.js +0 -4
- package/dist/schema-definitions/vehicle-positions/models/views/PublicStopTimeModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/views/interfaces/IPublicStopTimeDto.d.ts +0 -1
- package/dist/schema-definitions/vehicle-positions/redis/interfaces/IPublicApiCacheDto.d.ts +0 -2
- package/dist/schema-definitions/vehicle-positions/redis/interfaces/IPublicStopTimeCacheDto.d.ts +0 -1
- package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicApiCacheDtoSchema.js +0 -8
- package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicApiCacheDtoSchema.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicStopTimeCacheDtoSchema.js +1 -4
- package/dist/schema-definitions/vehicle-positions/redis/schemas/PublicStopTimeCacheDtoSchema.js.map +1 -1
- package/docs/asyncapi.yaml +0 -45
- package/docs/cache/types/redis.md +2 -82
- package/docs/implementation_documentation.md +0 -2
- package/docs/jis/index.md +5 -17
- package/docs/openapi-input.yaml +2 -13
- package/docs/openapi-output.yaml +4 -326
- package/package.json +2 -2
- package/db/example/redis/gtfsStopsCacheMock.json +0 -8
- package/db/example/redis/jisCacheMock.json +0 -31
- package/db/migrations/postgresql/20250716143052-add-stop-name-to-combined-stop-times.js +0 -53
- package/db/migrations/postgresql/sqls/20250716143052-add-stop-name-to-combined-stop-times-down.sql +0 -47
- package/db/migrations/postgresql/sqls/20250716143052-add-stop-name-to-combined-stop-times-up.sql +0 -47
- package/dist/helpers/jis/JISInfotextSeverityLevelPriority.d.ts +0 -6
- package/dist/helpers/jis/JISInfotextSeverityLevelPriority.js +0 -11
- package/dist/helpers/jis/JISInfotextSeverityLevelPriority.js.map +0 -1
- package/dist/integration-engine/jis/repositories/JISInfotextsRedisRepository.d.ts +0 -9
- package/dist/integration-engine/jis/repositories/JISInfotextsRedisRepository.js +0 -86
- package/dist/integration-engine/jis/repositories/JISInfotextsRedisRepository.js.map +0 -1
- package/dist/integration-engine/jis/transformations/JISInfotextCacheTranformation.d.ts +0 -7
- package/dist/integration-engine/jis/transformations/JISInfotextCacheTranformation.js +0 -37
- package/dist/integration-engine/jis/transformations/JISInfotextCacheTranformation.js.map +0 -1
- package/dist/integration-engine/jis/workers/tasks/AbstractFetchJISResourceTask.d.ts +0 -14
- package/dist/integration-engine/jis/workers/tasks/AbstractFetchJISResourceTask.js +0 -71
- package/dist/integration-engine/jis/workers/tasks/AbstractFetchJISResourceTask.js.map +0 -1
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsCacheTask.d.ts +0 -13
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsCacheTask.js +0 -47
- package/dist/integration-engine/jis/workers/tasks/RefreshJISInfotextsCacheTask.js.map +0 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSCisStopsModel.d.ts +0 -18
- package/dist/integration-engine/ropid-gtfs/RopidGTFSCisStopsModel.js +0 -44
- package/dist/integration-engine/ropid-gtfs/RopidGTFSCisStopsModel.js.map +0 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshGtfsStopsCacheTask.d.ts +0 -12
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshGtfsStopsCacheTask.js +0 -44
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshGtfsStopsCacheTask.js.map +0 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/data-access/cache/GtfsStopsRedisRepository.d.ts +0 -12
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/data-access/cache/GtfsStopsRedisRepository.js +0 -87
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/data-access/cache/GtfsStopsRedisRepository.js.map +0 -1
- package/dist/output-gateway/jis/data-access/cache/JISInfotextsRedisRepository.d.ts +0 -17
- package/dist/output-gateway/jis/data-access/cache/JISInfotextsRedisRepository.js +0 -113
- package/dist/output-gateway/jis/data-access/cache/JISInfotextsRedisRepository.js.map +0 -1
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.d.ts +0 -17
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.js +0 -154
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.js.map +0 -1
- package/dist/output-gateway/pid/controllers/v4/interfaces/ITransferBoardsParams.d.ts +0 -14
- package/dist/output-gateway/pid/controllers/v4/interfaces/ITransferBoardsParams.js +0 -3
- package/dist/output-gateway/pid/controllers/v4/interfaces/ITransferBoardsParams.js.map +0 -1
- package/dist/output-gateway/pid/helpers/TransferBoardFilter.d.ts +0 -5
- package/dist/output-gateway/pid/helpers/TransferBoardFilter.js +0 -33
- package/dist/output-gateway/pid/helpers/TransferBoardFilter.js.map +0 -1
- package/dist/output-gateway/pid/helpers/TransferBoardSorter.d.ts +0 -6
- package/dist/output-gateway/pid/helpers/TransferBoardSorter.js +0 -61
- package/dist/output-gateway/pid/helpers/TransferBoardSorter.js.map +0 -1
- package/dist/output-gateway/pid/routers/v4/V4PIDRouter.d.ts +0 -16
- package/dist/output-gateway/pid/routers/v4/V4PIDRouter.js +0 -67
- package/dist/output-gateway/pid/routers/v4/V4PIDRouter.js.map +0 -1
- package/dist/output-gateway/pid/service/transformations/JISInfotextCacheTransferTransformation.d.ts +0 -13
- package/dist/output-gateway/pid/service/transformations/JISInfotextCacheTransferTransformation.js +0 -31
- package/dist/output-gateway/pid/service/transformations/JISInfotextCacheTransferTransformation.js.map +0 -1
- package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.d.ts +0 -27
- package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.js +0 -78
- package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.js.map +0 -1
- package/dist/output-gateway/ropid-gtfs/data-access/redis/GtfsStopsRedisRepository.d.ts +0 -13
- package/dist/output-gateway/ropid-gtfs/data-access/redis/GtfsStopsRedisRepository.js +0 -83
- package/dist/output-gateway/ropid-gtfs/data-access/redis/GtfsStopsRedisRepository.js.map +0 -1
- package/dist/output-gateway/shared/service/VPSubscriber.js.map +0 -1
- package/dist/schema-definitions/jis/redis/interfaces/IJISInfotextDto.d.ts +0 -17
- package/dist/schema-definitions/jis/redis/interfaces/IJISInfotextDto.js +0 -3
- package/dist/schema-definitions/jis/redis/interfaces/IJISInfotextDto.js.map +0 -1
- package/dist/schema-definitions/jis/redis/schemas/JISInfotextDtoSchema.d.ts +0 -3
- package/dist/schema-definitions/jis/redis/schemas/JISInfotextDtoSchema.js +0 -59
- package/dist/schema-definitions/jis/redis/schemas/JISInfotextDtoSchema.js.map +0 -1
- package/dist/schema-definitions/ropid-gtfs/interfaces/IStopCisDto.d.ts +0 -16
- package/dist/schema-definitions/ropid-gtfs/interfaces/IStopCisDto.js +0 -3
- package/dist/schema-definitions/ropid-gtfs/interfaces/IStopCisDto.js.map +0 -1
- package/dist/schema-definitions/ropid-gtfs/models/StopCisDto.d.ts +0 -58
- package/dist/schema-definitions/ropid-gtfs/models/StopCisDto.js +0 -69
- package/dist/schema-definitions/ropid-gtfs/models/StopCisDto.js.map +0 -1
package/README.md
CHANGED
|
@@ -15,12 +15,16 @@ let GtfsStopParser = exports.GtfsStopParser = class GtfsStopParser {
|
|
|
15
15
|
prepareAswWhereOptions(aswIds) {
|
|
16
16
|
let aswWhereOptions = [];
|
|
17
17
|
for (const aswId of aswIds) {
|
|
18
|
-
|
|
19
|
-
if (
|
|
18
|
+
let aswIdLike = aswId.replaceAll("_", "/");
|
|
19
|
+
if (aswIdLike.slice(-1) === "/") {
|
|
20
|
+
aswIdLike = aswIdLike.slice(0, -1);
|
|
21
|
+
}
|
|
22
|
+
const [nodeId, stopId] = aswIdLike.split("/");
|
|
23
|
+
if (!nodeId) {
|
|
20
24
|
continue;
|
|
21
25
|
}
|
|
22
|
-
this.validateAswId(aswId,
|
|
23
|
-
aswWhereOptions.push(sequelize_1.Sequelize.and(sequelize_1.Sequelize.where(sequelize_1.Sequelize.col("asw_node_id"), "=",
|
|
26
|
+
this.validateAswId(aswId, nodeId, stopId);
|
|
27
|
+
aswWhereOptions.push(sequelize_1.Sequelize.and(sequelize_1.Sequelize.where(sequelize_1.Sequelize.col("asw_node_id"), "=", nodeId), stopId && sequelize_1.Sequelize.where(sequelize_1.Sequelize.col("asw_stop_id"), "=", stopId)));
|
|
24
28
|
}
|
|
25
29
|
return aswWhereOptions;
|
|
26
30
|
}
|
|
@@ -33,13 +37,6 @@ let GtfsStopParser = exports.GtfsStopParser = class GtfsStopParser {
|
|
|
33
37
|
throw new golemio_errors_1.GeneralError(`Invalid ASW ID: ${aswId}`, this.constructor.name, `Invalid ASW ID: ${aswId}`, 400);
|
|
34
38
|
}
|
|
35
39
|
}
|
|
36
|
-
parseAswId(aswId) {
|
|
37
|
-
const [aswNode, aswStopId] = aswId.replaceAll("_", "/").split("/");
|
|
38
|
-
return { aswNode, aswStopId };
|
|
39
|
-
}
|
|
40
|
-
getAswNodeFromId(aswId) {
|
|
41
|
-
return this.parseAswId(aswId).aswNode;
|
|
42
|
-
}
|
|
43
40
|
};
|
|
44
41
|
exports.GtfsStopParser = GtfsStopParser = __decorate([
|
|
45
42
|
(0, tsyringe_1.injectable)()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GtfsStopParser.js","sourceRoot":"","sources":["../../src/helpers/GtfsStopParser.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6EAAwE;AACxE,mEAA8E;AAC9E,iEAAgE;AAChE,oCAAmD;AAG5C,IAAM,cAAc,4BAApB,MAAM,cAAc;IAChB,sBAAsB,CAAC,MAAgB;QAC1C,IAAI,eAAe,GAAmB,EAAE,CAAC;QACzC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YACxB,
|
|
1
|
+
{"version":3,"file":"GtfsStopParser.js","sourceRoot":"","sources":["../../src/helpers/GtfsStopParser.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6EAAwE;AACxE,mEAA8E;AAC9E,iEAAgE;AAChE,oCAAmD;AAG5C,IAAM,cAAc,4BAApB,MAAM,cAAc;IAChB,sBAAsB,CAAC,MAAgB;QAC1C,IAAI,eAAe,GAAmB,EAAE,CAAC;QACzC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YACxB,IAAI,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAE3C,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;gBAC7B,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;aACtC;YAED,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAE9C,IAAI,CAAC,MAAM,EAAE;gBACT,SAAS;aACZ;YAED,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAE1C,eAAe,CAAC,IAAI,CAChB,qBAAS,CAAC,GAAG,CACT,qBAAS,CAAC,KAAK,CAAC,qBAAS,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAC1D,MAAM,IAAI,qBAAS,CAAC,KAAK,CAAC,qBAAS,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,CACvE,CACJ,CAAC;SACL;QACD,OAAO,eAAe,CAAC;IAC3B,CAAC;IAEO,cAAc,CAAC,KAAa;QAChC,OAAO,KAAK,IAAI,kBAAU,IAAI,KAAK,IAAI,kBAAU,CAAC;IACtD,CAAC;IAEO,aAAa,CAAC,KAAa,EAAE,MAAc,EAAE,MAAe;QAChE,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAEjC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;YACrF,MAAM,IAAI,6BAAY,CAAC,mBAAmB,KAAK,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,mBAAmB,KAAK,EAAE,EAAE,GAAG,CAAC,CAAC;SAC9G;IACL,CAAC;CACJ,CAAA;yBAvCY,cAAc;IAD1B,IAAA,qBAAU,GAAE;GACA,cAAc,CAuC1B"}
|
|
@@ -7,7 +7,7 @@ const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
|
7
7
|
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
8
8
|
class JISEventsController extends controllers_1.BaseController {
|
|
9
9
|
constructor() {
|
|
10
|
-
super("
|
|
10
|
+
super("jis", new golemio_validator_1.JSONSchemaValidator("JISEventsDataValidation", JISEventsJsonSchema_1.jisEventsJsonSchema));
|
|
11
11
|
this.processData = async (inputData) => {
|
|
12
12
|
try {
|
|
13
13
|
await this.validator.Validate(inputData);
|
|
@@ -22,6 +22,7 @@ class JISEventsController extends controllers_1.BaseController {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
};
|
|
25
|
+
this.name = "JISEventsController";
|
|
25
26
|
}
|
|
26
27
|
}
|
|
27
28
|
exports.JISEventsController = JISEventsController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISEventsController.js","sourceRoot":"","sources":["../../../../src/input-gateway/jis/controllers/JISEventsController.ts"],"names":[],"mappings":";;;AAAA,yGAA+E;AAC/E,8EAA8E;AAC9E,6EAA8F;AAC9F,mFAAkF;AAElF,MAAa,mBAAoB,SAAQ,4BAAc;IAKnD;QACI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"JISEventsController.js","sourceRoot":"","sources":["../../../../src/input-gateway/jis/controllers/JISEventsController.ts"],"names":[],"mappings":";;;AAAA,yGAA+E;AAC/E,8EAA8E;AAC9E,6EAA8F;AAC9F,mFAAkF;AAElF,MAAa,mBAAoB,SAAQ,4BAAc;IAKnD;QACI,KAAK,CAAC,KAAK,EAAE,IAAI,uCAAmB,CAAC,yBAAyB,EAAE,yCAAmB,CAAC,CAAC,CAAC;QAInF,gBAAW,GAAG,KAAK,EAAE,SAAc,EAAiB,EAAE;YACzD,IAAI;gBACA,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBACzC,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,GAAG,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;aAClH;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,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;iBACjG;aACJ;QACL,CAAC,CAAC;QAdE,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;IACtC,CAAC;CAcJ;AAtBD,kDAsBC"}
|
|
@@ -7,7 +7,7 @@ const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
|
7
7
|
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
8
8
|
class JISInfotextsController extends controllers_1.BaseController {
|
|
9
9
|
constructor() {
|
|
10
|
-
super("
|
|
10
|
+
super("jis", new golemio_validator_1.JSONSchemaValidator("JISInfotextsDataValidation", JISInfotextsJsonSchema_1.jisInfotextsJsonSchema));
|
|
11
11
|
this.processData = async (inputData) => {
|
|
12
12
|
try {
|
|
13
13
|
await this.validator.Validate(inputData);
|
|
@@ -22,6 +22,7 @@ class JISInfotextsController extends controllers_1.BaseController {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
};
|
|
25
|
+
this.name = "JISInfotextsController";
|
|
25
26
|
}
|
|
26
27
|
}
|
|
27
28
|
exports.JISInfotextsController = JISInfotextsController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextsController.js","sourceRoot":"","sources":["../../../../src/input-gateway/jis/controllers/JISInfotextsController.ts"],"names":[],"mappings":";;;AAAA,+GAAqF;AACrF,8EAA8E;AAC9E,6EAA8F;AAC9F,mFAAkF;AAElF,MAAa,sBAAuB,SAAQ,4BAAc;IAKtD;QACI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"JISInfotextsController.js","sourceRoot":"","sources":["../../../../src/input-gateway/jis/controllers/JISInfotextsController.ts"],"names":[],"mappings":";;;AAAA,+GAAqF;AACrF,8EAA8E;AAC9E,6EAA8F;AAC9F,mFAAkF;AAElF,MAAa,sBAAuB,SAAQ,4BAAc;IAKtD;QACI,KAAK,CAAC,KAAK,EAAE,IAAI,uCAAmB,CAAC,4BAA4B,EAAE,+CAAsB,CAAC,CAAC,CAAC;QAIzF,gBAAW,GAAG,KAAK,EAAE,SAAc,EAAiB,EAAE;YACzD,IAAI;gBACA,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBACzC,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,GAAG,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;aACrH;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,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;iBACjG;aACJ;QACL,CAAC,CAAC;QAdE,IAAI,CAAC,IAAI,GAAG,wBAAwB,CAAC;IACzC,CAAC;CAcJ;AAtBD,wDAsBC"}
|
|
@@ -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"}
|
|
@@ -2,12 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.JISContainer = void 0;
|
|
4
4
|
const Di_1 = require("../../ioc/Di");
|
|
5
|
-
const RopidGTFSStopsModel_1 = require("../../ropid-gtfs/RopidGTFSStopsModel");
|
|
6
5
|
const JISEventsDataSourceFactory_1 = require("../datasources/JISEventsDataSourceFactory");
|
|
7
6
|
const JISInfotextsDataSourceFactory_1 = require("../datasources/JISInfotextsDataSourceFactory");
|
|
8
7
|
const JISEventsRepository_1 = require("../repositories/JISEventsRepository");
|
|
9
8
|
const JISEventsRopidGTFSRoutesRepository_1 = require("../repositories/JISEventsRopidGTFSRoutesRepository");
|
|
10
|
-
const JISInfotextsRedisRepository_1 = require("../repositories/JISInfotextsRedisRepository");
|
|
11
9
|
const JISInfotextsRepository_1 = require("../repositories/JISInfotextsRepository");
|
|
12
10
|
const JISInfotextsRopidGTFSStopsRepository_1 = require("../repositories/JISInfotextsRopidGTFSStopsRepository");
|
|
13
11
|
const JISMetadataRepository_1 = require("../repositories/JISMetadataRepository");
|
|
@@ -19,10 +17,8 @@ const JISInfotextsTransformation_1 = require("../transformations/JISInfotextsTra
|
|
|
19
17
|
const FetchJISEventsTask_1 = require("../workers/tasks/FetchJISEventsTask");
|
|
20
18
|
const FetchJISInfotextsTask_1 = require("../workers/tasks/FetchJISInfotextsTask");
|
|
21
19
|
const RefreshJISEventsTask_1 = require("../workers/tasks/RefreshJISEventsTask");
|
|
22
|
-
const RefreshJISInfotextsCacheTask_1 = require("../workers/tasks/RefreshJISInfotextsCacheTask");
|
|
23
20
|
const RefreshJISInfotextsTask_1 = require("../workers/tasks/RefreshJISInfotextsTask");
|
|
24
21
|
const JISContainerToken_1 = require("./JISContainerToken");
|
|
25
|
-
const JISInfotextCacheTranformation_1 = require("../transformations/JISInfotextCacheTranformation");
|
|
26
22
|
//#region Initialization
|
|
27
23
|
const JISContainer = Di_1.PidContainer.createChildContainer();
|
|
28
24
|
exports.JISContainer = JISContainer;
|
|
@@ -31,16 +27,12 @@ exports.JISContainer = JISContainer;
|
|
|
31
27
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISEventsDataSourceFactory, JISEventsDataSourceFactory_1.JISEventsDataSourceFactory);
|
|
32
28
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISInfotextsDataSourceFactory, JISInfotextsDataSourceFactory_1.JISInfotextsDataSourceFactory);
|
|
33
29
|
//#endregion
|
|
34
|
-
//#region Cache Repositories
|
|
35
|
-
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISInfotextsRedisRepository, JISInfotextsRedisRepository_1.JISInfotextsRedisRepository);
|
|
36
|
-
//#endregion
|
|
37
30
|
//#region Repositories
|
|
38
31
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISEventsRepository, JISEventsRepository_1.JISEventsRepository);
|
|
39
32
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISEventsRopidGTFSRoutesRepository, JISEventsRopidGTFSRoutesRepository_1.JISEventsRopidGTFSRoutesRepository);
|
|
40
33
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISInfotextsRepository, JISInfotextsRepository_1.JISInfotextsRepository);
|
|
41
34
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISInfotextsRopidGTFSStopsRepository, JISInfotextsRopidGTFSStopsRepository_1.JISInfotextsRopidGTFSStopsRepository);
|
|
42
35
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISMetadataRepository, JISMetadataRepository_1.JISMetadataRepository);
|
|
43
|
-
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.RopidGTFSStopsRepository, RopidGTFSStopsModel_1.RopidGTFSStopsModel);
|
|
44
36
|
//#endregion
|
|
45
37
|
//#region Services
|
|
46
38
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISEventsDataService, JISEventsDataService_1.JISEventsDataService);
|
|
@@ -51,11 +43,9 @@ JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.FetchJISEve
|
|
|
51
43
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.FetchJISInfotextsTask, FetchJISInfotextsTask_1.FetchJISInfotextsTask);
|
|
52
44
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.RefreshJISEventsTask, RefreshJISEventsTask_1.RefreshJISEventsTask);
|
|
53
45
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.RefreshJISInfotextsTask, RefreshJISInfotextsTask_1.RefreshJISInfotextsTask);
|
|
54
|
-
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.RefreshJISInfotextsCacheTask, RefreshJISInfotextsCacheTask_1.RefreshJISInfotextsCacheTask);
|
|
55
46
|
//#endregion
|
|
56
47
|
//#region Transformations
|
|
57
48
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISEventsTransformation, JISEventsTransformation_1.JISEventsTransformation);
|
|
58
49
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISEventsGtfsRtTransformation, JISEventsGtfsRtTransformation_1.JISEventsGtfsRtTransformation);
|
|
59
50
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISInfotextsTransformation, JISInfotextsTransformation_1.JISInfotextsTransformation);
|
|
60
|
-
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISInfotextCacheTranformation, JISInfotextCacheTranformation_1.JISInfotextCacheTranformation);
|
|
61
51
|
//# sourceMappingURL=Di.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;
|
|
1
|
+
{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAE1C,0FAAuF;AACvF,gGAA6F;AAC7F,6EAA0E;AAC1E,2GAAwG;AACxG,mFAAgF;AAChF,+GAA4G;AAC5G,iFAA8E;AAC9E,2EAAwE;AACxE,iFAA8E;AAC9E,oGAAiG;AACjG,wFAAqF;AACrF,8FAA2F;AAC3F,4EAAyE;AACzE,kFAA+E;AAC/E,gFAA6E;AAC7E,sFAAmF;AACnF,2DAAwD;AAExD,wBAAwB;AACxB,MAAM,YAAY,GAAwB,iBAAY,CAAC,oBAAoB,EAAE,CAAC;AAkCrE,oCAAY;AAjCrB,YAAY;AAEZ,sBAAsB;AACtB,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,0BAA0B,EAAE,uDAA0B,CAAC,CAAC;AACzG,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC,CAAC;AAC/G,YAAY;AAEZ,sBAAsB;AACtB,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,mBAAmB,EAAE,yCAAmB,CAAC,CAAC;AAC3F,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,kCAAkC,EAAE,uEAAkC,CAAC,CAAC;AACzH,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,sBAAsB,EAAE,+CAAsB,CAAC,CAAC;AACjG,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,oCAAoC,EAAE,2EAAoC,CAAC,CAAC;AAC7H,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,qBAAqB,EAAE,6CAAqB,CAAC,CAAC;AAC/F,YAAY;AAEZ,kBAAkB;AAClB,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,oBAAoB,EAAE,2CAAoB,CAAC,CAAC;AAC7F,YAAY,CAAC,QAAQ,CAAC,qCAAiB,CAAC,uBAAuB,EAAE,iDAAuB,CAAC,CAAC;AAC1F,YAAY;AAEZ,eAAe;AACf,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,kBAAkB,EAAE,uCAAkB,CAAC,CAAC;AACzF,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,qBAAqB,EAAE,6CAAqB,CAAC,CAAC;AAC/F,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,oBAAoB,EAAE,2CAAoB,CAAC,CAAC;AAC7F,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,uBAAuB,EAAE,iDAAuB,CAAC,CAAC;AACnG,YAAY;AAEZ,yBAAyB;AACzB,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,uBAAuB,EAAE,iDAAuB,CAAC,CAAC;AACnG,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC,CAAC;AAC/G,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,0BAA0B,EAAE,uDAA0B,CAAC,CAAC"}
|
|
@@ -1,23 +1,19 @@
|
|
|
1
1
|
declare const JISContainerToken: {
|
|
2
2
|
JISEventsDataSourceFactory: symbol;
|
|
3
3
|
JISInfotextsDataSourceFactory: symbol;
|
|
4
|
-
JISInfotextsRedisRepository: symbol;
|
|
5
4
|
JISEventsRepository: symbol;
|
|
6
5
|
JISEventsRopidGTFSRoutesRepository: symbol;
|
|
7
6
|
JISInfotextsRepository: symbol;
|
|
8
7
|
JISInfotextsRopidGTFSStopsRepository: symbol;
|
|
9
8
|
JISMetadataRepository: symbol;
|
|
10
|
-
RopidGTFSStopsRepository: symbol;
|
|
11
9
|
JISEventsDataService: symbol;
|
|
12
10
|
JISInfotextsDataService: symbol;
|
|
13
11
|
JISEventsTransformation: symbol;
|
|
14
12
|
JISEventsGtfsRtTransformation: symbol;
|
|
15
13
|
JISInfotextsTransformation: symbol;
|
|
16
|
-
JISInfotextCacheTranformation: symbol;
|
|
17
14
|
FetchJISEventsTask: symbol;
|
|
18
15
|
FetchJISInfotextsTask: symbol;
|
|
19
16
|
RefreshJISEventsTask: symbol;
|
|
20
17
|
RefreshJISInfotextsTask: symbol;
|
|
21
|
-
RefreshJISInfotextsCacheTask: symbol;
|
|
22
18
|
};
|
|
23
19
|
export { JISContainerToken };
|
|
@@ -5,15 +5,12 @@ const JISContainerToken = {
|
|
|
5
5
|
/* Data Sources */
|
|
6
6
|
JISEventsDataSourceFactory: Symbol("JISEventsDataSourceFactory"),
|
|
7
7
|
JISInfotextsDataSourceFactory: Symbol("JISInfotextsDataSourceFactory"),
|
|
8
|
-
/* Cache Repositories */
|
|
9
|
-
JISInfotextsRedisRepository: Symbol("JISInfotextsRedisRepository"),
|
|
10
8
|
/* Repositories */
|
|
11
9
|
JISEventsRepository: Symbol("JISEventsRepository"),
|
|
12
10
|
JISEventsRopidGTFSRoutesRepository: Symbol("JISEventsRopidGTFSRoutesRepository"),
|
|
13
11
|
JISInfotextsRepository: Symbol("JISInfotextsRepository"),
|
|
14
12
|
JISInfotextsRopidGTFSStopsRepository: Symbol("JISInfotextsRopidGTFSStopsRepository"),
|
|
15
13
|
JISMetadataRepository: Symbol("JISMetadataRepository"),
|
|
16
|
-
RopidGTFSStopsRepository: Symbol("RopidGTFSStopsRepository"),
|
|
17
14
|
/* Services */
|
|
18
15
|
JISEventsDataService: Symbol("JISEventsDataService"),
|
|
19
16
|
JISInfotextsDataService: Symbol("JISInfotextsDataService"),
|
|
@@ -21,13 +18,11 @@ const JISContainerToken = {
|
|
|
21
18
|
JISEventsTransformation: Symbol("JISEventsTransformation"),
|
|
22
19
|
JISEventsGtfsRtTransformation: Symbol("JISEventsGtfsRtTransformation"),
|
|
23
20
|
JISInfotextsTransformation: Symbol("JISInfotextsTransformation"),
|
|
24
|
-
JISInfotextCacheTranformation: Symbol("JISInfotextCacheTranformation"),
|
|
25
21
|
/* Tasks */
|
|
26
22
|
FetchJISEventsTask: Symbol("FetchJISEventsTask"),
|
|
27
23
|
FetchJISInfotextsTask: Symbol("FetchJISInfotextsTask"),
|
|
28
24
|
RefreshJISEventsTask: Symbol("RefreshJISEventsTask"),
|
|
29
25
|
RefreshJISInfotextsTask: Symbol("RefreshJISInfotextsTask"),
|
|
30
|
-
RefreshJISInfotextsCacheTask: Symbol("RefreshJISInfotextsCacheTask"),
|
|
31
26
|
};
|
|
32
27
|
exports.JISContainerToken = JISContainerToken;
|
|
33
28
|
//# sourceMappingURL=JISContainerToken.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISContainerToken.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/ioc/JISContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,iBAAiB,GAAG;IACtB,kBAAkB;IAClB,0BAA0B,EAAE,MAAM,CAAC,4BAA4B,CAAC;IAChE,6BAA6B,EAAE,MAAM,CAAC,+BAA+B,CAAC;IACtE,
|
|
1
|
+
{"version":3,"file":"JISContainerToken.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/ioc/JISContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,iBAAiB,GAAG;IACtB,kBAAkB;IAClB,0BAA0B,EAAE,MAAM,CAAC,4BAA4B,CAAC;IAChE,6BAA6B,EAAE,MAAM,CAAC,+BAA+B,CAAC;IACtE,kBAAkB;IAClB,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC;IAClD,kCAAkC,EAAE,MAAM,CAAC,oCAAoC,CAAC;IAChF,sBAAsB,EAAE,MAAM,CAAC,wBAAwB,CAAC;IACxD,oCAAoC,EAAE,MAAM,CAAC,sCAAsC,CAAC;IACpF,qBAAqB,EAAE,MAAM,CAAC,uBAAuB,CAAC;IACtD,cAAc;IACd,oBAAoB,EAAE,MAAM,CAAC,sBAAsB,CAAC;IACpD,uBAAuB,EAAE,MAAM,CAAC,yBAAyB,CAAC;IAC1D,qBAAqB;IACrB,uBAAuB,EAAE,MAAM,CAAC,yBAAyB,CAAC;IAC1D,6BAA6B,EAAE,MAAM,CAAC,+BAA+B,CAAC;IACtE,0BAA0B,EAAE,MAAM,CAAC,4BAA4B,CAAC;IAChE,WAAW;IACX,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC;IAChD,qBAAqB,EAAE,MAAM,CAAC,uBAAuB,CAAC;IACtD,oBAAoB,EAAE,MAAM,CAAC,sBAAsB,CAAC;IACpD,uBAAuB,EAAE,MAAM,CAAC,yBAAyB,CAAC;CAC7D,CAAC;AAEO,8CAAiB"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { RopidGTFSStopsModel } from "../../ropid-gtfs";
|
|
2
1
|
import { JISInfotextsModel } from "../../../schema-definitions/jis/models/JISInfotextsModel";
|
|
3
2
|
import { IJISInfotext } from "../../../schema-definitions/jis/models/interfaces";
|
|
4
3
|
import { ILogger } from "@golemio/core/dist/helpers";
|
|
@@ -6,19 +5,16 @@ import { IDatabaseConnector } from "@golemio/core/dist/helpers/data-access/postg
|
|
|
6
5
|
import { AbstractValidatableRepository } from "@golemio/core/dist/helpers/data-access/postgres/repositories/AbstractValidatableRepository";
|
|
7
6
|
import { JSONSchemaValidator } from "@golemio/core/dist/shared/golemio-validator";
|
|
8
7
|
import { Transaction } from "@golemio/core/dist/shared/sequelize";
|
|
9
|
-
import { JISInfotextsRopidGTFSStopsRepository } from "./JISInfotextsRopidGTFSStopsRepository";
|
|
10
8
|
type RepositoryOptions = {
|
|
11
9
|
transaction?: Transaction;
|
|
12
10
|
};
|
|
13
11
|
export declare class JISInfotextsRepository extends AbstractValidatableRepository {
|
|
14
12
|
private logger;
|
|
15
|
-
private infotextStopRepository;
|
|
16
|
-
private gtfsStopRepository;
|
|
17
13
|
validator: JSONSchemaValidator;
|
|
18
14
|
schema: string;
|
|
19
15
|
tableName: string;
|
|
20
16
|
private sequelizeModel;
|
|
21
|
-
constructor(connector: IDatabaseConnector, logger: ILogger
|
|
17
|
+
constructor(connector: IDatabaseConnector, logger: ILogger);
|
|
22
18
|
/**
|
|
23
19
|
* Refresh all data from VYMI and delete old data
|
|
24
20
|
*
|
|
@@ -32,6 +28,5 @@ export declare class JISInfotextsRepository extends AbstractValidatableRepositor
|
|
|
32
28
|
* @returns The number of deleted items
|
|
33
29
|
*/
|
|
34
30
|
deleteAll(options?: RepositoryOptions): Promise<number>;
|
|
35
|
-
findAll(): Promise<JISInfotextsModel[]>;
|
|
36
31
|
}
|
|
37
32
|
export {};
|
|
@@ -13,7 +13,6 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.JISInfotextsRepository = void 0;
|
|
16
|
-
const ropid_gtfs_1 = require("../../ropid-gtfs");
|
|
17
16
|
const const_1 = require("../../../schema-definitions/const");
|
|
18
17
|
const JISInfotextsModel_1 = require("../../../schema-definitions/jis/models/JISInfotextsModel");
|
|
19
18
|
const AbstractValidatableRepository_1 = require("@golemio/core/dist/helpers/data-access/postgres/repositories/AbstractValidatableRepository");
|
|
@@ -22,48 +21,17 @@ const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
|
22
21
|
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
23
22
|
const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
|
|
24
23
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
25
|
-
const JISContainerToken_1 = require("../ioc/JISContainerToken");
|
|
26
|
-
const JISInfotextsRopidGTFSStopsRepository_1 = require("./JISInfotextsRopidGTFSStopsRepository");
|
|
27
24
|
const RepositoryUtils_1 = require("../../shared/RepositoryUtils");
|
|
28
25
|
let JISInfotextsRepository = exports.JISInfotextsRepository = class JISInfotextsRepository extends AbstractValidatableRepository_1.AbstractValidatableRepository {
|
|
29
|
-
constructor(connector, logger
|
|
26
|
+
constructor(connector, logger) {
|
|
30
27
|
super(connector, logger);
|
|
31
28
|
this.logger = logger;
|
|
32
|
-
this.infotextStopRepository = infotextStopRepository;
|
|
33
|
-
this.gtfsStopRepository = gtfsStopRepository;
|
|
34
29
|
this.schema = const_1.PG_SCHEMA;
|
|
35
30
|
this.tableName = JISInfotextsModel_1.JISInfotextsModel.tableName;
|
|
36
31
|
this.validator = new golemio_validator_1.JSONSchemaValidator("JISInfotextsRepository", JISInfotextsModel_1.JISInfotextsModel.jsonSchema);
|
|
37
32
|
this.sequelizeModel = connector
|
|
38
33
|
.getConnection()
|
|
39
34
|
.define(this.tableName, JISInfotextsModel_1.JISInfotextsModel.attributeModel, { schema: this.schema });
|
|
40
|
-
this.sequelizeModel.belongsToMany(this.gtfsStopRepository.sequelizeModel, {
|
|
41
|
-
through: this.infotextStopRepository["sequelizeModel"],
|
|
42
|
-
foreignKey: "infotext_id",
|
|
43
|
-
otherKey: "stop_id",
|
|
44
|
-
as: "stops",
|
|
45
|
-
});
|
|
46
|
-
this.gtfsStopRepository.sequelizeModel.belongsToMany(this.sequelizeModel, {
|
|
47
|
-
through: this.infotextStopRepository["sequelizeModel"],
|
|
48
|
-
foreignKey: "stop_id",
|
|
49
|
-
otherKey: "infotext_id",
|
|
50
|
-
});
|
|
51
|
-
this.infotextStopRepository["sequelizeModel"].belongsTo(this.sequelizeModel, {
|
|
52
|
-
targetKey: "id",
|
|
53
|
-
foreignKey: "infotext_id",
|
|
54
|
-
});
|
|
55
|
-
this.infotextStopRepository["sequelizeModel"].belongsTo(this.gtfsStopRepository.sequelizeModel, {
|
|
56
|
-
targetKey: "stop_id",
|
|
57
|
-
foreignKey: "stop_id",
|
|
58
|
-
});
|
|
59
|
-
this.sequelizeModel.hasMany(this.infotextStopRepository["sequelizeModel"], {
|
|
60
|
-
sourceKey: "id",
|
|
61
|
-
foreignKey: "infotext_id",
|
|
62
|
-
});
|
|
63
|
-
this.gtfsStopRepository.sequelizeModel.hasMany(this.infotextStopRepository["sequelizeModel"], {
|
|
64
|
-
sourceKey: "stop_id",
|
|
65
|
-
foreignKey: "stop_id",
|
|
66
|
-
});
|
|
67
35
|
}
|
|
68
36
|
/**
|
|
69
37
|
* Refresh all data from VYMI and delete old data
|
|
@@ -126,27 +94,11 @@ let JISInfotextsRepository = exports.JISInfotextsRepository = class JISInfotexts
|
|
|
126
94
|
throw new golemio_errors_1.GeneralError("Error in deleteAll", this.constructor.name, err);
|
|
127
95
|
}
|
|
128
96
|
}
|
|
129
|
-
async findAll() {
|
|
130
|
-
return await this.sequelizeModel.findAll({
|
|
131
|
-
include: [
|
|
132
|
-
{
|
|
133
|
-
model: this.gtfsStopRepository.sequelizeModel,
|
|
134
|
-
as: "stops",
|
|
135
|
-
attributes: ["stop_id"],
|
|
136
|
-
through: { attributes: [] },
|
|
137
|
-
required: true,
|
|
138
|
-
},
|
|
139
|
-
],
|
|
140
|
-
});
|
|
141
|
-
}
|
|
142
97
|
};
|
|
143
98
|
exports.JISInfotextsRepository = JISInfotextsRepository = __decorate([
|
|
144
99
|
(0, tsyringe_1.injectable)(),
|
|
145
100
|
__param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.PostgresConnector)),
|
|
146
101
|
__param(1, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
|
|
147
|
-
|
|
148
|
-
__param(3, (0, tsyringe_1.inject)(JISContainerToken_1.JISContainerToken.RopidGTFSStopsRepository)),
|
|
149
|
-
__metadata("design:paramtypes", [Object, Object, JISInfotextsRopidGTFSStopsRepository_1.JISInfotextsRopidGTFSStopsRepository,
|
|
150
|
-
ropid_gtfs_1.RopidGTFSStopsModel])
|
|
102
|
+
__metadata("design:paramtypes", [Object, Object])
|
|
151
103
|
], JISInfotextsRepository);
|
|
152
104
|
//# sourceMappingURL=JISInfotextsRepository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextsRepository.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/repositories/JISInfotextsRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"JISInfotextsRepository.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/repositories/JISInfotextsRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { RedisModel } from "@golemio/core/dist/integration-engine/models/RedisModel";
|
|
2
2
|
export declare class JISMetadataRepository extends RedisModel {
|
|
3
3
|
static readonly NAMESPACE_PREFIX = "jisMetadata";
|
|
4
|
-
protected readonly
|
|
5
|
-
protected readonly eventsKey = "events";
|
|
4
|
+
protected readonly key = "main";
|
|
6
5
|
constructor();
|
|
7
6
|
/** Get the Etag of the last JIS Infotexts response */
|
|
8
7
|
getLastInfotextsEtag(): Promise<string | undefined>;
|
|
@@ -12,7 +11,5 @@ export declare class JISMetadataRepository extends RedisModel {
|
|
|
12
11
|
* @param etag The new Etag of the last JIS Infotexts response
|
|
13
12
|
*/
|
|
14
13
|
setLastInfotextsEtag(etag: string): Promise<void>;
|
|
15
|
-
getLastEventsEtag(): Promise<string | undefined>;
|
|
16
|
-
setLastEventsEtag(etag: string): Promise<void>;
|
|
17
14
|
private initializeMetadata;
|
|
18
15
|
}
|
|
@@ -25,14 +25,13 @@ let JISMetadataRepository = exports.JISMetadataRepository = JISMetadataRepositor
|
|
|
25
25
|
isKeyConstructedFromData: false,
|
|
26
26
|
prefix: JISMetadataRepository_1.NAMESPACE_PREFIX,
|
|
27
27
|
}, new golemio_validator_1.JSONSchemaValidator("JISMetadataRepositoryValidator", JISMetadataDtoSchema_1.JISMetadataDtoSchema));
|
|
28
|
-
this.
|
|
29
|
-
this.eventsKey = "events";
|
|
28
|
+
this.key = "main";
|
|
30
29
|
}
|
|
31
30
|
/** Get the Etag of the last JIS Infotexts response */
|
|
32
31
|
async getLastInfotextsEtag() {
|
|
33
32
|
try {
|
|
34
|
-
const metadata = await this.get(this.
|
|
35
|
-
return metadata?.lastResponse.etag;
|
|
33
|
+
const metadata = await this.get(this.key);
|
|
34
|
+
return metadata?.infotexts.lastResponse.etag;
|
|
36
35
|
}
|
|
37
36
|
catch (err) {
|
|
38
37
|
if (err instanceof golemio_errors_1.GeneralError)
|
|
@@ -47,12 +46,12 @@ let JISMetadataRepository = exports.JISMetadataRepository = JISMetadataRepositor
|
|
|
47
46
|
*/
|
|
48
47
|
async setLastInfotextsEtag(etag) {
|
|
49
48
|
try {
|
|
50
|
-
let metadata = await this.get(this.
|
|
49
|
+
let metadata = await this.get(this.key);
|
|
51
50
|
if (!metadata)
|
|
52
51
|
metadata = this.initializeMetadata();
|
|
53
|
-
metadata.lastResponse.etag = etag;
|
|
54
|
-
metadata.lastResponse.updatedAt = new Date().toISOString();
|
|
55
|
-
await this.set(this.
|
|
52
|
+
metadata.infotexts.lastResponse.etag = etag;
|
|
53
|
+
metadata.infotexts.lastResponse.updatedAt = new Date().toISOString();
|
|
54
|
+
await this.set(this.key, metadata);
|
|
56
55
|
}
|
|
57
56
|
catch (err) {
|
|
58
57
|
if (err instanceof golemio_errors_1.GeneralError)
|
|
@@ -60,37 +59,13 @@ let JISMetadataRepository = exports.JISMetadataRepository = JISMetadataRepositor
|
|
|
60
59
|
throw new golemio_errors_1.GeneralError("Error while updating last infotexts etag", this.constructor.name, err);
|
|
61
60
|
}
|
|
62
61
|
}
|
|
63
|
-
async getLastEventsEtag() {
|
|
64
|
-
try {
|
|
65
|
-
const metadata = await this.get(this.eventsKey);
|
|
66
|
-
return metadata?.lastResponse.etag;
|
|
67
|
-
}
|
|
68
|
-
catch (err) {
|
|
69
|
-
if (err instanceof golemio_errors_1.GeneralError)
|
|
70
|
-
throw err;
|
|
71
|
-
throw new golemio_errors_1.GeneralError("Error while getting last events etag", this.constructor.name, err);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
async setLastEventsEtag(etag) {
|
|
75
|
-
try {
|
|
76
|
-
let metadata = await this.get(this.eventsKey);
|
|
77
|
-
if (!metadata)
|
|
78
|
-
metadata = this.initializeMetadata();
|
|
79
|
-
metadata.lastResponse.etag = etag;
|
|
80
|
-
metadata.lastResponse.updatedAt = new Date().toISOString();
|
|
81
|
-
await this.set(this.eventsKey, metadata);
|
|
82
|
-
}
|
|
83
|
-
catch (err) {
|
|
84
|
-
if (err instanceof golemio_errors_1.GeneralError)
|
|
85
|
-
throw err;
|
|
86
|
-
throw new golemio_errors_1.GeneralError("Error while updating last events etag", this.constructor.name, err);
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
62
|
initializeMetadata() {
|
|
90
63
|
return {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
64
|
+
infotexts: {
|
|
65
|
+
lastResponse: {
|
|
66
|
+
etag: "",
|
|
67
|
+
updatedAt: new Date().toISOString(),
|
|
68
|
+
},
|
|
94
69
|
},
|
|
95
70
|
};
|
|
96
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISMetadataRepository.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/repositories/JISMetadataRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,uEAAqE;AAErE,6GAAmF;AACnF,wFAAqF;AACrF,6EAAwE;AACxE,mFAAkF;AAClF,iEAAgE;AAGzD,IAAM,qBAAqB,6DAA3B,MAAM,qBAAsB,SAAQ,uBAAU;
|
|
1
|
+
{"version":3,"file":"JISMetadataRepository.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/repositories/JISMetadataRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,uEAAqE;AAErE,6GAAmF;AACnF,wFAAqF;AACrF,6EAAwE;AACxE,mFAAkF;AAClF,iEAAgE;AAGzD,IAAM,qBAAqB,6DAA3B,MAAM,qBAAsB,SAAQ,uBAAU;IAKjD;QACI,KAAK,CACD,uBAAuB,EACvB;YACI,kBAAkB,EAAE,IAAI,CAAC,KAAK;YAC9B,oBAAoB,EAAE,IAAI,CAAC,SAAS;YACpC,wBAAwB,EAAE,KAAK;YAC/B,MAAM,EAAE,uBAAqB,CAAC,gBAAgB;SACjD,EACD,IAAI,uCAAmB,CAAC,gCAAgC,EAAE,2CAAoB,CAAC,CAClF,CAAC;QAZa,QAAG,GAAG,MAAM,CAAC;IAahC,CAAC;IAED,sDAAsD;IACtD,KAAK,CAAC,oBAAoB;QACtB,IAAI;YACA,MAAM,QAAQ,GAAgC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvE,OAAO,QAAQ,EAAE,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC;SAChD;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,YAAY,6BAAY;gBAAE,MAAM,GAAG,CAAC;YAC3C,MAAM,IAAI,6BAAY,CAAC,yCAAyC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SACjG;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,oBAAoB,CAAC,IAAY;QACnC,IAAI;YACA,IAAI,QAAQ,GAAgC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrE,IAAI,CAAC,QAAQ;gBAAE,QAAQ,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACpD,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC;YAC5C,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACrE,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;SACtC;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,YAAY,6BAAY;gBAAE,MAAM,GAAG,CAAC;YAC3C,MAAM,IAAI,6BAAY,CAAC,0CAA0C,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SAClG;IACL,CAAC;IAEO,kBAAkB;QACtB,OAAO;YACH,SAAS,EAAE;gBACP,YAAY,EAAE;oBACV,IAAI,EAAE,EAAE;oBACR,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACtC;aACJ;SACJ,CAAC;IACN,CAAC;;AAvDsB,sCAAgB,GAAG,qCAA6B,AAAhC,CAAiC;gCAD/D,qBAAqB;IADjC,IAAA,qBAAU,GAAE;;GACA,qBAAqB,CAyDjC"}
|
|
@@ -18,7 +18,6 @@ class JISWorker extends workers_1.AbstractWorker {
|
|
|
18
18
|
this.registerTask(Di_1.JISContainer.resolve(JISContainerToken_1.JISContainerToken.FetchJISInfotextsTask));
|
|
19
19
|
this.registerTask(Di_1.JISContainer.resolve(JISContainerToken_1.JISContainerToken.RefreshJISEventsTask));
|
|
20
20
|
this.registerTask(Di_1.JISContainer.resolve(JISContainerToken_1.JISContainerToken.RefreshJISInfotextsTask));
|
|
21
|
-
this.registerTask(Di_1.JISContainer.resolve(JISContainerToken_1.JISContainerToken.RefreshJISInfotextsCacheTask));
|
|
22
21
|
}
|
|
23
22
|
}
|
|
24
23
|
exports.JISWorker = JISWorker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISWorker.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/workers/JISWorker.ts"],"names":[],"mappings":";;;AAAA,2EAA+E;AAE/E,kCAAyC;AACzC,gEAA6D;AAC7D,2CAA8C;
|
|
1
|
+
{"version":3,"file":"JISWorker.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/workers/JISWorker.ts"],"names":[],"mappings":";;;AAAA,2EAA+E;AAE/E,kCAAyC;AACzC,gEAA6D;AAC7D,2CAA8C;AAM9C,MAAa,SAAU,SAAQ,wBAAc;IAGzC;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,2BAAe,CAAC,WAAW,EAAE,CAAC;QAYxC,iBAAY,GAAG,CAAC,IAAW,EAAQ,EAAE;YACxC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QAVE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,iBAAY,CAAC,OAAO,CAAqB,qCAAiB,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAClG,IAAI,CAAC,YAAY,CAAC,iBAAY,CAAC,OAAO,CAAwB,qCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;QACxG,IAAI,CAAC,YAAY,CAAC,iBAAY,CAAC,OAAO,CAAuB,qCAAiB,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACtG,IAAI,CAAC,YAAY,CAAC,iBAAY,CAAC,OAAO,CAA0B,qCAAiB,CAAC,uBAAuB,CAAC,CAAC,CAAC;IAChH,CAAC;CAMJ;AAjBD,8BAiBC"}
|
|
@@ -1,15 +1,9 @@
|
|
|
1
1
|
import { JISEventsDataSourceFactory } from "../../datasources/JISEventsDataSourceFactory";
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
import { ILogger } from "@golemio/core/dist/helpers";
|
|
5
|
-
import { IJISEvent } from "../../../../schema-definitions/jis/datasources/interfaces";
|
|
6
|
-
export declare class FetchJISEventsTask extends AbstractFetchJISResourceTask<IJISEvent> {
|
|
2
|
+
import { AbstractEmptyTask } from "@golemio/core/dist/integration-engine";
|
|
3
|
+
export declare class FetchJISEventsTask extends AbstractEmptyTask {
|
|
7
4
|
private dataSourceFactory;
|
|
8
5
|
readonly queueName = "fetchJISEvents";
|
|
9
6
|
readonly queueTtl: number;
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
protected metadataGetter: () => Promise<string | undefined>;
|
|
13
|
-
protected metadataSetter: (etag: string) => Promise<void>;
|
|
14
|
-
protected getDataSource: (etag?: string) => import("@golemio/core/dist/integration-engine").IDataSource<IJISEvent[]>;
|
|
7
|
+
constructor(dataSourceFactory: JISEventsDataSourceFactory);
|
|
8
|
+
protected execute(): Promise<void>;
|
|
15
9
|
}
|
|
@@ -15,29 +15,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.FetchJISEventsTask = void 0;
|
|
16
16
|
const JISEventsDataSourceFactory_1 = require("../../datasources/JISEventsDataSourceFactory");
|
|
17
17
|
const JISContainerToken_1 = require("../../ioc/JISContainerToken");
|
|
18
|
+
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
18
19
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
19
|
-
const JISMetadataRepository_1 = require("../../repositories/JISMetadataRepository");
|
|
20
|
-
const AbstractFetchJISResourceTask_1 = require("./AbstractFetchJISResourceTask");
|
|
21
|
-
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
22
20
|
const constants_1 = require("../constants");
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
21
|
+
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
22
|
+
let FetchJISEventsTask = exports.FetchJISEventsTask = class FetchJISEventsTask extends integration_engine_1.AbstractEmptyTask {
|
|
23
|
+
constructor(dataSourceFactory) {
|
|
24
|
+
super(constants_1.JIS_WORKER_NAME.toLowerCase());
|
|
26
25
|
this.dataSourceFactory = dataSourceFactory;
|
|
27
26
|
this.queueName = "fetchJISEvents";
|
|
28
|
-
this.queueTtl = 20 * 1000;
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
27
|
+
this.queueTtl = 20 * 1000; // 20 seconds
|
|
28
|
+
}
|
|
29
|
+
async execute() {
|
|
30
|
+
try {
|
|
31
|
+
const dataSource = this.dataSourceFactory.getDataSource();
|
|
32
|
+
const data = await dataSource.getAll();
|
|
33
|
+
await integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "refreshJISEvents", data);
|
|
34
|
+
}
|
|
35
|
+
catch (err) {
|
|
36
|
+
if (err instanceof golemio_errors_1.AbstractGolemioError) {
|
|
37
|
+
throw err;
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
throw new golemio_errors_1.GeneralError("Error while fetching new JIS events", this.constructor.name, err);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
33
43
|
}
|
|
34
44
|
};
|
|
35
45
|
exports.FetchJISEventsTask = FetchJISEventsTask = __decorate([
|
|
36
46
|
(0, tsyringe_1.injectable)(),
|
|
37
47
|
__param(0, (0, tsyringe_1.inject)(JISContainerToken_1.JISContainerToken.JISEventsDataSourceFactory)),
|
|
38
|
-
|
|
39
|
-
__param(2, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
|
|
40
|
-
__metadata("design:paramtypes", [JISEventsDataSourceFactory_1.JISEventsDataSourceFactory,
|
|
41
|
-
JISMetadataRepository_1.JISMetadataRepository, Object])
|
|
48
|
+
__metadata("design:paramtypes", [JISEventsDataSourceFactory_1.JISEventsDataSourceFactory])
|
|
42
49
|
], FetchJISEventsTask);
|
|
43
50
|
//# sourceMappingURL=FetchJISEventsTask.js.map
|