@golemio/pid 2.2.1-dev.527194004 → 2.2.1-dev.527957275
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.
|
@@ -19,6 +19,8 @@ const models_1 = require("../../ropid-gtfs/models");
|
|
|
19
19
|
const _1 = require(".");
|
|
20
20
|
const __1 = require("..");
|
|
21
21
|
const RopidDeparturesModel_1 = require("./RopidDeparturesModel");
|
|
22
|
+
const config_1 = require("@golemio/core/dist/output-gateway/config");
|
|
23
|
+
const trace_provider_1 = require("@golemio/core/dist/monitoring/opentelemetry/trace-provider");
|
|
22
24
|
class PIDDeparturesModel {
|
|
23
25
|
constructor(departures, options) {
|
|
24
26
|
/** Orders departures in special way by given options
|
|
@@ -131,7 +133,7 @@ class PIDDepartureBoardsModel {
|
|
|
131
133
|
* @returns Object of the retrieved record or null
|
|
132
134
|
*/
|
|
133
135
|
this.GetAll = (options) => __awaiter(this, void 0, void 0, function* () {
|
|
134
|
-
var _a;
|
|
136
|
+
var _a, _b;
|
|
135
137
|
// set init parameters from query
|
|
136
138
|
const currentMoment = (0, moment_timezone_1.default)();
|
|
137
139
|
const minutesOffset = options.timeFrom ? options.timeFrom.diff(currentMoment, "minutes") : 0;
|
|
@@ -139,6 +141,8 @@ class PIDDepartureBoardsModel {
|
|
|
139
141
|
const order = options.order || __1.DepartureOrder.REAL;
|
|
140
142
|
const filter = options.filter || __1.DepartureFilter.NONE;
|
|
141
143
|
const skip = options.skip || [];
|
|
144
|
+
const spanStops = (0, trace_provider_1.createChildSpan)("PIDRouter.DB.stops", config_1.config.telemetry);
|
|
145
|
+
spanStops === null || spanStops === void 0 ? void 0 : spanStops.setAttributes(Object.assign(Object.assign({}, options), { timeFrom: (_a = options.timeFrom) === null || _a === void 0 ? void 0 : _a.toString() }));
|
|
142
146
|
const stopsToInclude = yield models_1.models.GTFSStopModel.GetAll({
|
|
143
147
|
appendAswId: true,
|
|
144
148
|
aswIds: options.aswIds,
|
|
@@ -156,7 +160,10 @@ class PIDDepartureBoardsModel {
|
|
|
156
160
|
throw new golemio_errors_1.CustomError(`Too many stops, try lower number or split requests. The maximum is ${this.stopsMaxCount} stops.`, true, "DepartureBoardsRouter", 413, null);
|
|
157
161
|
}
|
|
158
162
|
const stopsIds = stopsToInclude.map((e) => e.stop_id);
|
|
159
|
-
|
|
163
|
+
spanStops === null || spanStops === void 0 ? void 0 : spanStops.end();
|
|
164
|
+
const spanVymi = (0, trace_provider_1.createChildSpan)("PIDRouter.DB.vymi", config_1.config.telemetry);
|
|
165
|
+
const infotextsToInclude = yield this.ropidVYMIEventsStopsModel.GetAllDistinctWithEvents(stopsIds, (_b = options.timeFrom) !== null && _b !== void 0 ? _b : currentMoment, options.timezone);
|
|
166
|
+
const spanDirections = (0, trace_provider_1.createChildSpan)("PIDRouter.DB.directions", config_1.config.telemetry);
|
|
160
167
|
const departuresDirections = yield this.ropidDeparturesDirectionsModel.GetAll(stopsIds);
|
|
161
168
|
try {
|
|
162
169
|
const results = yield this.ropidDeparturesModel.GetAll({
|
|
@@ -167,7 +174,8 @@ class PIDDepartureBoardsModel {
|
|
|
167
174
|
stopsIds,
|
|
168
175
|
mode,
|
|
169
176
|
});
|
|
170
|
-
|
|
177
|
+
const spanDepartures = (0, trace_provider_1.createChildSpan)("PIDRouter.DB.departures", config_1.config.telemetry);
|
|
178
|
+
const res = {
|
|
171
179
|
departures: new PIDDeparturesModel(results, {
|
|
172
180
|
limit: options.limit,
|
|
173
181
|
offset: options.offset || 0,
|
|
@@ -181,6 +189,8 @@ class PIDDepartureBoardsModel {
|
|
|
181
189
|
infotexts: infotextsToInclude,
|
|
182
190
|
stops: stopsToInclude,
|
|
183
191
|
};
|
|
192
|
+
spanDepartures === null || spanDepartures === void 0 ? void 0 : spanDepartures.end();
|
|
193
|
+
return res;
|
|
184
194
|
}
|
|
185
195
|
catch (err) {
|
|
186
196
|
throw new golemio_errors_1.CustomError("Database error", true, "DepartureBoardsModel", 500, err);
|
|
@@ -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,wBAAoG;AACpG,0BAAkG;AAGlG,iEAA8D;
|
|
1
|
+
{"version":3,"file":"PIDDepartureBoardsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/PIDDepartureBoardsModel.ts"],"names":[],"mappings":"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"}
|