@golemio/pid 2.7.8 → 2.7.9
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/output-gateway/pid/models/RopidVYMIEventsStopsModel.d.ts +1 -0
- package/dist/output-gateway/pid/models/RopidVYMIEventsStopsModel.js +6 -4
- package/dist/output-gateway/pid/models/RopidVYMIEventsStopsModel.js.map +1 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopModel.js +8 -2
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopModel.js.map +1 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.d.ts +1 -0
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.js +5 -3
- package/dist/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.js.map +1 -1
- package/dist/output-gateway/ropid-gtfs/models/GTFSTripsModel.d.ts +1 -0
- package/dist/output-gateway/ropid-gtfs/models/GTFSTripsModel.js +15 -10
- package/dist/output-gateway/ropid-gtfs/models/GTFSTripsModel.js.map +1 -1
- package/dist/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.d.ts +1 -0
- package/dist/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.js +5 -4
- package/dist/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.js.map +1 -1
- package/package.json +2 -2
|
@@ -37,6 +37,7 @@ interface IInfotextsStopsWithRoutesOutputModel extends Omit<IInfotextsStopsWithR
|
|
|
37
37
|
* Custom Postgres model for Ropid VYMI Events
|
|
38
38
|
*/
|
|
39
39
|
export declare class RopidVYMIEventsStopsModel extends SequelizeModel {
|
|
40
|
+
private dbConnector;
|
|
40
41
|
private readonly eventsModel;
|
|
41
42
|
private readonly eventsRoutesModel;
|
|
42
43
|
private readonly gtfsStopsModel;
|
|
@@ -33,6 +33,7 @@ const ropid_vymi_1 = require("../../../schema-definitions/ropid-vymi");
|
|
|
33
33
|
const output_gateway_1 = require("@golemio/core/dist/output-gateway");
|
|
34
34
|
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
35
35
|
const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
|
|
36
|
+
const ioc_1 = require("@golemio/core/dist/output-gateway/ioc/");
|
|
36
37
|
var InfotextsRecordTypeEnum;
|
|
37
38
|
(function (InfotextsRecordTypeEnum) {
|
|
38
39
|
InfotextsRecordTypeEnum[InfotextsRecordTypeEnum["EXCEPTION"] = 1] = "EXCEPTION";
|
|
@@ -76,7 +77,7 @@ class RopidVYMIEventsStopsModel extends output_gateway_1.SequelizeModel {
|
|
|
76
77
|
include: {
|
|
77
78
|
attributes: [],
|
|
78
79
|
as: "vymi_event",
|
|
79
|
-
model:
|
|
80
|
+
model: this.dbConnector.getConnection().models[ropid_vymi_1.RopidVYMI.events.pgTableName],
|
|
80
81
|
where: {
|
|
81
82
|
time_from: {
|
|
82
83
|
[sequelize_1.default.Op.lte]: new Date().toISOString(),
|
|
@@ -127,7 +128,7 @@ class RopidVYMIEventsStopsModel extends output_gateway_1.SequelizeModel {
|
|
|
127
128
|
{
|
|
128
129
|
attributes: [],
|
|
129
130
|
as: "vymi_event",
|
|
130
|
-
model:
|
|
131
|
+
model: this.dbConnector.getConnection().models[ropid_vymi_1.RopidVYMI.events.pgTableName],
|
|
131
132
|
where: {
|
|
132
133
|
time_from: {
|
|
133
134
|
[sequelize_1.default.Op.lte]: currentDateISO,
|
|
@@ -140,12 +141,12 @@ class RopidVYMIEventsStopsModel extends output_gateway_1.SequelizeModel {
|
|
|
140
141
|
{
|
|
141
142
|
attributes: [],
|
|
142
143
|
as: "vymi_route",
|
|
143
|
-
model:
|
|
144
|
+
model: this.dbConnector.getConnection().models[ropid_vymi_1.RopidVYMI.eventsRoutes.pgTableName],
|
|
144
145
|
},
|
|
145
146
|
{
|
|
146
147
|
attributes: [],
|
|
147
148
|
as: "gtfs_stop",
|
|
148
|
-
model:
|
|
149
|
+
model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stops.pgTableName],
|
|
149
150
|
},
|
|
150
151
|
],
|
|
151
152
|
where: {
|
|
@@ -180,6 +181,7 @@ class RopidVYMIEventsStopsModel extends output_gateway_1.SequelizeModel {
|
|
|
180
181
|
// stop type 1 and 9 leads to general infotext type
|
|
181
182
|
return stopType === 1 || stopType === 9 ? InfotextsDisplayTypeEnum.GENERAL : InfotextsDisplayTypeEnum.INLINE;
|
|
182
183
|
};
|
|
184
|
+
this.dbConnector = ioc_1.OutputGatewayContainer.resolve(ioc_1.ContainerToken.PostgresDatabase);
|
|
183
185
|
this.eventsModel = new models_1.RopidVYMIEventsModel();
|
|
184
186
|
this.eventsRoutesModel = new models_1.RopidVYMIEventsRoutesModel();
|
|
185
187
|
this.gtfsStopsModel = new GTFSStopModel_1.GTFSStopModel();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidVYMIEventsStopsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/RopidVYMIEventsStopsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAAkF;AAClF,yEAAoE;AACpE,yCAA8C;AAC9C,6DAAuC;AACvC,uEAA4C;AAC5C,uEAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"RopidVYMIEventsStopsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/RopidVYMIEventsStopsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,11 +16,12 @@ exports.GTFSStopModel = void 0;
|
|
|
16
16
|
const const_1 = require("../../../schema-definitions/const");
|
|
17
17
|
const ropid_gtfs_1 = require("../../../schema-definitions/ropid-gtfs");
|
|
18
18
|
const StopDto_1 = require("../../../schema-definitions/ropid-gtfs/models/StopDto");
|
|
19
|
-
const database_1 = require("@golemio/core/dist/output-gateway/database");
|
|
20
19
|
const Geo_1 = require("@golemio/core/dist/output-gateway/Geo");
|
|
21
20
|
const models_1 = require("@golemio/core/dist/output-gateway/models");
|
|
22
21
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
23
22
|
const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
|
|
23
|
+
const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
|
|
24
|
+
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
24
25
|
class GTFSStopModel extends models_1.SequelizeModel {
|
|
25
26
|
constructor() {
|
|
26
27
|
super(ropid_gtfs_1.RopidGTFS.stops.name, ropid_gtfs_1.RopidGTFS.stops.pgTableName, StopDto_1.StopDto.attributeModel, {
|
|
@@ -56,13 +57,18 @@ class GTFSStopModel extends models_1.SequelizeModel {
|
|
|
56
57
|
});
|
|
57
58
|
return stops;
|
|
58
59
|
});
|
|
60
|
+
const connector = ioc_1.OutputGatewayContainer.resolve(CoreToken_1.CoreToken.PostgresConnector);
|
|
59
61
|
this.outputAttributes = Object.keys(StopDto_1.StopDto.attributeModel);
|
|
60
62
|
const notUsedColumns = ["stop_code", "stop_desc", "stop_url", "stop_timezone", "asw_node_id", "asw_stop_id"];
|
|
61
63
|
for (const column of notUsedColumns) {
|
|
62
64
|
this.sequelizeModel.removeAttribute(column);
|
|
63
65
|
this.outputAttributes.splice(this.outputAttributes.indexOf(column), 1);
|
|
64
66
|
}
|
|
65
|
-
this.cisStopsModel =
|
|
67
|
+
this.cisStopsModel = connector
|
|
68
|
+
.getConnection()
|
|
69
|
+
.define(ropid_gtfs_1.RopidGTFS.cis_stops.pgTableName, ropid_gtfs_1.RopidGTFS.cis_stops.outputSequelizeAttributes, {
|
|
70
|
+
schema: const_1.PG_SCHEMA,
|
|
71
|
+
});
|
|
66
72
|
}
|
|
67
73
|
GetAll(options) {
|
|
68
74
|
var _a, _b, _c;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTFSStopModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSStopModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAAuC;AACvC,uEAA4C;AAC5C,mFAAyD;AACzD
|
|
1
|
+
{"version":3,"file":"GTFSStopModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSStopModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { SequelizeModel } from "@golemio/core/dist/output-gateway";
|
|
2
2
|
import { IGTFSModels } from ".";
|
|
3
3
|
export declare class GTFSStopTimesModel extends SequelizeModel {
|
|
4
|
+
private dbConnector;
|
|
4
5
|
constructor();
|
|
5
6
|
Associate: (models: IGTFSModels) => void;
|
|
6
7
|
/** Retrieves all gtfs stop times for specific stop id
|
|
@@ -19,6 +19,7 @@ const StopTimesDto_1 = require("../../../schema-definitions/ropid-gtfs/models/St
|
|
|
19
19
|
const output_gateway_1 = require("@golemio/core/dist/output-gateway");
|
|
20
20
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
21
21
|
const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
|
|
22
|
+
const ioc_1 = require("@golemio/core/dist/output-gateway/ioc/");
|
|
22
23
|
class GTFSStopTimesModel extends output_gateway_1.SequelizeModel {
|
|
23
24
|
constructor() {
|
|
24
25
|
super(ropid_gtfs_1.RopidGTFS.stop_times.name, ropid_gtfs_1.RopidGTFS.stop_times.pgTableName, StopTimesDto_1.StopTimesDto.attributeModel, {
|
|
@@ -64,19 +65,19 @@ class GTFSStopTimesModel extends output_gateway_1.SequelizeModel {
|
|
|
64
65
|
{
|
|
65
66
|
as: "service",
|
|
66
67
|
attributes: [],
|
|
67
|
-
model:
|
|
68
|
+
model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.calendar.pgTableName].scope({
|
|
68
69
|
method: ["forDate", date],
|
|
69
70
|
}),
|
|
70
71
|
},
|
|
71
72
|
],
|
|
72
|
-
model:
|
|
73
|
+
model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.trips.pgTableName],
|
|
73
74
|
required: true,
|
|
74
75
|
});
|
|
75
76
|
}
|
|
76
77
|
if (stop) {
|
|
77
78
|
include.push({
|
|
78
79
|
as: "stop",
|
|
79
|
-
model:
|
|
80
|
+
model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stops.pgTableName],
|
|
80
81
|
});
|
|
81
82
|
}
|
|
82
83
|
try {
|
|
@@ -98,6 +99,7 @@ class GTFSStopTimesModel extends output_gateway_1.SequelizeModel {
|
|
|
98
99
|
this.GetOne = (id) => {
|
|
99
100
|
throw new golemio_errors_1.FatalError("Method not implemented");
|
|
100
101
|
};
|
|
102
|
+
this.dbConnector = ioc_1.OutputGatewayContainer.resolve(ioc_1.ContainerToken.PostgresDatabase);
|
|
101
103
|
}
|
|
102
104
|
}
|
|
103
105
|
exports.GTFSStopTimesModel = GTFSStopTimesModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTFSStopTimesModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAAuC;AACvC,uEAA4C;AAC5C,6FAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"GTFSStopTimesModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAAuC;AACvC,uEAA4C;AAC5C,6FAAmE;AACnE,sEAAmE;AACnE,6EAAoF;AACpF,oFAA6E;AAG7E,gEAAgG;AAEhG,MAAa,kBAAmB,SAAQ,+BAAc;IAElD;QACI,KAAK,CAAC,sBAAS,CAAC,UAAU,CAAC,IAAI,EAAE,sBAAS,CAAC,UAAU,CAAC,WAAW,EAAE,2BAAY,CAAC,cAAc,EAAE;YAC5F,MAAM,EAAE,iBAAS;SACpB,CAAC,CAAC;QAIA,cAAS,GAAG,CAAC,MAAmB,EAAE,EAAE;YACvC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE;gBAChE,UAAU,EAAE,SAAS;aACxB,CAAC,CAAC;YAEH,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,cAAc,EAAE;gBAC/D,EAAE,EAAE,MAAM;gBACV,UAAU,EAAE,SAAS;gBACrB,SAAS,EAAE,SAAS;aACvB,CAAC,CAAC;QACP,CAAC,CAAC;QAEF;;;;;;;;;WASG;QACI,WAAM,GAAG,CAAO,OAQtB,EAAgB,EAAE;YACf,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;YAChE,MAAM,OAAO,GAAkB,EAAE,CAAC;YAClC,MAAM,KAAK,GAAqD;gBAC5D,OAAO,EAAE,MAAM;gBACf,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE;aACzB,CAAC;YAEF,IAAI,IAAI,EAAE;gBACN,KAAK,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;aACtF;YAED,IAAI,EAAE,EAAE;gBACJ,KAAK,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;aACpF;YAED,IAAI,IAAI,EAAE;gBACN,OAAO,CAAC,IAAI,CAAC;oBACT,UAAU,EAAE,EAAE;oBACd,OAAO,EAAE;wBACL;4BACI,EAAE,EAAE,SAAS;4BACb,UAAU,EAAE,EAAE;4BACd,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,sBAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC;gCACjF,MAAM,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC;6BAC5B,CAAC;yBACL;qBACJ;oBACD,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,sBAAS,CAAC,KAAK,CAAC,WAAW,CAAC;oBAC3E,QAAQ,EAAE,IAAI;iBACjB,CAAC,CAAC;aACN;YAED,IAAI,IAAI,EAAE;gBACN,OAAO,CAAC,IAAI,CAAC;oBACT,EAAE,EAAE,MAAM;oBACV,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,sBAAS,CAAC,KAAK,CAAC,WAAW,CAAC;iBAC9E,CAAC,CAAC;aACN;YAED,IAAI;gBACA,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBACrC,OAAO;oBACP,KAAK;oBACL,MAAM;oBACN,KAAK,EAAE;wBACH,CAAC,SAAS,EAAE,KAAK,CAAC;wBAClB,CAAC,gBAAgB,EAAE,KAAK,CAAC;qBAC5B;oBACD,KAAK;iBACR,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,gBAAgB,EAAE,oBAAoB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAC5E;QACL,CAAC,CAAA,CAAC;QAEK,WAAM,GAAG,CAAC,EAAO,EAAgB,EAAE;YACtC,MAAM,IAAI,2BAAU,CAAC,wBAAwB,CAAC,CAAC;QACnD,CAAC,CAAC;QA3FE,IAAI,CAAC,WAAW,GAAG,4BAAsB,CAAC,OAAO,CAAqB,oBAAc,CAAC,gBAAgB,CAAC,CAAC;IAC3G,CAAC;;AAPL,gDAuGC;AAJkB,wCAAqB,GAAG,CAAC,IAAY,EAAE,QAAqB,EAA2B,EAAE;IACpG,oCAAoC;IACpC,OAAO,mBAAS,CAAC,OAAO,CAAC,IAAI,IAAI,WAAW,QAAQ,uCAAuC,CAAC,CAAC;AACjG,CAAC,AAHmC,CAGlC"}
|
|
@@ -25,7 +25,7 @@ const const_1 = require("../../../schema-definitions/const");
|
|
|
25
25
|
const ropid_gtfs_1 = require("../../../schema-definitions/ropid-gtfs");
|
|
26
26
|
const TripDto_1 = require("../../../schema-definitions/ropid-gtfs/models/TripDto");
|
|
27
27
|
const Geo_1 = require("@golemio/core/dist/output-gateway/Geo");
|
|
28
|
-
const
|
|
28
|
+
const ioc_1 = require("@golemio/core/dist/output-gateway/ioc/");
|
|
29
29
|
const models_1 = require("@golemio/core/dist/output-gateway/models");
|
|
30
30
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
31
31
|
class GTFSTripsModel extends models_1.SequelizeModel {
|
|
@@ -80,7 +80,7 @@ class GTFSTripsModel extends models_1.SequelizeModel {
|
|
|
80
80
|
as: "has_stop_id",
|
|
81
81
|
attributes: [],
|
|
82
82
|
duplicating: false,
|
|
83
|
-
model:
|
|
83
|
+
model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stop_times.pgTableName],
|
|
84
84
|
where: {
|
|
85
85
|
stop_id: stopId,
|
|
86
86
|
},
|
|
@@ -90,7 +90,9 @@ class GTFSTripsModel extends models_1.SequelizeModel {
|
|
|
90
90
|
include.push({
|
|
91
91
|
as: "service",
|
|
92
92
|
attributes: [],
|
|
93
|
-
model:
|
|
93
|
+
model: this.dbConnector
|
|
94
|
+
.getConnection()
|
|
95
|
+
.models[ropid_gtfs_1.RopidGTFS.calendar.pgTableName].scope({ method: ["forDate", date] }),
|
|
94
96
|
});
|
|
95
97
|
}
|
|
96
98
|
const data = yield this.sequelizeModel.findAll({
|
|
@@ -147,10 +149,10 @@ class GTFSTripsModel extends models_1.SequelizeModel {
|
|
|
147
149
|
include: [
|
|
148
150
|
{
|
|
149
151
|
as: "stop",
|
|
150
|
-
model:
|
|
152
|
+
model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stops.pgTableName],
|
|
151
153
|
},
|
|
152
154
|
],
|
|
153
|
-
model:
|
|
155
|
+
model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stop_times.pgTableName],
|
|
154
156
|
});
|
|
155
157
|
// Only stops or only stop times selected to include
|
|
156
158
|
}
|
|
@@ -158,30 +160,32 @@ class GTFSTripsModel extends models_1.SequelizeModel {
|
|
|
158
160
|
stops &&
|
|
159
161
|
include.push({
|
|
160
162
|
as: "stops",
|
|
161
|
-
model:
|
|
163
|
+
model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stops.pgTableName],
|
|
162
164
|
through: { attributes: [] },
|
|
163
165
|
});
|
|
164
166
|
stopTimes &&
|
|
165
167
|
include.push({
|
|
166
168
|
as: "stop_times",
|
|
167
|
-
model:
|
|
169
|
+
model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stop_times.pgTableName],
|
|
168
170
|
});
|
|
169
171
|
}
|
|
170
172
|
shapes &&
|
|
171
173
|
include.push({
|
|
172
174
|
as: "shapes",
|
|
173
|
-
model:
|
|
175
|
+
model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.shapes.pgTableName],
|
|
174
176
|
});
|
|
175
177
|
if (date || service) {
|
|
176
178
|
include.push({
|
|
177
179
|
as: "service",
|
|
178
|
-
model:
|
|
180
|
+
model: this.dbConnector
|
|
181
|
+
.getConnection()
|
|
182
|
+
.models[ropid_gtfs_1.RopidGTFS.calendar.pgTableName].scope({ method: ["forDate", date] }),
|
|
179
183
|
});
|
|
180
184
|
}
|
|
181
185
|
route &&
|
|
182
186
|
include.push({
|
|
183
187
|
as: "route",
|
|
184
|
-
model:
|
|
188
|
+
model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.routes.pgTableName],
|
|
185
189
|
});
|
|
186
190
|
return include;
|
|
187
191
|
};
|
|
@@ -220,6 +224,7 @@ class GTFSTripsModel extends models_1.SequelizeModel {
|
|
|
220
224
|
this.BuildResponse = (responseObject, longLoc, latLoc) => {
|
|
221
225
|
return (0, Geo_1.buildGeojsonFeature)(responseObject, longLoc, latLoc, true);
|
|
222
226
|
};
|
|
227
|
+
this.dbConnector = ioc_1.OutputGatewayContainer.resolve(ioc_1.ContainerToken.PostgresDatabase);
|
|
223
228
|
}
|
|
224
229
|
}
|
|
225
230
|
exports.GTFSTripsModel = GTFSTripsModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTFSTripsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSTripsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAAuC;AACvC,uEAA4C;AAC5C,mFAAyD;AACzD,+DAA4E;
|
|
1
|
+
{"version":3,"file":"GTFSTripsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/ropid-gtfs/models/GTFSTripsModel.ts"],"names":[],"mappings":"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"}
|
package/dist/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { ITripGetAllOutput, ITripWithPositionRepository } from "../interfaces/IT
|
|
|
6
6
|
import { IVPRepositoryInstances } from "../interfaces/IVPRepositoryInstances";
|
|
7
7
|
export declare class TripWithLastPositionRepository extends SequelizeModel implements ITripWithPositionRepository {
|
|
8
8
|
sequelizeModel: ModelStatic<TripWithLastPositionModel>;
|
|
9
|
+
private dbConnector;
|
|
9
10
|
constructor();
|
|
10
11
|
Associate: (repositories: IVPRepositoryInstances) => void;
|
|
11
12
|
/** Retrieves all vehicle trips
|
package/dist/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.js
CHANGED
|
@@ -44,7 +44,7 @@ const views_1 = require("../../../../schema-definitions/vehicle-positions/models
|
|
|
44
44
|
const output_gateway_1 = require("@golemio/core/dist/output-gateway");
|
|
45
45
|
const Geo_1 = require("@golemio/core/dist/output-gateway/Geo");
|
|
46
46
|
const data_access_2 = require("@golemio/core/dist/output-gateway/data-access");
|
|
47
|
-
const
|
|
47
|
+
const ioc_1 = require("@golemio/core/dist/output-gateway/ioc/");
|
|
48
48
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
49
49
|
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
50
50
|
const sequelize_1 = __importStar(require("@golemio/core/dist/shared/sequelize"));
|
|
@@ -197,11 +197,11 @@ class TripWithLastPositionRepository extends output_gateway_1.SequelizeModel {
|
|
|
197
197
|
const include = [
|
|
198
198
|
{
|
|
199
199
|
as: "vehicle_type",
|
|
200
|
-
model:
|
|
200
|
+
model: this.dbConnector.getConnection().models[vehicle_positions_1.VehiclePositions.vehicleTypes.pgTableName],
|
|
201
201
|
},
|
|
202
202
|
{
|
|
203
203
|
as: "vehicle_descriptor",
|
|
204
|
-
model:
|
|
204
|
+
model: this.dbConnector.getConnection().models[models_1.DescriptorModel.tableName],
|
|
205
205
|
attributes: ["is_air_conditioned"],
|
|
206
206
|
},
|
|
207
207
|
];
|
|
@@ -211,7 +211,7 @@ class TripWithLastPositionRepository extends output_gateway_1.SequelizeModel {
|
|
|
211
211
|
exclude: ["trips_id", "state_position"],
|
|
212
212
|
},
|
|
213
213
|
as: "all_positions",
|
|
214
|
-
model:
|
|
214
|
+
model: this.dbConnector.getConnection().models[views_1.ProcessedPositionModel.tableName],
|
|
215
215
|
where: {
|
|
216
216
|
state_position: {
|
|
217
217
|
[sequelize_1.Op.in]: possibleStatePositions,
|
|
@@ -231,6 +231,7 @@ class TripWithLastPositionRepository extends output_gateway_1.SequelizeModel {
|
|
|
231
231
|
}
|
|
232
232
|
return possibleStatePosition;
|
|
233
233
|
};
|
|
234
|
+
this.dbConnector = ioc_1.OutputGatewayContainer.resolve(ioc_1.ContainerToken.PostgresDatabase);
|
|
234
235
|
}
|
|
235
236
|
GetOne() {
|
|
236
237
|
throw new Error("Not implemented");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TripWithLastPositionRepository.js","sourceRoot":"","sources":["../../../../../src/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAAyD;AACzD,gEAAuC;AACvC,sFAAkE;AAClE,wFAA0D;AAC1D,yFAAwG;AACxG,sEAAmE;AACnE,+DAAuG;AACvG,+EAAmF;
|
|
1
|
+
{"version":3,"file":"TripWithLastPositionRepository.js","sourceRoot":"","sources":["../../../../../src/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/pid",
|
|
3
|
-
"version": "2.7.
|
|
3
|
+
"version": "2.7.9",
|
|
4
4
|
"description": "Golemio PID Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"@commitlint/cli": "^11.0.0",
|
|
40
40
|
"@commitlint/config-conventional": "^11.0.0",
|
|
41
41
|
"@golemio/cli": "1.4.3",
|
|
42
|
-
"@golemio/core": "1.8.
|
|
42
|
+
"@golemio/core": "1.8.2",
|
|
43
43
|
"@golemio/db-common": "1.1.1",
|
|
44
44
|
"@golemio/eslint-config": "1.1.1",
|
|
45
45
|
"@types/amqplib": "^0.5.17",
|