@golemio/pid 2.9.6-dev.1055124552 → 2.9.6-dev.1055849165
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/tasks/ProcessMetroRunMessagesTask.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.js +11 -3
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.js.map +1 -1
- package/package.json +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/RunNumbersRepository.d.ts +0 -7
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/RunNumbersRepository.js +0 -40
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/RunNumbersRepository.js.map +0 -1
|
@@ -12,7 +12,7 @@ export declare class ProcessMetroRunMessagesTask extends AbstractTask<IProcessMe
|
|
|
12
12
|
private readonly runsRepository;
|
|
13
13
|
private readonly runTripsRedisRepository;
|
|
14
14
|
private readonly gtfsTripRunManager;
|
|
15
|
-
private readonly
|
|
15
|
+
private readonly tripScheduleRepository;
|
|
16
16
|
constructor(queuePrefix: string);
|
|
17
17
|
protected execute({ routeName, messages }: IProcessMetroRunsMessagesInput): Promise<void>;
|
|
18
18
|
private processMessage;
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.js
CHANGED
|
@@ -22,7 +22,8 @@ const CommonRunsRepository_1 = require("../data-access/CommonRunsRepository");
|
|
|
22
22
|
const MetroMessageFilter_1 = require("../helpers/MetroMessageFilter");
|
|
23
23
|
const MetroTransformedRunsSchema_1 = require("../schema/MetroTransformedRunsSchema");
|
|
24
24
|
const MetroRunsMessageProcessingTransformation_1 = require("../transformations/MetroRunsMessageProcessingTransformation");
|
|
25
|
-
const
|
|
25
|
+
const precomputed_1 = require("../../../../ropid-gtfs/data-access/precomputed");
|
|
26
|
+
const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
|
|
26
27
|
class ProcessMetroRunMessagesTask extends integration_engine_1.AbstractTask {
|
|
27
28
|
constructor(queuePrefix) {
|
|
28
29
|
super(queuePrefix);
|
|
@@ -35,7 +36,7 @@ class ProcessMetroRunMessagesTask extends integration_engine_1.AbstractTask {
|
|
|
35
36
|
this.tripsRepository = new TripsRepository_1.TripsRepository();
|
|
36
37
|
this.runsRepository = new CommonRunsRepository_1.CommonRunsRepository();
|
|
37
38
|
this.runTripsRedisRepository = new cache_1.RunTripsRedisRepository();
|
|
38
|
-
this.
|
|
39
|
+
this.tripScheduleRepository = new precomputed_1.TripScheduleRepository();
|
|
39
40
|
this.gtfsTripRunManager = GTFSTripRunManagerFactory_1.GTFSTripRunManagerFactory.create(GTFSTripRunManagerFactory_1.GTFSTripRunType.Metro, this.positionsRepository, this.tripsRepository, this.runsRepository, this.runTripsRedisRepository);
|
|
40
41
|
}
|
|
41
42
|
execute({ routeName, messages }) {
|
|
@@ -74,7 +75,14 @@ class ProcessMetroRunMessagesTask extends integration_engine_1.AbstractTask {
|
|
|
74
75
|
}
|
|
75
76
|
addTripIdToMessage(runInput) {
|
|
76
77
|
return __awaiter(this, void 0, void 0, function* () {
|
|
77
|
-
const runNumbers = yield this.
|
|
78
|
+
const runNumbers = yield this.tripScheduleRepository.findOne({
|
|
79
|
+
attributes: ["trip_id"],
|
|
80
|
+
where: {
|
|
81
|
+
trip_number: runInput.trainNumber,
|
|
82
|
+
route_id: `L${runInput.routeId}`,
|
|
83
|
+
[sequelize_1.Op.and]: [sequelize_1.Sequelize.literal("start_timestamp::date = current_date")],
|
|
84
|
+
},
|
|
85
|
+
});
|
|
78
86
|
if (!runNumbers) {
|
|
79
87
|
return null;
|
|
80
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProcessMetroRunMessagesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.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;
|
|
1
|
+
{"version":3,"file":"ProcessMetroRunMessagesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
import { IModel, PostgresModel } from "@golemio/core/dist/integration-engine";
|
|
2
|
-
import { IRopidGTFSRunNumbersInputData } from "../../../../../schema-definitions/ropid-gtfs/RopidGTFSRunNumbers";
|
|
3
|
-
import { IMetroRunInputForProcessing } from "../../runs/interfaces/IMetroRunInputForProcessing";
|
|
4
|
-
export declare class RunNumbersRepository extends PostgresModel implements IModel {
|
|
5
|
-
constructor();
|
|
6
|
-
findByMetroRunInput(input: IMetroRunInputForProcessing): Promise<IRopidGTFSRunNumbersInputData | null>;
|
|
7
|
-
}
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.RunNumbersRepository = void 0;
|
|
13
|
-
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
14
|
-
const const_1 = require("../../../../../schema-definitions/const");
|
|
15
|
-
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
16
|
-
const RopidGTFSRunNumbers_1 = require("../../../../../schema-definitions/ropid-gtfs/RopidGTFSRunNumbers");
|
|
17
|
-
class RunNumbersRepository extends integration_engine_1.PostgresModel {
|
|
18
|
-
constructor() {
|
|
19
|
-
super("RunNumbersRepository", {
|
|
20
|
-
pgTableName: RopidGTFSRunNumbers_1.RopidGTFSRunNumbers.pgTableName,
|
|
21
|
-
pgSchema: const_1.PG_SCHEMA,
|
|
22
|
-
outputSequelizeAttributes: RopidGTFSRunNumbers_1.RopidGTFSRunNumbers.outputSequelizeAttributes,
|
|
23
|
-
savingType: "insertOnly",
|
|
24
|
-
attributesToRemove: ["id", "created_at", "updated_at"],
|
|
25
|
-
}, new golemio_validator_1.JSONSchemaValidator("RunNumbersRepositoryValidator", RopidGTFSRunNumbers_1.RopidGTFSRunNumbers.outputJsonSchema));
|
|
26
|
-
}
|
|
27
|
-
findByMetroRunInput(input) {
|
|
28
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
29
|
-
return yield this.findOne({
|
|
30
|
-
where: {
|
|
31
|
-
run_number: input.runNumber,
|
|
32
|
-
trip_number: input.trainNumber,
|
|
33
|
-
route_id: `L${input.routeId}`,
|
|
34
|
-
},
|
|
35
|
-
});
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
exports.RunNumbersRepository = RunNumbersRepository;
|
|
40
|
-
//# sourceMappingURL=RunNumbersRepository.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"RunNumbersRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/RunNumbersRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8EAA8E;AAC9E,mEAAuC;AACvC,mFAAkF;AAClF,0GAAyG;AAGzG,MAAa,oBAAqB,SAAQ,kCAAa;IACnD;QACI,KAAK,CACD,sBAAsB,EACtB;YACI,WAAW,EAAE,yCAAmB,CAAC,WAAW;YAC5C,QAAQ,EAAE,iBAAS;YACnB,yBAAyB,EAAE,yCAAmB,CAAC,yBAAyB;YACxE,UAAU,EAAE,YAAY;YACxB,kBAAkB,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC;SACzD,EACD,IAAI,uCAAmB,CAAC,+BAA+B,EAAE,yCAAmB,CAAC,gBAAgB,CAAC,CACjG,CAAC;IACN,CAAC;IAEY,mBAAmB,CAAC,KAAkC;;YAC/D,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC;gBACtB,KAAK,EAAE;oBACH,UAAU,EAAE,KAAK,CAAC,SAAS;oBAC3B,WAAW,EAAE,KAAK,CAAC,WAAW;oBAC9B,QAAQ,EAAE,IAAI,KAAK,CAAC,OAAO,EAAE;iBAChC;aACJ,CAAC,CAAC;QACP,CAAC;KAAA;CACJ;AAxBD,oDAwBC"}
|