@golemio/pid 2.7.4 → 2.7.5-dev.884508708
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/db/migrations/postgresql/20230525125437-presets-query.js +53 -0
- package/db/migrations/postgresql/sqls/20230525125437-presets-query-down.sql +34 -0
- package/db/migrations/postgresql/sqls/20230525125437-presets-query-up.sql +34 -0
- package/dist/const.d.ts +1 -0
- package/dist/const.js +1 -0
- package/dist/const.js.map +1 -1
- package/dist/input-gateway/vehicle-positions/VehiclePositionsController.js +2 -2
- package/dist/input-gateway/vehicle-positions/VehiclePositionsController.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMetadataModel.js +2 -2
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMetadataModel.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSStopTimesModel.js +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSStopTimesModel.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSWorker.js +14 -14
- package/dist/integration-engine/ropid-gtfs/RopidGTFSWorker.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/helpers/DataCacheManager.js +1 -1
- package/dist/integration-engine/ropid-gtfs/helpers/DataCacheManager.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/railtrack/tasks/data-access/MetroRailtrackGPSRepository.js +2 -2
- package/dist/integration-engine/ropid-gtfs/workers/railtrack/tasks/data-access/MetroRailtrackGPSRepository.js.map +1 -1
- package/dist/integration-engine/ropid-vymi/workers/tasks/helpers/RopidVYMIApiHelper.js +2 -2
- package/dist/integration-engine/ropid-vymi/workers/tasks/helpers/RopidVYMIApiHelper.js.map +1 -1
- package/dist/integration-engine/shared/RopidMetadataModel.js +2 -2
- package/dist/integration-engine/shared/RopidMetadataModel.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js +3 -3
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/MetroRunsMessagesRepository.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/MetroRunsMessagesRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/MetroMessageFilter.d.ts +3 -3
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/MetroMessageFilter.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/interfaces/IMetroRunInputForProcessing.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/interfaces/IProcessMetroRunsMessagesInput.d.ts +5 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/schema/MetroTransformedRunsSchema.d.ts +2 -3
- package/dist/integration-engine/vehicle-positions/workers/runs/schema/MetroTransformedRunsSchema.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/schema/MetroTransformedRunsSchema.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunsMessagesTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/MetroRunsMessageProcessingTransformation.d.ts +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/MetroRunsMessageProcessingTransformation.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/MetroRunsMessagesTransformation.js +6 -5
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/MetroRunsMessagesTransformation.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/data-access/DescriptorRepository.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/data-access/DescriptorRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/transformations/DescriptorTransformation.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/transformations/DescriptorTransformation.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsHistoryRepository.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsHistoryRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.d.ts +20 -14
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.js +30 -22
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsHistoryRepository.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsHistoryRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js +18 -28
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/PositionsMapper.d.ts +4 -3
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/PositionsMapper.js +17 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/PositionsMapper.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsIdGenerator.d.ts +4 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsIdGenerator.js +7 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsIdGenerator.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsMapper.d.ts +4 -3
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsMapper.js +19 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsMapper.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DelayComputationManager.js +1 -1
- 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/PositionsManager.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.js +47 -13
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/BusDelayAtStop.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/BusDelayAtStop.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/TramDelayAtStop.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/TramDelayAtStop.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/VPInterfaces.d.ts +0 -14
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.js +15 -5
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.js.map +1 -1
- package/dist/output-gateway/pid/middleware/checkTimeFromMiddleware.js +1 -1
- package/dist/output-gateway/pid/middleware/checkTimeFromMiddleware.js.map +1 -1
- package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.js +3 -3
- package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.js.map +1 -1
- package/dist/output-gateway/ropid-gtfs/GTFSRouter.js +5 -5
- package/dist/output-gateway/ropid-gtfs/GTFSRouter.js.map +1 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSCalendarModel.js +2 -2
- package/dist/output-gateway/ropid-gtfs/models/GTFSCalendarModel.js.map +1 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSRoutesModel.js +1 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSRoutesModel.js.map +1 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSShapesModel.js +1 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSShapesModel.js.map +1 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopModel.js +2 -2
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopModel.js.map +1 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.js +2 -2
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.js.map +1 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSTripsModel.js +1 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSTripsModel.js.map +1 -1
- package/dist/output-gateway/vehicle-positions/VehiclePositionsRouter.js +7 -7
- package/dist/output-gateway/vehicle-positions/VehiclePositionsRouter.js.map +1 -1
- package/dist/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.js +2 -2
- package/dist/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.js.map +1 -1
- package/dist/schema-definitions/ropid-departures-presets/RopidDeparturesPresetsSDMA.js +1 -1
- package/dist/schema-definitions/ropid-departures-presets/index.js +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/StopTimesDto.js +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/StopTimesDto.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/MetroRunsMessagesModel.d.ts +2 -2
- package/dist/schema-definitions/vehicle-positions/models/MetroRunsMessagesModel.js +4 -2
- package/dist/schema-definitions/vehicle-positions/models/MetroRunsMessagesModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/PositionDto.d.ts +8 -5
- package/dist/schema-definitions/vehicle-positions/models/PositionDto.js +1 -0
- package/dist/schema-definitions/vehicle-positions/models/PositionDto.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/interfaces/IMetroRunsMessagesModel.d.ts +2 -2
- package/dist/schema-definitions/vehicle-positions/models/interfaces/IPositionDto.d.ts +7 -5
- package/dist/schema-definitions/vehicle-positions/models/interfaces/IPositionDto.js +1 -0
- package/docs/architecture/pid_architecture_overview.drawio +180 -0
- package/package.json +4 -4
package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js
CHANGED
|
@@ -107,7 +107,7 @@ class CommonRunsRepository extends models_2.PostgresModel {
|
|
|
107
107
|
}
|
|
108
108
|
catch (err) {
|
|
109
109
|
yield t.rollback();
|
|
110
|
-
throw new golemio_errors_1.
|
|
110
|
+
throw new golemio_errors_1.GeneralError("createAndAssociate: error while saving to database", this.name, err);
|
|
111
111
|
}
|
|
112
112
|
});
|
|
113
113
|
this.updateAndAssociate = ({ run, run_message }, runId) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -126,7 +126,7 @@ class CommonRunsRepository extends models_2.PostgresModel {
|
|
|
126
126
|
}
|
|
127
127
|
catch (err) {
|
|
128
128
|
yield t.rollback();
|
|
129
|
-
throw new golemio_errors_1.
|
|
129
|
+
throw new golemio_errors_1.GeneralError("updateAndAssociate: error while saving to database", this.name, err);
|
|
130
130
|
}
|
|
131
131
|
});
|
|
132
132
|
this.deleteNHoursOldData = (hours) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -141,7 +141,7 @@ class CommonRunsRepository extends models_2.PostgresModel {
|
|
|
141
141
|
});
|
|
142
142
|
}
|
|
143
143
|
catch (err) {
|
|
144
|
-
throw new golemio_errors_1.
|
|
144
|
+
throw new golemio_errors_1.GeneralError("Error while purging old data", this.constructor.name, err);
|
|
145
145
|
}
|
|
146
146
|
});
|
|
147
147
|
this.getScheduledTrips = (origin_route_name, run_number, msg_last_timestamp) => {
|
|
@@ -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;AAEhF,mEAAuC;AACvC,uFAAgE;AAGhE,iFAAqF;AACrF,yEAAqF;AACrF,
|
|
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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"}
|
|
@@ -57,7 +57,7 @@ class MetroRunsMessagesRepository extends models_2.PostgresModel {
|
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
59
|
catch (err) {
|
|
60
|
-
const exception = new golemio_errors_1.
|
|
60
|
+
const exception = new golemio_errors_1.GeneralError(`[${this.constructor.name}] Could not save data: ${err.message}`, this.constructor.name, err);
|
|
61
61
|
helpers_1.log.error(exception);
|
|
62
62
|
throw exception;
|
|
63
63
|
}
|
|
@@ -73,7 +73,7 @@ class MetroRunsMessagesRepository extends models_2.PostgresModel {
|
|
|
73
73
|
});
|
|
74
74
|
}
|
|
75
75
|
catch (err) {
|
|
76
|
-
throw new golemio_errors_1.
|
|
76
|
+
throw new golemio_errors_1.GeneralError("Error while purging old data", this.constructor.name, err);
|
|
77
77
|
}
|
|
78
78
|
});
|
|
79
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetroRunsMessagesRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/data-access/MetroRunsMessagesRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAuC;AACvC,uFAAuE;AACvE,2EAAoE;AACpE,yEAAqF;AACrF,
|
|
1
|
+
{"version":3,"file":"MetroRunsMessagesRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/data-access/MetroRunsMessagesRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAuC;AACvC,uFAAuE;AACvE,2EAAoE;AACpE,yEAAqF;AACrF,6EAAwE;AACxE,mFAAkF;AAClF,iFAAoE;AAEpE,MAAa,2BAA4B,SAAQ,sBAAa;IAC1D;QACI,KAAK,CACD,6BAA6B,EAC7B;YACI,WAAW,EAAE,+BAAsB,CAAC,UAAU;YAC9C,QAAQ,EAAE,iBAAS;YACnB,yBAAyB,EAAE,+BAAsB,CAAC,cAAc;YAChE,UAAU,EAAE,YAAY;SAC3B,EACD,IAAI,uCAAmB,CAAC,6BAA6B,EAAE,+BAAsB,CAAC,eAAe,CAAC,CACjG,CAAC;QAGC,aAAQ,GAAG,CAAO,IAA8B,EAAE,WAAW,GAAG,KAAK,EAAqC,EAAE;YAC/G,IAAI;gBACA,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC1B,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAyB,IAAI,EAAE;oBACtE,gBAAgB,EAAE,IAAI;oBACtB,SAAS,EAAE,WAAW;iBACzB,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,SAAS,GAAG,IAAI,6BAAY,CAC9B,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,0BAA0B,GAAG,CAAC,OAAO,EAAE,EAChE,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,GAAG,CACN,CAAC;gBAEF,aAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBACrB,MAAM,SAAS,CAAC;aACnB;QACL,CAAC,CAAA,CAAC;QAEK,wBAAmB,GAAG,CAAO,KAAa,EAAmB,EAAE;YAClE,IAAI;gBACA,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBACrC,KAAK,EAAE;wBACH,UAAU,EAAE;4BACR,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,mBAAS,CAAC,OAAO,CAAC,qBAAqB,KAAK,SAAS,CAAC;yBAClE;qBACJ;iBACJ,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,8BAA8B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACtF;QACL,CAAC,CAAA,CAAC;IAjCF,CAAC;CAkCJ;AA9CD,kEA8CC"}
|
package/dist/integration-engine/vehicle-positions/workers/runs/helpers/MetroMessageFilter.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { IProcessMetroRunsMessage } from "../interfaces/IProcessMetroRunsMessagesInput";
|
|
2
2
|
interface IValidMessagesWithTrackIdsOutput {
|
|
3
|
-
filteredMessages:
|
|
3
|
+
filteredMessages: IProcessMetroRunsMessage[];
|
|
4
4
|
trackIds: string[];
|
|
5
5
|
}
|
|
6
6
|
export declare class MetroMessageFilter {
|
|
7
7
|
private static DELAY_ORIGIN_RANGE_MIN;
|
|
8
8
|
private static DELAY_ORIGIN_RANGE_MAX;
|
|
9
|
-
static getValidMessagesWithTrackIds(messages:
|
|
9
|
+
static getValidMessagesWithTrackIds(messages: IProcessMetroRunsMessage[]): IValidMessagesWithTrackIdsOutput;
|
|
10
10
|
}
|
|
11
11
|
export {};
|
package/dist/integration-engine/vehicle-positions/workers/runs/helpers/MetroMessageFilter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetroMessageFilter.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/MetroMessageFilter.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"MetroMessageFilter.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/MetroMessageFilter.ts"],"names":[],"mappings":";;;AAAA,2EAAoE;AAQpE,MAAa,kBAAkB;IAIpB,MAAM,CAAC,4BAA4B,CAAC,QAAoC;QAC3E,IAAI,gBAAgB,GAA+B,EAAE,CAAC;QACtD,IAAI,QAAQ,GAAgB,IAAI,GAAG,EAAE,CAAC;QAEtC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;YAC3C,IACI,YAAY,GAAG,kBAAkB,CAAC,sBAAsB;gBACxD,YAAY,GAAG,kBAAkB,CAAC,sBAAsB,EAC1D;gBACE,aAAG,CAAC,IAAI,CACJ,8CAA8C,YAAY,mBAAmB;oBACzE,IAAI,kBAAkB,CAAC,sBAAsB,KAAK,kBAAkB,CAAC,sBAAsB,GAAG,CACrG,CAAC;gBAEF,SAAS;aACZ;YAED,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC/B,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SAC1B;QAED,OAAO;YACH,gBAAgB;YAChB,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;SACjC,CAAC;IACN,CAAC;;AA9BL,gDA+BC;AA9BkB,yCAAsB,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,gBAAgB;AACvD,yCAAsB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,uBAAuB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { IRailtrackCoordinates } from "../../../../ropid-gtfs/workers/railtrack/tasks/interfaces/IAggregatedRailtrackGPSData";
|
|
2
2
|
export interface IMetroRunInputForProcessing {
|
|
3
3
|
messageTimestamp: string;
|
|
4
|
-
timestampScheduled:
|
|
4
|
+
timestampScheduled: string;
|
|
5
5
|
runNumber: number;
|
|
6
6
|
routeId: string;
|
|
7
7
|
trainSetNumberScheduled: string;
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { IMetroRunsMessagesModel } from "../../../../../schema-definitions/vehicle-positions/models/interfaces/IMetroRunsMessagesModel";
|
|
2
|
+
export interface IProcessMetroRunsMessage extends Omit<IMetroRunsMessagesModel, "message_timestamp" | "actual_position_timestamp_scheduled"> {
|
|
3
|
+
message_timestamp: string;
|
|
4
|
+
actual_position_timestamp_scheduled: string;
|
|
5
|
+
}
|
|
2
6
|
export interface IProcessMetroRunsMessagesInput {
|
|
3
7
|
routeName: string;
|
|
4
|
-
messages:
|
|
8
|
+
messages: IProcessMetroRunsMessage[];
|
|
5
9
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { IProcessMetroRunsMessagesInput } from "../interfaces/IProcessMetroRunsMessagesInput";
|
|
1
|
+
import { IProcessMetroRunsMessage, IProcessMetroRunsMessagesInput } from "../interfaces/IProcessMetroRunsMessagesInput";
|
|
3
2
|
export declare class MetroTransformedRunsValidationSchema implements IProcessMetroRunsMessagesInput {
|
|
4
3
|
routeName: string;
|
|
5
|
-
messages:
|
|
4
|
+
messages: IProcessMetroRunsMessage[];
|
|
6
5
|
}
|
package/dist/integration-engine/vehicle-positions/workers/runs/schema/MetroTransformedRunsSchema.js
CHANGED
|
@@ -43,8 +43,8 @@ __decorate([
|
|
|
43
43
|
__metadata("design:type", Number)
|
|
44
44
|
], MetroTransformedRunMessagesValidationSchema.prototype, "delay_origin", void 0);
|
|
45
45
|
__decorate([
|
|
46
|
-
(0, class_validator_1.
|
|
47
|
-
__metadata("design:type",
|
|
46
|
+
(0, class_validator_1.IsISO8601)(),
|
|
47
|
+
__metadata("design:type", String)
|
|
48
48
|
], MetroTransformedRunMessagesValidationSchema.prototype, "actual_position_timestamp_scheduled", void 0);
|
|
49
49
|
class MetroTransformedRunsValidationSchema {
|
|
50
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetroTransformedRunsSchema.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/schema/MetroTransformedRunsSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"MetroTransformedRunsSchema.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/schema/MetroTransformedRunsSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mFAAmE;AACnE,+EAA6H;AAG7H,MAAM,2CAA2C;CAwBhD;AAtBG;IADC,IAAA,0BAAQ,GAAE;;+EACS;AAGpB;IADC,IAAA,2BAAS,GAAE;;sFACe;AAG3B;IADC,IAAA,0BAAQ,GAAE;;+FACyB;AAGpC;IADC,IAAA,0BAAQ,GAAE;;0FACoB;AAG/B;IADC,IAAA,0BAAQ,GAAE;;iFACW;AAGtB;IADC,IAAA,0BAAQ,GAAE;;6EACO;AAGlB;IADC,IAAA,0BAAQ,GAAE;;iFACW;AAGtB;IADC,IAAA,2BAAS,GAAE;;wGACiC;AAGjD,MAAa,oCAAoC;CAShD;AAPG;IADC,IAAA,0BAAQ,GAAE;;uEACQ;AAMnB;IAJC,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,IAAA,gCAAc,GAAE;IAChB,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,2CAA2C,CAAC;;sEAClB;AAR1C,oFASC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProcessMetroRunsMessagesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunsMessagesTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oEAA2E;AAC3E,wIAA6H;AAE7H,iGAAsH;AACtH,yFAA8G;AAE9G,uHAGyG;AACzG,2FAA0D;
|
|
1
|
+
{"version":3,"file":"ProcessMetroRunsMessagesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunsMessagesTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oEAA2E;AAC3E,wIAA6H;AAE7H,iGAAsH;AACtH,yFAA8G;AAE9G,uHAGyG;AACzG,2FAA0D;AAC1D,8EAA2F;AAC3F,2EAAoE;AACpE,8EAA2E;AAC3E,sEAAmE;AAEnE,qFAA4F;AAC5F,0HAAuH;AAEvH,MAAa,4BAA6B,SAAQ,iCAA4C;IAa1F,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAbP,cAAS,GAAG,yBAAyB,CAAC;QACtC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QACxC,WAAM,GAAG,iEAAoC,CAAC;QAY1D,IAAI,CAAC,wBAAwB,GAAG,IAAI,mFAAwC,EAAE,CAAC;QAC/E,IAAI,CAAC,sBAAsB,GAAG,IAAI,yDAA2B,EAAE,CAAC;QAChE,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,EAAE,CAAC;QACrD,IAAI,CAAC,eAAe,GAAG,IAAI,iCAAe,EAAE,CAAC;QAC7C,IAAI,CAAC,cAAc,GAAG,IAAI,2CAAoB,EAAE,CAAC;QACjD,IAAI,CAAC,uBAAuB,GAAG,IAAI,+BAAuB,EAAE,CAAC;QAE7D,IAAI,CAAC,kBAAkB,GAAG,qDAAyB,CAAC,MAAM,CACtD,2CAAe,CAAC,KAAK,EACrB,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,uBAAuB,CAC/B,CAAC;IACN,CAAC;IAEe,OAAO,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAkC;;YAC3E,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,GAAG,uCAAkB,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;YACjG,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC/B,OAAO;aACV;YAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAEvF,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE;gBACpC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;aAC/C;QACL,CAAC;KAAA;IAEa,cAAc,CAAC,OAAiC,EAAE,OAA2C;;YACvG,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YACjF,IAAI,CAAC,IAAI,EAAE;gBACP,OAAO;aACV;YAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAClG,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC7B,aAAG,CAAC,OAAO,CAAC,8CAA8C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBAC9F,OAAO;aACV;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/F,IAAI,QAAQ,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClC,MAAM,iCAAY,CAAC,qBAAqB,CACpC,GAAG,2BAAM,CAAC,oBAAoB,IAAI,oCAAgB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,EACvE,aAAa,EACb,QAAQ,CACX,CAAC;aACL;QACL,CAAC;KAAA;CACJ;AAjED,oEAiEC"}
|
|
@@ -31,7 +31,7 @@ class SaveBusRunsToDBTask extends workers_1.AbstractTask {
|
|
|
31
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
32
32
|
const timestamp = msgProperties === null || msgProperties === void 0 ? void 0 : msgProperties.timestamp;
|
|
33
33
|
if (!timestamp) {
|
|
34
|
-
throw new golemio_errors_1.
|
|
34
|
+
throw new golemio_errors_1.GeneralError(`Missing bus run message timestamp: ${JSON.stringify(data)}`, this.constructor.name);
|
|
35
35
|
}
|
|
36
36
|
const transformedData = yield this.messagesTransformation.transform({ data: data.M.V, timestamp });
|
|
37
37
|
for (const element of transformedData) {
|
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":";;;;;;;;;;;;AAAA,2EAA6E;AAC7E,
|
|
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;AAC3E,8EAA2E;AAE3E,iEAAwE;AACxE,0GAAuG;AAEvG,MAAa,mBAAoB,SAAQ,sBAA8B;IASnE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QATP,cAAS,GAAG,iBAAiB,CAAC;QAC9B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,6CAA0B,CAAC;QAQhD,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;IAC5E,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,eAAe,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YACnG,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE;gBACnC,yDAAyD;gBACzD,IAAI,CAAA,MAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,0CAAE,MAAM,IAAG,CAAC,EAAE;oBAClC,SAAS;iBACZ;gBAED,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;aAC9D;;KACJ;CACJ;AAhCD,kDAgCC"}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.js
CHANGED
|
@@ -30,7 +30,7 @@ class SaveTramRunsToDBTask extends workers_1.AbstractTask {
|
|
|
30
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
31
|
const timestamp = msgProperties === null || msgProperties === void 0 ? void 0 : msgProperties.timestamp;
|
|
32
32
|
if (!timestamp) {
|
|
33
|
-
throw new golemio_errors_1.
|
|
33
|
+
throw new golemio_errors_1.GeneralError(`Missing tram run message timestamp: ${JSON.stringify(data)}`, this.constructor.name);
|
|
34
34
|
}
|
|
35
35
|
const transformedData = yield this.messagesTransformation.transform({ data: data.M.V, timestamp }, true);
|
|
36
36
|
for (const element of transformedData) {
|
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":";;;;;;;;;;;;AAAA,2EAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"SaveTramRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAA6E;AAC7E,6EAAwE;AAExE,8EAA2E;AAC3E,8EAA2E;AAE3E,iEAAwE;AACxE,0GAAuG;AAEvG,MAAa,oBAAqB,SAAQ,sBAA8B;IASpE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QATP,cAAS,GAAG,kBAAkB,CAAC;QAC/B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,6CAA0B,CAAC;QAQhD,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;IAC5E,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,eAAe,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,IAAI,CAAC,CAAC;YACzG,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE;gBACnC,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;aAC9D;QACL,CAAC;KAAA;CACJ;AA3BD,oDA2BC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { IAggregatedRailtrackGPSData } from "../../../../ropid-gtfs/workers/railtrack/tasks/interfaces/IAggregatedRailtrackGPSData";
|
|
2
2
|
import { IVehiclePositionsSchedule } from "../../vehicle-positions/interfaces/VPInterfaces";
|
|
3
|
-
import { IMetroRunsMessagesModel } from "../../../../../schema-definitions/vehicle-positions/models/interfaces/IMetroRunsMessagesModel";
|
|
4
3
|
import { BaseTransformation, ITransformation } from "@golemio/core/dist/integration-engine/transformations";
|
|
5
4
|
import { IMetroRunInputForProcessing } from "../interfaces/IMetroRunInputForProcessing";
|
|
5
|
+
import { IProcessMetroRunsMessage } from "../interfaces/IProcessMetroRunsMessagesInput";
|
|
6
6
|
interface ITransformationInput {
|
|
7
|
-
message:
|
|
7
|
+
message: IProcessMetroRunsMessage;
|
|
8
8
|
gpsData: IAggregatedRailtrackGPSData | null;
|
|
9
9
|
}
|
|
10
10
|
interface ITransformationOutput {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetroRunsMessageProcessingTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/transformations/MetroRunsMessageProcessingTransformation.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"MetroRunsMessageProcessingTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/transformations/MetroRunsMessageProcessingTransformation.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,2EAAoE;AACpE,2FAA4G;AAC5G,kEAA+D;AAc/D,MAAa,wCAAyC,SAAQ,oCAAkB;IAAhF;;QACW,SAAI,GAAG,2BAA2B,CAAC;QAEnC,cAAS,GAAG,CAAO,EAAE,OAAO,EAAE,OAAO,EAAwB,EAA8C,EAAE;YAChH,MAAM,WAAW,GAAG,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,WAAW,EAAE;gBACd,OAAO;aACV;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAC9E,IAAI,QAAQ,EAAE;gBACV,OAAO;oBACH,WAAW;oBACX,QAAQ;iBACX,CAAC;aACL;QACL,CAAC,CAAA,CAAC;QAEQ,qBAAgB,GAAG,GAAuB,EAAE,gDAAE,CAAC,CAAA,CAAC;IAgD9D,CAAC;IA9CW,2BAA2B,CAAC,OAAiC;QACjE,MAAM,OAAO,GAAG,mCAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAChE,IAAI,CAAC,OAAO,EAAE;YACV,aAAG,CAAC,IAAI,CAAC,mEAAmE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACvG,OAAO;SACV;QAED,IAAI,SAAiB,CAAC;QACtB,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,0BAA0B,CAAC,GAAG,CAAC,EAAE;YACzD,SAAS,GAAG,OAAO,CAAC,0BAA0B,CAAC;SAClD;aAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE;YAC3D,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC;SAC7C;aAAM;YACH,aAAG,CAAC,IAAI,CAAC,kFAAkF,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACtH,OAAO;SACV;QAED,OAAO;YACH,QAAQ,EAAE,OAAO;YACjB,UAAU,EAAE,SAAS;YACrB,kBAAkB,EAAE,OAAO,CAAC,iBAAiB;SAChD,CAAC;IACN,CAAC;IAEO,wBAAwB,CAC5B,OAAiC,EACjC,WAAsC,EACtC,OAA2C;;QAE3C,MAAM,WAAW,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,0CAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC7D,IAAI,CAAC,WAAW,EAAE;YACd,aAAG,CAAC,OAAO,CAAC,iEAAiE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACxG,OAAO;SACV;QAED,OAAO;YACH,gBAAgB,EAAE,OAAO,CAAC,iBAAiB;YAC3C,kBAAkB,EAAE,OAAO,CAAC,mCAAmC;YAC/D,OAAO,EAAE,WAAW,CAAC,QAAQ;YAC7B,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAoB,CAAC;YAC5D,uBAAuB,EAAE,OAAO,CAAC,0BAA0B;YAC3D,kBAAkB,EAAE,OAAO,CAAC,qBAAqB;YACjD,WAAW,EAAE,OAAO,CAAC,YAAY;YACjC,WAAW;SACd,CAAC;IACN,CAAC;CACJ;AAlED,4FAkEC"}
|
|
@@ -22,18 +22,19 @@ class MetroRunsMessagesTransformation extends transformations_1.BaseTransformati
|
|
|
22
22
|
return Promise.resolve(dto);
|
|
23
23
|
};
|
|
24
24
|
this.transformElement = ({ messageData, trainData }) => {
|
|
25
|
-
const
|
|
26
|
-
const messageTimestamp = new Date(messageData.tm)
|
|
25
|
+
const delayOriginSeconds = parseInt(trainData.$.odch);
|
|
26
|
+
const messageTimestamp = new Date(messageData.tm);
|
|
27
|
+
const scheduledTimestamp = new Date(messageTimestamp);
|
|
27
28
|
// delay is in seconds, positive number means the train is ahead of time
|
|
28
|
-
|
|
29
|
+
scheduledTimestamp.setSeconds(scheduledTimestamp.getSeconds() + delayOriginSeconds);
|
|
29
30
|
return {
|
|
30
31
|
route_name: messageData.linka,
|
|
31
|
-
message_timestamp:
|
|
32
|
+
message_timestamp: messageTimestamp,
|
|
32
33
|
train_set_number_scheduled: trainData.$.csp.trimStart(),
|
|
33
34
|
train_set_number_real: trainData.$.csr.trimStart(),
|
|
34
35
|
train_number: trainData.$.cv,
|
|
35
36
|
track_id: trainData.$.ko,
|
|
36
|
-
delay_origin:
|
|
37
|
+
delay_origin: delayOriginSeconds,
|
|
37
38
|
actual_position_timestamp_scheduled: scheduledTimestamp,
|
|
38
39
|
};
|
|
39
40
|
};
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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"}
|
|
@@ -72,7 +72,7 @@ let DescriptorRepository = DescriptorRepository_1 = class DescriptorRepository e
|
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
74
|
catch (err) {
|
|
75
|
-
const exception = new golemio_errors_1.
|
|
75
|
+
const exception = new golemio_errors_1.GeneralError(`[${DescriptorRepository_1.REPOSITORY_NAME}] Could not save data: ${err.message}`, this.constructor.name, err);
|
|
76
76
|
this.logger.error(exception);
|
|
77
77
|
throw exception;
|
|
78
78
|
}
|
|
@@ -88,7 +88,7 @@ let DescriptorRepository = DescriptorRepository_1 = class DescriptorRepository e
|
|
|
88
88
|
});
|
|
89
89
|
}
|
|
90
90
|
catch (err) {
|
|
91
|
-
throw new golemio_errors_1.
|
|
91
|
+
throw new golemio_errors_1.GeneralError("Error while purging old data", this.constructor.name, err);
|
|
92
92
|
}
|
|
93
93
|
});
|
|
94
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DescriptorRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-descriptors/data-access/DescriptorRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAuC;AACvC,yFAAkE;AAGlE,6FAA0F;AAC1F,yEAAqF;AACrF,
|
|
1
|
+
{"version":3,"file":"DescriptorRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-descriptors/data-access/DescriptorRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAuC;AACvC,yFAAkE;AAGlE,6FAA0F;AAC1F,yEAAqF;AACrF,6EAAwE;AACxE,mFAAkF;AAClF,iFAAiF;AACjF,iEAAwE;AAGxE,IAAa,oBAAoB,4BAAjC,MAAa,oBAAqB,SAAQ,sBAAa;IAInD,YAAmD,MAAe;QAC9D,KAAK,CACD,sBAAoB,CAAC,eAAe,EACpC;YACI,WAAW,EAAE,wBAAe,CAAC,SAAS;YACtC,QAAQ,EAAE,iBAAS;YACnB,yBAAyB,EAAE,wBAAe,CAAC,cAAc;YACzD,UAAU,EAAE,gBAAgB;SAC/B,EACD,IAAI,uCAAmB,CAAC,sBAAoB,CAAC,eAAe,GAAG,WAAW,EAAE,wBAAe,CAAC,eAAe,CAAC,CAC/G,CAAC;QAV6C,WAAM,GAAN,MAAM,CAAS;QAa3D,aAAQ,GAAG,CAAO,IAA4B,EAAE,WAAW,GAAG,KAAK,EAA8B,EAAE;YACtG,IAAI;gBACA,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC1B,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,EAAE;oBAC9C,iBAAiB,EAAE,wBAAe,CAAC,gBAAgB;oBACnD,SAAS,EAAE,WAAW;iBACzB,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,SAAS,GAAG,IAAI,6BAAY,CAC9B,IAAI,sBAAoB,CAAC,eAAe,0BAA0B,GAAG,CAAC,OAAO,EAAE,EAC/E,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,GAAG,CACN,CAAC;gBAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAC7B,MAAM,SAAS,CAAC;aACnB;QACL,CAAC,CAAA,CAAC;QAEK,wBAAmB,GAAG,CAAO,KAAa,EAAmB,EAAE;YAClE,IAAI;gBACA,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBACrC,KAAK,EAAE;wBACH,UAAU,EAAE;4BACR,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,mBAAS,CAAC,OAAO,CAAC,qBAAqB,KAAK,SAAS,CAAC;yBAClE;qBACJ;iBACJ,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,8BAA8B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACtF;QACL,CAAC,CAAA,CAAC;IAjCF,CAAC;CAkCJ,CAAA;AAhDkB,oCAAe,GAAG,wBAAyB,CAAA;AADjD,oBAAoB;IADhC,IAAA,qBAAU,GAAE;IAKI,WAAA,IAAA,iBAAM,EAAC,+BAAc,CAAC,MAAM,CAAC,CAAA;;GAJjC,oBAAoB,CAiDhC;AAjDY,oDAAoB"}
|
|
@@ -64,7 +64,7 @@ let DescriptorTransformation = class DescriptorTransformation extends transforma
|
|
|
64
64
|
case VehicleDescriptorEnums_1.VehicleDescriptorTractionEnum.Tram:
|
|
65
65
|
return RouteTypeEnums_1.GTFSRouteTypeEnum.TRAM;
|
|
66
66
|
default:
|
|
67
|
-
throw new golemio_errors_1.
|
|
67
|
+
throw new golemio_errors_1.GeneralError(`${this.name}: unknown traction: ${traction}`, this.constructor.name);
|
|
68
68
|
}
|
|
69
69
|
};
|
|
70
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DescriptorTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-descriptors/transformations/DescriptorTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,2FAA4G;AAC5G,
|
|
1
|
+
{"version":3,"file":"DescriptorTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-descriptors/transformations/DescriptorTransformation.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,7 @@ class PositionsHistoryRepository extends integration_engine_1.PostgresModel {
|
|
|
71
71
|
});
|
|
72
72
|
}
|
|
73
73
|
catch (err) {
|
|
74
|
-
throw new golemio_errors_1.
|
|
74
|
+
throw new golemio_errors_1.GeneralError("Error while purging old data", this.constructor.name, err);
|
|
75
75
|
}
|
|
76
76
|
});
|
|
77
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PositionsHistoryRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsHistoryRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAuC;AACvC,2FAA0D;AAC1D,wGAAwE;AACxE,8EAA8E;AAC9E,
|
|
1
|
+
{"version":3,"file":"PositionsHistoryRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsHistoryRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAuC;AACvC,2FAA0D;AAC1D,wGAAwE;AACxE,8EAA8E;AAC9E,6EAAwE;AACxE,mFAAkF;AAClF,iFAAoE;AAEpE,MAAa,0BAA2B,SAAQ,kCAAa;IACzD;QACI,KAAK,CACD,0BAA0B,EAC1B;YACI,yBAAyB,EAAE,yBAAW,CAAC,cAAc;YACrD,WAAW,EAAE,oCAAgB,CAAC,SAAS,CAAC,kBAAkB;YAC1D,QAAQ,EAAE,iBAAS;YACnB,UAAU,EAAE,YAAY;YACxB,2BAA2B,EAAE;gBACzB,OAAO,EAAE;oBACL;wBACI,MAAM,EAAE,CAAC,UAAU,CAAC;wBACpB,IAAI,EAAE,qCAAqC;qBAC9C;oBACD;wBACI,MAAM,EAAE,CAAC,aAAa,CAAC;wBACvB,IAAI,EAAE,wCAAwC;qBACjD;iBACJ;aACJ;SACJ,EACD,IAAI,uCAAmB,CAAC,oCAAgB,CAAC,SAAS,CAAC,IAAI,GAAG,gBAAgB,EAAE,yBAAW,CAAC,UAAU,CAAC,CACtG,CAAC;QAGC,wBAAmB,GAAG,CAAO,KAAa,EAAmB,EAAE;YAClE,IAAI;gBACA,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBACrC,KAAK,EAAE;wBACH,UAAU,EAAE;4BACR,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,mBAAS,CAAC,OAAO,CAAC,qBAAqB,KAAK,SAAS,CAAC;yBAClE;qBACJ;iBACJ,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,8BAA8B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACtF;QACL,CAAC,CAAA,CAAC;IAdF,CAAC;CAeJ;AAvCD,gEAuCC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { IGtfsRunTripCache } from "../../../../ropid-gtfs/interfaces/IGtfsRunTripCache";
|
|
2
2
|
import { IMetroRunInputForProcessing } from "../../runs/interfaces/IMetroRunInputForProcessing";
|
|
3
|
+
import { IPositionDto } from "../../../../../schema-definitions/vehicle-positions/models/interfaces/IPositionDto";
|
|
3
4
|
import { VPTripsNonNullableModel } from "../../../../../schema-definitions/vehicle-positions/models/interfaces/IVPTripsModel";
|
|
4
5
|
import { IVPTripsPositionAttributes } from "../../../../../schema-definitions/vehicle-positions/models/interfaces/IVPTripsPositionAttributes";
|
|
6
|
+
import { PositionDto } from "../../../../../schema-definitions/vehicle-positions/models/PositionDto";
|
|
5
7
|
import { IModel, PostgresModel } from "@golemio/core/dist/integration-engine/models";
|
|
6
|
-
import {
|
|
7
|
-
import Sequelize from "@golemio/core/dist/shared/sequelize";
|
|
8
|
+
import Sequelize, { ModelStatic } from "@golemio/core/dist/shared/sequelize";
|
|
8
9
|
import { IUpdateRunsGtfsTripInput } from "../interfaces/IUpdateRunsGtfsTripInput";
|
|
9
10
|
export interface ITripAttributes extends Pick<VPTripsNonNullableModel, "id" | "gtfs_trip_id" | "gtfs_route_type" | "start_timestamp" | "end_timestamp" | "agency_name_scheduled" | "start_cis_stop_id" | "last_position_context"> {
|
|
10
11
|
}
|
|
@@ -12,23 +13,28 @@ export interface ITripPositions extends ITripAttributes {
|
|
|
12
13
|
positions: IVPTripsPositionAttributes[];
|
|
13
14
|
}
|
|
14
15
|
export declare class PositionsRepository extends PostgresModel implements IModel {
|
|
15
|
-
|
|
16
|
-
name: string;
|
|
17
|
-
/** The Sequelize Model */
|
|
18
|
-
sequelizeModel: Sequelize.ModelCtor<any>;
|
|
19
|
-
/** The Sequelize Model for temporary table */
|
|
20
|
-
protected tmpSequelizeModel: Sequelize.ModelCtor<any> | null;
|
|
21
|
-
/** Validation helper */
|
|
22
|
-
protected validator: IValidator;
|
|
23
|
-
/** Type/Strategy of saving the data */
|
|
24
|
-
protected savingType: "insertOnly" | "insertOrUpdate";
|
|
25
|
-
/** Associated vehiclepositions_trips Model for updating the delay */
|
|
16
|
+
sequelizeModel: ModelStatic<PositionDto>;
|
|
26
17
|
protected tripsModel: Sequelize.ModelCtor<any>;
|
|
27
18
|
constructor();
|
|
19
|
+
/**
|
|
20
|
+
* Get all trips with positions for given trip ids. Positions are ordered by created_at instead of origin_timestamp
|
|
21
|
+
* to ensure they are processed by the same order they are created
|
|
22
|
+
* (sometimes TCP common positions are received out of order)
|
|
23
|
+
*
|
|
24
|
+
* Example of processing of mismatched TCP common positions:
|
|
25
|
+
* Batch 1 - TCP position (event T) with origin_timestamp 10:00:01, created_at 10:00:04, not last position
|
|
26
|
+
* (position is at_stop, last stop sequence is 2, delay at last stop is null, is not served to the output API)
|
|
27
|
+
* Batch 1 - TCP position (event O) with origin_timestamp 10:00:00, created_at 10:00:05, last position
|
|
28
|
+
* (position is on_track, last stop sequence is 2, delay at last stop is 10 and is served to the output API)
|
|
29
|
+
* Batch 2 - TCP position (event T) with origin_timestamp 10:01:00, created_at 10:01:04, last position
|
|
30
|
+
* (position is on_track, last stop sequence is 2, delay at last stop is 10 and is served to the output API)
|
|
31
|
+
* Batch 3 - TCP position (event 0) with origin_timestamp 10:01:40, created_at 10:01:44, last position
|
|
32
|
+
* (position is on_track, last stop sequence is 3, delay at last stop is 20 and is served to the output API)
|
|
33
|
+
*/
|
|
28
34
|
getPositionsForUpdateDelay: (tripIds: string[]) => Promise<ITripPositions[]>;
|
|
29
35
|
bulkUpdate: (data: any[]) => Promise<any>;
|
|
30
36
|
upsertCommonRunPosition: ({ run, run_message }: IUpdateRunsGtfsTripInput, gtfsTrip: IGtfsRunTripCache, isCurrent?: boolean) => Promise<any>;
|
|
31
37
|
upsertMetroRunPosition: (runInput: IMetroRunInputForProcessing, gtfsTrip: IGtfsRunTripCache, isCurrent?: boolean) => Promise<any>;
|
|
32
38
|
deleteNHoursOldData: (hours: number) => Promise<number>;
|
|
33
|
-
createNotPublic: (
|
|
39
|
+
createNotPublic: (positionDto: Partial<IPositionDto>) => Promise<PositionDto>;
|
|
34
40
|
}
|
|
@@ -45,7 +45,6 @@ const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
|
45
45
|
const models_2 = require("@golemio/core/dist/integration-engine/models");
|
|
46
46
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
47
47
|
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
48
|
-
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
49
48
|
const sequelize_1 = __importStar(require("@golemio/core/dist/shared/sequelize"));
|
|
50
49
|
const const_2 = require("../../../../../const");
|
|
51
50
|
const PositionsMapper_1 = __importDefault(require("./helpers/PositionsMapper"));
|
|
@@ -69,6 +68,21 @@ class PositionsRepository extends models_2.PostgresModel {
|
|
|
69
68
|
],
|
|
70
69
|
},
|
|
71
70
|
}, new golemio_validator_1.JSONSchemaValidator(vehicle_positions_1.VehiclePositions.positions.name + "ModelValidator", PositionDto_1.PositionDto.jsonSchema));
|
|
71
|
+
/**
|
|
72
|
+
* Get all trips with positions for given trip ids. Positions are ordered by created_at instead of origin_timestamp
|
|
73
|
+
* to ensure they are processed by the same order they are created
|
|
74
|
+
* (sometimes TCP common positions are received out of order)
|
|
75
|
+
*
|
|
76
|
+
* Example of processing of mismatched TCP common positions:
|
|
77
|
+
* Batch 1 - TCP position (event T) with origin_timestamp 10:00:01, created_at 10:00:04, not last position
|
|
78
|
+
* (position is at_stop, last stop sequence is 2, delay at last stop is null, is not served to the output API)
|
|
79
|
+
* Batch 1 - TCP position (event O) with origin_timestamp 10:00:00, created_at 10:00:05, last position
|
|
80
|
+
* (position is on_track, last stop sequence is 2, delay at last stop is 10 and is served to the output API)
|
|
81
|
+
* Batch 2 - TCP position (event T) with origin_timestamp 10:01:00, created_at 10:01:04, last position
|
|
82
|
+
* (position is on_track, last stop sequence is 2, delay at last stop is 10 and is served to the output API)
|
|
83
|
+
* Batch 3 - TCP position (event 0) with origin_timestamp 10:01:40, created_at 10:01:44, last position
|
|
84
|
+
* (position is on_track, last stop sequence is 3, delay at last stop is 20 and is served to the output API)
|
|
85
|
+
*/
|
|
72
86
|
this.getPositionsForUpdateDelay = (tripIds) => __awaiter(this, void 0, void 0, function* () {
|
|
73
87
|
// TODO - check that origin_time is not duplicate for tracking == 2.
|
|
74
88
|
// const originTimeColumn = `"vehiclepositions_positions"."origin_time"`;
|
|
@@ -119,7 +133,7 @@ class PositionsRepository extends models_2.PostgresModel {
|
|
|
119
133
|
},
|
|
120
134
|
],
|
|
121
135
|
order: [
|
|
122
|
-
[{ model: this.sequelizeModel, as: "position" }, "
|
|
136
|
+
[{ model: this.sequelizeModel, as: "position" }, "created_at", "ASC"],
|
|
123
137
|
[{ model: this.sequelizeModel, as: "position" }, "tracking", "DESC"],
|
|
124
138
|
],
|
|
125
139
|
raw: true,
|
|
@@ -174,7 +188,7 @@ class PositionsRepository extends models_2.PostgresModel {
|
|
|
174
188
|
}, []);
|
|
175
189
|
}
|
|
176
190
|
catch (err) {
|
|
177
|
-
throw new golemio_errors_1.
|
|
191
|
+
throw new golemio_errors_1.GeneralError(`Error while transforming data from db for batch. Trip count ${results.length}.`, this.name, err);
|
|
178
192
|
}
|
|
179
193
|
});
|
|
180
194
|
this.bulkUpdate = (data) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -196,7 +210,7 @@ class PositionsRepository extends models_2.PostgresModel {
|
|
|
196
210
|
catch (err) {
|
|
197
211
|
helpers_1.log.error(err);
|
|
198
212
|
yield transaction.rollback();
|
|
199
|
-
throw new golemio_errors_1.
|
|
213
|
+
throw new golemio_errors_1.GeneralError("Error while saving to database.", this.name, err);
|
|
200
214
|
}
|
|
201
215
|
}));
|
|
202
216
|
const records = yield Promise.all(promises);
|
|
@@ -215,7 +229,7 @@ class PositionsRepository extends models_2.PostgresModel {
|
|
|
215
229
|
return record.get({ plain: true });
|
|
216
230
|
}
|
|
217
231
|
catch (err) {
|
|
218
|
-
throw new golemio_errors_1.
|
|
232
|
+
throw new golemio_errors_1.GeneralError("upsertCommonRunPosition: Error while saving to database.", this.name, err);
|
|
219
233
|
}
|
|
220
234
|
});
|
|
221
235
|
this.upsertMetroRunPosition = (runInput, gtfsTrip, isCurrent = true) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -226,7 +240,7 @@ class PositionsRepository extends models_2.PostgresModel {
|
|
|
226
240
|
return record.get({ plain: true });
|
|
227
241
|
}
|
|
228
242
|
catch (err) {
|
|
229
|
-
throw new golemio_errors_1.
|
|
243
|
+
throw new golemio_errors_1.GeneralError("upsertMetroRunPosition: Error while saving to database.", this.name, err);
|
|
230
244
|
}
|
|
231
245
|
});
|
|
232
246
|
this.deleteNHoursOldData = (hours) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -240,24 +254,18 @@ class PositionsRepository extends models_2.PostgresModel {
|
|
|
240
254
|
});
|
|
241
255
|
}
|
|
242
256
|
catch (err) {
|
|
243
|
-
throw new golemio_errors_1.
|
|
257
|
+
throw new golemio_errors_1.GeneralError("Error while purging old data", this.constructor.name, err);
|
|
244
258
|
}
|
|
245
259
|
});
|
|
246
|
-
this.createNotPublic = (
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
state_process: const_2.StateProcessEnum.PROCESSED,
|
|
256
|
-
this_stop_id: input.run_message.actual_stop_asw_id,
|
|
257
|
-
tracking: 2,
|
|
258
|
-
trips_id: id,
|
|
259
|
-
tcp_event: input.run_message.events,
|
|
260
|
-
}, { returning: true });
|
|
260
|
+
this.createNotPublic = (positionDto) => __awaiter(this, void 0, void 0, function* () {
|
|
261
|
+
try {
|
|
262
|
+
return yield this.sequelizeModel.create(positionDto, {
|
|
263
|
+
returning: true,
|
|
264
|
+
});
|
|
265
|
+
}
|
|
266
|
+
catch (err) {
|
|
267
|
+
throw new golemio_errors_1.GeneralError("createNotPublic: error while saving data", this.name, err);
|
|
268
|
+
}
|
|
261
269
|
});
|
|
262
270
|
this.tripsModel = connectors_1.PostgresConnector.getConnection().define(models_1.VPTripsModel.TABLE_NAME, models_1.VPTripsModel.attributeModel, {
|
|
263
271
|
schema: const_1.PG_SCHEMA,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PositionsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,mEAAuC;AACvC,2FAA0D;AAC1D,uFAA6D;
|
|
1
|
+
{"version":3,"file":"PositionsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ class TripsHistoryRepository extends integration_engine_1.PostgresModel {
|
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
37
|
catch (err) {
|
|
38
|
-
throw new golemio_errors_1.
|
|
38
|
+
throw new golemio_errors_1.GeneralError("Error while purging old data", this.constructor.name, err);
|
|
39
39
|
}
|
|
40
40
|
});
|
|
41
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TripsHistoryRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsHistoryRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mEAAuC;AACvC,uFAA6D;AAC7D,8EAA8E;AAC9E,
|
|
1
|
+
{"version":3,"file":"TripsHistoryRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsHistoryRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mEAAuC;AACvC,uFAA6D;AAC7D,8EAA8E;AAC9E,6EAAwE;AACxE,mFAAkF;AAClF,mEAAoE;AAEpE,MAAa,sBAAuB,SAAQ,kCAAa;IACrD;QACI,KAAK,CACD,0BAA0B,EAC1B;YACI,WAAW,EAAE,qBAAY,CAAC,kBAAkB;YAC5C,QAAQ,EAAE,iBAAS;YACnB,yBAAyB,EAAE,qBAAY,CAAC,cAAc;YACtD,UAAU,EAAE,gBAAgB;SAC/B,EACD,IAAI,uCAAmB,CAAC,mCAAmC,EAAE,qBAAY,CAAC,UAAU,CAAC,CACxF,CAAC;QAGC,wBAAmB,GAAG,CAAO,KAAa,EAAmB,EAAE;YAClE,IAAI;gBACA,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBACrC,KAAK,EAAE;wBACH,UAAU,EAAE;4BACR,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,qBAAS,CAAC,OAAO,CAAC,qBAAqB,KAAK,SAAS,CAAC;yBAClE;qBACJ;iBACJ,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,8BAA8B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACtF;QACL,CAAC,CAAA,CAAC;IAdF,CAAC;CAeJ;AA3BD,wDA2BC"}
|
|
@@ -104,7 +104,7 @@ export declare class TripsRepository extends PostgresModel implements IModel {
|
|
|
104
104
|
findAll: (options: Sequelize.FindOptions<any> | undefined) => Promise<any>;
|
|
105
105
|
private findGTFSTripIdBasic;
|
|
106
106
|
private findGTFSTripIdsTrain;
|
|
107
|
-
upsertNotPublic: (
|
|
107
|
+
upsertNotPublic: (tripDto: Partial<IVPTripsModel>) => Promise<void>;
|
|
108
108
|
/**
|
|
109
109
|
* Return all valid trips for GTFS Realtime feed
|
|
110
110
|
*
|