@golemio/pid 4.1.3-dev.2044320024 → 4.1.3-rc.2044357310
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/dist/input-gateway/jis/controllers/JISEventsController.js +1 -1
- package/dist/input-gateway/jis/controllers/JISEventsController.js.map +1 -1
- package/dist/integration-engine/jis/datasources/JISEventsDataSourceFactory.js +5 -7
- package/dist/integration-engine/jis/datasources/JISEventsDataSourceFactory.js.map +1 -1
- package/dist/integration-engine/jis/datasources/JISInfotextsDataSourceFactory.js +5 -7
- package/dist/integration-engine/jis/datasources/JISInfotextsDataSourceFactory.js.map +1 -1
- package/dist/integration-engine/jis/ioc/Di.js +1 -7
- package/dist/integration-engine/jis/ioc/Di.js.map +1 -1
- package/dist/integration-engine/jis/ioc/JISContainerToken.d.ts +0 -3
- package/dist/integration-engine/jis/ioc/JISContainerToken.js +0 -3
- package/dist/integration-engine/jis/ioc/JISContainerToken.js.map +1 -1
- package/dist/integration-engine/jis/services/JISEventsDataService.d.ts +1 -2
- package/dist/integration-engine/jis/services/JISEventsDataService.js +1 -7
- package/dist/integration-engine/jis/services/JISEventsDataService.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/AbstractFetchJISResourceTask.d.ts +0 -1
- package/dist/integration-engine/jis/workers/tasks/AbstractFetchJISResourceTask.js +1 -1
- package/dist/integration-engine/jis/workers/tasks/AbstractFetchJISResourceTask.js.map +1 -1
- package/dist/integration-engine/jis/workers/tasks/FetchJISEventsTask.d.ts +0 -1
- package/dist/integration-engine/jis/workers/tasks/FetchJISEventsTask.js +0 -2
- package/dist/integration-engine/jis/workers/tasks/FetchJISEventsTask.js.map +1 -1
- package/dist/integration-engine/jis/workers/tasks/FetchJISInfotextsTask.d.ts +0 -1
- package/dist/integration-engine/jis/workers/tasks/FetchJISInfotextsTask.js +0 -2
- package/dist/integration-engine/jis/workers/tasks/FetchJISInfotextsTask.js.map +1 -1
- package/dist/integration-engine/jis/workers/tasks/RefreshJISEventsTask.d.ts +2 -9
- package/dist/integration-engine/jis/workers/tasks/RefreshJISEventsTask.js +3 -28
- package/dist/integration-engine/jis/workers/tasks/RefreshJISEventsTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/AlertsGenerator.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/AlertsGenerator.js.map +1 -1
- package/dist/output-gateway/jis/domain/IJISEventsInterfaces.d.ts +31 -0
- package/dist/output-gateway/jis/helpers/TranslationHelper.d.ts +4 -0
- package/dist/output-gateway/jis/helpers/TranslationHelper.js +48 -0
- package/dist/output-gateway/jis/helpers/TranslationHelper.js.map +1 -0
- package/dist/output-gateway/jis/ioc/Di.js +5 -1
- package/dist/output-gateway/jis/ioc/Di.js.map +1 -1
- package/dist/output-gateway/jis/ioc/OgJisToken.d.ts +1 -0
- package/dist/output-gateway/jis/ioc/OgJisToken.js +1 -0
- package/dist/output-gateway/jis/ioc/OgJisToken.js.map +1 -1
- package/dist/output-gateway/jis/transformations/JISEventsCustomFormatTransformation.d.ts +5 -2
- package/dist/output-gateway/jis/transformations/JISEventsCustomFormatTransformation.js +16 -6
- package/dist/output-gateway/jis/transformations/JISEventsCustomFormatTransformation.js.map +1 -1
- package/dist/output-gateway/public/data-access/redis/PublicVehiclePositionsRepository.js +3 -1
- package/dist/output-gateway/public/data-access/redis/PublicVehiclePositionsRepository.js.map +1 -1
- package/dist/schema-definitions/jis/datasources/JISEventsJsonSchema.js +1 -2
- package/dist/schema-definitions/jis/datasources/JISEventsJsonSchema.js.map +1 -1
- package/dist/schema-definitions/jis/datasources/interfaces/IJISEvent.d.ts +1 -2
- package/dist/schema-definitions/jis/models/JISEventsModel.js +1 -2
- package/dist/schema-definitions/jis/models/JISEventsModel.js.map +1 -1
- package/docs/asyncapi.yaml +5 -33
- package/docs/implementation_documentation.md +8 -55
- package/package.json +3 -3
- package/dist/helpers/jis/JISEventTranslationHelper.d.ts +0 -4
- package/dist/helpers/jis/JISEventTranslationHelper.js +0 -46
- package/dist/helpers/jis/JISEventTranslationHelper.js.map +0 -1
- package/dist/helpers/jis/interfaces/IJISEventCustomFormatDto.d.ts +0 -33
- package/dist/helpers/jis/interfaces/IJISEventCustomFormatDto.js +0 -3
- package/dist/helpers/jis/interfaces/IJISEventCustomFormatDto.js.map +0 -1
- package/dist/integration-engine/jis/transformations/UpdateEventWebhookTransformation.d.ts +0 -13
- package/dist/integration-engine/jis/transformations/UpdateEventWebhookTransformation.js +0 -62
- package/dist/integration-engine/jis/transformations/UpdateEventWebhookTransformation.js.map +0 -1
- package/dist/integration-engine/jis/workers/tasks/UpdateEventWebhookTask.d.ts +0 -21
- package/dist/integration-engine/jis/workers/tasks/UpdateEventWebhookTask.js +0 -132
- package/dist/integration-engine/jis/workers/tasks/UpdateEventWebhookTask.js.map +0 -1
- package/dist/schema-definitions/jis/constants/jisEventType.d.ts +0 -2
- package/dist/schema-definitions/jis/constants/jisEventType.js +0 -5
- package/dist/schema-definitions/jis/constants/jisEventType.js.map +0 -1
|
@@ -11,7 +11,7 @@ class JISEventsController extends controllers_1.BaseController {
|
|
|
11
11
|
this.processData = async (inputData) => {
|
|
12
12
|
try {
|
|
13
13
|
await this.validator.Validate(inputData);
|
|
14
|
-
await this.sendMessageToExchange("input." + this.queuePrefix + ".refreshJISEvents", JSON.stringify(
|
|
14
|
+
await this.sendMessageToExchange("input." + this.queuePrefix + ".refreshJISEvents", JSON.stringify(inputData));
|
|
15
15
|
}
|
|
16
16
|
catch (err) {
|
|
17
17
|
if (err instanceof golemio_errors_1.AbstractGolemioError) {
|
|
@@ -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,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,
|
|
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"}
|
|
@@ -28,18 +28,16 @@ let JISEventsDataSourceFactory = exports.JISEventsDataSourceFactory = JISEventsD
|
|
|
28
28
|
return new integration_engine_1.DataSource(JISEventsDataSourceFactory_1.DATASOURCE_NAME, this.getProtocolStrategy(etag), new integration_engine_1.JSONDataTypeStrategy({ resultsPath: "" }), new golemio_validator_1.JSONSchemaValidator(JISEventsDataSourceFactory_1.DATASOURCE_NAME + "Validator", JISEventsJsonSchema_1.jisEventsJsonSchema));
|
|
29
29
|
}
|
|
30
30
|
getProtocolStrategy(etag) {
|
|
31
|
-
const baseUrl = this.config.getValue("module.pid.jis.
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
...this.config.getValue("module.pid.jis.vymiApi.events.headers", {}),
|
|
36
|
-
};
|
|
31
|
+
const baseUrl = this.config.getValue("module.pid.jis.baseUrl");
|
|
32
|
+
let headers = this.config.getValue("module.pid.jis.events.headers");
|
|
33
|
+
const urlPath = this.config.getValue("module.pid.jis.events.path");
|
|
34
|
+
const url = new URL(urlPath, baseUrl).toString();
|
|
37
35
|
if (typeof etag === "string") {
|
|
38
36
|
headers = { ...headers, "If-None-Match": etag, "Cache-Control": "no-store" };
|
|
39
37
|
}
|
|
40
38
|
return new HTTPFetchProtocolStrategy_1.HTTPFetchProtocolStrategy({
|
|
41
39
|
method: "GET",
|
|
42
|
-
url
|
|
40
|
+
url,
|
|
43
41
|
headers,
|
|
44
42
|
timeoutInSeconds: 20,
|
|
45
43
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISEventsDataSourceFactory.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/datasources/JISEventsDataSourceFactory.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,yGAA+E;AAE/E,wEAAqE;AACrE,8EAAwH;AACxH,6IAA0I;AAC1I,mFAAkF;AAClF,iEAAwE;AAGjE,IAAM,0BAA0B,uEAAhC,MAAM,0BAA0B;IACnC,YAAoD,MAAqB;QAArB,WAAM,GAAN,MAAM,CAAe;IAAG,CAAC;IAItE,aAAa,CAAC,IAAa;QAC9B,OAAO,IAAI,+BAAU,CACjB,4BAA0B,CAAC,eAAe,EAC1C,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAC9B,IAAI,yCAAoB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,EAC7C,IAAI,uCAAmB,CAAC,4BAA0B,CAAC,eAAe,GAAG,WAAW,EAAE,yCAAmB,CAAC,CACzG,CAAC;IACN,CAAC;IAEO,mBAAmB,CAAC,IAAa;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAS,
|
|
1
|
+
{"version":3,"file":"JISEventsDataSourceFactory.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/datasources/JISEventsDataSourceFactory.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,yGAA+E;AAE/E,wEAAqE;AACrE,8EAAwH;AACxH,6IAA0I;AAC1I,mFAAkF;AAClF,iEAAwE;AAGjE,IAAM,0BAA0B,uEAAhC,MAAM,0BAA0B;IACnC,YAAoD,MAAqB;QAArB,WAAM,GAAN,MAAM,CAAe;IAAG,CAAC;IAItE,aAAa,CAAC,IAAa;QAC9B,OAAO,IAAI,+BAAU,CACjB,4BAA0B,CAAC,eAAe,EAC1C,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAC9B,IAAI,yCAAoB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,EAC7C,IAAI,uCAAmB,CAAC,4BAA0B,CAAC,eAAe,GAAG,WAAW,EAAE,yCAAmB,CAAC,CACzG,CAAC;IACN,CAAC;IAEO,mBAAmB,CAAC,IAAa;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAS,wBAAwB,CAAC,CAAC;QACvE,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAc,+BAA+B,CAAgB,CAAC;QAChG,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAS,4BAA4B,CAAC,CAAC;QAC3E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;QAEjD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC1B,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,CAAC;SAChF;QAED,OAAO,IAAI,qDAAyB,CAAC;YACjC,MAAM,EAAE,KAAK;YACb,GAAG;YACH,OAAO;YACP,gBAAgB,EAAE,EAAE;SACvB,CAAC,CAAC;IACP,CAAC;;AA3Bc,0CAAe,GAAG,qBAAqB,AAAxB,CAAyB;qCAH9C,0BAA0B;IADtC,IAAA,qBAAU,GAAE;IAEI,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,YAAY,CAAC,CAAA;;GADlC,0BAA0B,CA+BtC"}
|
|
@@ -28,18 +28,16 @@ let JISInfotextsDataSourceFactory = exports.JISInfotextsDataSourceFactory = JISI
|
|
|
28
28
|
return new integration_engine_1.DataSource(JISInfotextsDataSourceFactory_1.DATASOURCE_NAME, this.getProtocolStrategy(etag), new integration_engine_1.JSONDataTypeStrategy({ resultsPath: "" }), new golemio_validator_1.JSONSchemaValidator(JISInfotextsDataSourceFactory_1.DATASOURCE_NAME + "Validator", JISInfotextsJsonSchema_1.jisInfotextsJsonSchema));
|
|
29
29
|
}
|
|
30
30
|
getProtocolStrategy(etag) {
|
|
31
|
-
const baseUrl = this.config.getValue("module.pid.jis.
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
...this.config.getValue("module.pid.jis.vymiApi.infotexts.headers", {}),
|
|
36
|
-
};
|
|
31
|
+
const baseUrl = this.config.getValue("module.pid.jis.baseUrl");
|
|
32
|
+
let headers = this.config.getValue("module.pid.jis.infotexts.headers");
|
|
33
|
+
const urlPath = this.config.getValue("module.pid.jis.infotexts.path");
|
|
34
|
+
const url = new URL(urlPath, baseUrl).toString();
|
|
37
35
|
if (typeof etag === "string") {
|
|
38
36
|
headers = { ...headers, "If-None-Match": etag, "Cache-Control": "no-store" };
|
|
39
37
|
}
|
|
40
38
|
return new HTTPFetchProtocolStrategy_1.HTTPFetchProtocolStrategy({
|
|
41
39
|
method: "GET",
|
|
42
|
-
url
|
|
40
|
+
url,
|
|
43
41
|
headers,
|
|
44
42
|
timeoutInSeconds: 20,
|
|
45
43
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextsDataSourceFactory.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/datasources/JISInfotextsDataSourceFactory.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,+GAAqF;AAErF,wEAAqE;AACrE,8EAAwH;AACxH,6IAA0I;AAC1I,mFAAkF;AAClF,iEAAwE;AAGjE,IAAM,6BAA6B,6EAAnC,MAAM,6BAA6B;IACtC,YAAoD,MAAqB;QAArB,WAAM,GAAN,MAAM,CAAe;IAAG,CAAC;IAItE,aAAa,CAAC,IAAa;QAC9B,OAAO,IAAI,+BAAU,CACjB,+BAA6B,CAAC,eAAe,EAC7C,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAC9B,IAAI,yCAAoB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,EAC7C,IAAI,uCAAmB,CAAC,+BAA6B,CAAC,eAAe,GAAG,WAAW,EAAE,+CAAsB,CAAC,CAC/G,CAAC;IACN,CAAC;IAEO,mBAAmB,CAAC,IAAa;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAS,
|
|
1
|
+
{"version":3,"file":"JISInfotextsDataSourceFactory.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/datasources/JISInfotextsDataSourceFactory.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,+GAAqF;AAErF,wEAAqE;AACrE,8EAAwH;AACxH,6IAA0I;AAC1I,mFAAkF;AAClF,iEAAwE;AAGjE,IAAM,6BAA6B,6EAAnC,MAAM,6BAA6B;IACtC,YAAoD,MAAqB;QAArB,WAAM,GAAN,MAAM,CAAe;IAAG,CAAC;IAItE,aAAa,CAAC,IAAa;QAC9B,OAAO,IAAI,+BAAU,CACjB,+BAA6B,CAAC,eAAe,EAC7C,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAC9B,IAAI,yCAAoB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,EAC7C,IAAI,uCAAmB,CAAC,+BAA6B,CAAC,eAAe,GAAG,WAAW,EAAE,+CAAsB,CAAC,CAC/G,CAAC;IACN,CAAC;IAEO,mBAAmB,CAAC,IAAa;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAS,wBAAwB,CAAC,CAAC;QACvE,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAc,kCAAkC,CAAgB,CAAC;QACnG,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAS,+BAA+B,CAAC,CAAC;QAC9E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;QAEjD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC1B,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,CAAC;SAChF;QAED,OAAO,IAAI,qDAAyB,CAAC;YACjC,MAAM,EAAE,KAAK;YACb,GAAG;YACH,OAAO;YACP,gBAAgB,EAAE,EAAE;SACvB,CAAC,CAAC;IACP,CAAC;;AA3Bc,6CAAe,GAAG,wBAAwB,AAA3B,CAA4B;wCAHjD,6BAA6B;IADzC,IAAA,qBAAU,GAAE;IAEI,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,YAAY,CAAC,CAAA;;GADlC,6BAA6B,CA+BzC"}
|
|
@@ -15,17 +15,14 @@ const JISEventsDataService_1 = require("../services/JISEventsDataService");
|
|
|
15
15
|
const JISInfotextsDataService_1 = require("../services/JISInfotextsDataService");
|
|
16
16
|
const JISEventsGtfsRtTransformation_1 = require("../transformations/JISEventsGtfsRtTransformation");
|
|
17
17
|
const JISEventsTransformation_1 = require("../transformations/JISEventsTransformation");
|
|
18
|
-
const JISInfotextCacheTranformation_1 = require("../transformations/JISInfotextCacheTranformation");
|
|
19
18
|
const JISInfotextsTransformation_1 = require("../transformations/JISInfotextsTransformation");
|
|
20
|
-
const UpdateEventWebhookTransformation_1 = require("../transformations/UpdateEventWebhookTransformation");
|
|
21
19
|
const FetchJISEventsTask_1 = require("../workers/tasks/FetchJISEventsTask");
|
|
22
20
|
const FetchJISInfotextsTask_1 = require("../workers/tasks/FetchJISInfotextsTask");
|
|
23
21
|
const RefreshJISEventsTask_1 = require("../workers/tasks/RefreshJISEventsTask");
|
|
24
22
|
const RefreshJISInfotextsCacheTask_1 = require("../workers/tasks/RefreshJISInfotextsCacheTask");
|
|
25
23
|
const RefreshJISInfotextsTask_1 = require("../workers/tasks/RefreshJISInfotextsTask");
|
|
26
|
-
const UpdateEventWebhookTask_1 = require("../workers/tasks/UpdateEventWebhookTask");
|
|
27
24
|
const JISContainerToken_1 = require("./JISContainerToken");
|
|
28
|
-
const
|
|
25
|
+
const JISInfotextCacheTranformation_1 = require("../transformations/JISInfotextCacheTranformation");
|
|
29
26
|
//#region Initialization
|
|
30
27
|
const JISContainer = Di_1.PidContainer.createChildContainer();
|
|
31
28
|
exports.JISContainer = JISContainer;
|
|
@@ -44,7 +41,6 @@ JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISInfotext
|
|
|
44
41
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISInfotextsRopidGTFSStopsRepository, JISInfotextsRopidGTFSStopsRepository_1.JISInfotextsRopidGTFSStopsRepository);
|
|
45
42
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISMetadataRepository, JISMetadataRepository_1.JISMetadataRepository);
|
|
46
43
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.RopidGTFSStopsRepository, RopidGTFSStopsModel_1.RopidGTFSStopsModel);
|
|
47
|
-
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.RopidGTFSRoutesRepository, RopidGTFSRoutesRepository_1.RopidGTFSRoutesRepository);
|
|
48
44
|
//#endregion
|
|
49
45
|
//#region Services
|
|
50
46
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISEventsDataService, JISEventsDataService_1.JISEventsDataService);
|
|
@@ -56,12 +52,10 @@ JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.FetchJISInf
|
|
|
56
52
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.RefreshJISEventsTask, RefreshJISEventsTask_1.RefreshJISEventsTask);
|
|
57
53
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.RefreshJISInfotextsTask, RefreshJISInfotextsTask_1.RefreshJISInfotextsTask);
|
|
58
54
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.RefreshJISInfotextsCacheTask, RefreshJISInfotextsCacheTask_1.RefreshJISInfotextsCacheTask);
|
|
59
|
-
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.UpdateEventWebhookTask, UpdateEventWebhookTask_1.UpdateEventWebhookTask);
|
|
60
55
|
//#endregion
|
|
61
56
|
//#region Transformations
|
|
62
57
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISEventsTransformation, JISEventsTransformation_1.JISEventsTransformation);
|
|
63
58
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISEventsGtfsRtTransformation, JISEventsGtfsRtTransformation_1.JISEventsGtfsRtTransformation);
|
|
64
59
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISInfotextsTransformation, JISInfotextsTransformation_1.JISInfotextsTransformation);
|
|
65
60
|
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.JISInfotextCacheTranformation, JISInfotextCacheTranformation_1.JISInfotextCacheTranformation);
|
|
66
|
-
JISContainer.registerSingleton(JISContainerToken_1.JISContainerToken.UpdateEventWebhookTransformation, UpdateEventWebhookTransformation_1.UpdateEventWebhookTransformation);
|
|
67
61
|
//# 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;AAC1C,8EAAyE;AAEzE,0FAAuF;AACvF,gGAA6F;AAC7F,6EAA0E;AAC1E,2GAAwG;AACxG,6FAA0F;AAC1F,mFAAgF;AAChF,+GAA4G;AAC5G,iFAA8E;AAC9E,2EAAwE;AACxE,iFAA8E;AAC9E,oGAAiG;AACjG,wFAAqF;AACrF,
|
|
1
|
+
{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAC1C,8EAAyE;AAEzE,0FAAuF;AACvF,gGAA6F;AAC7F,6EAA0E;AAC1E,2GAAwG;AACxG,6FAA0F;AAC1F,mFAAgF;AAChF,+GAA4G;AAC5G,iFAA8E;AAC9E,2EAAwE;AACxE,iFAA8E;AAC9E,oGAAiG;AACjG,wFAAqF;AACrF,8FAA2F;AAC3F,4EAAyE;AACzE,kFAA+E;AAC/E,gFAA6E;AAC7E,gGAA6F;AAC7F,sFAAmF;AACnF,2DAAwD;AACxD,oGAAiG;AAEjG,wBAAwB;AACxB,MAAM,YAAY,GAAwB,iBAAY,CAAC,oBAAoB,EAAE,CAAC;AAyCrE,oCAAY;AAxCrB,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,4BAA4B;AAC5B,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AAC3G,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,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,wBAAwB,EAAE,yCAAmB,CAAC,CAAC;AAChG,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,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC;AAC7G,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;AACzG,YAAY,CAAC,iBAAiB,CAAC,qCAAiB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC,CAAC"}
|
|
@@ -8,19 +8,16 @@ declare const JISContainerToken: {
|
|
|
8
8
|
JISInfotextsRopidGTFSStopsRepository: symbol;
|
|
9
9
|
JISMetadataRepository: symbol;
|
|
10
10
|
RopidGTFSStopsRepository: symbol;
|
|
11
|
-
RopidGTFSRoutesRepository: symbol;
|
|
12
11
|
JISEventsDataService: symbol;
|
|
13
12
|
JISInfotextsDataService: symbol;
|
|
14
13
|
JISEventsTransformation: symbol;
|
|
15
14
|
JISEventsGtfsRtTransformation: symbol;
|
|
16
15
|
JISInfotextsTransformation: symbol;
|
|
17
16
|
JISInfotextCacheTranformation: symbol;
|
|
18
|
-
UpdateEventWebhookTransformation: symbol;
|
|
19
17
|
FetchJISEventsTask: symbol;
|
|
20
18
|
FetchJISInfotextsTask: symbol;
|
|
21
19
|
RefreshJISEventsTask: symbol;
|
|
22
20
|
RefreshJISInfotextsTask: symbol;
|
|
23
21
|
RefreshJISInfotextsCacheTask: symbol;
|
|
24
|
-
UpdateEventWebhookTask: symbol;
|
|
25
22
|
};
|
|
26
23
|
export { JISContainerToken };
|
|
@@ -14,7 +14,6 @@ const JISContainerToken = {
|
|
|
14
14
|
JISInfotextsRopidGTFSStopsRepository: Symbol("JISInfotextsRopidGTFSStopsRepository"),
|
|
15
15
|
JISMetadataRepository: Symbol("JISMetadataRepository"),
|
|
16
16
|
RopidGTFSStopsRepository: Symbol("RopidGTFSStopsRepository"),
|
|
17
|
-
RopidGTFSRoutesRepository: Symbol("RopidGTFSRoutesRepository"),
|
|
18
17
|
/* Services */
|
|
19
18
|
JISEventsDataService: Symbol("JISEventsDataService"),
|
|
20
19
|
JISInfotextsDataService: Symbol("JISInfotextsDataService"),
|
|
@@ -23,14 +22,12 @@ const JISContainerToken = {
|
|
|
23
22
|
JISEventsGtfsRtTransformation: Symbol("JISEventsGtfsRtTransformation"),
|
|
24
23
|
JISInfotextsTransformation: Symbol("JISInfotextsTransformation"),
|
|
25
24
|
JISInfotextCacheTranformation: Symbol("JISInfotextCacheTranformation"),
|
|
26
|
-
UpdateEventWebhookTransformation: Symbol("UpdateEventWebhookTransformation"),
|
|
27
25
|
/* Tasks */
|
|
28
26
|
FetchJISEventsTask: Symbol("FetchJISEventsTask"),
|
|
29
27
|
FetchJISInfotextsTask: Symbol("FetchJISInfotextsTask"),
|
|
30
28
|
RefreshJISEventsTask: Symbol("RefreshJISEventsTask"),
|
|
31
29
|
RefreshJISInfotextsTask: Symbol("RefreshJISInfotextsTask"),
|
|
32
30
|
RefreshJISInfotextsCacheTask: Symbol("RefreshJISInfotextsCacheTask"),
|
|
33
|
-
UpdateEventWebhookTask: Symbol("UpdateEventWebhookTask"),
|
|
34
31
|
};
|
|
35
32
|
exports.JISContainerToken = JISContainerToken;
|
|
36
33
|
//# 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,wBAAwB;IACxB,2BAA2B,EAAE,MAAM,CAAC,6BAA6B,CAAC;IAClE,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,wBAAwB,EAAE,MAAM,CAAC,0BAA0B,CAAC;IAC5D,
|
|
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,wBAAwB;IACxB,2BAA2B,EAAE,MAAM,CAAC,6BAA6B,CAAC;IAClE,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,wBAAwB,EAAE,MAAM,CAAC,0BAA0B,CAAC;IAC5D,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,6BAA6B,EAAE,MAAM,CAAC,+BAA+B,CAAC;IACtE,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;IAC1D,4BAA4B,EAAE,MAAM,CAAC,8BAA8B,CAAC;CACvE,CAAC;AAEO,8CAAiB"}
|
|
@@ -15,7 +15,6 @@ export declare class JISEventsDataService {
|
|
|
15
15
|
*
|
|
16
16
|
* @param events Array of JIS events to insert or update.
|
|
17
17
|
* @param eventsRopidGTFSRoutes Array of corresponding ROPID-GTFS route records to insert or update.
|
|
18
|
-
* @returns boolean true if any events were saved, false if no events were saved.
|
|
19
18
|
*/
|
|
20
|
-
upsertAll(events: IJISEvent[], eventsRopidGTFSRoutes: IJISEventsRopidGTFSRoutes[]): Promise<
|
|
19
|
+
upsertAll(events: IJISEvent[], eventsRopidGTFSRoutes: IJISEventsRopidGTFSRoutes[]): Promise<void>;
|
|
21
20
|
}
|
|
@@ -33,7 +33,6 @@ let JISEventsDataService = exports.JISEventsDataService = class JISEventsDataSer
|
|
|
33
33
|
*
|
|
34
34
|
* @param events Array of JIS events to insert or update.
|
|
35
35
|
* @param eventsRopidGTFSRoutes Array of corresponding ROPID-GTFS route records to insert or update.
|
|
36
|
-
* @returns boolean true if any events were saved, false if no events were saved.
|
|
37
36
|
*/
|
|
38
37
|
async upsertAll(events, eventsRopidGTFSRoutes) {
|
|
39
38
|
const connection = this.databaseConnector.getConnection();
|
|
@@ -43,11 +42,10 @@ let JISEventsDataService = exports.JISEventsDataService = class JISEventsDataSer
|
|
|
43
42
|
if (events.length === 0) {
|
|
44
43
|
this.logger.info(`${this.constructor.name}.upsertAll: 0 events were imported - keeping existing data`);
|
|
45
44
|
await transaction.commit();
|
|
46
|
-
return false;
|
|
47
45
|
}
|
|
48
46
|
else {
|
|
49
47
|
const isSingleUpdate = events.length === 1;
|
|
50
|
-
|
|
48
|
+
await this.eventsRepository.upsertAll(events, { transaction });
|
|
51
49
|
await this.eventsRopidGTFSRoutesRepository.upsertAll(eventsRopidGTFSRoutes, { transaction });
|
|
52
50
|
await this.eventsRopidGTFSRoutesRepository.deleteAllLastUpdatedBefore(saveTime, events, {
|
|
53
51
|
transaction,
|
|
@@ -56,10 +54,6 @@ let JISEventsDataService = exports.JISEventsDataService = class JISEventsDataSer
|
|
|
56
54
|
this.logger.info(`${this.constructor.name}.upsertAll: ${events.length} JIS events and ` +
|
|
57
55
|
`${eventsRopidGTFSRoutes.length} JIS eventsRopidGTFSRoutes were saved ` +
|
|
58
56
|
(isSingleUpdate ? "(single update)" : "(full sync)"));
|
|
59
|
-
if (savedEvents.length === 0) {
|
|
60
|
-
return false;
|
|
61
|
-
}
|
|
62
|
-
return true;
|
|
63
57
|
}
|
|
64
58
|
}
|
|
65
59
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISEventsDataService.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/services/JISEventsDataService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAkE;AAClE,6EAA+E;AAC/E,2GAA6G;AAI7G,wEAAqE;AACrE,6EAAwE;AACxE,iEAAwE;AAGjE,IAAM,oBAAoB,kCAA1B,MAAM,oBAAoB;IAC7B,YAEY,gBAAqC,EAErC,+BAAmE,EAC9B,iBAAqC,EAChD,MAAe;QAJzC,qBAAgB,GAAhB,gBAAgB,CAAqB;QAErC,oCAA+B,GAA/B,+BAA+B,CAAoC;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAoB;QAChD,WAAM,GAAN,MAAM,CAAS;QAEjD,aAAa;IACjB,CAAC;IAED
|
|
1
|
+
{"version":3,"file":"JISEventsDataService.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/services/JISEventsDataService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAkE;AAClE,6EAA+E;AAC/E,2GAA6G;AAI7G,wEAAqE;AACrE,6EAAwE;AACxE,iEAAwE;AAGjE,IAAM,oBAAoB,kCAA1B,MAAM,oBAAoB;IAC7B,YAEY,gBAAqC,EAErC,+BAAmE,EAC9B,iBAAqC,EAChD,MAAe;QAJzC,qBAAgB,GAAhB,gBAAgB,CAAqB;QAErC,oCAA+B,GAA/B,+BAA+B,CAAoC;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAoB;QAChD,WAAM,GAAN,MAAM,CAAS;QAEjD,aAAa;IACjB,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,SAAS,CAAC,MAAmB,EAAE,qBAAkD;QAC1F,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC;QAC1D,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,CAAC;QACnD,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC;QAE5B,IAAI;YACA,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,4DAA4D,CAAC,CAAC;gBACvG,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC;aAC9B;iBAAM;gBACH,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;gBAC3C,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;gBAC/D,MAAM,IAAI,CAAC,+BAA+B,CAAC,SAAS,CAAC,qBAAqB,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;gBAC7F,MAAM,IAAI,CAAC,+BAA+B,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM,EAAE;oBACpF,WAAW;iBACd,CAAC,CAAC;gBACH,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,eAAe,MAAM,CAAC,MAAM,kBAAkB;oBAClE,GAAG,qBAAqB,CAAC,MAAM,wCAAwC;oBACvE,CAAC,cAAc,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAC3D,CAAC;aACL;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,WAAW,CAAC,QAAQ,EAAE,CAAC;YAC7B,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;CACJ,CAAA;+BAhDY,oBAAoB;IADhC,IAAA,qBAAU,GAAE;IAGJ,WAAA,IAAA,iBAAM,EAAC,qCAAiB,CAAC,mBAAmB,CAAC,CAAA;IAE7C,WAAA,IAAA,iBAAM,EAAC,qCAAiB,CAAC,kCAAkC,CAAC,CAAA;IAE5D,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,iBAAiB,CAAC,CAAA;IACnC,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;qCAJC,yCAAmB;QAEJ,uEAAkC;GALtE,oBAAoB,CAgDhC"}
|
|
@@ -19,7 +19,6 @@ class JISWorker extends workers_1.AbstractWorker {
|
|
|
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
21
|
this.registerTask(Di_1.JISContainer.resolve(JISContainerToken_1.JISContainerToken.RefreshJISInfotextsCacheTask));
|
|
22
|
-
this.registerTask(Di_1.JISContainer.resolve(JISContainerToken_1.JISContainerToken.UpdateEventWebhookTask));
|
|
23
22
|
}
|
|
24
23
|
}
|
|
25
24
|
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;AAO9C,MAAa,SAAU,SAAQ,wBAAc;IAGzC;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,2BAAe,CAAC,WAAW,EAAE,CAAC;QAaxC,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;QAXE,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;QAC5G,IAAI,CAAC,YAAY,CAAC,iBAAY,CAAC,OAAO,CAA+B,qCAAiB,CAAC,4BAA4B,CAAC,CAAC,CAAC;IAC1H,CAAC;CAMJ;AAlBD,8BAkBC"}
|
|
@@ -8,7 +8,6 @@ export declare abstract class AbstractFetchJISResourceTask<TItem> extends Abstra
|
|
|
8
8
|
protected abstract readonly metadataGetter: () => Promise<string | undefined>;
|
|
9
9
|
protected abstract readonly metadataSetter: (etag: string) => Promise<void>;
|
|
10
10
|
protected abstract readonly getDataSource: (etag?: string) => IDataSource<TItem[]>;
|
|
11
|
-
protected abstract readonly sendMessageToExchange: (data: TItem[]) => Promise<boolean>;
|
|
12
11
|
constructor(metadataRepository: JISMetadataRepository, logger: ILogger, queuePrefix: string);
|
|
13
12
|
protected execute(): Promise<void>;
|
|
14
13
|
private getResponseEtag;
|
|
@@ -41,7 +41,7 @@ let AbstractFetchJISResourceTask = exports.AbstractFetchJISResourceTask = class
|
|
|
41
41
|
else {
|
|
42
42
|
this.logger.warn(`${this.constructor.name}.execute: Response has no ETag.`);
|
|
43
43
|
}
|
|
44
|
-
await
|
|
44
|
+
await integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, this.queueRoutingKey, data);
|
|
45
45
|
}
|
|
46
46
|
catch (err) {
|
|
47
47
|
if (err instanceof golemio_errors_1.AbstractGolemioError) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractFetchJISResourceTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/jis/workers/tasks/AbstractFetchJISResourceTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"AbstractFetchJISResourceTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/jis/workers/tasks/AbstractFetchJISResourceTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8EAAqG;AACrG,iEAA4D;AAC5D,6EAA8F;AAC9F,2GAAwG;AACxG,oFAAmF;AAEnF,wEAAqE;AAErE,IAAsB,4BAA4B,0CAAlD,MAAsB,4BAAoC,SAAQ,sCAAiB;IAM/E,YACuB,kBAAyC,EACf,MAAe,EAC5D,WAAmB;QAEnB,KAAK,CAAC,WAAW,CAAC,CAAC;QAJA,uBAAkB,GAAlB,kBAAkB,CAAuB;QACf,WAAM,GAAN,MAAM,CAAS;IAIhE,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,UAAU,CAAC,kBAAkB,EAAE,CAAC;YAEjE,IAAI,IAAI,YAAY,yCAAmB,EAAE;gBACrC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,iDAAiD,QAAQ,EAAE,CAAC,CAAC;gBACtG,OAAO;aACV;YAED,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YAEpD,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;gBAClC,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;aAC3C;iBAAM;gBACH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,iCAAiC,CAAC,CAAC;aAC/E;YAED,MAAM,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;SAC1F;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,YAAY,qCAAoB,EAAE;gBACrC,MAAM,GAAG,CAAC;aACb;iBAAM;gBACH,MAAM,IAAI,6BAAY,CAAC,sCAAsC,IAAI,CAAC,eAAe,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACpH;SACJ;IACL,CAAC;IAEO,eAAe,CAAC,QAAiB;QACrC,IACI,OAAO,QAAQ,KAAK,QAAQ;YAC5B,QAAQ,KAAK,IAAI;YACjB,SAAS,IAAI,QAAQ;YACrB,OAAO,QAAQ,CAAC,OAAO,KAAK,QAAQ;YACpC,QAAQ,CAAC,OAAO,KAAK,IAAI;YACzB,MAAM,IAAI,QAAQ,CAAC,OAAO;YAC1B,OAAO,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,QAAQ,EAC9C;YACE,OAAO,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;SACnC;IACL,CAAC;CACJ,CAAA;uCAxDqB,4BAA4B;IAQzC,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;qCADc,6CAAqB;GAP9C,4BAA4B,CAwDjD"}
|
|
@@ -12,5 +12,4 @@ export declare class FetchJISEventsTask extends AbstractFetchJISResourceTask<IJI
|
|
|
12
12
|
protected metadataGetter: () => Promise<string | undefined>;
|
|
13
13
|
protected metadataSetter: (etag: string) => Promise<void>;
|
|
14
14
|
protected getDataSource: (etag?: string) => import("@golemio/core/dist/integration-engine").IDataSource<IJISEvent[]>;
|
|
15
|
-
protected sendMessageToExchange: (data: IJISEvent[]) => Promise<boolean>;
|
|
16
15
|
}
|
|
@@ -20,7 +20,6 @@ const JISMetadataRepository_1 = require("../../repositories/JISMetadataRepositor
|
|
|
20
20
|
const AbstractFetchJISResourceTask_1 = require("./AbstractFetchJISResourceTask");
|
|
21
21
|
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
22
22
|
const constants_1 = require("../constants");
|
|
23
|
-
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
24
23
|
let FetchJISEventsTask = exports.FetchJISEventsTask = class FetchJISEventsTask extends AbstractFetchJISResourceTask_1.AbstractFetchJISResourceTask {
|
|
25
24
|
constructor(dataSourceFactory, metadataRepository, logger) {
|
|
26
25
|
super(metadataRepository, logger, constants_1.JIS_WORKER_NAME.toLowerCase());
|
|
@@ -31,7 +30,6 @@ let FetchJISEventsTask = exports.FetchJISEventsTask = class FetchJISEventsTask e
|
|
|
31
30
|
this.metadataGetter = () => this.metadataRepository.getLastEventsEtag();
|
|
32
31
|
this.metadataSetter = (etag) => this.metadataRepository.setLastEventsEtag(etag);
|
|
33
32
|
this.getDataSource = (etag) => this.dataSourceFactory.getDataSource(etag);
|
|
34
|
-
this.sendMessageToExchange = (data) => integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, this.queueRoutingKey, { data: data, shouldTriggerWebhooks: false });
|
|
35
33
|
}
|
|
36
34
|
};
|
|
37
35
|
exports.FetchJISEventsTask = FetchJISEventsTask = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchJISEventsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/jis/workers/tasks/FetchJISEventsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6FAA4F;AAC5F,mEAAkE;AAClE,iEAAwE;AACxE,oFAAmF;AACnF,iFAA8E;AAC9E,wEAAqE;AAErE,4CAA+C;
|
|
1
|
+
{"version":3,"file":"FetchJISEventsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/jis/workers/tasks/FetchJISEventsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6FAA4F;AAC5F,mEAAkE;AAClE,iEAAwE;AACxE,oFAAmF;AACnF,iFAA8E;AAC9E,wEAAqE;AAErE,4CAA+C;AAIxC,IAAM,kBAAkB,gCAAxB,MAAM,kBAAmB,SAAQ,2DAAuC;IAK3E,YAEI,iBAAqD,EAErD,kBAAyC,EACf,MAAe;QAEzC,KAAK,CAAC,kBAAkB,EAAE,MAAM,EAAE,2BAAe,CAAC,WAAW,EAAE,CAAC,CAAC;QALzD,sBAAiB,GAAjB,iBAAiB,CAA4B;QANzC,cAAS,GAAG,gBAAgB,CAAC;QAC7B,aAAQ,GAAG,EAAE,GAAG,IAAI,CAAC;QAClB,oBAAe,GAAG,kBAAkB,CAAC;QAY9C,mBAAc,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,CAAC;QACnE,mBAAc,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACnF,kBAAa,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAJxF,CAAC;CAKJ,CAAA;6BAlBY,kBAAkB;IAD9B,IAAA,qBAAU,GAAE;IAOJ,WAAA,IAAA,iBAAM,EAAC,qCAAiB,CAAC,0BAA0B,CAAC,CAAA;IAEpD,WAAA,IAAA,iBAAM,EAAC,qCAAiB,CAAC,qBAAqB,CAAC,CAAA;IAE/C,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;qCAHE,uDAA0B;QAEjC,6CAAqB;GATpC,kBAAkB,CAkB9B"}
|
|
@@ -12,5 +12,4 @@ export declare class FetchJISInfotextsTask extends AbstractFetchJISResourceTask<
|
|
|
12
12
|
protected metadataGetter: () => Promise<string | undefined>;
|
|
13
13
|
protected metadataSetter: (etag: string) => Promise<void>;
|
|
14
14
|
protected getDataSource: (etag?: string) => import("@golemio/core/dist/integration-engine").IDataSource<IJISInfotext[]>;
|
|
15
|
-
protected sendMessageToExchange: (data: IJISInfotext[]) => Promise<boolean>;
|
|
16
15
|
}
|
|
@@ -20,7 +20,6 @@ const JISMetadataRepository_1 = require("../../repositories/JISMetadataRepositor
|
|
|
20
20
|
const AbstractFetchJISResourceTask_1 = require("./AbstractFetchJISResourceTask");
|
|
21
21
|
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
22
22
|
const constants_1 = require("../constants");
|
|
23
|
-
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
24
23
|
let FetchJISInfotextsTask = exports.FetchJISInfotextsTask = class FetchJISInfotextsTask extends AbstractFetchJISResourceTask_1.AbstractFetchJISResourceTask {
|
|
25
24
|
constructor(dataSourceFactory, metadataRepository, logger) {
|
|
26
25
|
super(metadataRepository, logger, constants_1.JIS_WORKER_NAME.toLowerCase());
|
|
@@ -31,7 +30,6 @@ let FetchJISInfotextsTask = exports.FetchJISInfotextsTask = class FetchJISInfote
|
|
|
31
30
|
this.metadataGetter = () => this.metadataRepository.getLastInfotextsEtag();
|
|
32
31
|
this.metadataSetter = (etag) => this.metadataRepository.setLastInfotextsEtag(etag);
|
|
33
32
|
this.getDataSource = (etag) => this.dataSourceFactory.getDataSource(etag);
|
|
34
|
-
this.sendMessageToExchange = (data) => integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, this.queueRoutingKey, data);
|
|
35
33
|
}
|
|
36
34
|
};
|
|
37
35
|
exports.FetchJISInfotextsTask = FetchJISInfotextsTask = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchJISInfotextsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/jis/workers/tasks/FetchJISInfotextsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mGAAkG;AAClG,mEAAkE;AAClE,iEAAwE;AACxE,oFAAmF;AACnF,iFAA8E;AAC9E,wEAAqE;AAErE,4CAA+C;
|
|
1
|
+
{"version":3,"file":"FetchJISInfotextsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/jis/workers/tasks/FetchJISInfotextsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mGAAkG;AAClG,mEAAkE;AAClE,iEAAwE;AACxE,oFAAmF;AACnF,iFAA8E;AAC9E,wEAAqE;AAErE,4CAA+C;AAIxC,IAAM,qBAAqB,mCAA3B,MAAM,qBAAsB,SAAQ,2DAA0C;IAKjF,YAEI,iBAAwD,EAExD,kBAAyC,EACf,MAAe;QAEzC,KAAK,CAAC,kBAAkB,EAAE,MAAM,EAAE,2BAAe,CAAC,WAAW,EAAE,CAAC,CAAC;QALzD,sBAAiB,GAAjB,iBAAiB,CAA+B;QAN5C,cAAS,GAAG,mBAAmB,CAAC;QAChC,aAAQ,GAAG,EAAE,GAAG,IAAI,CAAC;QAClB,oBAAe,GAAG,qBAAqB,CAAC;QAYjD,mBAAc,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,EAAE,CAAC;QACtE,mBAAc,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACtF,kBAAa,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAJxF,CAAC;CAKJ,CAAA;gCAlBY,qBAAqB;IADjC,IAAA,qBAAU,GAAE;IAOJ,WAAA,IAAA,iBAAM,EAAC,qCAAiB,CAAC,6BAA6B,CAAC,CAAA;IAEvD,WAAA,IAAA,iBAAM,EAAC,qCAAiB,CAAC,qBAAqB,CAAC,CAAA;IAE/C,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;qCAHE,6DAA6B;QAEpC,6CAAqB;GATpC,qBAAqB,CAkBjC"}
|
|
@@ -3,19 +3,12 @@ import { JISEventsTransformation } from "../../transformations/JISEventsTransfor
|
|
|
3
3
|
import { IJISEvent } from "../../../../schema-definitions/jis/datasources/interfaces";
|
|
4
4
|
import { AbstractTaskJsonSchema } from "@golemio/core/dist/integration-engine/workers/AbstractTaskJsonSchema";
|
|
5
5
|
import { JSONSchemaValidator } from "@golemio/core/dist/shared/golemio-validator";
|
|
6
|
-
export declare class RefreshJISEventsTask extends AbstractTaskJsonSchema<{
|
|
7
|
-
data: IJISEvent[];
|
|
8
|
-
shouldTriggerWebhooks?: boolean;
|
|
9
|
-
}> {
|
|
6
|
+
export declare class RefreshJISEventsTask extends AbstractTaskJsonSchema<IJISEvent[]> {
|
|
10
7
|
private eventsDataService;
|
|
11
8
|
private eventsTransformation;
|
|
12
9
|
readonly schema: JSONSchemaValidator;
|
|
13
10
|
readonly queueName = "refreshJISEvents";
|
|
14
11
|
readonly queueTtl: number;
|
|
15
12
|
constructor(eventsDataService: JISEventsDataService, eventsTransformation: JISEventsTransformation);
|
|
16
|
-
protected execute(
|
|
17
|
-
data: IJISEvent[];
|
|
18
|
-
shouldTriggerWebhooks?: boolean;
|
|
19
|
-
}): Promise<void>;
|
|
20
|
-
private transformAndSave;
|
|
13
|
+
protected execute(data: IJISEvent[]): Promise<void>;
|
|
21
14
|
}
|
|
@@ -17,7 +17,6 @@ const JISContainerToken_1 = require("../../ioc/JISContainerToken");
|
|
|
17
17
|
const JISEventsDataService_1 = require("../../services/JISEventsDataService");
|
|
18
18
|
const JISEventsTransformation_1 = require("../../transformations/JISEventsTransformation");
|
|
19
19
|
const JISEventsJsonSchema_1 = require("../../../../schema-definitions/jis/datasources/JISEventsJsonSchema");
|
|
20
|
-
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
21
20
|
const AbstractTaskJsonSchema_1 = require("@golemio/core/dist/integration-engine/workers/AbstractTaskJsonSchema");
|
|
22
21
|
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
23
22
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
@@ -27,35 +26,11 @@ let RefreshJISEventsTask = exports.RefreshJISEventsTask = class RefreshJISEvents
|
|
|
27
26
|
super(constants_1.JIS_WORKER_NAME.toLowerCase());
|
|
28
27
|
this.eventsDataService = eventsDataService;
|
|
29
28
|
this.eventsTransformation = eventsTransformation;
|
|
30
|
-
this.schema = new golemio_validator_1.JSONSchemaValidator("JISEventsDataValidation",
|
|
31
|
-
type: "object",
|
|
32
|
-
properties: {
|
|
33
|
-
data: JISEventsJsonSchema_1.jisEventsJsonSchema,
|
|
34
|
-
shouldTriggerWebhooks: { type: "boolean" },
|
|
35
|
-
},
|
|
36
|
-
required: ["data"],
|
|
37
|
-
definitions: {
|
|
38
|
-
Translation: {
|
|
39
|
-
type: "object",
|
|
40
|
-
properties: {
|
|
41
|
-
cs: { type: "string" },
|
|
42
|
-
en: { oneOf: [{ type: "string" }, { type: "null", nullable: true }] },
|
|
43
|
-
},
|
|
44
|
-
additionalProperties: false,
|
|
45
|
-
required: ["cs"],
|
|
46
|
-
},
|
|
47
|
-
},
|
|
48
|
-
});
|
|
29
|
+
this.schema = new golemio_validator_1.JSONSchemaValidator("JISEventsDataValidation", JISEventsJsonSchema_1.jisEventsJsonSchema);
|
|
49
30
|
this.queueName = "refreshJISEvents";
|
|
50
31
|
this.queueTtl = 60 * 1000; // 1 minute
|
|
51
32
|
}
|
|
52
|
-
async execute(
|
|
53
|
-
const savedData = await this.transformAndSave(input.data);
|
|
54
|
-
if (input.shouldTriggerWebhooks && savedData) {
|
|
55
|
-
await integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "updateEventWebhook", input.data);
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
async transformAndSave(data) {
|
|
33
|
+
async execute(data) {
|
|
59
34
|
const transformedData = this.eventsTransformation.transformArray(data);
|
|
60
35
|
const events = [];
|
|
61
36
|
const eventsRopidGTFSRoutes = [];
|
|
@@ -63,7 +38,7 @@ let RefreshJISEventsTask = exports.RefreshJISEventsTask = class RefreshJISEvents
|
|
|
63
38
|
events.push(event);
|
|
64
39
|
eventsRopidGTFSRoutes.push(...routes);
|
|
65
40
|
}
|
|
66
|
-
|
|
41
|
+
await this.eventsDataService.upsertAll(events, eventsRopidGTFSRoutes);
|
|
67
42
|
}
|
|
68
43
|
};
|
|
69
44
|
exports.RefreshJISEventsTask = RefreshJISEventsTask = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RefreshJISEventsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/jis/workers/tasks/RefreshJISEventsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mEAAkE;AAClE,8EAA6E;AAC7E,2FAA0F;AAE1F,4GAA+E;AAE/E,
|
|
1
|
+
{"version":3,"file":"RefreshJISEventsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/jis/workers/tasks/RefreshJISEventsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mEAAkE;AAClE,8EAA6E;AAC7E,2FAA0F;AAE1F,4GAA+E;AAE/E,iHAA8G;AAC9G,mFAAkF;AAClF,iEAAwE;AACxE,4CAA+C;AAGxC,IAAM,oBAAoB,kCAA1B,MAAM,oBAAqB,SAAQ,+CAAmC;IAKzE,YAEI,iBAA+C,EAE/C,oBAAqD;QAErD,KAAK,CAAC,2BAAe,CAAC,WAAW,EAAE,CAAC,CAAC;QAJ7B,sBAAiB,GAAjB,iBAAiB,CAAsB;QAEvC,yBAAoB,GAApB,oBAAoB,CAAyB;QARzC,WAAM,GAAG,IAAI,uCAAmB,CAAC,yBAAyB,EAAE,yCAAmB,CAAC,CAAC;QACjF,cAAS,GAAG,kBAAkB,CAAC;QAC/B,aAAQ,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,WAAW;IASjD,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,IAAiB;QACrC,MAAM,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAEvE,MAAM,MAAM,GAAqB,EAAE,CAAC;QACpC,MAAM,qBAAqB,GAAgC,EAAE,CAAC;QAE9D,KAAK,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,MAAM,EAAE,IAAI,eAAe,EAAE;YACpE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,qBAAqB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;SACzC;QAED,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAC1E,CAAC;CACJ,CAAA;+BA3BY,oBAAoB;IADhC,IAAA,qBAAU,GAAE;IAOJ,WAAA,IAAA,iBAAM,EAAC,qCAAiB,CAAC,oBAAoB,CAAC,CAAA;IAE9C,WAAA,IAAA,iBAAM,EAAC,qCAAiB,CAAC,uBAAuB,CAAC,CAAA;qCADvB,2CAAoB;QAEjB,iDAAuB;GAThD,oBAAoB,CA2BhC"}
|
package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/AlertsGenerator.js
CHANGED
|
@@ -12,7 +12,7 @@ class AlertsGenerator {
|
|
|
12
12
|
this.vymiEventsRepository = vymiEventsRepository;
|
|
13
13
|
this.alertsTransformation = new AlertsTransformation_1.AlertsTransformation(vymiRoutesRepository);
|
|
14
14
|
this.jisEventsTransformation = new JISEventsGtfsRtTransformation_1.JISEventsGtfsRtTransformation();
|
|
15
|
-
this.jisAllowedOrgs = this.config.getValue("module.pid.jis.
|
|
15
|
+
this.jisAllowedOrgs = this.config.getValue("module.pid.jis.events.gtfsRtAllowedOrgs.*");
|
|
16
16
|
}
|
|
17
17
|
async generateAlerts(feedHeader) {
|
|
18
18
|
const alertsMessage = ovapi_gtfs_realtime_bindings_1.transit_realtime.FeedMessage.create({ header: feedHeader });
|
package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/AlertsGenerator.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AlertsGenerator.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/AlertsGenerator.ts"],"names":[],"mappings":";;;AACA,iHAAsG;AAGtG,wFAAyF;AAGzF,kFAA+E;AAE/E,MAAa,eAAe;IAKxB,YACqB,MAAqB,EACrB,qBAA4C,EAC5C,mBAAwC,EACxC,oBAA0C,EAC3D,oBAAgD;QAJ/B,WAAM,GAAN,MAAM,CAAe;QACrB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,yBAAoB,GAApB,oBAAoB,CAAsB;QAG3D,IAAI,CAAC,oBAAoB,GAAG,IAAI,2CAAoB,CAAC,oBAAoB,CAAC,CAAC;QAC3E,IAAI,CAAC,uBAAuB,GAAG,IAAI,6DAA6B,EAAE,CAAC;QACnE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAW,
|
|
1
|
+
{"version":3,"file":"AlertsGenerator.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/AlertsGenerator.ts"],"names":[],"mappings":";;;AACA,iHAAsG;AAGtG,wFAAyF;AAGzF,kFAA+E;AAE/E,MAAa,eAAe;IAKxB,YACqB,MAAqB,EACrB,qBAA4C,EAC5C,mBAAwC,EACxC,oBAA0C,EAC3D,oBAAgD;QAJ/B,WAAM,GAAN,MAAM,CAAe;QACrB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,yBAAoB,GAApB,oBAAoB,CAAsB;QAG3D,IAAI,CAAC,oBAAoB,GAAG,IAAI,2CAAoB,CAAC,oBAAoB,CAAC,CAAC;QAC3E,IAAI,CAAC,uBAAuB,GAAG,IAAI,6DAA6B,EAAE,CAAC;QACnE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAW,2CAA2C,CAAa,CAAC;IAClH,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,UAAuB;QAC/C,MAAM,aAAa,GAAG,+CAAY,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAE9E,MAAM,CAAC,aAAa,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpD,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CACtC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAE,UAAU,CAAC,SAAoB,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CACxF;YACD,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,IAAI,CAAC,cAAc,CAAC;SACpE,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QACnF,MAAM,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QAE1F,MAAM,YAAY,GAAG,CAAC,GAAG,uBAAuB,EAAE,GAAG,iBAAiB,CAAC,CAAC;QACxE,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE;YAC9B,MAAM,UAAU,GAAG,+CAAY,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAC7D,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACzC;QAED,IAAI,+CAAY,CAAC,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE;YACzD,MAAM,MAAM,GAAG,+CAAY,CAAC,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,MAAM,EAAY,CAAC;YAEjF,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,QAAQ,GAAG,YAAY,EAAE,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC9F,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;SACjF;IACL,CAAC;CACJ;AA3CD,0CA2CC"}
|
|
@@ -1,5 +1,36 @@
|
|
|
1
|
+
import { IJISTranslationText } from "../../../schema-definitions/jis/models/interfaces";
|
|
1
2
|
import { JISEventsModel } from "../../../schema-definitions/jis/models/JISEventsModel";
|
|
2
3
|
export interface IJISEventCustomFormatInputDto {
|
|
3
4
|
data: JISEventsModel;
|
|
4
5
|
timezone: string;
|
|
5
6
|
}
|
|
7
|
+
export interface IJISEventCustomFormatDto {
|
|
8
|
+
id: string;
|
|
9
|
+
type: string;
|
|
10
|
+
header_text: IJISTranslationText;
|
|
11
|
+
cause: IJISTranslationText;
|
|
12
|
+
cause_detail: IJISTranslationText;
|
|
13
|
+
severity_level: string;
|
|
14
|
+
active_period: {
|
|
15
|
+
start: string;
|
|
16
|
+
end?: string | null;
|
|
17
|
+
};
|
|
18
|
+
display_period: {
|
|
19
|
+
start: string;
|
|
20
|
+
end?: string | null;
|
|
21
|
+
};
|
|
22
|
+
effects: IJISTranslationText[];
|
|
23
|
+
description_text: IJISTranslationText;
|
|
24
|
+
description_html: IJISTranslationText;
|
|
25
|
+
organization_name: string;
|
|
26
|
+
informed_entity?: {
|
|
27
|
+
routes?: Array<{
|
|
28
|
+
id: string;
|
|
29
|
+
route_short_name: string;
|
|
30
|
+
route_long_name: string;
|
|
31
|
+
route_type: number;
|
|
32
|
+
}>;
|
|
33
|
+
} | null;
|
|
34
|
+
last_modified_timestamp: string;
|
|
35
|
+
created_timestamp: string;
|
|
36
|
+
}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TranslationHelper = void 0;
|
|
4
|
+
class TranslationHelper {
|
|
5
|
+
constructor() {
|
|
6
|
+
this.effectToCs = (effect) => {
|
|
7
|
+
const effects = {
|
|
8
|
+
NO_SERVICE: "Přerušení provozu",
|
|
9
|
+
REDUCED_SERVICE: "Omezení provozu",
|
|
10
|
+
SIGNIFICANT_DELAYS: "Zpoždění",
|
|
11
|
+
DETOUR: "Odklon",
|
|
12
|
+
ADDITIONAL_SERVICE: "Posílení spojů",
|
|
13
|
+
MODIFIED_SERVICE: "Změna provozu",
|
|
14
|
+
OTHER_EFFECT: "Ostatní opatření",
|
|
15
|
+
UNKNOWN_EFFECT: "Neznámé opatření",
|
|
16
|
+
STOP_MOVED: "Zastávka přemístěna",
|
|
17
|
+
NO_EFFECT: "Bez opatření",
|
|
18
|
+
ACCESSIBILITY_ISSUE: "Omezení bezbariérového přístupu",
|
|
19
|
+
};
|
|
20
|
+
if (!effects[effect]) {
|
|
21
|
+
return "Neplatný typ události";
|
|
22
|
+
}
|
|
23
|
+
return effects[effect].charAt(0).toUpperCase() + effects[effect].slice(1);
|
|
24
|
+
};
|
|
25
|
+
this.causeToCs = (cause) => {
|
|
26
|
+
const causes = {
|
|
27
|
+
ACCIDENT: "Nehoda",
|
|
28
|
+
STRIKE: "Stávka",
|
|
29
|
+
TECHNICAL_PROBLEM: "Technický problém",
|
|
30
|
+
CONSTRUCTION: "Stavba",
|
|
31
|
+
WEATHER: "Počasí",
|
|
32
|
+
DEMONSTRATION: "Demonstrace",
|
|
33
|
+
POLICE_ACTIVITY: "Policejní uzávěra",
|
|
34
|
+
MEDICAL_EMERGENCY: "Zásah záchranné služby",
|
|
35
|
+
OTHER_CAUSE: "Jiný důvod",
|
|
36
|
+
UNKNOWN_CAUSE: "Neznámý důvod",
|
|
37
|
+
HOLIDAY: "Svátek",
|
|
38
|
+
MAINTENANCE: "Údržba",
|
|
39
|
+
};
|
|
40
|
+
if (!causes[cause]) {
|
|
41
|
+
return "Neplatný důvod události";
|
|
42
|
+
}
|
|
43
|
+
return causes[cause].charAt(0).toUpperCase() + causes[cause].slice(1);
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
exports.TranslationHelper = TranslationHelper;
|
|
48
|
+
//# sourceMappingURL=TranslationHelper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TranslationHelper.js","sourceRoot":"","sources":["../../../../src/output-gateway/jis/helpers/TranslationHelper.ts"],"names":[],"mappings":";;;AAAA,MAAa,iBAAiB;IAA9B;QACW,eAAU,GAAG,CAAC,MAAc,EAAU,EAAE;YAC3C,MAAM,OAAO,GAA2B;gBACpC,UAAU,EAAE,mBAAmB;gBAC/B,eAAe,EAAE,iBAAiB;gBAClC,kBAAkB,EAAE,UAAU;gBAC9B,MAAM,EAAE,QAAQ;gBAChB,kBAAkB,EAAE,gBAAgB;gBACpC,gBAAgB,EAAE,eAAe;gBACjC,YAAY,EAAE,kBAAkB;gBAChC,cAAc,EAAE,kBAAkB;gBAClC,UAAU,EAAE,qBAAqB;gBACjC,SAAS,EAAE,cAAc;gBACzB,mBAAmB,EAAE,iCAAiC;aACzD,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAClB,OAAO,uBAAuB,CAAC;aAClC;YACD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9E,CAAC,CAAC;QAEF,cAAS,GAAG,CAAC,KAAa,EAAE,EAAE;YAC1B,MAAM,MAAM,GAA2B;gBACnC,QAAQ,EAAE,QAAQ;gBAClB,MAAM,EAAE,QAAQ;gBAChB,iBAAiB,EAAE,mBAAmB;gBACtC,YAAY,EAAE,QAAQ;gBACtB,OAAO,EAAE,QAAQ;gBACjB,aAAa,EAAE,aAAa;gBAC5B,eAAe,EAAE,mBAAmB;gBACpC,iBAAiB,EAAE,wBAAwB;gBAC3C,WAAW,EAAE,YAAY;gBACzB,aAAa,EAAE,eAAe;gBAC9B,OAAO,EAAE,QAAQ;gBACjB,WAAW,EAAE,QAAQ;aACxB,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAChB,OAAO,yBAAyB,CAAC;aACpC;YAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC1E,CAAC,CAAC;IACN,CAAC;CAAA;AA1CD,8CA0CC"}
|
|
@@ -5,8 +5,9 @@ const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
|
|
|
5
5
|
const V1EventsController_1 = require("../controllers/v1/V1EventsController");
|
|
6
6
|
const JISEventsRepository_1 = require("../data-access/JISEventsRepository");
|
|
7
7
|
const JISEventsRopidGTFSRoutesRepository_1 = require("../data-access/JISEventsRopidGTFSRoutesRepository");
|
|
8
|
-
const RopidGTFSRoutesRepository_1 = require("../data-access/RopidGTFSRoutesRepository");
|
|
9
8
|
const JISEventsCustomFormatTransformation_1 = require("../transformations/JISEventsCustomFormatTransformation");
|
|
9
|
+
const TranslationHelper_1 = require("../helpers/TranslationHelper");
|
|
10
|
+
const RopidGTFSRoutesRepository_1 = require("../data-access/RopidGTFSRoutesRepository");
|
|
10
11
|
const OgJisToken_1 = require("./OgJisToken");
|
|
11
12
|
const ogJisContainer = ioc_1.OutputGatewayContainer.createChildContainer();
|
|
12
13
|
exports.OgJisContainer = ogJisContainer;
|
|
@@ -20,4 +21,7 @@ ogJisContainer.registerSingleton(OgJisToken_1.OgJisToken.RopidGTFSRoutesReposito
|
|
|
20
21
|
//#endregion
|
|
21
22
|
//#region Transformations
|
|
22
23
|
ogJisContainer.registerSingleton(OgJisToken_1.OgJisToken.JISEventsCustomFormatTransformation, JISEventsCustomFormatTransformation_1.JISEventsCustomFormatTransformation);
|
|
24
|
+
//#endregion
|
|
25
|
+
//#region Helpers
|
|
26
|
+
ogJisContainer.registerSingleton(OgJisToken_1.OgJisToken.TranslationHelper, TranslationHelper_1.TranslationHelper);
|
|
23
27
|
//# sourceMappingURL=Di.js.map
|