@golemio/pid 2.2.12-dev.641965809 → 2.2.12-dev.644959745
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/example/99_precomputed_tables.sql +6 -2
- package/db/migrations/postgresql/20220915123941-partitioned-departures.js +53 -0
- package/db/migrations/postgresql/sqls/20220915123941-partitioned-departures-down.sql +39 -0
- package/db/migrations/postgresql/sqls/20220915123941-partitioned-departures-up.sql +63 -0
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMetadataModel.d.ts +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMetadataModel.js +3 -3
- package/dist/integration-engine/ropid-gtfs/RopidGTFSMetadataModel.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSWorker.d.ts +2 -4
- package/dist/integration-engine/ropid-gtfs/RopidGTFSWorker.js +5 -15
- package/dist/integration-engine/ropid-gtfs/RopidGTFSWorker.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/data-access/DeparturesRepository.d.ts +8 -0
- package/dist/integration-engine/ropid-gtfs/{RopidGTFSDeparturesModel.js → data-access/DeparturesRepository.js} +36 -32
- package/dist/integration-engine/ropid-gtfs/data-access/DeparturesRepository.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/index.d.ts +1 -0
- package/dist/integration-engine/{vehicle-positions/schema → ropid-gtfs/data-access}/index.js +1 -3
- package/dist/integration-engine/ropid-gtfs/data-access/index.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/index.d.ts +0 -1
- package/dist/integration-engine/ropid-gtfs/index.js +0 -1
- package/dist/integration-engine/ropid-gtfs/index.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/transformations/MetroRunsMessagesTransformation.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/transformations/MetroRunsMessagesTransformation.js +4 -1
- package/dist/integration-engine/vehicle-positions/transformations/MetroRunsMessagesTransformation.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/DeleteDataTask.d.ts +2 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/DeleteDataTask.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/DeleteDataTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.d.ts +2 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.js +5 -3
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/interfaces/IDataDeletionParams.d.ts +3 -0
- package/dist/integration-engine/vehicle-positions/{schema/MetroRunsSchemaInterfaces.js → workers/runs/tasks/interfaces/IDataDeletionParams.js} +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/interfaces/IDataDeletionParams.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/{schema/MetroRunsSchemaInterfaces.d.ts → workers/runs/tasks/interfaces/MetroRunsMessageInterfaces.d.ts} +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/interfaces/MetroRunsMessageInterfaces.js +3 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/interfaces/MetroRunsMessageInterfaces.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/{schema → workers/runs/tasks/schema}/DataDeletionSchema.d.ts +1 -3
- package/dist/integration-engine/vehicle-positions/{schema → workers/runs/tasks/schema}/DataDeletionSchema.js +0 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/schema/DataDeletionSchema.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/{schema → workers/runs/tasks/schema}/MetroRunsSchema.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/{schema → workers/runs/tasks/schema}/MetroRunsSchema.js +1 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/schema/MetroRunsSchema.js.map +1 -0
- package/dist/output-gateway/pid/{models/RopidDeparturesModel.d.ts → data-access/DeparturesRepository.d.ts} +1 -4
- package/dist/output-gateway/pid/{models/RopidDeparturesModel.js → data-access/DeparturesRepository.js} +15 -9
- package/dist/output-gateway/pid/data-access/DeparturesRepository.js.map +1 -0
- package/dist/output-gateway/pid/data-access/index.d.ts +1 -0
- package/dist/output-gateway/pid/data-access/index.js +18 -0
- package/dist/output-gateway/pid/data-access/index.js.map +1 -0
- package/dist/output-gateway/pid/helpers/DepartureBoardMapper.js +1 -1
- package/dist/output-gateway/pid/helpers/DepartureBoardMapper.js.map +1 -1
- package/dist/output-gateway/pid/index.d.ts +5 -31
- package/dist/output-gateway/pid/index.js.map +1 -1
- package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.d.ts +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/pid/models/helpers/PIDDepartureModel.js +2 -1
- package/dist/output-gateway/pid/models/helpers/PIDDepartureModel.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.d.ts +0 -102
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js +1 -150
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.d.ts +40 -0
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.js +176 -0
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.js.map +1 -0
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/index.d.ts +1 -0
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/index.js +18 -0
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/index.js.map +1 -0
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/interfaces/IDeparturesModel.d.ts +33 -0
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/interfaces/IDeparturesModel.js +3 -0
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/interfaces/IDeparturesModel.js.map +1 -0
- package/package.json +2 -3
- package/dist/integration-engine/ropid-gtfs/RopidGTFSDeparturesModel.d.ts +0 -19
- package/dist/integration-engine/ropid-gtfs/RopidGTFSDeparturesModel.js.map +0 -1
- package/dist/integration-engine/vehicle-positions/schema/DataDeletionSchema.js.map +0 -1
- package/dist/integration-engine/vehicle-positions/schema/MetroRunsSchema.js.map +0 -1
- package/dist/integration-engine/vehicle-positions/schema/MetroRunsSchemaInterfaces.js.map +0 -1
- package/dist/integration-engine/vehicle-positions/schema/index.d.ts +0 -3
- package/dist/integration-engine/vehicle-positions/schema/index.js.map +0 -1
- package/dist/output-gateway/pid/models/RopidDeparturesModel.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetroRunsMessagesTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/vehicle-positions/transformations/MetroRunsMessagesTransformation.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"MetroRunsMessagesTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/vehicle-positions/transformations/MetroRunsMessagesTransformation.ts"],"names":[],"mappings":";;;;AAYA,MAAa,+BAA+B;;AAA5C,0EAqCC;;AApCiB,wCAAQ,GAAG,CAAC,IAAqB,EAA4B,EAAE;IACzE,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IACjD,IAAI,CAAC,SAAS,EAAE;QACZ,OAAO,EAAE,CAAC;KACb;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC3B,SAAS,GAAG,CAAC,SAAS,CAAC,CAAC;KAC3B;IAED,MAAM,GAAG,GAA6B,EAAE,CAAC;IACzC,KAAK,MAAM,aAAa,IAAI,SAAS,EAAE;QACnC,MAAM,OAAO,GAAG,EAAI,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;QAC7E,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACrB;IAED,OAAO,GAAG,CAAC;AACf,CAAE,CAAA;AAEa,4CAAY,GAAG,CAAC,EAAE,WAAW,EAAE,SAAS,EAAqB,EAA0B,EAAE;IACpG,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,gBAAgB,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC5D,wEAAwE;IACxE,MAAM,kBAAkB,GAAG,gBAAgB,GAAG,WAAW,GAAG,IAAI,CAAC;IAEjE,OAAO;QACH,UAAU,EAAE,WAAW,CAAC,KAAK;QAC7B,iBAAiB,EAAE,WAAW,CAAC,EAAE;QACjC,0BAA0B,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE;QACvD,qBAAqB,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE;QAClD,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE;QAC5B,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE;QACxB,YAAY,EAAE,WAAW;QACzB,mCAAmC,EAAE,kBAAkB;KAChC,CAAC;AAChC,CAAE,CAAA"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
|
|
2
|
-
import { IDataDeletionParams
|
|
2
|
+
import { IDataDeletionParams } from "./interfaces/IDataDeletionParams";
|
|
3
|
+
import { DataDeletionValidationSchema } from "./schema/DataDeletionSchema";
|
|
3
4
|
export declare class DeleteDataTask extends AbstractTask<IDataDeletionParams> {
|
|
4
5
|
readonly queueName = "deleteData";
|
|
5
6
|
readonly queueTtl: number;
|
|
@@ -11,14 +11,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.DeleteDataTask = void 0;
|
|
13
13
|
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
14
|
-
const schema_1 = require("../../../schema");
|
|
15
14
|
const data_access_1 = require("../../../data-access");
|
|
15
|
+
const DataDeletionSchema_1 = require("./schema/DataDeletionSchema");
|
|
16
16
|
class DeleteDataTask extends workers_1.AbstractTask {
|
|
17
17
|
constructor(queuePrefix) {
|
|
18
18
|
super(queuePrefix);
|
|
19
19
|
this.queueName = "deleteData";
|
|
20
20
|
this.queueTtl = 1 * 60 * 60 * 1000; // 1 hour
|
|
21
|
-
this.schema =
|
|
21
|
+
this.schema = DataDeletionSchema_1.DataDeletionValidationSchema;
|
|
22
22
|
this.messagesRepository = new data_access_1.MetroRunsMessagesRepository();
|
|
23
23
|
}
|
|
24
24
|
execute(data) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeleteDataTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/DeleteDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"DeleteDataTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/DeleteDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAA6E;AAC7E,sDAAgF;AAEhF,oEAA2E;AAE3E,MAAa,cAAe,SAAQ,sBAAiC;IAOjE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAPP,cAAS,GAAG,YAAY,CAAC;QACzB,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,SAAS;QACxC,WAAM,GAAG,iDAA4B,CAAC;QAMlD,IAAI,CAAC,kBAAkB,GAAG,IAAI,yCAA2B,EAAE,CAAC;IAChE,CAAC;IAEe,OAAO,CAAC,IAAyB;;YAC7C,MAAM,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACxE,CAAC;KAAA;CACJ;AAfD,wCAeC"}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
|
|
2
|
-
import { IMetroRunsInput
|
|
2
|
+
import { IMetroRunsInput } from "./interfaces/MetroRunsMessageInterfaces";
|
|
3
|
+
import { MetroRunsValidationSchema } from "./schema/MetroRunsSchema";
|
|
3
4
|
export declare class SaveMetroRunsToDBTask extends AbstractTask<IMetroRunsInput> {
|
|
4
5
|
readonly queueName = "saveMetroRunsToDB";
|
|
5
6
|
readonly queueTtl: number;
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.js
CHANGED
|
@@ -11,21 +11,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.SaveMetroRunsToDBTask = void 0;
|
|
13
13
|
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
14
|
-
const schema_1 = require("../../../schema");
|
|
15
14
|
const transformations_1 = require("../../../transformations");
|
|
16
15
|
const data_access_1 = require("../../../data-access");
|
|
16
|
+
const MetroRunsSchema_1 = require("./schema/MetroRunsSchema");
|
|
17
17
|
class SaveMetroRunsToDBTask extends workers_1.AbstractTask {
|
|
18
18
|
constructor(queuePrefix) {
|
|
19
19
|
super(queuePrefix);
|
|
20
20
|
this.queueName = "saveMetroRunsToDB";
|
|
21
21
|
this.queueTtl = 3 * 60 * 1000; // 3 minutes
|
|
22
|
-
this.schema =
|
|
22
|
+
this.schema = MetroRunsSchema_1.MetroRunsValidationSchema;
|
|
23
23
|
this.messagesRepository = new data_access_1.MetroRunsMessagesRepository();
|
|
24
24
|
}
|
|
25
25
|
execute(data) {
|
|
26
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
27
27
|
const messages = transformations_1.MetroRunsMessagesTransformation.mapToDTO(data);
|
|
28
|
-
|
|
28
|
+
if (messages.length > 0) {
|
|
29
|
+
yield this.messagesRepository.saveData(messages);
|
|
30
|
+
}
|
|
29
31
|
});
|
|
30
32
|
}
|
|
31
33
|
}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveMetroRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"SaveMetroRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAA6E;AAC7E,8DAAwF;AACxF,sDAAgF;AAEhF,8DAAqE;AAErE,MAAa,qBAAsB,SAAQ,sBAA6B;IAOpE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAPP,cAAS,GAAG,mBAAmB,CAAC;QAChC,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,2CAAyB,CAAC;QAM/C,IAAI,CAAC,kBAAkB,GAAG,IAAI,yCAA2B,EAAE,CAAC;IAChE,CAAC;IAEe,OAAO,CAAC,IAAqB;;YACzC,MAAM,QAAQ,GAAG,iDAA+B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAChE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrB,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;aACpD;QACL,CAAC;KAAA;CACJ;AAlBD,sDAkBC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"IDataDeletionParams.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/interfaces/IDataDeletionParams.ts"],"names":[],"mappings":""}
|
|
@@ -15,7 +15,7 @@ export interface IMetroRunsTrainContent {
|
|
|
15
15
|
}
|
|
16
16
|
export interface IMetroRunsMessageContent {
|
|
17
17
|
$: IMetroRunsMessageProperties;
|
|
18
|
-
vlak
|
|
18
|
+
vlak?: IMetroRunsTrainContent | IMetroRunsTrainContent[];
|
|
19
19
|
}
|
|
20
20
|
export interface IMetroRunsInput {
|
|
21
21
|
m: IMetroRunsMessageContent;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MetroRunsMessageInterfaces.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/interfaces/MetroRunsMessageInterfaces.ts"],"names":[],"mappings":""}
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DataDeletionSchema.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/schema/DataDeletionSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+EAAuE;AAGvE,MAAa,4BAA4B;CAIxC;AADG;IAFC,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAG,EAAC,EAAE,EAAE,EAAE,OAAO,EAAE,4CAA4C,EAAE,CAAC;;iEAC9C;AAHzB,oEAIC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IMetroRunsInput, IMetroRunsMessageContent } from "
|
|
1
|
+
import { IMetroRunsInput, IMetroRunsMessageContent } from "../interfaces/MetroRunsMessageInterfaces";
|
|
2
2
|
export declare class MetroRunsValidationSchema implements IMetroRunsInput {
|
|
3
3
|
m: IMetroRunsMessageContent;
|
|
4
4
|
}
|
|
@@ -67,6 +67,7 @@ __decorate([
|
|
|
67
67
|
__metadata("design:type", Object)
|
|
68
68
|
], MessageContentValidationSchema.prototype, "$", void 0);
|
|
69
69
|
__decorate([
|
|
70
|
+
(0, class_validator_1.IsOptional)(),
|
|
70
71
|
(0, class_validator_1.IsObject)({ each: true }),
|
|
71
72
|
(0, class_validator_1.ValidateNested)(),
|
|
72
73
|
(0, class_transformer_1.Type)(() => TrainContentValidationSchema),
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/schema/MetroRunsSchema.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MetroRunsSchema.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/schema/MetroRunsSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+EAQmD;AACnD,mFAAmE;AASnE,MAAM,iCAAiC;CAWtC;AARG;IAFC,IAAA,0BAAQ,GAAE;IACV,IAAA,8BAAY,EAAC,CAAC,EAAE,CAAC,CAAC;;gEACJ;AAGf;IADC,IAAA,2BAAS,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;;6DAChB;AAIZ;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;8DACE;AAGjB,MAAM,+BAA+B;CAepC;AAbG;IADC,IAAA,0BAAQ,GAAE;;4DACE;AAGb;IADC,IAAA,0BAAQ,GAAE;;4DACE;AAGb;IADC,IAAA,0BAAQ,GAAE;;2DACC;AAGZ;IADC,IAAA,0BAAQ,GAAE;;2DACC;AAGZ;IADC,IAAA,gCAAc,GAAE;;6DACH;AAGlB,MAAM,4BAA4B;CAKjC;AADG;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,gCAAc,GAAE;IAChB,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,+BAA+B,CAAC;;uDACd;AAGlC,MAAM,8BAA8B;CAWnC;AAPG;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,gCAAc,GAAE;IAChB,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,iCAAiC,CAAC;;yDACd;AAMhC;IAJC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,IAAA,gCAAc,GAAE;IAChB,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,4BAA4B,CAAC;;4DACgB;AAG7D,MAAa,yBAAyB;CAKrC;AADG;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,gCAAc,GAAE;IAChB,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,8BAA8B,CAAC;;oDACd;AAJjC,8DAKC"}
|
|
@@ -9,10 +9,7 @@ export interface IDeparturesViewOptions {
|
|
|
9
9
|
minutesOffset: number;
|
|
10
10
|
mode: DepartureMode;
|
|
11
11
|
}
|
|
12
|
-
|
|
13
|
-
* Custom Postgres model for Ropid Departures View Model
|
|
14
|
-
*/
|
|
15
|
-
export declare class RopidDeparturesModel extends SequelizeModel {
|
|
12
|
+
export declare class DeparturesRepository extends SequelizeModel {
|
|
16
13
|
private tripsModel;
|
|
17
14
|
private positionsModel;
|
|
18
15
|
constructor();
|
|
@@ -12,21 +12,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.
|
|
15
|
+
exports.DeparturesRepository = void 0;
|
|
16
16
|
const moment_1 = __importDefault(require("moment"));
|
|
17
17
|
const output_gateway_1 = require("@golemio/core/dist/output-gateway");
|
|
18
18
|
const ropid_gtfs_1 = require("../../../schema-definitions/ropid-gtfs");
|
|
19
|
+
const precomputed_1 = require("../../../schema-definitions/ropid-gtfs/models/precomputed");
|
|
19
20
|
const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
|
|
20
21
|
const VehiclePositionsTripsModel_1 = require("../../vehicle-positions/models/VehiclePositionsTripsModel");
|
|
21
22
|
const VehiclePositionsPositionsModel_1 = require("../../vehicle-positions/models/VehiclePositionsPositionsModel");
|
|
22
23
|
const __1 = require("..");
|
|
23
24
|
const const_1 = require("../../../const");
|
|
24
|
-
|
|
25
|
-
* Custom Postgres model for Ropid Departures View Model
|
|
26
|
-
*/
|
|
27
|
-
class RopidDeparturesModel extends output_gateway_1.SequelizeModel {
|
|
25
|
+
class DeparturesRepository extends output_gateway_1.SequelizeModel {
|
|
28
26
|
constructor() {
|
|
29
|
-
super(
|
|
27
|
+
super("DeparturesRepository", precomputed_1.DeparturesModel.TABLE_NAME, precomputed_1.DeparturesModel.attributeModel, {
|
|
28
|
+
schema: ropid_gtfs_1.RopidGTFS.pgSchema,
|
|
29
|
+
});
|
|
30
30
|
this.sequelizeModel.removeAttribute("id");
|
|
31
31
|
this.tripsModel = new VehiclePositionsTripsModel_1.VehiclePositionsTripsModel();
|
|
32
32
|
this.positionsModel = new VehiclePositionsPositionsModel_1.VehiclePositionsPositionsModel();
|
|
@@ -35,7 +35,7 @@ class RopidDeparturesModel extends output_gateway_1.SequelizeModel {
|
|
|
35
35
|
sourceKey: "trip_id",
|
|
36
36
|
scope: {
|
|
37
37
|
[sequelize_1.default.Op.and]: [
|
|
38
|
-
sequelize_1.default.literal(`TO_TIMESTAMP(trip.start_timestamp/1000)::DATE = ${
|
|
38
|
+
sequelize_1.default.literal(`TO_TIMESTAMP(trip.start_timestamp/1000)::DATE = ${precomputed_1.DeparturesModel.TABLE_NAME}.date`),
|
|
39
39
|
],
|
|
40
40
|
},
|
|
41
41
|
as: "trip",
|
|
@@ -168,6 +168,7 @@ class RopidDeparturesModel extends output_gateway_1.SequelizeModel {
|
|
|
168
168
|
conditionMode,
|
|
169
169
|
],
|
|
170
170
|
};
|
|
171
|
+
const stopPrefixes = new Set(options.stopsIds.map((stopId) => stopId.substring(0, 4)));
|
|
171
172
|
return this.sequelizeModel.findAll({
|
|
172
173
|
attributes: {
|
|
173
174
|
include: [
|
|
@@ -182,6 +183,11 @@ class RopidDeparturesModel extends output_gateway_1.SequelizeModel {
|
|
|
182
183
|
},
|
|
183
184
|
where: {
|
|
184
185
|
[sequelize_1.default.Op.and]: [
|
|
186
|
+
{
|
|
187
|
+
part_index: {
|
|
188
|
+
[sequelize_1.default.Op.in]: [...stopPrefixes],
|
|
189
|
+
},
|
|
190
|
+
},
|
|
185
191
|
{
|
|
186
192
|
stop_id: {
|
|
187
193
|
[sequelize_1.default.Op.in]: options.stopsIds,
|
|
@@ -224,5 +230,5 @@ class RopidDeparturesModel extends output_gateway_1.SequelizeModel {
|
|
|
224
230
|
});
|
|
225
231
|
}
|
|
226
232
|
}
|
|
227
|
-
exports.
|
|
228
|
-
//# sourceMappingURL=
|
|
233
|
+
exports.DeparturesRepository = DeparturesRepository;
|
|
234
|
+
//# sourceMappingURL=DeparturesRepository.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DeparturesRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/data-access/DeparturesRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from "./DeparturesRepository";
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./DeparturesRepository"), exports);
|
|
18
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/data-access/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC"}
|
|
@@ -73,7 +73,7 @@ DepartureBoardMapper.transformResponseData = (x, preferredTimezone, mode) => {
|
|
|
73
73
|
},
|
|
74
74
|
route: {
|
|
75
75
|
short_name: x.route_short_name,
|
|
76
|
-
type: parseInt(x.route_type, 10),
|
|
76
|
+
type: x.route_type ? parseInt(x.route_type, 10) : null,
|
|
77
77
|
is_night: x.is_night === "1",
|
|
78
78
|
is_regional: x.is_regional === "1",
|
|
79
79
|
is_substitute_transport: x.is_substitute_transport === "1",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DepartureBoardMapper.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/helpers/DepartureBoardMapper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DepartureBoardMapper.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/helpers/DepartureBoardMapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,42 +1,16 @@
|
|
|
1
1
|
import { DeparturesDirectionsEnum } from "../../schema-definitions/ropid-departures-directions";
|
|
2
|
+
import { IDeparturesModel } from "../../schema-definitions/ropid-gtfs/models/precomputed/interfaces/IDeparturesModel";
|
|
2
3
|
import { StatePositionEnum, StateProcessEnum } from "../../const";
|
|
3
4
|
export * from "./models";
|
|
4
5
|
export * from "./PIDRouter";
|
|
5
|
-
export interface IPIDDeparture {
|
|
6
|
+
export interface IPIDDeparture extends IDeparturesModel {
|
|
6
7
|
direction: DeparturesDirectionsEnum | null;
|
|
7
|
-
max_stop_sequence: number;
|
|
8
|
-
min_stop_sequence: number;
|
|
9
|
-
stop_sequence: number;
|
|
10
|
-
is_night: string;
|
|
11
|
-
is_regional: string;
|
|
12
|
-
is_substitute_transport: string;
|
|
13
8
|
delay_seconds: number | null;
|
|
14
9
|
delay_minutes: number | null;
|
|
15
10
|
is_delay_available: boolean;
|
|
16
|
-
arrival_time: string;
|
|
17
|
-
departure_time: string;
|
|
18
|
-
arrival_datetime: string;
|
|
19
|
-
departure_datetime: string;
|
|
20
11
|
arrival_datetime_real: Date | null;
|
|
21
12
|
departure_datetime_real: Date | null;
|
|
22
|
-
route_short_name: string;
|
|
23
|
-
trip_id: string;
|
|
24
|
-
trip_headsign: string;
|
|
25
|
-
trip_short_name: string;
|
|
26
|
-
service_id: string;
|
|
27
|
-
stop_id: string;
|
|
28
|
-
stop_name: string;
|
|
29
|
-
stop_headsign: string;
|
|
30
13
|
state_position: string;
|
|
31
|
-
last_stop_id: string | null;
|
|
32
|
-
last_stop_sequence: number | null;
|
|
33
|
-
next_stop_id: string;
|
|
34
|
-
next_stop_sequence: number | null;
|
|
35
|
-
platform_code: string;
|
|
36
|
-
route_type: string;
|
|
37
|
-
route_id: string;
|
|
38
|
-
wheelchair_boarding: number;
|
|
39
|
-
wheelchair_accessible: number;
|
|
40
14
|
real_wheelchair_accessible: boolean | null;
|
|
41
15
|
is_canceled: boolean;
|
|
42
16
|
"trip.agency_name_real": string | null;
|
|
@@ -112,15 +86,15 @@ export interface IPIDDepartureOutput {
|
|
|
112
86
|
name: String | null;
|
|
113
87
|
};
|
|
114
88
|
route: {
|
|
115
|
-
short_name:
|
|
116
|
-
type:
|
|
89
|
+
short_name: string | null;
|
|
90
|
+
type: number | null;
|
|
117
91
|
is_night: Boolean;
|
|
118
92
|
is_regional: Boolean;
|
|
119
93
|
is_substitute_transport: Boolean;
|
|
120
94
|
};
|
|
121
95
|
stop: {
|
|
122
96
|
id: String;
|
|
123
|
-
platform_code:
|
|
97
|
+
platform_code: string | null;
|
|
124
98
|
};
|
|
125
99
|
trip: {
|
|
126
100
|
direction: DeparturesDirectionsEnum | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/pid/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/pid/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAIA,2CAAyB;AACzB,8CAA4B;AAoH5B,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,0CAAyB,CAAA;IACzB,sCAAqB,CAAA;IACrB,gCAAe,CAAA;AACnB,CAAC,EAJW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAIxB;AAED,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,+BAAa,CAAA;IACb,yCAAuB,CAAA;AAC3B,CAAC,EAHW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAGzB;AAED,IAAY,eAQX;AARD,WAAY,eAAe;IACvB,gCAAa,CAAA;IACb,2CAAwB,CAAA;IACxB,0DAAuC,CAAA;IACvC,oDAAiC,CAAA;IACjC,mEAAgD,CAAA;IAChD,qEAAkD,CAAA;IAClD,8EAA2D,CAAA;AAC/D,CAAC,EARW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAQ1B;AAED,IAAY,aAKX;AALD,WAAY,aAAa;IACrB,wCAAuB,CAAA;IACvB,sCAAqB,CAAA;IACrB,mCAAkB,CAAA;IAClB,8BAA8B;AAClC,CAAC,EALW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAKxB"}
|
|
@@ -3,7 +3,7 @@ declare class PIDDepartureBoardsModel {
|
|
|
3
3
|
private stopsMaxCount;
|
|
4
4
|
private ropidVYMIEventsStopsModel;
|
|
5
5
|
private ropidDeparturesDirectionsModel;
|
|
6
|
-
private
|
|
6
|
+
private departuresRepository;
|
|
7
7
|
constructor();
|
|
8
8
|
/** Retrieves all gtfs stop times for specific stop, optionaly enhanced with realtime delays
|
|
9
9
|
* @param {string} id Id of the stop
|
|
@@ -18,7 +18,7 @@ const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/mom
|
|
|
18
18
|
const models_1 = require("../../ropid-gtfs/models");
|
|
19
19
|
const _1 = require(".");
|
|
20
20
|
const __1 = require("..");
|
|
21
|
-
const
|
|
21
|
+
const data_access_1 = require("../data-access");
|
|
22
22
|
const config_1 = require("@golemio/core/dist/output-gateway/config");
|
|
23
23
|
const trace_provider_1 = require("@golemio/core/dist/monitoring/opentelemetry/trace-provider");
|
|
24
24
|
const PIDDepartureModel_1 = __importDefault(require("./helpers/PIDDepartureModel"));
|
|
@@ -66,7 +66,7 @@ class PIDDepartureBoardsModel {
|
|
|
66
66
|
const departuresDirections = yield this.ropidDeparturesDirectionsModel.GetAll(stopsIds);
|
|
67
67
|
spanDirections === null || spanDirections === void 0 ? void 0 : spanDirections.end();
|
|
68
68
|
try {
|
|
69
|
-
const results = yield this.
|
|
69
|
+
const results = yield this.departuresRepository.GetAll({
|
|
70
70
|
currentMoment,
|
|
71
71
|
minutesAfter: options.minutesAfter,
|
|
72
72
|
minutesBefore: options.minutesBefore,
|
|
@@ -99,7 +99,7 @@ class PIDDepartureBoardsModel {
|
|
|
99
99
|
});
|
|
100
100
|
this.ropidVYMIEventsStopsModel = new _1.RopidVYMIEventsStopsModel();
|
|
101
101
|
this.ropidDeparturesDirectionsModel = new _1.RopidDeparturesDirectionsModel();
|
|
102
|
-
this.
|
|
102
|
+
this.departuresRepository = new data_access_1.DeparturesRepository();
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
exports.PIDDepartureBoardsModel = PIDDepartureBoardsModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PIDDepartureBoardsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/PIDDepartureBoardsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6EAAuE;AACvE,gGAA2E;AAC3E,oDAA+C;AAC/C,wBAA8E;AAC9E,0BAAmF;AAEnF,
|
|
1
|
+
{"version":3,"file":"PIDDepartureBoardsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/PIDDepartureBoardsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,12 +65,13 @@ class PIDDeparturesModel {
|
|
|
65
65
|
*/
|
|
66
66
|
this.addDirections = () => {
|
|
67
67
|
this.departures.forEach((departure) => {
|
|
68
|
+
var _a;
|
|
68
69
|
departure.direction = departure.direction || null;
|
|
69
70
|
const thisStopDeparturesDirections = this.options.departuresDirections.filter((departuresDirection) => departuresDirection.departure_stop_id === departure.stop_id);
|
|
70
71
|
if (thisStopDeparturesDirections.length > 0) {
|
|
71
72
|
for (const thisStopDeparturesDirection of thisStopDeparturesDirections) {
|
|
72
73
|
if (departure.stop_id === thisStopDeparturesDirection.departure_stop_id &&
|
|
73
|
-
departure.next_stop_id.match(thisStopDeparturesDirection.next_stop_id_regexp)) {
|
|
74
|
+
((_a = departure.next_stop_id) === null || _a === void 0 ? void 0 : _a.match(thisStopDeparturesDirection.next_stop_id_regexp))) {
|
|
74
75
|
departure.direction = thisStopDeparturesDirection.direction;
|
|
75
76
|
}
|
|
76
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PIDDepartureModel.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/models/helpers/PIDDepartureModel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"PIDDepartureModel.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/models/helpers/PIDDepartureModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,107 +1,5 @@
|
|
|
1
1
|
import { ModelAttributes } from "@golemio/core/dist/shared/sequelize";
|
|
2
2
|
export declare const RopidGTFSPrecomputed: {
|
|
3
|
-
departures: {
|
|
4
|
-
name: string;
|
|
5
|
-
outputJsonSchema: {
|
|
6
|
-
type: string;
|
|
7
|
-
properties: {
|
|
8
|
-
stop_sequence: {
|
|
9
|
-
type: string;
|
|
10
|
-
};
|
|
11
|
-
stop_headsign: {
|
|
12
|
-
type: string;
|
|
13
|
-
};
|
|
14
|
-
pickup_type: {
|
|
15
|
-
type: string;
|
|
16
|
-
};
|
|
17
|
-
drop_off_type: {
|
|
18
|
-
type: string;
|
|
19
|
-
};
|
|
20
|
-
arrival_time: {
|
|
21
|
-
type: string;
|
|
22
|
-
};
|
|
23
|
-
arrival_datetime: {
|
|
24
|
-
type: string;
|
|
25
|
-
};
|
|
26
|
-
departure_time: {
|
|
27
|
-
type: string;
|
|
28
|
-
};
|
|
29
|
-
departure_datetime: {
|
|
30
|
-
type: string;
|
|
31
|
-
};
|
|
32
|
-
stop_id: {
|
|
33
|
-
type: string;
|
|
34
|
-
};
|
|
35
|
-
stop_name: {
|
|
36
|
-
type: string;
|
|
37
|
-
};
|
|
38
|
-
platform_code: {
|
|
39
|
-
type: string;
|
|
40
|
-
};
|
|
41
|
-
wheelchair_boarding: {
|
|
42
|
-
type: string;
|
|
43
|
-
};
|
|
44
|
-
min_stop_sequence: {
|
|
45
|
-
type: string;
|
|
46
|
-
};
|
|
47
|
-
max_stop_sequence: {
|
|
48
|
-
type: string;
|
|
49
|
-
};
|
|
50
|
-
trip_id: {
|
|
51
|
-
type: string;
|
|
52
|
-
};
|
|
53
|
-
trip_headsign: {
|
|
54
|
-
type: string;
|
|
55
|
-
};
|
|
56
|
-
trip_short_name: {
|
|
57
|
-
type: string;
|
|
58
|
-
};
|
|
59
|
-
wheelchair_accessible: {
|
|
60
|
-
type: string;
|
|
61
|
-
};
|
|
62
|
-
service_id: {
|
|
63
|
-
type: string;
|
|
64
|
-
};
|
|
65
|
-
date: {
|
|
66
|
-
type: string;
|
|
67
|
-
};
|
|
68
|
-
route_short_name: {
|
|
69
|
-
type: string;
|
|
70
|
-
};
|
|
71
|
-
route_type: {
|
|
72
|
-
type: string;
|
|
73
|
-
};
|
|
74
|
-
route_id: {
|
|
75
|
-
type: string;
|
|
76
|
-
};
|
|
77
|
-
is_night: {
|
|
78
|
-
type: string;
|
|
79
|
-
};
|
|
80
|
-
is_regional: {
|
|
81
|
-
type: string;
|
|
82
|
-
};
|
|
83
|
-
is_substitute_transport: {
|
|
84
|
-
type: string;
|
|
85
|
-
};
|
|
86
|
-
next_stop_sequence: {
|
|
87
|
-
type: string;
|
|
88
|
-
};
|
|
89
|
-
next_stop_id: {
|
|
90
|
-
type: string;
|
|
91
|
-
};
|
|
92
|
-
last_stop_sequence: {
|
|
93
|
-
type: string;
|
|
94
|
-
};
|
|
95
|
-
last_stop_id: {
|
|
96
|
-
type: string;
|
|
97
|
-
};
|
|
98
|
-
};
|
|
99
|
-
required: string[];
|
|
100
|
-
};
|
|
101
|
-
outputSequelizeAttributes: ModelAttributes<any, any>;
|
|
102
|
-
modelIndexOptions: import("sequelize/types/dialects/abstract/query-interface").IndexesOptions[];
|
|
103
|
-
pgTableName: string;
|
|
104
|
-
};
|
|
105
3
|
services_first14days: {
|
|
106
4
|
name: string;
|
|
107
5
|
outputJsonSchema: {
|