@golemio/pid 2.13.2-dev.1289813514 → 2.13.2-rc.1291418443
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/integration-engine/vehicle-positions/ioc/Di.js +0 -14
- package/dist/integration-engine/vehicle-positions/ioc/Di.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.d.ts +0 -7
- package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.js +0 -7
- package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/RunsWorker.js +8 -4
- package/dist/integration-engine/vehicle-positions/workers/runs/RunsWorker.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/BusMessageFilter.d.ts +2 -4
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/BusMessageFilter.js +3 -13
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/BusMessageFilter.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/TramMessageFilter.d.ts +2 -5
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/TramMessageFilter.js +3 -14
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/TramMessageFilter.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/interfaces/ICommonMessageFilter.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusMessageFilter.d.ts +5 -4
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusMessageFilter.js +22 -16
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusMessageFilter.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusRunsFacade.d.ts +4 -4
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusRunsFacade.js +3 -4
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusRunsFacade.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/interfaces/IRegionalBusMessageFilter.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/interfaces/IRegionalBusRunsFacade.d.ts +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/interfaces/MetroRunsMessageInterfaces.d.ts +0 -3
- package/dist/integration-engine/vehicle-positions/workers/runs/interfaces/RegionalBusRunsMessageInterfaces.d.ts +0 -4
- package/dist/integration-engine/vehicle-positions/workers/runs/schema/RegionalBusTransformedRunsSchema.js +0 -4
- package/dist/integration-engine/vehicle-positions/workers/runs/schema/RegionalBusTransformedRunsSchema.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.js +5 -19
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveArrivaCityRunsToDBTask.d.ts +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveArrivaCityRunsToDBTask.js +2 -11
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveArrivaCityRunsToDBTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.js +8 -21
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.d.ts +1 -5
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.js +8 -42
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.js +8 -21
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.d.ts +1 -3
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.js +7 -28
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/MetroRunsMessagesTransformation.d.ts +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/MetroRunsMessagesTransformation.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/MetroRunsMessagesTransformation.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/RegionalBusRunsMessagesTransformation.js +0 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/RegionalBusRunsMessagesTransformation.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/RefreshPublicStopTimeCacheTask.d.ts +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/RefreshPublicStopTimeCacheTask.js +1 -0
- 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/MpvMessageTransformation.d.ts +6 -3
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/MpvMessageTransformation.js +19 -8
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/MpvMessageTransformation.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/interfaces/IRegionalBusRunsMessagesModel.d.ts +0 -1
- package/package.json +2 -2
- package/db/migrations/postgresql/20240424122841-delay-at-past-stops-release-part-1.js +0 -53
- package/db/migrations/postgresql/20240509102153-update-v-vehiclepositions-past-stop-times.js +0 -53
- package/db/migrations/postgresql/sqls/20240424122841-delay-at-past-stops-release-part-1-down.sql +0 -1
- package/db/migrations/postgresql/sqls/20240424122841-delay-at-past-stops-release-part-1-up.sql +0 -98
- package/db/migrations/postgresql/sqls/20240509102153-update-v-vehiclepositions-past-stop-times-down.sql +0 -42
- package/db/migrations/postgresql/sqls/20240509102153-update-v-vehiclepositions-past-stop-times-up.sql +0 -42
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/TimestampValidator.d.ts +0 -6
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/TimestampValidator.js +0 -38
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/TimestampValidator.js.map +0 -1
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveArrivaCityRunsToDBTask.d.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
|
|
2
2
|
import { MessageProperties } from "amqplib";
|
|
3
|
+
import { IRegionalBusRunsFacade } from "../helpers/regional-bus/interfaces/IRegionalBusRunsFacade";
|
|
3
4
|
import { IRegionalBusRunsInput } from "../interfaces/RegionalBusRunsMessageInterfaces";
|
|
4
5
|
import { RegionalBusRunsValidationSchema } from "../schema/RegionalBusRunsSchema";
|
|
5
|
-
import { RegionalBusRunsFacade } from "../helpers/regional-bus/RegionalBusRunsFacade";
|
|
6
6
|
export declare class SaveArrivaCityRunsToDBTask extends AbstractTask<IRegionalBusRunsInput> {
|
|
7
7
|
private regionalBusRunsFacade;
|
|
8
8
|
readonly queueName = "saveArrivaCityRunsToDB";
|
|
9
9
|
readonly queueTtl: number;
|
|
10
10
|
readonly schema: typeof RegionalBusRunsValidationSchema;
|
|
11
|
-
constructor(regionalBusRunsFacade:
|
|
11
|
+
constructor(regionalBusRunsFacade: IRegionalBusRunsFacade);
|
|
12
12
|
protected execute(data: IRegionalBusRunsInput, msgProperties?: MessageProperties): Promise<void>;
|
|
13
13
|
}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveArrivaCityRunsToDBTask.js
CHANGED
|
@@ -28,8 +28,6 @@ const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
|
28
28
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
29
29
|
const constants_1 = require("../constants");
|
|
30
30
|
const RegionalBusRunsSchema_1 = require("../schema/RegionalBusRunsSchema");
|
|
31
|
-
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
32
|
-
const RegionalBusRunsFacade_1 = require("../helpers/regional-bus/RegionalBusRunsFacade");
|
|
33
31
|
let SaveArrivaCityRunsToDBTask = exports.SaveArrivaCityRunsToDBTask = class SaveArrivaCityRunsToDBTask extends workers_1.AbstractTask {
|
|
34
32
|
constructor(regionalBusRunsFacade) {
|
|
35
33
|
super(constants_1.WORKER_NAME);
|
|
@@ -41,14 +39,7 @@ let SaveArrivaCityRunsToDBTask = exports.SaveArrivaCityRunsToDBTask = class Save
|
|
|
41
39
|
execute(data, msgProperties) {
|
|
42
40
|
return __awaiter(this, void 0, void 0, function* () {
|
|
43
41
|
const inputMessages = Array.isArray(data.M.V) ? data.M.V : [data.M.V];
|
|
44
|
-
const
|
|
45
|
-
if (!timestamp) {
|
|
46
|
-
throw new golemio_errors_1.GeneralError(`Missing ArrivaCity run message timestamp: ${JSON.stringify(data)}`, this.constructor.name);
|
|
47
|
-
}
|
|
48
|
-
const transformedMessages = yield this.regionalBusRunsFacade.transformAndSaveMessages({
|
|
49
|
-
messages: inputMessages,
|
|
50
|
-
timestamp,
|
|
51
|
-
});
|
|
42
|
+
const transformedMessages = yield this.regionalBusRunsFacade.transformAndSaveMessages(inputMessages);
|
|
52
43
|
if (transformedMessages.length === 0) {
|
|
53
44
|
return;
|
|
54
45
|
}
|
|
@@ -61,6 +52,6 @@ let SaveArrivaCityRunsToDBTask = exports.SaveArrivaCityRunsToDBTask = class Save
|
|
|
61
52
|
exports.SaveArrivaCityRunsToDBTask = SaveArrivaCityRunsToDBTask = __decorate([
|
|
62
53
|
(0, tsyringe_1.injectable)(),
|
|
63
54
|
__param(0, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.RegionalBusRunsFacade)),
|
|
64
|
-
__metadata("design:paramtypes", [
|
|
55
|
+
__metadata("design:paramtypes", [Object])
|
|
65
56
|
], SaveArrivaCityRunsToDBTask);
|
|
66
57
|
//# sourceMappingURL=SaveArrivaCityRunsToDBTask.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveArrivaCityRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveArrivaCityRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAA8E;AAC9E,2FAAqF;AACrF,2EAA6E;AAC7E,iEAAwE;AAExE,4CAA2C;
|
|
1
|
+
{"version":3,"file":"SaveArrivaCityRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveArrivaCityRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAA8E;AAC9E,2FAAqF;AACrF,2EAA6E;AAC7E,iEAAwE;AAExE,4CAA2C;AAG3C,2EAAkF;AAG3E,IAAM,0BAA0B,wCAAhC,MAAM,0BAA2B,SAAQ,sBAAmC;IAK/E,YAA4D,qBAAqD;QAC7G,KAAK,CAAC,uBAAW,CAAC,CAAC;QAD6C,0BAAqB,GAArB,qBAAqB,CAAwB;QAJjG,cAAS,GAAG,wBAAwB,CAAC;QACrC,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,uDAA+B,CAAC;IAIzD,CAAC;IAEe,OAAO,CAAC,IAA2B,EAAE,aAAiC;;YAClF,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACtE,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;YACrG,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE;gBAClC,OAAO;aACV;YAED,MAAM,8BAAY,CAAC,qBAAqB,CACpC,IAAI,CAAC,WAAW,EAChB,+BAA+B,EAC/B;gBACI,QAAQ,EAAE,mBAAmB;aAChC,EACD,EAAE,SAAS,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,EAAE,CAC1C,CAAC;QACN,CAAC;KAAA;CACJ,CAAA;qCAzBY,0BAA0B;IADtC,IAAA,qBAAU,GAAE;IAMI,WAAA,IAAA,iBAAM,EAAC,mCAAgB,CAAC,qBAAqB,CAAC,CAAA;;GALlD,0BAA0B,CAyBtC"}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.d.ts
CHANGED
|
@@ -10,6 +10,6 @@ export declare class SaveBusRunsToDBTask extends AbstractTask<ICommonRunsInput>
|
|
|
10
10
|
private readonly runsRepository;
|
|
11
11
|
private readonly messageProcessor;
|
|
12
12
|
private readonly messageFilter;
|
|
13
|
-
constructor();
|
|
13
|
+
constructor(queuePrefix: string);
|
|
14
14
|
protected execute(data: ICommonRunsInput, msgProperties?: MessageProperties): Promise<void>;
|
|
15
15
|
}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
12
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
13
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -24,17 +15,16 @@ const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
|
24
15
|
const CommonRunsRepository_1 = require("../data-access/CommonRunsRepository");
|
|
25
16
|
const CommonMessageProcessor_1 = require("../helpers/CommonMessageProcessor");
|
|
26
17
|
const CommonRunsSchema_1 = require("../schema/CommonRunsSchema");
|
|
18
|
+
const CommonRunsMessagesTransformation_1 = require("../transformations/CommonRunsMessagesTransformation");
|
|
27
19
|
const Di_1 = require("../../../ioc/Di");
|
|
28
20
|
const VPContainerToken_1 = require("../../../ioc/VPContainerToken");
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
constructor() {
|
|
33
|
-
super(constants_1.WORKER_NAME);
|
|
21
|
+
class SaveBusRunsToDBTask extends workers_1.AbstractTask {
|
|
22
|
+
constructor(queuePrefix) {
|
|
23
|
+
super(queuePrefix);
|
|
34
24
|
this.queueName = "saveBusRunsToDB";
|
|
35
25
|
this.queueTtl = 2 * 60 * 1000; // 2 minutes
|
|
36
26
|
this.schema = CommonRunsSchema_1.CommonRunsValidationSchema;
|
|
37
|
-
this.messagesTransformation =
|
|
27
|
+
this.messagesTransformation = new CommonRunsMessagesTransformation_1.CommonRunsMessagesTransformation();
|
|
38
28
|
this.runsRepository = new CommonRunsRepository_1.CommonRunsRepository();
|
|
39
29
|
this.messageProcessor = new CommonMessageProcessor_1.CommonMessageProcessor(this.runsRepository);
|
|
40
30
|
this.messageFilter = Di_1.VPContainer.resolve(VPContainerToken_1.VPContainerToken.BusMessageFilter);
|
|
@@ -46,15 +36,12 @@ let SaveBusRunsToDBTask = exports.SaveBusRunsToDBTask = class SaveBusRunsToDBTas
|
|
|
46
36
|
throw new golemio_errors_1.GeneralError(`Missing bus run message timestamp: ${JSON.stringify(data)}`, this.constructor.name);
|
|
47
37
|
}
|
|
48
38
|
const messages = yield this.messagesTransformation.transform({ data: data.M.V, timestamp });
|
|
49
|
-
const filteredMessages = this.messageFilter.yieldFilteredMessages(messages
|
|
39
|
+
const filteredMessages = this.messageFilter.yieldFilteredMessages(messages);
|
|
50
40
|
for (const runMessage of filteredMessages) {
|
|
51
41
|
yield this.messageProcessor.processTransformedRun(runMessage, timestamp);
|
|
52
42
|
}
|
|
53
43
|
});
|
|
54
44
|
}
|
|
55
|
-
}
|
|
56
|
-
exports.SaveBusRunsToDBTask = SaveBusRunsToDBTask
|
|
57
|
-
(0, tsyringe_1.injectable)(),
|
|
58
|
-
__metadata("design:paramtypes", [])
|
|
59
|
-
], SaveBusRunsToDBTask);
|
|
45
|
+
}
|
|
46
|
+
exports.SaveBusRunsToDBTask = SaveBusRunsToDBTask;
|
|
60
47
|
//# sourceMappingURL=SaveBusRunsToDBTask.js.map
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveBusRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SaveBusRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAA6E;AAC7E,6EAAwE;AAExE,8EAA2E;AAE3E,8EAA2E;AAG3E,iEAAwE;AACxE,0GAAuG;AACvG,wCAA2D;AAC3D,oEAA8E;AAE9E,MAAa,mBAAoB,SAAQ,sBAA8B;IAUnE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAVP,cAAS,GAAG,iBAAiB,CAAC;QAC9B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,6CAA0B,CAAC;QAShD,IAAI,CAAC,sBAAsB,GAAG,IAAI,mEAAgC,EAAE,CAAC;QACrE,IAAI,CAAC,cAAc,GAAG,IAAI,2CAAoB,EAAE,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,IAAI,+CAAsB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACxE,IAAI,CAAC,aAAa,GAAG,gBAAW,CAAC,OAAO,CAAuB,mCAAgB,CAAC,gBAAgB,CAAC,CAAC;IACtG,CAAC;IAEe,OAAO,CAAC,IAAsB,EAAE,aAAiC;;YAC7E,MAAM,SAAS,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,CAAC;YAC3C,IAAI,CAAC,SAAS,EAAE;gBACZ,MAAM,IAAI,6BAAY,CAAC,sCAAsC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aAC/G;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YAC5F,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YAE5E,KAAK,MAAM,UAAU,IAAI,gBAAgB,EAAE;gBACvC,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;aAC5E;QACL,CAAC;KAAA;CACJ;AA/BD,kDA+BC"}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.d.ts
CHANGED
|
@@ -2,16 +2,12 @@ import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
|
|
|
2
2
|
import { MessageProperties } from "amqplib";
|
|
3
3
|
import { IMetroRunsInput } from "../interfaces/MetroRunsMessageInterfaces";
|
|
4
4
|
import { MetroRunsValidationSchema } from "../schema/MetroRunsSchema";
|
|
5
|
-
import { TimestampValidator } from "../helpers/TimestampValidator";
|
|
6
|
-
import { ILogger } from "@golemio/core/dist/helpers";
|
|
7
5
|
export declare class SaveMetroRunsToDBTask extends AbstractTask<IMetroRunsInput> {
|
|
8
|
-
private timestampValidator;
|
|
9
|
-
private logger;
|
|
10
6
|
readonly queueName = "saveMetroRunsToDB";
|
|
11
7
|
readonly queueTtl: number;
|
|
12
8
|
readonly schema: typeof MetroRunsValidationSchema;
|
|
13
9
|
private readonly messagesTransformation;
|
|
14
10
|
private readonly messagesRepository;
|
|
15
|
-
constructor(
|
|
11
|
+
constructor(queuePrefix: string);
|
|
16
12
|
protected execute(data: IMetroRunsInput, msgProperties?: MessageProperties): Promise<void>;
|
|
17
13
|
}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.js
CHANGED
|
@@ -1,16 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
-
};
|
|
14
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
15
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
16
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -26,36 +14,19 @@ const queueprocessors_1 = require("@golemio/core/dist/integration-engine/queuepr
|
|
|
26
14
|
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
27
15
|
const MetroRunsMessagesRepository_1 = require("../data-access/MetroRunsMessagesRepository");
|
|
28
16
|
const MetroRunsSchema_1 = require("../schema/MetroRunsSchema");
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
const constants_1 = require("../constants");
|
|
34
|
-
const TimestampValidator_1 = require("../helpers/TimestampValidator");
|
|
35
|
-
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
36
|
-
let SaveMetroRunsToDBTask = exports.SaveMetroRunsToDBTask = class SaveMetroRunsToDBTask extends workers_1.AbstractTask {
|
|
37
|
-
constructor(timestampValidator, logger) {
|
|
38
|
-
super(constants_1.WORKER_NAME);
|
|
39
|
-
this.timestampValidator = timestampValidator;
|
|
40
|
-
this.logger = logger;
|
|
17
|
+
const MetroRunsMessagesTransformation_1 = require("../transformations/MetroRunsMessagesTransformation");
|
|
18
|
+
class SaveMetroRunsToDBTask extends workers_1.AbstractTask {
|
|
19
|
+
constructor(queuePrefix) {
|
|
20
|
+
super(queuePrefix);
|
|
41
21
|
this.queueName = "saveMetroRunsToDB";
|
|
42
22
|
this.queueTtl = 3 * 60 * 1000; // 3 minutes
|
|
43
23
|
this.schema = MetroRunsSchema_1.MetroRunsValidationSchema;
|
|
44
|
-
this.messagesTransformation =
|
|
24
|
+
this.messagesTransformation = new MetroRunsMessagesTransformation_1.MetroRunsMessagesTransformation();
|
|
45
25
|
this.messagesRepository = new MetroRunsMessagesRepository_1.MetroRunsMessagesRepository();
|
|
46
26
|
}
|
|
47
27
|
execute(data, msgProperties) {
|
|
48
28
|
return __awaiter(this, void 0, void 0, function* () {
|
|
49
|
-
const
|
|
50
|
-
if (!timestamp) {
|
|
51
|
-
throw new golemio_errors_1.GeneralError(`Missing metro run message timestamp: ${JSON.stringify(data)}`, this.constructor.name);
|
|
52
|
-
}
|
|
53
|
-
if (!this.timestampValidator.isTimestampValid(timestamp, data.m.$.tm)) {
|
|
54
|
-
this.logger.error(new golemio_errors_1.GeneralError(`Message timestamp 'tm' of value ${data.m.$.tm} is not valid ` +
|
|
55
|
-
`for line ${data.m.$.linka}, gvd ${data.m.$.gvd}`, this.constructor.name, undefined, undefined, "pid"));
|
|
56
|
-
return Promise.resolve();
|
|
57
|
-
}
|
|
58
|
-
const messages = yield this.messagesTransformation.transform({ data });
|
|
29
|
+
const messages = yield this.messagesTransformation.transform(data);
|
|
59
30
|
if (messages.length === 0) {
|
|
60
31
|
return;
|
|
61
32
|
}
|
|
@@ -66,11 +37,6 @@ let SaveMetroRunsToDBTask = exports.SaveMetroRunsToDBTask = class SaveMetroRunsT
|
|
|
66
37
|
}, { timestamp: msgProperties === null || msgProperties === void 0 ? void 0 : msgProperties.timestamp });
|
|
67
38
|
});
|
|
68
39
|
}
|
|
69
|
-
}
|
|
70
|
-
exports.SaveMetroRunsToDBTask = SaveMetroRunsToDBTask
|
|
71
|
-
(0, tsyringe_1.injectable)(),
|
|
72
|
-
__param(0, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.TimestampValidator)),
|
|
73
|
-
__param(1, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
|
|
74
|
-
__metadata("design:paramtypes", [TimestampValidator_1.TimestampValidator, Object])
|
|
75
|
-
], SaveMetroRunsToDBTask);
|
|
40
|
+
}
|
|
41
|
+
exports.SaveMetroRunsToDBTask = SaveMetroRunsToDBTask;
|
|
76
42
|
//# sourceMappingURL=SaveMetroRunsToDBTask.js.map
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveMetroRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SaveMetroRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2FAAqF;AACrF,2EAA6E;AAE7E,4FAAyF;AAEzF,+DAAsE;AACtE,wGAAqG;AAErG,MAAa,qBAAsB,SAAQ,sBAA6B;IAQpE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QARP,cAAS,GAAG,mBAAmB,CAAC;QAChC,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,2CAAyB,CAAC;QAO/C,IAAI,CAAC,sBAAsB,GAAG,IAAI,iEAA+B,EAAE,CAAC;QACpE,IAAI,CAAC,kBAAkB,GAAG,IAAI,yDAA2B,EAAE,CAAC;IAChE,CAAC;IAEe,OAAO,CAAC,IAAqB,EAAE,aAAiC;;YAC5E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACnE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvB,OAAO;aACV;YAED,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACjD,MAAM,8BAAY,CAAC,qBAAqB,CACpC,IAAI,CAAC,WAAW,EAChB,yBAAyB,EACzB;gBACI,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK;gBACzB,QAAQ;aACX,EACD,EAAE,SAAS,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,EAAE,CAC1C,CAAC;QACN,CAAC;KAAA;CACJ;AA/BD,sDA+BC"}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.d.ts
CHANGED
|
@@ -10,6 +10,6 @@ export declare class SaveTramRunsToDBTask extends AbstractTask<ICommonRunsInput>
|
|
|
10
10
|
private readonly runsRepository;
|
|
11
11
|
private readonly messageProcessor;
|
|
12
12
|
private readonly messageFilter;
|
|
13
|
-
constructor();
|
|
13
|
+
constructor(queuePrefix: string);
|
|
14
14
|
protected execute(data: ICommonRunsInput, msgProperties?: MessageProperties): Promise<void>;
|
|
15
15
|
}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
12
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
13
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -26,15 +17,14 @@ const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
|
26
17
|
const CommonRunsRepository_1 = require("../data-access/CommonRunsRepository");
|
|
27
18
|
const CommonMessageProcessor_1 = require("../helpers/CommonMessageProcessor");
|
|
28
19
|
const CommonRunsSchema_1 = require("../schema/CommonRunsSchema");
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
super(constants_1.WORKER_NAME);
|
|
20
|
+
const CommonRunsMessagesTransformation_1 = require("../transformations/CommonRunsMessagesTransformation");
|
|
21
|
+
class SaveTramRunsToDBTask extends workers_1.AbstractTask {
|
|
22
|
+
constructor(queuePrefix) {
|
|
23
|
+
super(queuePrefix);
|
|
34
24
|
this.queueName = "saveTramRunsToDB";
|
|
35
25
|
this.queueTtl = 3 * 60 * 1000; // 3 minutes
|
|
36
26
|
this.schema = CommonRunsSchema_1.CommonRunsValidationSchema;
|
|
37
|
-
this.messagesTransformation =
|
|
27
|
+
this.messagesTransformation = new CommonRunsMessagesTransformation_1.CommonRunsMessagesTransformation();
|
|
38
28
|
this.runsRepository = new CommonRunsRepository_1.CommonRunsRepository();
|
|
39
29
|
this.messageProcessor = new CommonMessageProcessor_1.CommonMessageProcessor(this.runsRepository);
|
|
40
30
|
this.messageFilter = Di_1.VPContainer.resolve(VPContainerToken_1.VPContainerToken.TramMessageFilter);
|
|
@@ -46,15 +36,12 @@ let SaveTramRunsToDBTask = exports.SaveTramRunsToDBTask = class SaveTramRunsToDB
|
|
|
46
36
|
throw new golemio_errors_1.GeneralError(`Missing tram run message timestamp: ${JSON.stringify(data)}`, this.constructor.name);
|
|
47
37
|
}
|
|
48
38
|
const messages = yield this.messagesTransformation.transform({ data: data.M.V, timestamp }, true);
|
|
49
|
-
const filteredMessages = this.messageFilter.yieldFilteredMessages(messages
|
|
39
|
+
const filteredMessages = this.messageFilter.yieldFilteredMessages(messages);
|
|
50
40
|
for (const runMessage of filteredMessages) {
|
|
51
41
|
yield this.messageProcessor.processTransformedRun(runMessage, timestamp);
|
|
52
42
|
}
|
|
53
43
|
});
|
|
54
44
|
}
|
|
55
|
-
}
|
|
56
|
-
exports.SaveTramRunsToDBTask = SaveTramRunsToDBTask
|
|
57
|
-
(0, tsyringe_1.injectable)(),
|
|
58
|
-
__metadata("design:paramtypes", [])
|
|
59
|
-
], SaveTramRunsToDBTask);
|
|
45
|
+
}
|
|
46
|
+
exports.SaveTramRunsToDBTask = SaveTramRunsToDBTask;
|
|
60
47
|
//# sourceMappingURL=SaveTramRunsToDBTask.js.map
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveTramRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SaveTramRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2D;AAC3D,oEAA8E;AAC9E,2EAA6E;AAC7E,6EAAwE;AAExE,8EAA2E;AAC3E,8EAA2E;AAG3E,iEAAwE;AACxE,0GAAuG;AAEvG,MAAa,oBAAqB,SAAQ,sBAA8B;IAUpE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAVP,cAAS,GAAG,kBAAkB,CAAC;QAC/B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,6CAA0B,CAAC;QAShD,IAAI,CAAC,sBAAsB,GAAG,IAAI,mEAAgC,EAAE,CAAC;QACrE,IAAI,CAAC,cAAc,GAAG,IAAI,2CAAoB,EAAE,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,IAAI,+CAAsB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACxE,IAAI,CAAC,aAAa,GAAG,gBAAW,CAAC,OAAO,CAAuB,mCAAgB,CAAC,iBAAiB,CAAC,CAAC;IACvG,CAAC;IAEe,OAAO,CAAC,IAAsB,EAAE,aAAiC;;YAC7E,MAAM,SAAS,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,CAAC;YAC3C,IAAI,CAAC,SAAS,EAAE;gBACZ,MAAM,IAAI,6BAAY,CAAC,uCAAuC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aAChH;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,IAAI,CAAC,CAAC;YAClG,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YAE5E,KAAK,MAAM,UAAU,IAAI,gBAAgB,EAAE;gBACvC,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;aAC5E;QACL,CAAC;KAAA;CACJ;AA/BD,oDA+BC"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import { ICommonRunWithMessageDto } from "../../../../../schema-definitions/vehicle-positions/models/interfaces/ICommonRunWithMessageDto";
|
|
2
2
|
import { BaseTransformation, ITransformation } from "@golemio/core/dist/integration-engine/transformations";
|
|
3
3
|
import { ICommonRunsInputData, ICommonRunsInputElement } from "../interfaces/CommonRunsMessageInterfaces";
|
|
4
|
-
import { TimestampValidator } from "../helpers/TimestampValidator";
|
|
5
4
|
export declare class CommonRunsMessagesTransformation extends BaseTransformation implements ITransformation {
|
|
6
|
-
private timestampValidator;
|
|
7
5
|
name: string;
|
|
8
6
|
private readonly commonRunHelper;
|
|
9
|
-
constructor(
|
|
7
|
+
constructor();
|
|
10
8
|
/**
|
|
11
9
|
* Overrides BaseTransformation::transform
|
|
12
10
|
*/
|
|
@@ -1,16 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
-
};
|
|
14
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
15
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
16
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -27,21 +15,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
27
15
|
exports.CommonRunsMessagesTransformation = void 0;
|
|
28
16
|
const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
29
17
|
const transformations_1 = require("@golemio/core/dist/integration-engine/transformations");
|
|
18
|
+
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
30
19
|
const CommonRunHelper_1 = require("../helpers/CommonRunHelper");
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
const VPContainerToken_1 = require("../../../ioc/VPContainerToken");
|
|
34
|
-
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
35
|
-
let CommonRunsMessagesTransformation = exports.CommonRunsMessagesTransformation = class CommonRunsMessagesTransformation extends transformations_1.BaseTransformation {
|
|
36
|
-
constructor(timestampValidator) {
|
|
20
|
+
class CommonRunsMessagesTransformation extends transformations_1.BaseTransformation {
|
|
21
|
+
constructor() {
|
|
37
22
|
super();
|
|
38
|
-
this.timestampValidator = timestampValidator;
|
|
39
23
|
this.name = "CommonRunsMessagesTransformation";
|
|
40
24
|
/**
|
|
41
25
|
* Overrides BaseTransformation::transform
|
|
42
26
|
*/
|
|
43
27
|
this.transform = ({ data, timestamp }, isTram = false) => __awaiter(this, void 0, void 0, function* () {
|
|
44
|
-
const now = (0,
|
|
28
|
+
const now = (0, moment_timezone_1.default)(timestamp).tz("Europe/Prague").format();
|
|
45
29
|
const res = [];
|
|
46
30
|
if (!Array.isArray(data)) {
|
|
47
31
|
data = [data];
|
|
@@ -69,7 +53,7 @@ let CommonRunsMessagesTransformation = exports.CommonRunsMessagesTransformation
|
|
|
69
53
|
return Promise.reject();
|
|
70
54
|
}
|
|
71
55
|
const scheduledStopTimestampDate = attributes.tjr ? this.commonRunHelper.parseDateFromRunInput(attributes.tjr) : null;
|
|
72
|
-
|
|
56
|
+
return {
|
|
73
57
|
run: {
|
|
74
58
|
id: identifiers.runId,
|
|
75
59
|
route_id: identifiers.routeId,
|
|
@@ -94,14 +78,9 @@ let CommonRunsMessagesTransformation = exports.CommonRunsMessagesTransformation
|
|
|
94
78
|
events: attributes.events,
|
|
95
79
|
},
|
|
96
80
|
};
|
|
97
|
-
return t;
|
|
98
81
|
});
|
|
99
82
|
this.commonRunHelper = new CommonRunHelper_1.CommonRunHelper();
|
|
100
83
|
}
|
|
101
|
-
}
|
|
102
|
-
exports.CommonRunsMessagesTransformation = CommonRunsMessagesTransformation
|
|
103
|
-
(0, tsyringe_1.injectable)(),
|
|
104
|
-
__param(0, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.TimestampValidator)),
|
|
105
|
-
__metadata("design:paramtypes", [TimestampValidator_1.TimestampValidator])
|
|
106
|
-
], CommonRunsMessagesTransformation);
|
|
84
|
+
}
|
|
85
|
+
exports.CommonRunsMessagesTransformation = CommonRunsMessagesTransformation;
|
|
107
86
|
//# sourceMappingURL=CommonRunsMessagesTransformation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommonRunsMessagesTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CommonRunsMessagesTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { MetroRunsMessagesModel } from "../../../../../schema-definitions/vehicle-positions/models";
|
|
2
2
|
import { BaseTransformation, ITransformation } from "@golemio/core/dist/integration-engine/transformations";
|
|
3
|
-
import {
|
|
3
|
+
import { IMetroRunsInput, IMetroRunsMessageProperties, IMetroRunsTrainContent } from "../interfaces/MetroRunsMessageInterfaces";
|
|
4
4
|
interface IMetroRunsElement {
|
|
5
5
|
messageData: IMetroRunsMessageProperties;
|
|
6
6
|
trainData: IMetroRunsTrainContent;
|
|
7
7
|
}
|
|
8
8
|
export declare class MetroRunsMessagesTransformation extends BaseTransformation implements ITransformation {
|
|
9
9
|
name: string;
|
|
10
|
-
transform: (
|
|
10
|
+
transform: (data: IMetroRunsInput) => Promise<MetroRunsMessagesModel[]>;
|
|
11
11
|
protected transformElement: ({ messageData, trainData }: IMetroRunsElement) => MetroRunsMessagesModel;
|
|
12
12
|
}
|
|
13
13
|
export {};
|
|
@@ -6,7 +6,7 @@ class MetroRunsMessagesTransformation extends transformations_1.BaseTransformati
|
|
|
6
6
|
constructor() {
|
|
7
7
|
super(...arguments);
|
|
8
8
|
this.name = "MetroRunMessages";
|
|
9
|
-
this.transform = (
|
|
9
|
+
this.transform = (data) => {
|
|
10
10
|
let { $: messageData, vlak: trainData } = data.m;
|
|
11
11
|
if (!trainData) {
|
|
12
12
|
return Promise.resolve([]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetroRunsMessagesTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/transformations/MetroRunsMessagesTransformation.ts"],"names":[],"mappings":";;;AACA,2FAA4G;
|
|
1
|
+
{"version":3,"file":"MetroRunsMessagesTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/transformations/MetroRunsMessagesTransformation.ts"],"names":[],"mappings":";;;AACA,2FAA4G;AAQ5G,MAAa,+BAAgC,SAAQ,oCAAkB;IAAvE;;QACW,SAAI,GAAG,kBAAkB,CAAC;QAE1B,cAAS,GAAG,CAAC,IAAqB,EAAqC,EAAE;YAC5E,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;YACjD,IAAI,CAAC,SAAS,EAAE;gBACZ,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;aAC9B;YAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;gBAC3B,SAAS,GAAG,CAAC,SAAS,CAAC,CAAC;aAC3B;YAED,MAAM,GAAG,GAA6B,EAAE,CAAC;YACzC,KAAK,MAAM,aAAa,IAAI,SAAS,EAAE;gBACnC,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;gBACjF,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACrB;YAED,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAChC,CAAC,CAAC;QAEQ,qBAAgB,GAAG,CAAC,EAAE,WAAW,EAAE,SAAS,EAAqB,EAA0B,EAAE;YACnG,MAAM,kBAAkB,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACtD,MAAM,gBAAgB,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAClD,MAAM,kBAAkB,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACtD,wEAAwE;YACxE,kBAAkB,CAAC,UAAU,CAAC,kBAAkB,CAAC,UAAU,EAAE,GAAG,kBAAkB,CAAC,CAAC;YAEpF,OAAO;gBACH,UAAU,EAAE,WAAW,CAAC,KAAK;gBAC7B,iBAAiB,EAAE,gBAAgB;gBACnC,0BAA0B,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE;gBACvD,qBAAqB,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE;gBAClD,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE;gBAC5B,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE;gBACxB,YAAY,EAAE,kBAAkB;gBAChC,mCAAmC,EAAE,kBAAkB;aAChC,CAAC;QAChC,CAAC,CAAC;IACN,CAAC;CAAA;AAxCD,0EAwCC"}
|
|
@@ -30,7 +30,6 @@ let RegionalBusRunsMessagesTransformation = exports.RegionalBusRunsMessagesTrans
|
|
|
30
30
|
speed_kmh: Number.parseInt(messageData.rych),
|
|
31
31
|
bearing: Number.parseInt(messageData.smer),
|
|
32
32
|
is_terminated: messageData.conn === "0" || messageData.line === "0",
|
|
33
|
-
timestamp: messageData.tm,
|
|
34
33
|
};
|
|
35
34
|
};
|
|
36
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegionalBusRunsMessagesTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/transformations/RegionalBusRunsMessagesTransformation.ts"],"names":[],"mappings":";;;;;;;;;AACA,6GAA0G;AAC1G,
|
|
1
|
+
{"version":3,"file":"RegionalBusRunsMessagesTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/transformations/RegionalBusRunsMessagesTransformation.ts"],"names":[],"mappings":";;;;;;;;;AACA,6GAA0G;AAC1G,iEAAgE;AAOzD,IAAM,qCAAqC,mDAA3C,MAAM,qCAAsC,SAAQ,+CAAiD;IAArG;;QACI,SAAI,GAAG,uCAAuC,CAAC;QAE5C,sBAAiB,GAAG,CAAC,IAAiB,EAAgB,EAAE;;YAC9D,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC;YAE3B,OAAO;gBACH,gBAAgB,EAAE,WAAW,CAAC,IAAI;gBAClC,WAAW,EAAE,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;gBACnF,eAAe,EAAE,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;gBACxG,MAAM,EAAE,MAAA,WAAW,CAAC,MAAM,mCAAI,EAAE;gBAChC,WAAW,EAAE;oBACT,IAAI,EAAE,OAAO;oBACb,WAAW,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;iBACxF;gBACD,iBAAiB,EAAE,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE,GAAG,GAAG,CAAC;gBACjD,mBAAmB,EAAE,WAAW,CAAC,GAAG,IAAI,WAAW,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;gBACzG,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC5C,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC1C,aAAa,EAAE,WAAW,CAAC,IAAI,KAAK,GAAG,IAAI,WAAW,CAAC,IAAI,KAAK,GAAG;aACtE,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;gDAtBY,qCAAqC;IADjD,IAAA,qBAAU,GAAE;GACA,qCAAqC,CAsBjD"}
|
|
@@ -13,6 +13,7 @@ export declare class RefreshPublicStopTimeCacheTask extends AbstractEmptyTask {
|
|
|
13
13
|
readonly queueTtl = 10000;
|
|
14
14
|
private lockTimeout;
|
|
15
15
|
private refreshInterval;
|
|
16
|
+
private vehicleIdGenerator;
|
|
16
17
|
constructor(config: ISimpleConfig, logger: ILogger, redisClient: IoRedisConnector, publicStopTimeRepository: PublicStopTimeRepository, publicStopTimeCacheRepository: PublicStopTimeCacheRepository);
|
|
17
18
|
protected execute(): Promise<void>;
|
|
18
19
|
private createMutex;
|
|
@@ -48,6 +48,7 @@ let RefreshPublicStopTimeCacheTask = exports.RefreshPublicStopTimeCacheTask = cl
|
|
|
48
48
|
this.queueTtl = 10000; // 10s
|
|
49
49
|
this.lockTimeout = config.getValue("old.datasources.pid.vehicle-positions.publicCache.mutexLockStopTimeTimeout", 6000); // default 6s
|
|
50
50
|
this.refreshInterval = this.lockTimeout * 0.8;
|
|
51
|
+
this.vehicleIdGenerator = new VehicleIdGenerator_1.VehicleIdGenerator();
|
|
51
52
|
}
|
|
52
53
|
execute() {
|
|
53
54
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RefreshPublicStopTimeCacheTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/RefreshPublicStopTimeCacheTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAA8E;AAG9E,oGAAiG;AACjG,wEAAqE;AAErE,8EAAqE;AACrE,mEAA2E;AAC3E,2EAAkF;AAClF,6EAA8F;AAC9F,+EAAkE;AAClE,iEAAwE;AACxE,mDAA2D;AAC3D,4CAA2C;AAC3C,sGAAmG;AACnG,4FAAyF;AACzF,gDAA6C;AAC7C,iFAAsG;AAG/F,IAAM,8BAA8B,4CAApC,MAAM,8BAA+B,SAAQ,2BAAiB;
|
|
1
|
+
{"version":3,"file":"RefreshPublicStopTimeCacheTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/RefreshPublicStopTimeCacheTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,9 @@ import { Moment } from "@golemio/core/dist/shared/moment-timezone";
|
|
|
3
3
|
import { IMpvPositionContent } from "../../../../../schema-definitions/vehicle-positions/interfaces/IMpvMessageInterfaces";
|
|
4
4
|
import { ITransformationElement, ITransformationResult } from "../interfaces/TransformationInterfaces";
|
|
5
5
|
export declare class MpvMessageTransformation extends BaseTransformation implements ITransformation {
|
|
6
|
-
private static ORIGIN_TIME_FORMAT;
|
|
7
6
|
name: string;
|
|
8
7
|
private config;
|
|
9
|
-
private
|
|
8
|
+
private static ORIGIN_TIME_FORMAT;
|
|
10
9
|
constructor();
|
|
11
10
|
/**
|
|
12
11
|
* Overrides BaseTransformation::transform
|
|
@@ -32,7 +31,6 @@ export declare class MpvMessageTransformation extends BaseTransformation impleme
|
|
|
32
31
|
* @returns {number}
|
|
33
32
|
*/
|
|
34
33
|
private checkMidnight;
|
|
35
|
-
private isBlacklistedAgency;
|
|
36
34
|
/**
|
|
37
35
|
* Fix source negative bearing value due to overflow by adding 256
|
|
38
36
|
*
|
|
@@ -47,4 +45,9 @@ export declare class MpvMessageTransformation extends BaseTransformation impleme
|
|
|
47
45
|
* @returns {stringList}
|
|
48
46
|
*/
|
|
49
47
|
private formatASWStopId;
|
|
48
|
+
/**
|
|
49
|
+
* Returns list of vehicle reg numbers that should be excluded from MPVNet processing
|
|
50
|
+
* (already processed from another source)
|
|
51
|
+
*/
|
|
52
|
+
private get regionalBusRegNumberBlacklist();
|
|
50
53
|
}
|
|
@@ -31,7 +31,6 @@ var PositionTrackingEnum;
|
|
|
31
31
|
class MpvMessageTransformation extends transformations_1.BaseTransformation {
|
|
32
32
|
constructor() {
|
|
33
33
|
super();
|
|
34
|
-
this.skipAgencyNames = [DPPUtils_1.default.DPP_AGENCY_NAME];
|
|
35
34
|
/**
|
|
36
35
|
* Overrides BaseTransformation::transform
|
|
37
36
|
*/
|
|
@@ -62,9 +61,14 @@ class MpvMessageTransformation extends transformations_1.BaseTransformation {
|
|
|
62
61
|
this.transformElement = (element) => __awaiter(this, void 0, void 0, function* () {
|
|
63
62
|
var _a, _b;
|
|
64
63
|
const attributes = element.$;
|
|
64
|
+
// DPP and regional bus trips to be excluded in HTTP ingress
|
|
65
|
+
const isDPPTrip = attributes.dopr === DPPUtils_1.default.DPP_AGENCY_NAME;
|
|
66
|
+
const isRegionalBusTrip = !!attributes.vuzevc &&
|
|
67
|
+
this.regionalBusRegNumberBlacklist &&
|
|
68
|
+
this.regionalBusRegNumberBlacklist.includes(attributes.vuzevc);
|
|
65
69
|
// Trips with null cpoz (origin time) and falsy or "false" zrus (cancellation) attributes are excluded
|
|
66
70
|
const hasInvalidAttributes = !attributes.cpoz && (!attributes.zrus || attributes.zrus === "false");
|
|
67
|
-
if (
|
|
71
|
+
if (isDPPTrip || isRegionalBusTrip || hasInvalidAttributes) {
|
|
68
72
|
return null;
|
|
69
73
|
}
|
|
70
74
|
attributes.lin = attributes.lin || "none";
|
|
@@ -229,12 +233,6 @@ class MpvMessageTransformation extends transformations_1.BaseTransformation {
|
|
|
229
233
|
};
|
|
230
234
|
this.name = vehicle_positions_1.VehiclePositions.name;
|
|
231
235
|
this.config = Di_1.IntegrationEngineContainer.resolve(CoreToken_1.CoreToken.SimpleConfig);
|
|
232
|
-
this.skipAgencyNames = this.skipAgencyNames.concat(this.config
|
|
233
|
-
.getValue("module.pid.vehicle-positions.mpvIntegration.skipAgencyNames", "ARRIVA CITY,ARRIVA CITY (Neratovice)")
|
|
234
|
-
.split(","));
|
|
235
|
-
}
|
|
236
|
-
isBlacklistedAgency(agency) {
|
|
237
|
-
return agency && this.skipAgencyNames.includes(agency);
|
|
238
236
|
}
|
|
239
237
|
/**
|
|
240
238
|
* Fix source negative bearing value due to overflow by adding 256
|
|
@@ -257,6 +255,19 @@ class MpvMessageTransformation extends transformations_1.BaseTransformation {
|
|
|
257
255
|
const aswParsedStopPostId = parseInt(stopId, 10) - aswParsedStopNodeId * fixedRightPadFactor;
|
|
258
256
|
return aswParsedStopNodeId + "/" + aswParsedStopPostId;
|
|
259
257
|
}
|
|
258
|
+
/**
|
|
259
|
+
* Returns list of vehicle reg numbers that should be excluded from MPVNet processing
|
|
260
|
+
* (already processed from another source)
|
|
261
|
+
*/
|
|
262
|
+
get regionalBusRegNumberBlacklist() {
|
|
263
|
+
const valuePath = "old.datasources.pid.vehicle-positions.regNumberWhitelist.regionalBus";
|
|
264
|
+
const blacklistDict = this.config.getValue(valuePath, {});
|
|
265
|
+
const blacklist = Object.values(blacklistDict);
|
|
266
|
+
if (blacklist.length > 0 && blacklist[0] !== "*") {
|
|
267
|
+
return blacklist;
|
|
268
|
+
}
|
|
269
|
+
return null;
|
|
270
|
+
}
|
|
260
271
|
}
|
|
261
272
|
exports.MpvMessageTransformation = MpvMessageTransformation;
|
|
262
273
|
MpvMessageTransformation.ORIGIN_TIME_FORMAT = "HH:mm:ss";
|