@golemio/pid 5.15.1 → 5.15.2-rc.2591024738
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/jis/repositories/RopidDeparturesPresetsRoutesRepository.d.ts +1 -0
- package/dist/integration-engine/jis/repositories/RopidDeparturesPresetsRoutesRepository.js +18 -0
- package/dist/integration-engine/jis/repositories/RopidDeparturesPresetsRoutesRepository.js.map +1 -1
- package/docs/openapi-output.yaml +1 -1
- package/package.json +1 -1
package/dist/integration-engine/jis/repositories/RopidDeparturesPresetsRoutesRepository.d.ts
CHANGED
|
@@ -13,6 +13,7 @@ export declare class RopidDeparturesPresetsRoutesRepository extends AbstractVali
|
|
|
13
13
|
sequelizeModel: ModelStatic<RopidDeparturesPresetsRoutesModel>;
|
|
14
14
|
private junctionModel;
|
|
15
15
|
private departuresModel;
|
|
16
|
+
private tripScheduleActualModel;
|
|
16
17
|
constructor(connector: IDatabaseConnector, logger: ILogger, presetsStopsRepository: RopidDeparturesPresetsRopidGTFSStopsRepository);
|
|
17
18
|
findAllWithRoutes(): Promise<IRopidDeparturesPresetsRoutes[]>;
|
|
18
19
|
refreshData(data: IRopidDeparturesPresetsRoutes[]): Promise<void>;
|
|
@@ -15,7 +15,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.RopidDeparturesPresetsRoutesRepository = void 0;
|
|
16
16
|
const const_1 = require("../../../schema-definitions/const");
|
|
17
17
|
const RopidDeparturesPresetsRoutesModel_1 = require("../../../schema-definitions/jis/models/RopidDeparturesPresetsRoutesModel");
|
|
18
|
+
const RopidGTFSPrecomputed_1 = require("../../../schema-definitions/ropid-gtfs/RopidGTFSPrecomputed");
|
|
18
19
|
const precomputed_1 = require("../../../schema-definitions/ropid-gtfs/models/precomputed");
|
|
20
|
+
const SourceTableSuffixEnum_1 = require("../../ropid-gtfs/helpers/SourceTableSuffixEnum");
|
|
19
21
|
const AbstractValidatableRepository_1 = require("@golemio/core/dist/helpers/data-access/postgres/repositories/AbstractValidatableRepository");
|
|
20
22
|
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
21
23
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
@@ -34,12 +36,19 @@ let RopidDeparturesPresetsRoutesRepository = class RopidDeparturesPresetsRoutesR
|
|
|
34
36
|
this.sequelizeModel = db.define(RopidDeparturesPresetsRoutesModel_1.RopidDeparturesPresetsRoutesModel.tableName, RopidDeparturesPresetsRoutesModel_1.RopidDeparturesPresetsRoutesModel.attributeModel, { schema: this.schema });
|
|
35
37
|
this.junctionModel = presetsStopsRepository.sequelizeModel;
|
|
36
38
|
this.departuresModel = db.define(precomputed_1.DeparturesModel.TABLE_NAME, precomputed_1.DeparturesModel.attributeModel, { schema: this.schema });
|
|
39
|
+
this.tripScheduleActualModel = db.define(RopidGTFSPrecomputed_1.RopidGTFSPrecomputed.tripSchedule.pgTableName + SourceTableSuffixEnum_1.SourceTableSuffixEnum.Actual, RopidGTFSPrecomputed_1.RopidGTFSPrecomputed.tripSchedule.outputSequelizeAttributes, { schema: this.schema });
|
|
37
40
|
this.junctionModel.hasMany(this.departuresModel, {
|
|
38
41
|
foreignKey: "stop_id",
|
|
39
42
|
sourceKey: "stop_id",
|
|
40
43
|
as: "departures",
|
|
41
44
|
constraints: false,
|
|
42
45
|
});
|
|
46
|
+
this.departuresModel.hasMany(this.tripScheduleActualModel, {
|
|
47
|
+
foreignKey: "trip_id",
|
|
48
|
+
sourceKey: "trip_id",
|
|
49
|
+
as: "tripSchedule",
|
|
50
|
+
constraints: false,
|
|
51
|
+
});
|
|
43
52
|
}
|
|
44
53
|
async findAllWithRoutes() {
|
|
45
54
|
// https://github.com/sequelize/sequelize/issues/2996
|
|
@@ -64,8 +73,17 @@ let RopidDeparturesPresetsRoutesRepository = class RopidDeparturesPresetsRoutesR
|
|
|
64
73
|
as: "departures",
|
|
65
74
|
attributes: [],
|
|
66
75
|
required: true,
|
|
76
|
+
include: [
|
|
77
|
+
{
|
|
78
|
+
model: this.tripScheduleActualModel,
|
|
79
|
+
as: "tripSchedule",
|
|
80
|
+
attributes: [],
|
|
81
|
+
required: false,
|
|
82
|
+
},
|
|
83
|
+
],
|
|
67
84
|
},
|
|
68
85
|
],
|
|
86
|
+
where: sequelize_1.Sequelize.literal(`"departures->tripSchedule"."trip_id" IS NULL OR "departures->tripSchedule"."exceptional" = 0`),
|
|
69
87
|
order: [
|
|
70
88
|
[sequelize_1.Sequelize.literal('"ropid_departures_presets_ropidgtfs_stops"."preset_id"'), "ASC"],
|
|
71
89
|
[sequelize_1.Sequelize.literal('"ropid_departures_presets_ropidgtfs_stops"."stop_id"'), "ASC"],
|
package/dist/integration-engine/jis/repositories/RopidDeparturesPresetsRoutesRepository.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidDeparturesPresetsRoutesRepository.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/repositories/RopidDeparturesPresetsRoutesRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAAuC;AAGvC,gIAAsG;AACtG,2FAAqE;
|
|
1
|
+
{"version":3,"file":"RopidDeparturesPresetsRoutesRepository.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/repositories/RopidDeparturesPresetsRoutesRepository.ts"],"names":[],"mappings":"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"}
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -1310,7 +1310,7 @@ paths:
|
|
|
1310
1310
|
responses:
|
|
1311
1311
|
200:
|
|
1312
1312
|
|
|
1313
|
-
description: A list of ROPID departures presets linked with gtfs stops
|
|
1313
|
+
description: A list of ROPID departures presets linked with gtfs stops, without exceptional routes
|
|
1314
1314
|
headers:
|
|
1315
1315
|
Cache-Control:
|
|
1316
1316
|
description: Cache control directive for caching proxies
|