@golemio/pid 2.8.4-dev.950679748 → 2.8.4-dev.951931360
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/workers/runs/data-access/CommonRunsRepository.js +13 -6
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonRunHelper.d.ts +16 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonRunHelper.js +41 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonRunHelper.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/interfaces/ICommonRunHelper.d.ts +10 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/interfaces/ICommonRunHelper.js +3 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/interfaces/ICommonRunHelper.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.d.ts +2 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.js +18 -13
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.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/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.d.ts +1 -1
- package/dist/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.js +2 -1
- 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/package.json +1 -1
package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js
CHANGED
|
@@ -76,12 +76,19 @@ 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
|
-
|
|
79
|
+
[sequelize_1.default.Op.or]: [
|
|
80
|
+
{
|
|
81
|
+
id: run.id,
|
|
82
|
+
},
|
|
83
|
+
{
|
|
84
|
+
route_id: run.route_id,
|
|
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
|
+
],
|
|
85
92
|
},
|
|
86
93
|
order: [["msg_last_timestamp", "DESC"]],
|
|
87
94
|
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,QAAQ,EAAE,GAAG,CAAC,QAAQ;
|
|
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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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
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
|
+
}
|
|
@@ -0,0 +1,41 @@
|
|
|
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
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
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
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ICommonRunHelper.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/interfaces/ICommonRunHelper.ts"],"names":[],"mappings":""}
|
|
@@ -3,6 +3,8 @@ 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();
|
|
6
8
|
/**
|
|
7
9
|
* Overrides BaseTransformation::transform
|
|
8
10
|
*/
|
|
@@ -16,9 +16,10 @@ 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");
|
|
19
20
|
class CommonRunsMessagesTransformation extends transformations_1.BaseTransformation {
|
|
20
21
|
constructor() {
|
|
21
|
-
super(
|
|
22
|
+
super();
|
|
22
23
|
this.name = "CommonRunsMessagesTransformation";
|
|
23
24
|
/**
|
|
24
25
|
* Overrides BaseTransformation::transform
|
|
@@ -35,25 +36,28 @@ class CommonRunsMessagesTransformation extends transformations_1.BaseTransformat
|
|
|
35
36
|
res.push(elementTransformed);
|
|
36
37
|
}
|
|
37
38
|
catch (err) {
|
|
38
|
-
helpers_1.log.
|
|
39
|
+
helpers_1.log.warn(`${this.name}: invalid run parameters: ${JSON.stringify(element).substring(0, 2000)}`);
|
|
39
40
|
}
|
|
40
41
|
}
|
|
41
42
|
return res;
|
|
42
43
|
});
|
|
43
44
|
this.transformElement = (element, isTram = false) => __awaiter(this, void 0, void 0, function* () {
|
|
44
45
|
const attributes = element.data.$;
|
|
45
|
-
|
|
46
|
-
const uniqueKey = `${route_id}` + `_${run_number}` + `_${attributes.evc}` + `_${element.timestamp}`;
|
|
47
|
-
if (attributes.takt === "" || attributes.tm === "")
|
|
46
|
+
if (!isTram && !attributes.tjr) {
|
|
48
47
|
return Promise.reject();
|
|
49
|
-
|
|
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) {
|
|
50
53
|
return Promise.reject();
|
|
51
|
-
|
|
54
|
+
}
|
|
55
|
+
const scheduledStopTimestampDate = attributes.tjr ? this.commonRunHelper.parseDateFromRunInput(attributes.tjr) : null;
|
|
52
56
|
return {
|
|
53
57
|
run: {
|
|
54
|
-
id:
|
|
55
|
-
route_id,
|
|
56
|
-
run_number:
|
|
58
|
+
id: identifiers.runId,
|
|
59
|
+
route_id: identifiers.routeId,
|
|
60
|
+
run_number: identifiers.runNumber,
|
|
57
61
|
line_short_name: attributes.line,
|
|
58
62
|
registration_number: attributes.evc,
|
|
59
63
|
msg_start_timestamp: element.timestamp,
|
|
@@ -66,15 +70,16 @@ class CommonRunsMessagesTransformation extends transformations_1.BaseTransformat
|
|
|
66
70
|
lat: +attributes.lat,
|
|
67
71
|
lng: +attributes.lng,
|
|
68
72
|
actual_stop_asw_id: attributes.akt,
|
|
69
|
-
actual_stop_timestamp_real:
|
|
70
|
-
actual_stop_timestamp_scheduled:
|
|
73
|
+
actual_stop_timestamp_real: realStopTimestampDate,
|
|
74
|
+
actual_stop_timestamp_scheduled: scheduledStopTimestampDate,
|
|
71
75
|
last_stop_asw_id: attributes.konc,
|
|
72
76
|
packet_number: attributes.pkt,
|
|
73
|
-
msg_timestamp:
|
|
77
|
+
msg_timestamp: messageTimestampDate,
|
|
74
78
|
events: attributes.events,
|
|
75
79
|
},
|
|
76
80
|
};
|
|
77
81
|
});
|
|
82
|
+
this.commonRunHelper = new CommonRunHelper_1.CommonRunHelper();
|
|
78
83
|
}
|
|
79
84
|
}
|
|
80
85
|
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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"}
|
|
@@ -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.info(`${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
|
}
|
|
@@ -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: Date;
|
|
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,0DAmFC;AAlFiB,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;gBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;aAC5B;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 | null;
|
|
10
10
|
last_stop_asw_id?: string;
|
|
11
11
|
packet_number: string;
|
|
12
|
-
msg_timestamp:
|
|
12
|
+
msg_timestamp: Date;
|
|
13
13
|
events: TCPEventEnum;
|
|
14
14
|
}
|