@golemio/pid 2.8.4-dev.952072231 → 2.8.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/integration-engine/ropid-gtfs/workers/presets/tasks/ProcessAndSendLogsTask.js +2 -2
- package/dist/integration-engine/ropid-gtfs/workers/presets/tasks/ProcessAndSendLogsTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js +6 -13
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.d.ts +0 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.js +13 -18
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DelayComputationManager.js +0 -5
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DelayComputationManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js +71 -93
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js.map +1 -1
- package/dist/schema-definitions/ropid-departures-preset-logs/models/interfaces/IPresetLogProcessedDto.d.ts +2 -2
- package/dist/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.d.ts +1 -1
- package/dist/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.js +1 -2
- package/dist/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/interfaces/ICommonRunsMessagesModel.d.ts +2 -2
- package/docs/implementation_documentation.md +2 -2
- package/package.json +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonRunHelper.d.ts +0 -16
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonRunHelper.js +0 -41
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonRunHelper.js.map +0 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/interfaces/ICommonRunHelper.d.ts +0 -10
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/interfaces/ICommonRunHelper.js +0 -3
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/interfaces/ICommonRunHelper.js.map +0 -1
|
@@ -53,8 +53,8 @@ class ProcessAndSendLogsTask extends workers_1.AbstractEmptyTask {
|
|
|
53
53
|
const { device_alias, received_at } = logEntry.toJSON();
|
|
54
54
|
logIds.push(logEntry.get("id"));
|
|
55
55
|
logData.push({
|
|
56
|
-
device_alias,
|
|
57
|
-
|
|
56
|
+
deviceAlias: device_alias,
|
|
57
|
+
receivedAt: LogDateTimeUtils_1.LogDateTimeUtils.parseISONoFractionalFromDate(received_at),
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
60
|
try {
|
package/dist/integration-engine/ropid-gtfs/workers/presets/tasks/ProcessAndSendLogsTask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProcessAndSendLogsTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/tasks/ProcessAndSendLogsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA0C;AAC1C,+EAAoE;AAIpE,wEAAqE;AAErE,2EAAkF;AAElF,kEAA+D;AAG/D,MAAM,iBAAiB,GAAG,KAAK,CAAC;AAChC,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC,MAAa,sBAAuB,SAAQ,2BAAiB;IAUzD,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAVP,cAAS,GAAG,oBAAoB,CAAC;QACjC,aAAQ,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QAU/C,MAAM,MAAM,GAAG,iBAAY,CAAC,OAAO,CAAgB,qBAAS,CAAC,YAAY,CAAC,CAAC;QAE3E,IAAI,CAAC,aAAa,GAAG,iBAAY,CAAC,OAAO,CAAuB,2CAAoB,CAAC,mBAAmB,CAAC,CAAC;QAC1G,IAAI,CAAC,iBAAiB,GAAG,iBAAY,CAAC,OAAO,CAA0B,2CAAoB,CAAC,sBAAsB,CAAC,CAAC;QACpH,IAAI,CAAC,MAAM,GAAG,iBAAY,CAAC,OAAO,CAAU,qBAAS,CAAC,MAAM,CAAC,CAAC;QAE9D,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,4BAA4B,EAAE,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7F,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE1C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,iCAAiC,EAAE,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpG,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;IAEe,OAAO;;YACnB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3E,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;gBACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,wDAAwD,CAAC,CAAC;gBACnG,OAAO;aACV;YAED,qFAAqF;YACrF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE;gBACxD,MAAM,WAAW,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC5D,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;aACxC;QACL,CAAC;KAAA;IAEa,YAAY,CAAC,UAA4B;;YACnD,IAAI,MAAM,GAAa,EAAE,CAAC;YAC1B,IAAI,OAAO,GAA6B,EAAE,CAAC;YAE3C,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE;gBAC/B,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;gBAExD,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAW,CAAC,CAAC;gBAC1C,OAAO,CAAC,IAAI,CAAC;oBACT,YAAY;
|
|
1
|
+
{"version":3,"file":"ProcessAndSendLogsTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/tasks/ProcessAndSendLogsTask.ts"],"names":[],"mappings":"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"}
|
package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js
CHANGED
|
@@ -76,19 +76,12 @@ class CommonRunsRepository extends models_2.PostgresModel {
|
|
|
76
76
|
this.getRunRecordForUpdate = (run) => {
|
|
77
77
|
return this.sequelizeModel.findOne({
|
|
78
78
|
where: {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
run_number: run.run_number,
|
|
86
|
-
registration_number: run.registration_number,
|
|
87
|
-
msg_last_timestamp: {
|
|
88
|
-
[sequelize_1.Op.gt]: sequelize_1.default.literal("NOW() - INTERVAL '3 HOURS'"),
|
|
89
|
-
},
|
|
90
|
-
},
|
|
91
|
-
],
|
|
79
|
+
route_id: run.route_id,
|
|
80
|
+
run_number: run.run_number,
|
|
81
|
+
registration_number: run.registration_number,
|
|
82
|
+
msg_last_timestamp: {
|
|
83
|
+
[sequelize_1.Op.gt]: sequelize_1.default.literal("NOW() - INTERVAL '3 HOURS'"),
|
|
84
|
+
},
|
|
92
85
|
},
|
|
93
86
|
order: [["msg_last_timestamp", "DESC"]],
|
|
94
87
|
raw: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommonRunsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gFAAgF;AAChF,mEAAuC;AACvC,uFAAgE;AAIhE,iFAAqF;AACrF,yEAAqF;AACrF,6EAAwE;AACxE,mFAAkF;AAClF,iFAAoE;AACpE,iFAA8E;AAE9E,MAAa,oBAAqB,SAAQ,sBAAa;IAgBnD;QACI,KAAK,CACD,sBAAsB,EACtB;YACI,WAAW,EAAE,wBAAe,CAAC,UAAU;YACvC,QAAQ,EAAE,iBAAS;YACnB,yBAAyB,EAAE,wBAAe,CAAC,cAAc;YACzD,UAAU,EAAE,YAAY;YACxB,2BAA2B,EAAE;gBACzB,OAAO,EAAE;oBACL;wBACI,MAAM,EAAE,CAAC,IAAI,CAAC;wBACd,IAAI,EAAE,4BAA4B;qBACrC;oBACD;wBACI,MAAM,EAAE,CAAC,UAAU,EAAE,YAAY,EAAE,qBAAqB,EAAE,qBAAqB,CAAC;wBAChF,IAAI,EAAE,2BAA2B;qBACpC;iBACJ;aACJ;SACJ,EACD,IAAI,uCAAmB,CAAC,+BAA+B,EAAE,wBAAe,CAAC,UAAU,CAAC,CACvF,CAAC;QAiBC,0BAAqB,GAAG,CAAC,GAAqB,EAAoC,EAAE;YACvF,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC/B,KAAK,EAAE;oBACH,
|
|
1
|
+
{"version":3,"file":"CommonRunsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,6 @@ import { BaseTransformation, ITransformation } from "@golemio/core/dist/integrat
|
|
|
3
3
|
import { ICommonRunsInputData, ICommonRunsInputElement } from "../interfaces/CommonRunsMessageInterfaces";
|
|
4
4
|
export declare class CommonRunsMessagesTransformation extends BaseTransformation implements ITransformation {
|
|
5
5
|
name: string;
|
|
6
|
-
private readonly commonRunHelper;
|
|
7
|
-
constructor();
|
|
8
6
|
/**
|
|
9
7
|
* Overrides BaseTransformation::transform
|
|
10
8
|
*/
|
|
@@ -16,10 +16,9 @@ exports.CommonRunsMessagesTransformation = void 0;
|
|
|
16
16
|
const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
17
17
|
const transformations_1 = require("@golemio/core/dist/integration-engine/transformations");
|
|
18
18
|
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
19
|
-
const CommonRunHelper_1 = require("../helpers/CommonRunHelper");
|
|
20
19
|
class CommonRunsMessagesTransformation extends transformations_1.BaseTransformation {
|
|
21
20
|
constructor() {
|
|
22
|
-
super();
|
|
21
|
+
super(...arguments);
|
|
23
22
|
this.name = "CommonRunsMessagesTransformation";
|
|
24
23
|
/**
|
|
25
24
|
* Overrides BaseTransformation::transform
|
|
@@ -36,28 +35,25 @@ class CommonRunsMessagesTransformation extends transformations_1.BaseTransformat
|
|
|
36
35
|
res.push(elementTransformed);
|
|
37
36
|
}
|
|
38
37
|
catch (err) {
|
|
39
|
-
helpers_1.log.verbose(`${this.name}:
|
|
38
|
+
helpers_1.log.verbose(`${this.name}: run has empty string timestamps: ${JSON.stringify(element)}`);
|
|
40
39
|
}
|
|
41
40
|
}
|
|
42
41
|
return res;
|
|
43
42
|
});
|
|
44
43
|
this.transformElement = (element, isTram = false) => __awaiter(this, void 0, void 0, function* () {
|
|
45
44
|
const attributes = element.data.$;
|
|
46
|
-
|
|
45
|
+
const [route_id, run_number] = attributes.turnus.split("/");
|
|
46
|
+
const uniqueKey = `${route_id}` + `_${run_number}` + `_${attributes.evc}` + `_${element.timestamp}`;
|
|
47
|
+
if (attributes.takt === "" || attributes.tm === "")
|
|
47
48
|
return Promise.reject();
|
|
48
|
-
|
|
49
|
-
const identifiers = this.commonRunHelper.getRunIdentifiers(attributes, element.timestamp);
|
|
50
|
-
const realStopTimestampDate = this.commonRunHelper.parseDateFromRunInput(attributes.takt);
|
|
51
|
-
const messageTimestampDate = this.commonRunHelper.parseDateFromRunInput(attributes.tm);
|
|
52
|
-
if (!identifiers || !realStopTimestampDate || !messageTimestampDate) {
|
|
49
|
+
if (!isTram && (!attributes.tjr || attributes.tjr === ""))
|
|
53
50
|
return Promise.reject();
|
|
54
|
-
|
|
55
|
-
const scheduledStopTimestampDate = attributes.tjr ? this.commonRunHelper.parseDateFromRunInput(attributes.tjr) : null;
|
|
51
|
+
const actualStopTimestampScheduled = attributes.tjr ? new Date(attributes.tjr + "Z") : undefined;
|
|
56
52
|
return {
|
|
57
53
|
run: {
|
|
58
|
-
id:
|
|
59
|
-
route_id
|
|
60
|
-
run_number:
|
|
54
|
+
id: uniqueKey,
|
|
55
|
+
route_id,
|
|
56
|
+
run_number: run_number,
|
|
61
57
|
line_short_name: attributes.line,
|
|
62
58
|
registration_number: attributes.evc,
|
|
63
59
|
msg_start_timestamp: element.timestamp,
|
|
@@ -70,16 +66,15 @@ class CommonRunsMessagesTransformation extends transformations_1.BaseTransformat
|
|
|
70
66
|
lat: +attributes.lat,
|
|
71
67
|
lng: +attributes.lng,
|
|
72
68
|
actual_stop_asw_id: attributes.akt,
|
|
73
|
-
actual_stop_timestamp_real:
|
|
74
|
-
actual_stop_timestamp_scheduled:
|
|
69
|
+
actual_stop_timestamp_real: new Date(attributes.takt + "Z"),
|
|
70
|
+
actual_stop_timestamp_scheduled: actualStopTimestampScheduled,
|
|
75
71
|
last_stop_asw_id: attributes.konc,
|
|
76
72
|
packet_number: attributes.pkt,
|
|
77
|
-
msg_timestamp:
|
|
73
|
+
msg_timestamp: moment_timezone_1.default.utc(attributes.tm).tz("Europe/Prague").format(),
|
|
78
74
|
events: attributes.events,
|
|
79
75
|
},
|
|
80
76
|
};
|
|
81
77
|
});
|
|
82
|
-
this.commonRunHelper = new CommonRunHelper_1.CommonRunHelper();
|
|
83
78
|
}
|
|
84
79
|
}
|
|
85
80
|
exports.CommonRunsMessagesTransformation = CommonRunsMessagesTransformation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommonRunsMessagesTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,2EAAoE;AACpE,2FAA4G;AAC5G,gGAA+D;
|
|
1
|
+
{"version":3,"file":"CommonRunsMessagesTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,6 @@ const config_1 = require("@golemio/core/dist/integration-engine/config");
|
|
|
37
37
|
const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
38
38
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
39
39
|
const turf = __importStar(require("@turf/turf"));
|
|
40
|
-
const monitoring_1 = require("@golemio/core/dist/monitoring");
|
|
41
40
|
class DelayComputationManager {
|
|
42
41
|
constructor(gtfsTripsRepository) {
|
|
43
42
|
this.gtfsTripsRepository = gtfsTripsRepository;
|
|
@@ -48,7 +47,6 @@ class DelayComputationManager {
|
|
|
48
47
|
* @returns {IComputationTrip} - Result with shape anchor points
|
|
49
48
|
*/
|
|
50
49
|
this.getComputationObject = (tripId) => __awaiter(this, void 0, void 0, function* () {
|
|
51
|
-
const computationObjectSpan = (0, monitoring_1.createChildSpan)("Task.UpdateDelay.GetComputationObject");
|
|
52
50
|
try {
|
|
53
51
|
const stopTimes = yield this.gtfsTripsRepository.findByIdWithStopTimes(tripId);
|
|
54
52
|
const shapes = yield this.gtfsTripsRepository.findByIdWithShapes(tripId);
|
|
@@ -142,9 +140,6 @@ class DelayComputationManager {
|
|
|
142
140
|
helpers_1.log.error(err);
|
|
143
141
|
throw new golemio_errors_1.GeneralError("Error while getting object for delay calculation (trip_id=" + tripId + ").", this.constructor.name, err);
|
|
144
142
|
}
|
|
145
|
-
finally {
|
|
146
|
-
computationObjectSpan === null || computationObjectSpan === void 0 ? void 0 : computationObjectSpan.end();
|
|
147
|
-
}
|
|
148
143
|
});
|
|
149
144
|
/**
|
|
150
145
|
* Return geometry of anchor points with distance from start along trip track shape
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DelayComputationManager.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DelayComputationManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yEAAsE;AACtE,2EAAoE;AACpE,6EAAwE;AACxE,iDAAmC;
|
|
1
|
+
{"version":3,"file":"DelayComputationManager.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DelayComputationManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTFSTripCommonRunManager.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,8EAA4D;AAC5D,gGAA2E;AAC3E,mDAAyC;AACzC,6EAA+D;AAE/D,6EAA0E;AAG1E,MAAa,wBAAyB,SAAQ,uDAA0B;IACvD,gBAAgB,CAAC,QAAwB,EAAE,KAA+B;;YACnF,MAAM,kBAAkB,GAAG,IAAA,yBAAM,EAAC,KAAK,CAAC,WAAW,CAAC,+BAA+B,CAAC,CAAC;YACrF,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;YAC5E,IAAI,QAAQ,GAAkB;gBAC1B,YAAY,EAAE,EAAE;gBAChB,SAAS,EAAE,EAAE;gBACb,QAAQ;aACX,CAAC;YAEF,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE;gBACtB,QAAQ,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAC;aAC3G;iBAAM;gBACH,wBAAG,CAAC,OAAO,CAAC,qEAAqE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aAC7G;YAED,8BAA8B;YAC9B,OAAO,IAAI,CAAC,2BAA2B,CAAC,QAAQ,EAAE,kBAAkB,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACjH,CAAC;KAAA;IAES,yBAAyB;QAC/B,OAAO;YACH,wBAAwB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAC1C,qFAAqF,EACrF,EAAE,CACK;YACX,sBAAsB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CACxC,mFAAmF,EACnF,EAAE,CACK;SACd,CAAC;IACN,CAAC;IAEa,+BAA+B,CACzC,QAAuB,EACvB,eAA6B,EAC7B,kBAA0B,EAC1B,KAA+B;;YAE/B,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,aAAa,CAAC;YACrD,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC;YACvC,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,eAAe,EAAE,KAAK,EAAE,kBAAkB,EAAE,YAAY,CAAC,CAAC;YACnH,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,eAAe,EAAE,qBAAqB,CAAC,CAAC;YAEhG,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,IAAI,CAAC,QAAQ;gBAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAErD,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;IAEO,qBAAqB,CACzB,eAA6B,EAC7B,KAAmB,EACnB,kBAA0B,EAC1B,
|
|
1
|
+
{"version":3,"file":"GTFSTripCommonRunManager.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,7 +92,7 @@ class PropagateDelayTask extends workers_1.AbstractTask {
|
|
|
92
92
|
return this.isCurrentGtfsTrip(trip, gtfs_trip_id, positionTripWeekDay);
|
|
93
93
|
});
|
|
94
94
|
if (!gtfsCurrentTrip) {
|
|
95
|
-
helpers_1.log.
|
|
95
|
+
helpers_1.log.warn(`${this.queueName}: could not determine GTFS trip from run trips data: ` +
|
|
96
96
|
JSON.stringify(delayedPositions.trip).substring(0, 2000));
|
|
97
97
|
continue;
|
|
98
98
|
}
|
package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js
CHANGED
|
@@ -27,7 +27,6 @@ const PositionsManager_1 = __importDefault(require("../helpers/PositionsManager"
|
|
|
27
27
|
const TripStopsManager_1 = require("../helpers/TripStopsManager");
|
|
28
28
|
const VPUtils_1 = require("../helpers/VPUtils");
|
|
29
29
|
const UpdateDelaySchema_1 = require("../schema/UpdateDelaySchema");
|
|
30
|
-
const trace_provider_1 = require("@golemio/core/dist/monitoring/opentelemetry/trace-provider");
|
|
31
30
|
class UpdateDelayTask extends workers_1.AbstractTask {
|
|
32
31
|
constructor(queuePrefix) {
|
|
33
32
|
super(queuePrefix);
|
|
@@ -41,26 +40,17 @@ class UpdateDelayTask extends workers_1.AbstractTask {
|
|
|
41
40
|
* @returns {Object[]} - Arrays of inserted/updated positions and array of (inserted)/updated trips
|
|
42
41
|
*/
|
|
43
42
|
this.updateComputedPositionsAndTrips = (computedResult) => __awaiter(this, void 0, void 0, function* () {
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
})));
|
|
56
|
-
return {
|
|
57
|
-
positionsUpdated,
|
|
58
|
-
tripsUpdated,
|
|
59
|
-
};
|
|
60
|
-
}
|
|
61
|
-
finally {
|
|
62
|
-
updateSpan === null || updateSpan === void 0 ? void 0 : updateSpan.end();
|
|
63
|
-
}
|
|
43
|
+
const positionsUpdated = yield this.positionsRepository.bulkUpdate(computedResult.flatMap((e) => e.positions));
|
|
44
|
+
const tripsUpdated = yield this.tripsRepository.bulkUpdate(computedResult.map((e) => ({
|
|
45
|
+
id: e.context.tripId,
|
|
46
|
+
last_position_id: e.context.lastPositionId,
|
|
47
|
+
last_position_context: e.context,
|
|
48
|
+
is_canceled: e.context.lastPositionCanceled,
|
|
49
|
+
})));
|
|
50
|
+
return {
|
|
51
|
+
positionsUpdated,
|
|
52
|
+
tripsUpdated,
|
|
53
|
+
};
|
|
64
54
|
});
|
|
65
55
|
this.tripsRepository = new TripsRepository_1.TripsRepository();
|
|
66
56
|
this.positionsRepository = new PositionsRepository_1.PositionsRepository();
|
|
@@ -76,82 +66,73 @@ class UpdateDelayTask extends workers_1.AbstractTask {
|
|
|
76
66
|
return __awaiter(this, void 0, void 0, function* () {
|
|
77
67
|
const tripIds = data.updatedTrips.map((trip) => trip.id);
|
|
78
68
|
if (((_a = data.positions) === null || _a === void 0 ? void 0 : _a.length) > 0) {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
69
|
+
// unique ids in input data in key-value (id-positions) structure
|
|
70
|
+
let tripIdToPositionDict = {};
|
|
71
|
+
for (const position of data.positions) {
|
|
72
|
+
tripIdToPositionDict[position.trips_id] = position;
|
|
73
|
+
}
|
|
74
|
+
// unique block_ids and its parent input trips_id in key-value structure
|
|
75
|
+
let tripsIdsByBlockIds = {};
|
|
76
|
+
// unique block_ids and its parent gtfs_trip_id in key-value structure
|
|
77
|
+
let blockIdToTripIdsDict = {};
|
|
78
|
+
for (const trip of data.updatedTrips) {
|
|
79
|
+
if (!trip.gtfs_block_id) {
|
|
80
|
+
continue;
|
|
86
81
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
// unique block_ids and its parent gtfs_trip_id in key-value structure
|
|
90
|
-
let blockIdToTripIdsDict = {};
|
|
91
|
-
for (const trip of data.updatedTrips) {
|
|
92
|
-
if (!trip.gtfs_block_id) {
|
|
93
|
-
continue;
|
|
94
|
-
}
|
|
95
|
-
if (!tripsIdsByBlockIds[trip.gtfs_block_id]) {
|
|
96
|
-
tripsIdsByBlockIds[trip.gtfs_block_id] = trip.id;
|
|
97
|
-
}
|
|
98
|
-
else {
|
|
99
|
-
// save only the shorter trip_id (it is the raw input id with no suffixes)
|
|
100
|
-
tripsIdsByBlockIds[trip.gtfs_block_id] =
|
|
101
|
-
tripsIdsByBlockIds[trip.gtfs_block_id] > trip.id ? trip.id : tripsIdsByBlockIds[trip.gtfs_block_id];
|
|
102
|
-
}
|
|
103
|
-
if (!blockIdToTripIdsDict[trip.gtfs_block_id]) {
|
|
104
|
-
blockIdToTripIdsDict[trip.gtfs_block_id] = new Set();
|
|
105
|
-
}
|
|
106
|
-
if (trip.gtfs_trip_id) {
|
|
107
|
-
blockIdToTripIdsDict[trip.gtfs_block_id].add(trip.gtfs_trip_id);
|
|
108
|
-
}
|
|
82
|
+
if (!tripsIdsByBlockIds[trip.gtfs_block_id]) {
|
|
83
|
+
tripsIdsByBlockIds[trip.gtfs_block_id] = trip.id;
|
|
109
84
|
}
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
return acc;
|
|
121
|
-
}), Promise.resolve({}));
|
|
122
|
-
// duplicate positions for trips with block_ids
|
|
123
|
-
for (const trip of data.updatedTrips) {
|
|
124
|
-
if (tripIdToPositionDict[trip.id]) {
|
|
125
|
-
if (trip.gtfs_block_id) {
|
|
126
|
-
// Determine current position tracking status
|
|
127
|
-
tripIdToPositionDict[trip.id].tracking = VPUtils_1.VPUtils.determineTrackingStatus(trip.gtfs_trip_id, blockIdToTripStopScheduleDict[trip.gtfs_block_id], tripIdToPositionDict[trip.id]);
|
|
128
|
-
}
|
|
129
|
-
continue;
|
|
130
|
-
}
|
|
131
|
-
const currentPosition = data.positions.find((position) => {
|
|
132
|
-
return position.trips_id === tripsIdsByBlockIds[trip.gtfs_block_id];
|
|
133
|
-
});
|
|
134
|
-
if (!currentPosition) {
|
|
135
|
-
continue;
|
|
136
|
-
}
|
|
137
|
-
// Determine position duplication and new position tracking status
|
|
138
|
-
const newPositionTrackingStatus = VPUtils_1.VPUtils.determineNewPositionTracking(blockIdToTripStopScheduleDict[trip.gtfs_block_id], trip, currentPosition);
|
|
139
|
-
// duplicate position with new created trip for second trip
|
|
140
|
-
const newPosition = Object.assign({}, currentPosition);
|
|
141
|
-
newPosition.trips_id = trip.id;
|
|
142
|
-
newPosition.tracking = newPositionTrackingStatus;
|
|
143
|
-
data.positions.push(newPosition);
|
|
85
|
+
else {
|
|
86
|
+
// save only the shorter trip_id (it is the raw input id with no suffixes)
|
|
87
|
+
tripsIdsByBlockIds[trip.gtfs_block_id] =
|
|
88
|
+
tripsIdsByBlockIds[trip.gtfs_block_id] > trip.id ? trip.id : tripsIdsByBlockIds[trip.gtfs_block_id];
|
|
89
|
+
}
|
|
90
|
+
if (!blockIdToTripIdsDict[trip.gtfs_block_id]) {
|
|
91
|
+
blockIdToTripIdsDict[trip.gtfs_block_id] = new Set();
|
|
92
|
+
}
|
|
93
|
+
if (trip.gtfs_trip_id) {
|
|
94
|
+
blockIdToTripIdsDict[trip.gtfs_block_id].add(trip.gtfs_trip_id);
|
|
144
95
|
}
|
|
145
|
-
// save all new positions
|
|
146
|
-
yield this.positionsRepository.save(data.positions);
|
|
147
96
|
}
|
|
148
|
-
|
|
149
|
-
|
|
97
|
+
// Get cached schedule for each unique block_id
|
|
98
|
+
const blockIdToTripStopScheduleDict = yield Object.entries(blockIdToTripIdsDict).reduce((acc, [blockId, gtfsTripIds]) => __awaiter(this, void 0, void 0, function* () {
|
|
99
|
+
const tripStops = yield acc;
|
|
100
|
+
try {
|
|
101
|
+
const schedule = yield this.tripStopsManager.setAndReturnTripStopsSchedule(blockId, [...gtfsTripIds]);
|
|
102
|
+
tripStops[blockId] = schedule;
|
|
103
|
+
}
|
|
104
|
+
catch (err) {
|
|
105
|
+
helpers_1.IntegrationErrorHandler.handle(err);
|
|
106
|
+
}
|
|
107
|
+
return acc;
|
|
108
|
+
}), Promise.resolve({}));
|
|
109
|
+
// duplicate positions for trips with block_ids
|
|
110
|
+
for (const trip of data.updatedTrips) {
|
|
111
|
+
if (tripIdToPositionDict[trip.id]) {
|
|
112
|
+
if (trip.gtfs_block_id) {
|
|
113
|
+
// Determine current position tracking status
|
|
114
|
+
tripIdToPositionDict[trip.id].tracking = VPUtils_1.VPUtils.determineTrackingStatus(trip.gtfs_trip_id, blockIdToTripStopScheduleDict[trip.gtfs_block_id], tripIdToPositionDict[trip.id]);
|
|
115
|
+
}
|
|
116
|
+
continue;
|
|
117
|
+
}
|
|
118
|
+
const currentPosition = data.positions.find((position) => {
|
|
119
|
+
return position.trips_id === tripsIdsByBlockIds[trip.gtfs_block_id];
|
|
120
|
+
});
|
|
121
|
+
if (!currentPosition) {
|
|
122
|
+
continue;
|
|
123
|
+
}
|
|
124
|
+
// Determine position duplication and new position tracking status
|
|
125
|
+
const newPositionTrackingStatus = VPUtils_1.VPUtils.determineNewPositionTracking(blockIdToTripStopScheduleDict[trip.gtfs_block_id], trip, currentPosition);
|
|
126
|
+
// duplicate position with new created trip for second trip
|
|
127
|
+
const newPosition = Object.assign({}, currentPosition);
|
|
128
|
+
newPosition.trips_id = trip.id;
|
|
129
|
+
newPosition.tracking = newPositionTrackingStatus;
|
|
130
|
+
data.positions.push(newPosition);
|
|
150
131
|
}
|
|
132
|
+
// save all new positions
|
|
133
|
+
yield this.positionsRepository.save(data.positions);
|
|
151
134
|
}
|
|
152
135
|
if (((_b = data.updatedTrips) === null || _b === void 0 ? void 0 : _b.length) > 0) {
|
|
153
|
-
const tripsSpan = (0, trace_provider_1.createChildSpan)("Task.UpdateDelay.updatedTrips");
|
|
154
|
-
tripsSpan === null || tripsSpan === void 0 ? void 0 : tripsSpan.setAttribute("updatedTrips", data.updatedTrips.length);
|
|
155
136
|
try {
|
|
156
137
|
// Get all positions for each trip
|
|
157
138
|
const tripsPositionsToUpdate = yield this.positionsRepository.getPositionsForUpdateDelay(tripIds);
|
|
@@ -187,9 +168,6 @@ class UpdateDelayTask extends workers_1.AbstractTask {
|
|
|
187
168
|
catch (err) {
|
|
188
169
|
throw new golemio_errors_1.GeneralError(`Error while updating delay. For trip ids:${tripIds.slice(0, 10).join(",")}`, this.constructor.name, err);
|
|
189
170
|
}
|
|
190
|
-
finally {
|
|
191
|
-
tripsSpan === null || tripsSpan === void 0 ? void 0 : tripsSpan.end();
|
|
192
|
-
}
|
|
193
171
|
}
|
|
194
172
|
});
|
|
195
173
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4FAAiF;AACjF,oFAAyE;AACzE,oEAA8G;AAC9G,2EAA6F;AAC7F,2FAAqF;AACrF,2EAA6E;AAC7E,6EAAwE;AACxE,4EAAyF;AACzF,oEAAiE;AACjE,gFAA6E;AAC7E,mFAA2D;AAC3D,kEAA+D;AAC/D,gDAA6C;AAU7C,mEAA0E;
|
|
1
|
+
{"version":3,"file":"UpdateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export declare class CommonRunsMessagesModel extends Model<CommonRunsMessagesMod
|
|
|
13
13
|
actual_stop_timestamp_scheduled?: Date;
|
|
14
14
|
last_stop_asw_id: string;
|
|
15
15
|
packet_number: string;
|
|
16
|
-
msg_timestamp:
|
|
16
|
+
msg_timestamp: string;
|
|
17
17
|
events: TCPEventEnum;
|
|
18
18
|
static attributeModel: ModelAttributes<CommonRunsMessagesModel>;
|
|
19
19
|
static arrayJsonSchema: JSONSchemaType<ICommonRunsMessagesModel[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommonRunsMessagesModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAIxF,MAAa,uBAAwB,SAAQ,iBAA8B;;AAA3E,
|
|
1
|
+
{"version":3,"file":"CommonRunsMessagesModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAIxF,MAAa,uBAAwB,SAAQ,iBAA8B;;AAA3E,0DAkFC;AAjFiB,kCAAU,GAAG,gCAAgC,CAAC;AAc9C,sCAAc,GAA6C;IACrE,EAAE,EAAE;QACA,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,aAAa,EAAE,IAAI;KACtB;IACD,OAAO,EAAE,qBAAS,CAAC,MAAM;IACzB,GAAG,EAAE,qBAAS,CAAC,OAAO;IACtB,GAAG,EAAE,qBAAS,CAAC,OAAO;IACtB,kBAAkB,EAAE,qBAAS,CAAC,MAAM;IACpC,0BAA0B,EAAE,qBAAS,CAAC,IAAI;IAC1C,+BAA+B,EAAE,qBAAS,CAAC,IAAI;IAC/C,gBAAgB,EAAE,qBAAS,CAAC,MAAM;IAClC,aAAa,EAAE,qBAAS,CAAC,MAAM;IAC/B,aAAa,EAAE,qBAAS,CAAC,IAAI;IAC7B,MAAM,EAAE,qBAAS,CAAC,MAAM;CAC3B,CAAC;AAEY,uCAAe,GAA+C;IACxE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE;gBACA,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,IAAI;aACjB;YACD,OAAO,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;aACjB;YACD,GAAG,EAAE;gBACD,IAAI,EAAE,QAAQ;aACjB;YACD,GAAG,EAAE;gBACD,IAAI,EAAE,QAAQ;aACjB;YACD,kBAAkB,EAAE;gBAChB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;aACjB;YACD,0BAA0B,EAAE;gBACxB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;aAC5B;YACD,+BAA+B,EAAE;gBAC7B,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;gBACzB,QAAQ,EAAE,IAAI;aACjB;YACD,gBAAgB,EAAE;gBACd,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;aACjB;YACD,aAAa,EAAE;gBACX,IAAI,EAAE,QAAQ;aACjB;YACD,aAAa,EAAE;gBACX,IAAI,EAAE,QAAQ;aACjB;YACD,MAAM,EAAE;gBACJ,IAAI,EAAE,QAAQ;aACjB;SACJ;QACD,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,4BAA4B,EAAE,eAAe,EAAE,eAAe,EAAE,QAAQ,CAAC;KACrG;CACJ,CAAC"}
|
package/dist/schema-definitions/vehicle-positions/models/interfaces/ICommonRunsMessagesModel.d.ts
CHANGED
|
@@ -6,9 +6,9 @@ export interface ICommonRunsMessagesModel {
|
|
|
6
6
|
lng: number;
|
|
7
7
|
actual_stop_asw_id?: string;
|
|
8
8
|
actual_stop_timestamp_real: Date;
|
|
9
|
-
actual_stop_timestamp_scheduled?: Date
|
|
9
|
+
actual_stop_timestamp_scheduled?: Date;
|
|
10
10
|
last_stop_asw_id?: string;
|
|
11
11
|
packet_number: string;
|
|
12
|
-
msg_timestamp:
|
|
12
|
+
msg_timestamp: string;
|
|
13
13
|
events: TCPEventEnum;
|
|
14
14
|
}
|
|
@@ -348,8 +348,8 @@ _:warning: Původním záměrem bylo využití OIS číselníku během zpracová
|
|
|
348
348
|
```json
|
|
349
349
|
[
|
|
350
350
|
{
|
|
351
|
-
"
|
|
352
|
-
"
|
|
351
|
+
"deviceAlias": "test-povstani",
|
|
352
|
+
"receivedAt": "2023-06-27T14:39:58Z"
|
|
353
353
|
}
|
|
354
354
|
]
|
|
355
355
|
```
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/pid",
|
|
3
|
-
"version": "2.8.4
|
|
3
|
+
"version": "2.8.4",
|
|
4
4
|
"description": "Golemio PID Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"@commitlint/cli": "^11.0.0",
|
|
40
40
|
"@commitlint/config-conventional": "^11.0.0",
|
|
41
41
|
"@golemio/cli": "1.4.4",
|
|
42
|
-
"@golemio/core": "1.8.
|
|
42
|
+
"@golemio/core": "1.8.7",
|
|
43
43
|
"@golemio/db-common": "1.1.1",
|
|
44
44
|
"@golemio/eslint-config": "1.1.1",
|
|
45
45
|
"@types/amqplib": "^0.5.17",
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import { ICommonRunsMessageProperties } from "../interfaces/CommonRunsMessageInterfaces";
|
|
2
|
-
import { ICommonRunHelper, ICommonRunIdentifiers } from "./interfaces/ICommonRunHelper";
|
|
3
|
-
export declare class CommonRunHelper implements ICommonRunHelper {
|
|
4
|
-
private logger;
|
|
5
|
-
constructor();
|
|
6
|
-
/**
|
|
7
|
-
* @returns {ICommonRunIdentifiers | null} commonRunIdentifiers
|
|
8
|
-
* { runId: "123_456_789_2020-01-01T00:00:00Z", routeId: "123", runNumber: "456" }
|
|
9
|
-
*/
|
|
10
|
-
getRunIdentifiers(properties: ICommonRunsMessageProperties, msgTimestamp: string): ICommonRunIdentifiers | null;
|
|
11
|
-
/**
|
|
12
|
-
* @param {string} utcTimestamp - "2022-03-27T12:04:38"
|
|
13
|
-
* @returns {Date | null} dateObject - Date(2022-03-27T12:04:38.000Z)
|
|
14
|
-
*/
|
|
15
|
-
parseDateFromRunInput(utcTimestamp: string): Date | null;
|
|
16
|
-
}
|
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CommonRunHelper = void 0;
|
|
4
|
-
const Di_1 = require("../../../ioc/Di");
|
|
5
|
-
const ioc_1 = require("@golemio/core/dist/integration-engine/ioc");
|
|
6
|
-
class CommonRunHelper {
|
|
7
|
-
constructor() {
|
|
8
|
-
this.logger = Di_1.VPContainer.resolve(ioc_1.ContainerToken.Logger);
|
|
9
|
-
}
|
|
10
|
-
/**
|
|
11
|
-
* @returns {ICommonRunIdentifiers | null} commonRunIdentifiers
|
|
12
|
-
* { runId: "123_456_789_2020-01-01T00:00:00Z", routeId: "123", runNumber: "456" }
|
|
13
|
-
*/
|
|
14
|
-
getRunIdentifiers(properties, msgTimestamp) {
|
|
15
|
-
const { turnus, evc } = properties;
|
|
16
|
-
let identifiers = null;
|
|
17
|
-
const [routeIdFromTurnus, runNumberFromTurnus] = turnus.split("/");
|
|
18
|
-
if (routeIdFromTurnus && runNumberFromTurnus) {
|
|
19
|
-
identifiers = {
|
|
20
|
-
runId: `${routeIdFromTurnus}_${runNumberFromTurnus}_${evc}_${msgTimestamp}`,
|
|
21
|
-
routeId: routeIdFromTurnus,
|
|
22
|
-
runNumber: runNumberFromTurnus,
|
|
23
|
-
};
|
|
24
|
-
}
|
|
25
|
-
return identifiers;
|
|
26
|
-
}
|
|
27
|
-
/**
|
|
28
|
-
* @param {string} utcTimestamp - "2022-03-27T12:04:38"
|
|
29
|
-
* @returns {Date | null} dateObject - Date(2022-03-27T12:04:38.000Z)
|
|
30
|
-
*/
|
|
31
|
-
parseDateFromRunInput(utcTimestamp) {
|
|
32
|
-
const date = new Date(utcTimestamp + "Z");
|
|
33
|
-
if (date.toString() === "Invalid Date") {
|
|
34
|
-
this.logger.info(`parseDateFromRunInput: unable to parse date from ${utcTimestamp + "Z"}`);
|
|
35
|
-
return null;
|
|
36
|
-
}
|
|
37
|
-
return date;
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
exports.CommonRunHelper = CommonRunHelper;
|
|
41
|
-
//# sourceMappingURL=CommonRunHelper.js.map
|
package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonRunHelper.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"CommonRunHelper.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/CommonRunHelper.ts"],"names":[],"mappings":";;;AAAA,wCAA2D;AAE3D,mEAA2E;AAI3E,MAAa,eAAe;IAGxB;QACI,IAAI,CAAC,MAAM,GAAG,gBAAW,CAAC,OAAO,CAAU,oBAAc,CAAC,MAAM,CAAC,CAAC;IACtE,CAAC;IAED;;;OAGG;IACI,iBAAiB,CAAC,UAAwC,EAAE,YAAoB;QACnF,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC;QACnC,IAAI,WAAW,GAAiC,IAAI,CAAC;QAErD,MAAM,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnE,IAAI,iBAAiB,IAAI,mBAAmB,EAAE;YAC1C,WAAW,GAAG;gBACV,KAAK,EAAE,GAAG,iBAAiB,IAAI,mBAAmB,IAAI,GAAG,IAAI,YAAY,EAAE;gBAC3E,OAAO,EAAE,iBAAiB;gBAC1B,SAAS,EAAE,mBAAmB;aACjC,CAAC;SACL;QAED,OAAO,WAAW,CAAC;IACvB,CAAC;IAED;;;OAGG;IACI,qBAAqB,CAAC,YAAoB;QAC7C,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,CAAC;QAC1C,IAAI,IAAI,CAAC,QAAQ,EAAE,KAAK,cAAc,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oDAAoD,YAAY,GAAG,GAAG,EAAE,CAAC,CAAC;YAC3F,OAAO,IAAI,CAAC;SACf;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAxCD,0CAwCC"}
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import { ICommonRunsMessageProperties } from "../../interfaces/CommonRunsMessageInterfaces";
|
|
2
|
-
export interface ICommonRunIdentifiers {
|
|
3
|
-
runId: string;
|
|
4
|
-
routeId: string;
|
|
5
|
-
runNumber: string;
|
|
6
|
-
}
|
|
7
|
-
export interface ICommonRunHelper {
|
|
8
|
-
getRunIdentifiers(properties: ICommonRunsMessageProperties, msgTimestamp: string): ICommonRunIdentifiers | null;
|
|
9
|
-
parseDateFromRunInput(utcTimestamp: string): Date | null;
|
|
10
|
-
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ICommonRunHelper.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/interfaces/ICommonRunHelper.ts"],"names":[],"mappings":""}
|