@golemio/pid 2.4.3-dev.775640157 → 2.5.0
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/departure-boards/DepartureBoardsRouter.js +2 -3
- package/dist/output-gateway/departure-boards/DepartureBoardsRouter.js.map +1 -1
- package/dist/output-gateway/pid/PIDRouter.js +3 -3
- package/dist/output-gateway/pid/PIDRouter.js.map +1 -1
- package/dist/output-gateway/{shared → pid}/constants/index.d.ts +0 -0
- package/dist/output-gateway/{shared → pid}/constants/index.js +0 -0
- package/dist/output-gateway/pid/constants/index.js.map +1 -0
- package/dist/output-gateway/pid/constants/validations.d.ts +7 -0
- package/dist/output-gateway/pid/constants/validations.js +29 -0
- package/dist/output-gateway/pid/constants/validations.js.map +1 -0
- package/dist/output-gateway/pid/controllers/DepartureBoardsController.js +1 -1
- package/dist/output-gateway/pid/controllers/DepartureBoardsController.js.map +1 -1
- package/dist/output-gateway/shared/RopidRouterUtils.d.ts +1 -1
- package/dist/output-gateway/shared/RopidRouterUtils.js +6 -4
- package/dist/output-gateway/shared/RopidRouterUtils.js.map +1 -1
- package/dist/output-gateway/vehicle-positions/VehiclePositionsRouter.js +3 -4
- package/dist/output-gateway/vehicle-positions/VehiclePositionsRouter.js.map +1 -1
- package/package.json +4 -4
- package/dist/output-gateway/shared/constants/index.js.map +0 -1
- package/dist/output-gateway/shared/constants/validations.d.ts +0 -9
- package/dist/output-gateway/shared/constants/validations.js +0 -34
- package/dist/output-gateway/shared/constants/validations.js.map +0 -1
|
@@ -22,7 +22,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
22
22
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
23
|
exports.departureBoardsRouter = exports.DepartureBoardsRouter = void 0;
|
|
24
24
|
const pid_1 = require("../pid");
|
|
25
|
-
const constants_1 = require("../shared/constants");
|
|
26
25
|
const shared_1 = require("../shared");
|
|
27
26
|
const redis_1 = require("@golemio/core/dist/output-gateway/redis");
|
|
28
27
|
const BaseRouter_1 = require("@golemio/core/dist/output-gateway/routes/BaseRouter");
|
|
@@ -56,7 +55,7 @@ class DepartureBoardsRouter extends BaseRouter_1.BaseRouter {
|
|
|
56
55
|
const gtfsIds = this.ConvertToArray(req.query.ids || []);
|
|
57
56
|
const names = this.ConvertToArray(req.query.names || []);
|
|
58
57
|
const limit = parseInt(req.query.limit || this.defaultQueryParameters.limit, 10);
|
|
59
|
-
const preferredTimezone = shared_1.RopidRouterUtils.
|
|
58
|
+
const preferredTimezone = shared_1.RopidRouterUtils.validateAndReturnTimezone(req.query.preferredTimezone, this.constructor.name);
|
|
60
59
|
const timezoneDefinedRegexp = /[T ][\d:\.]+([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)/;
|
|
61
60
|
const timeFrom = req.query.timeFrom
|
|
62
61
|
? req.query.timeFrom.match(timezoneDefinedRegexp)
|
|
@@ -143,7 +142,7 @@ class DepartureBoardsRouter extends BaseRouter_1.BaseRouter {
|
|
|
143
142
|
.isInt(process.env.NODE_ENV === "test" ? {} : { lt: const_1.DATA_RETENTION_IN_MINUTES + 1 }),
|
|
144
143
|
(0, express_validator_1.query)("minutesAfter").optional().isInt(),
|
|
145
144
|
(0, express_validator_1.query)("orderBySchedule").optional().isBoolean(),
|
|
146
|
-
(0, express_validator_1.query)("preferredTimezone").optional().isString()
|
|
145
|
+
(0, express_validator_1.query)("preferredTimezone").optional().isString(),
|
|
147
146
|
(0, express_validator_1.query)("showAllRoutesFirst").optional().isBoolean(),
|
|
148
147
|
], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)("DepartureBoardsRouter"), (0, redis_1.useCacheMiddleware)(expire), this.GetDepartureBoard);
|
|
149
148
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DepartureBoardsRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/departure-boards/DepartureBoardsRouter.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;;;;;;;;;;;AAEH,gCAAuH;AACvH,
|
|
1
|
+
{"version":3,"file":"DepartureBoardsRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/departure-boards/DepartureBoardsRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ const Validation_1 = require("@golemio/core/dist/output-gateway/Validation");
|
|
|
11
11
|
const express_1 = require("@golemio/core/dist/shared/express");
|
|
12
12
|
const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
|
|
13
13
|
const const_1 = require("../../const");
|
|
14
|
-
const constants_1 = require("
|
|
14
|
+
const constants_1 = require("./constants");
|
|
15
15
|
const controllers_1 = require("./controllers");
|
|
16
16
|
const ParamValidatorManager_1 = require("./helpers/ParamValidatorManager");
|
|
17
17
|
const middleware_1 = require("./middleware");
|
|
@@ -20,7 +20,7 @@ class PIDRouter extends BaseRouter_1.BaseRouter {
|
|
|
20
20
|
super();
|
|
21
21
|
this.router = (0, express_1.Router)();
|
|
22
22
|
this.registerDepartureBoardsRoutes = () => {
|
|
23
|
-
const {
|
|
23
|
+
const { prefferedTimezone, departureMode, order, filter, skip } = constants_1.departureBoardsValidationArrays;
|
|
24
24
|
const validation = [
|
|
25
25
|
(0, express_validator_1.oneOf)([
|
|
26
26
|
(0, express_validator_1.query)("aswIds").exists().custom(ParamValidatorManager_1.ParamValidatorManager.getAswIdsValidator()),
|
|
@@ -36,7 +36,7 @@ class PIDRouter extends BaseRouter_1.BaseRouter {
|
|
|
36
36
|
.optional()
|
|
37
37
|
.isInt(process.env.NODE_ENV === "test" ? {} : { lt: const_1.DATA_RETENTION_IN_MINUTES + 1 }),
|
|
38
38
|
(0, express_validator_1.query)("minutesAfter").optional().isInt(),
|
|
39
|
-
(0, express_validator_1.query)("preferredTimezone").optional().isString().isIn(
|
|
39
|
+
(0, express_validator_1.query)("preferredTimezone").optional().isString().isIn(prefferedTimezone),
|
|
40
40
|
(0, express_validator_1.query)("mode").optional().isIn(departureMode),
|
|
41
41
|
(0, express_validator_1.query)("order").optional().isString().isIn(order),
|
|
42
42
|
(0, express_validator_1.query)("filter").optional().isString().isIn(filter),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PIDRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/pid/PIDRouter.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,mEAA6E;AAC7E,oFAAiF;AACjF,6EAAkH;AAClH,+DAA2D;AAC3D,mFAA2E;AAC3E,uCAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"PIDRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/pid/PIDRouter.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/constants/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.departureBoardsValidationArrays = void 0;
|
|
7
|
+
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
8
|
+
exports.departureBoardsValidationArrays = {
|
|
9
|
+
departureMode: ["departures", "arrivals", "mixed"],
|
|
10
|
+
order: ["real", "timetable"],
|
|
11
|
+
filter: [
|
|
12
|
+
"none",
|
|
13
|
+
"routeOnce",
|
|
14
|
+
"routeHeadingOnce",
|
|
15
|
+
"routeOnceFill",
|
|
16
|
+
"routeHeadingOnceFill",
|
|
17
|
+
"routeHeadingOnceNoGap",
|
|
18
|
+
"routeHeadingOnceNoGapFill",
|
|
19
|
+
],
|
|
20
|
+
skip: ["untracked", "canceled", "atStop" /*, "onInfotext"*/],
|
|
21
|
+
// TODO replace moment.tz.names() with Intl.supportedValuesOf("timeZone") after migrating to Node 18
|
|
22
|
+
prefferedTimezone: moment_timezone_1.default.tz.names().concat(moment_timezone_1.default.tz
|
|
23
|
+
.names()
|
|
24
|
+
// concats only those names that have character /
|
|
25
|
+
.filter((name) => name.match(/\//g))
|
|
26
|
+
// that is replaced with _
|
|
27
|
+
.map((name) => name.replace(/\//g, "_"))),
|
|
28
|
+
};
|
|
29
|
+
//# sourceMappingURL=validations.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validations.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/constants/validations.ts"],"names":[],"mappings":";;;;;;AAAA,gGAA+D;AAElD,QAAA,+BAA+B,GAAG;IAC3C,aAAa,EAAE,CAAC,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC;IAClD,KAAK,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC;IAC5B,MAAM,EAAE;QACJ,MAAM;QACN,WAAW;QACX,kBAAkB;QAClB,eAAe;QACf,sBAAsB;QACtB,uBAAuB;QACvB,2BAA2B;KAC9B;IACD,IAAI,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,QAAQ,CAAC,kBAAkB,CAAC;IAC5D,oGAAoG;IACpG,iBAAiB,EAAE,yBAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,MAAM,CACvC,yBAAM,CAAC,EAAE;SACJ,KAAK,EAAE;QACR,iDAAiD;SAChD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACpC,0BAA0B;SACzB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAC/C;CACJ,CAAC"}
|
|
@@ -24,7 +24,7 @@ class DepartureBoardsController {
|
|
|
24
24
|
this.getDepartureBoard = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
25
25
|
var _a;
|
|
26
26
|
const query = shared_1.RopidRouterUtils.mapObjectToDTOInstance(dto_1.DepartureBoardsQueryDTO, req.query);
|
|
27
|
-
const preferredTimezone = shared_1.RopidRouterUtils.
|
|
27
|
+
const preferredTimezone = shared_1.RopidRouterUtils.validateAndReturnTimezone(query.preferredTimezone, this.constructor.name);
|
|
28
28
|
// datetime is valid ISO 8601 (by express validator)
|
|
29
29
|
// it matches:
|
|
30
30
|
// 2020-10-10T10:00:00Z
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DepartureBoardsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/controllers/DepartureBoardsController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gGAA2E;AAE3E,+FAA6F;AAC7F,qEAAkE;AAClE,yCAA8C;AAC9C,sCAAyD;AACzD,gCAAkF;AAElF,MAAa,yBAAyB;IAGlC;QAIO,sBAAiB,GAAmB,CAAO,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;YAChE,MAAM,KAAK,GAAG,yBAAgB,CAAC,sBAAsB,CAAC,6BAAuB,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;YAC1F,MAAM,iBAAiB,GAAG,yBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"DepartureBoardsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/controllers/DepartureBoardsController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gGAA2E;AAE3E,+FAA6F;AAC7F,qEAAkE;AAClE,yCAA8C;AAC9C,sCAAyD;AACzD,gCAAkF;AAElF,MAAa,yBAAyB;IAGlC;QAIO,sBAAiB,GAAmB,CAAO,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;YAChE,MAAM,KAAK,GAAG,yBAAgB,CAAC,sBAAsB,CAAC,6BAAuB,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;YAC1F,MAAM,iBAAiB,GAAG,yBAAgB,CAAC,yBAAyB,CAAC,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAErH,oDAAoD;YACpD,cAAc;YACd,uBAAuB;YACvB,0BAA0B;YAC1B,yBAAyB;YACzB,4BAA4B;YAC5B,MAAM,qBAAqB,GAAW,uDAAuD,CAAC;YAC9F,+DAA+D;YAC/D,MAAM,QAAQ,GAAuB,KAAK,CAAC,QAAQ;gBAC/C,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,qBAAqB,CAAC;oBACzC,CAAC,CAAC,IAAA,yBAAM,EAAC,KAAK,CAAC,QAAQ,CAAC;oBACxB,CAAC,CAAC,yBAAM,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,iBAAiB,CAAC;gBAClD,CAAC,CAAC,SAAS,CAAC;YAEhB,MAAM,IAAI,GAAG,IAAA,gCAAe,EAAC,6CAA6C,EAAE,eAAM,CAAC,SAAS,CAAC,CAAC;YAC9F,IAAI;gBACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC;oBAChD,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,OAAO,EAAE,KAAK,CAAC,GAAG;oBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,YAAY,EAAE,KAAK,CAAC,YAAY;oBAChC,aAAa,EAAE,KAAK,CAAC,aAAa;oBAClC,QAAQ;oBACR,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,KAAK,EAAE,MAAA,KAAK,CAAC,KAAK,mCAAI,KAAK,CAAC,KAAK;oBACjC,QAAQ,EAAE,iBAAiB;oBAC3B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;iBAC/C,CAAC,CAAC;gBACH,oCAAoC;gBACpC,GAAG,CAAC,SAAS,CAAC,+BAA+B,EAAE,MAAM,CAAC,CAAC;gBACvD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,yBAAgB,CAAC,sBAAsB,CAAC,gCAA0B,EAAE,IAAI,CAAC,CAAC,CAAC;aACnG;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;oBAAS;gBACN,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,EAAE,CAAC;aACf;QACL,CAAC,CAAA,CAAC;QAjDE,IAAI,CAAC,oBAAoB,GAAG,IAAI,gCAAuB,EAAE,CAAC;IAC9D,CAAC;CAiDJ;AAtDD,8DAsDC"}
|
|
@@ -12,5 +12,5 @@ export declare class RopidRouterUtils {
|
|
|
12
12
|
/**
|
|
13
13
|
* Validate and return timezone (it is possible to use _ symbol instead of URL encoded / symbol)
|
|
14
14
|
*/
|
|
15
|
-
static
|
|
15
|
+
static validateAndReturnTimezone: (preferredTimezone: ParsedQs[number], context: string) => string;
|
|
16
16
|
}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.RopidRouterUtils = void 0;
|
|
7
7
|
const config_1 = require("@golemio/core/dist/output-gateway/config");
|
|
8
8
|
const Logger_1 = require("@golemio/core/dist/output-gateway/Logger");
|
|
9
|
+
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
9
10
|
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
10
11
|
const class_transformer_1 = require("@golemio/core/dist/shared/class-transformer");
|
|
11
12
|
class RopidRouterUtils {
|
|
@@ -41,10 +42,11 @@ RopidRouterUtils.formatTimestamp = (timestamp, preferredTimezone, shouldParseTim
|
|
|
41
42
|
/**
|
|
42
43
|
* Validate and return timezone (it is possible to use _ symbol instead of URL encoded / symbol)
|
|
43
44
|
*/
|
|
44
|
-
RopidRouterUtils.
|
|
45
|
-
const timezone = typeof preferredTimezone === "string"
|
|
46
|
-
|
|
47
|
-
:
|
|
45
|
+
RopidRouterUtils.validateAndReturnTimezone = (preferredTimezone, context) => {
|
|
46
|
+
const timezone = (typeof preferredTimezone === "string" ? preferredTimezone : config_1.config.vehiclePositions.defaultTimezone).replace(/_/s, "/");
|
|
47
|
+
if (!moment_timezone_1.default.tz.names().includes(timezone)) {
|
|
48
|
+
throw new golemio_errors_1.CustomError("Invalid timezone: " + timezone, true, context, undefined);
|
|
49
|
+
}
|
|
48
50
|
return timezone;
|
|
49
51
|
};
|
|
50
52
|
//# sourceMappingURL=RopidRouterUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidRouterUtils.js","sourceRoot":"","sources":["../../../src/output-gateway/shared/RopidRouterUtils.ts"],"names":[],"mappings":";;;;;;AAAA,qEAAkE;AAClE,qEAA+D;AAC/D,gGAA+D;AAC/D,mFAAgG;AAGhG,MAAa,gBAAgB;;AAA7B,
|
|
1
|
+
{"version":3,"file":"RopidRouterUtils.js","sourceRoot":"","sources":["../../../src/output-gateway/shared/RopidRouterUtils.ts"],"names":[],"mappings":";;;;;;AAAA,qEAAkE;AAClE,qEAA+D;AAC/D,6EAAuE;AACvE,gGAA+D;AAC/D,mFAAgG;AAGhG,MAAa,gBAAgB;;AAA7B,4CA6CC;AA5CG;;GAEG;AACW,uCAAsB,GAAG,CAAI,GAAwB,EAAE,IAAS,EAAE,EAAE;IAC9E,OAAO,IAAA,mCAAe,EAAC,GAAG,EAAE,IAAI,EAAE,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC;AACrE,CAAC,CAAC;AAEF;;GAEG;AACW,gCAAe,GAAG,CAAC,SAAc,EAAE,iBAAyB,EAAE,oBAAoB,GAAG,KAAK,EAAiB,EAAE;IACvH,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAE5B,IAAI;QACA,MAAM,QAAQ,GAAG,IAAA,yBAAM,EAAC,oBAAoB,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;aACxF,EAAE,CAAC,iBAAiB,CAAC;aACrB,MAAM,EAAE,CAAC;QAEd,IAAI,QAAQ,KAAK,cAAc,EAAE;YAC7B,YAAG,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;YACpE,OAAO,IAAI,CAAC;SACf;QAED,OAAO,QAAQ,CAAC;KACnB;IAAC,OAAO,GAAG,EAAE;QACV,YAAG,CAAC,KAAK,CAAC,wDAAwD,EAAE,GAAG,CAAC,CAAC;QACzE,OAAO,IAAI,CAAC;KACf;AACL,CAAC,CAAC;AAEF;;GAEG;AACW,0CAAyB,GAAG,CAAC,iBAAmC,EAAE,OAAe,EAAU,EAAE;IACvG,MAAM,QAAQ,GAAG,CACb,OAAO,iBAAiB,KAAK,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,eAAM,CAAC,gBAAgB,CAAC,eAAe,CACtG,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAErB,IAAI,CAAC,yBAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACvC,MAAM,IAAI,4BAAW,CAAC,oBAAoB,GAAG,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;KACpF;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC"}
|
|
@@ -30,13 +30,12 @@ const shared_1 = require("../shared");
|
|
|
30
30
|
const models_1 = require("./models");
|
|
31
31
|
const config_1 = require("@golemio/core/dist/output-gateway/config");
|
|
32
32
|
const trace_provider_1 = require("@golemio/core/dist/monitoring/opentelemetry/trace-provider");
|
|
33
|
-
const constants_1 = require("../shared/constants");
|
|
34
33
|
class VehiclePositionsRouter {
|
|
35
34
|
constructor() {
|
|
36
35
|
// Assign router to the express.Router() instance
|
|
37
36
|
this.router = (0, express_1.Router)();
|
|
38
37
|
this.GetAll = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
39
|
-
const preferredTimezone = shared_1.RopidRouterUtils.
|
|
38
|
+
const preferredTimezone = shared_1.RopidRouterUtils.validateAndReturnTimezone(req.query.preferredTimezone, this.constructor.name);
|
|
40
39
|
const span = (0, trace_provider_1.createChildSpan)("VehiclePositionsRouter.GetAll", config_1.config.telemetry);
|
|
41
40
|
try {
|
|
42
41
|
const result = yield this.model.GetAll({
|
|
@@ -62,7 +61,7 @@ class VehiclePositionsRouter {
|
|
|
62
61
|
});
|
|
63
62
|
this.GetOne = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
64
63
|
const id = req.params.id;
|
|
65
|
-
const preferredTimezone = shared_1.RopidRouterUtils.
|
|
64
|
+
const preferredTimezone = shared_1.RopidRouterUtils.validateAndReturnTimezone(req.query.preferredTimezone, this.constructor.name);
|
|
66
65
|
try {
|
|
67
66
|
const data = yield this.model.GetOneByGTFSTripId(id, {
|
|
68
67
|
includeNotTracking: (0, Utils_1.parseBooleanQueryParam)(req.query.includeNotTracking),
|
|
@@ -187,7 +186,7 @@ class VehiclePositionsRouter {
|
|
|
187
186
|
(0, express_validator_1.query)("includePositions").optional().isBoolean(),
|
|
188
187
|
(0, express_validator_1.query)("includeNotPublic").optional().isBoolean(),
|
|
189
188
|
(0, express_validator_1.query)("updatedSince").optional().isISO8601(),
|
|
190
|
-
(0, express_validator_1.query)("preferredTimezone").optional().isString()
|
|
189
|
+
(0, express_validator_1.query)("preferredTimezone").optional().isString(),
|
|
191
190
|
], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)("VehiclePositionsRouter"), (0, redis_1.useCacheMiddleware)(expire), this.GetAll);
|
|
192
191
|
this.router.get("/:id", [
|
|
193
192
|
(0, express_validator_1.param)("id").exists(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VehiclePositionsRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/vehicle-positions/VehiclePositionsRouter.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;AAEH,+BAAiC;AACjC,6EAAuE;AACvE,+DAA4F;AAC5F,mFAA2E;AAC3E,gGAA+D;AAC/D,mEAA6F;AAC7F,mEAAiF;AACjF,6EAAkH;AAClH,sCAA8C;AAC9C,qCAAkC;AAElC,qEAAkE;AAClE,+FAA6F;
|
|
1
|
+
{"version":3,"file":"VehiclePositionsRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/vehicle-positions/VehiclePositionsRouter.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.
|
|
3
|
+
"version": "2.5.0",
|
|
4
4
|
"description": "Golemio PID Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -37,8 +37,8 @@
|
|
|
37
37
|
"@apideck/portman": "^1.16.1",
|
|
38
38
|
"@commitlint/cli": "^11.0.0",
|
|
39
39
|
"@commitlint/config-conventional": "^11.0.0",
|
|
40
|
-
"@golemio/cli": "1.4.
|
|
41
|
-
"@golemio/core": "1.
|
|
40
|
+
"@golemio/cli": "1.4.1",
|
|
41
|
+
"@golemio/core": "1.5.0",
|
|
42
42
|
"@golemio/db-common": "1.1.0",
|
|
43
43
|
"@golemio/eslint-config": "1.1.0",
|
|
44
44
|
"@ovos-media/ts-transform-paths": "^1.7.18-1",
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"typescript": "4.7.2"
|
|
74
74
|
},
|
|
75
75
|
"peerDependencies": {
|
|
76
|
-
"@golemio/core": "1.
|
|
76
|
+
"@golemio/core": "1.5.0"
|
|
77
77
|
},
|
|
78
78
|
"dependencies": {
|
|
79
79
|
"@golemio/ovapi-gtfs-realtime-bindings": "1.1.0",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/output-gateway/shared/constants/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B"}
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ValidationArrays = void 0;
|
|
7
|
-
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
8
|
-
exports.ValidationArrays = {
|
|
9
|
-
departureBoards: {
|
|
10
|
-
departureMode: ["departures", "arrivals", "mixed"],
|
|
11
|
-
order: ["real", "timetable"],
|
|
12
|
-
filter: [
|
|
13
|
-
"none",
|
|
14
|
-
"routeOnce",
|
|
15
|
-
"routeHeadingOnce",
|
|
16
|
-
"routeOnceFill",
|
|
17
|
-
"routeHeadingOnceFill",
|
|
18
|
-
"routeHeadingOnceNoGap",
|
|
19
|
-
"routeHeadingOnceNoGapFill",
|
|
20
|
-
],
|
|
21
|
-
skip: ["untracked", "canceled", "atStop" /*, "onInfotext"*/],
|
|
22
|
-
},
|
|
23
|
-
// TODO replace moment.tz.names() with Intl.supportedValuesOf("timeZone") after migrating to Node 18
|
|
24
|
-
preferredTimezone: [
|
|
25
|
-
...moment_timezone_1.default.tz.names(),
|
|
26
|
-
...moment_timezone_1.default.tz
|
|
27
|
-
.names()
|
|
28
|
-
// concats only those names that have character /
|
|
29
|
-
.filter((name) => name.match(/\//g))
|
|
30
|
-
// that is replaced with _
|
|
31
|
-
.map((name) => name.replace(/\//g, "_")),
|
|
32
|
-
],
|
|
33
|
-
};
|
|
34
|
-
//# sourceMappingURL=validations.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"validations.js","sourceRoot":"","sources":["../../../../src/output-gateway/shared/constants/validations.ts"],"names":[],"mappings":";;;;;;AAAA,gGAA+D;AAElD,QAAA,gBAAgB,GAAG;IAC5B,eAAe,EAAE;QACb,aAAa,EAAE,CAAC,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC;QAClD,KAAK,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC;QAC5B,MAAM,EAAE;YACJ,MAAM;YACN,WAAW;YACX,kBAAkB;YAClB,eAAe;YACf,sBAAsB;YACtB,uBAAuB;YACvB,2BAA2B;SAC9B;QACD,IAAI,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,QAAQ,CAAC,kBAAkB,CAAC;KAC/D;IACD,oGAAoG;IACpG,iBAAiB,EAAE;QACf,GAAG,yBAAM,CAAC,EAAE,CAAC,KAAK,EAAE;QACpB,GAAG,yBAAM,CAAC,EAAE;aACP,KAAK,EAAE;YACR,iDAAiD;aAChD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpC,0BAA0B;aACzB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;KAC/C;CACJ,CAAC"}
|