@golemio/core 1.2.21-dev.672373825 → 1.2.21-dev.674670813
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/workers/helpers/MessageDataValidator.js +1 -1
- package/dist/integration-engine/workers/helpers/MessageDataValidator.js.map +1 -1
- package/dist/output-gateway/routes/GeoJsonRouter.d.ts +4 -0
- package/dist/output-gateway/routes/GeoJsonRouter.js +16 -0
- package/dist/output-gateway/routes/GeoJsonRouter.js.map +1 -1
- package/package.json +1 -1
|
@@ -19,7 +19,7 @@ class MessageDataValidator {
|
|
|
19
19
|
return __awaiter(this, void 0, void 0, function* () {
|
|
20
20
|
let validationErrors = [];
|
|
21
21
|
try {
|
|
22
|
-
validationErrors = yield (0, class_validator_1.validate)(data);
|
|
22
|
+
validationErrors = yield (0, class_validator_1.validate)(data, { forbidUnknownValues: true });
|
|
23
23
|
}
|
|
24
24
|
catch (err) {
|
|
25
25
|
const exception = new errors_1.CustomError(`[Queue ${queueKey}] Message validation failed: ${err.message}`, true, "MessageDataValidator", undefined, err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MessageDataValidator.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/helpers/MessageDataValidator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAA4D;AAC5D,4CAA8C;AAC9C,2CAAkC;AAClC,mDAAiD;AAEjD,MAAa,oBAAoB;IACtB,MAAM,CAAO,QAAQ,CAAC,QAAgB,EAAE,IAAY;;YACvD,IAAI,gBAAgB,GAAsB,EAAE,CAAC;YAC7C,IAAI;gBACA,gBAAgB,GAAG,MAAM,IAAA,0BAAQ,EAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"MessageDataValidator.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/helpers/MessageDataValidator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAA4D;AAC5D,4CAA8C;AAC9C,2CAAkC;AAClC,mDAAiD;AAEjD,MAAa,oBAAoB;IACtB,MAAM,CAAO,QAAQ,CAAC,QAAgB,EAAE,IAAY;;YACvD,IAAI,gBAAgB,GAAsB,EAAE,CAAC;YAC7C,IAAI;gBACA,gBAAgB,GAAG,MAAM,IAAA,0BAAQ,EAAC,IAAI,EAAE,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC;aAC1E;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,SAAS,GAAG,IAAI,oBAAW,CAC7B,UAAU,QAAQ,gCAAgC,GAAG,CAAC,OAAO,EAAE,EAC/D,IAAI,EACJ,sBAAsB,EACtB,SAAS,EACT,GAAG,CACN,CAAC;gBAEF,aAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBACrB,4BAAc,CAAC,QAAQ,CACnB,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EACzD,qBAAqB,QAAQ,EAAE,EAC/B,MAAM,CACT,CAAC;gBAEF,MAAM,SAAS,CAAC;aACnB;YAED,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,CAAC;gBACpE,MAAM,SAAS,GAAG,IAAI,oBAAW,CAC7B,UAAU,QAAQ,iCAAiC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EACzF,IAAI,EACJ,sBAAsB,CACzB,CAAC;gBAEF,aAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBACrB,4BAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,qBAAqB,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;gBAEvG,MAAM,SAAS,CAAC;aACnB;QACL,CAAC;KAAA;IAEO,MAAM,CAAC,wBAAwB,CAAC,MAAyB;QAC7D,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,CAChD,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CACrG,CAAC;IACN,CAAC;CACJ;AA5CD,oDA4CC"}
|
|
@@ -2,6 +2,7 @@ import { IGeoJsonModel } from "../models/interfaces/IGeoJsonModel";
|
|
|
2
2
|
import { BaseRouter } from "./BaseRouter";
|
|
3
3
|
import { NextFunction, Request, Response, Router } from "express";
|
|
4
4
|
import { ValidationChain } from "express-validator/check";
|
|
5
|
+
import QueryString from "qs";
|
|
5
6
|
/**
|
|
6
7
|
* Router for data in GeoJSON format using GeoJSON model -
|
|
7
8
|
* binds / and /:id to GetAll and GetOne methods of GeoJsonModel.
|
|
@@ -22,4 +23,7 @@ export declare class GeoJsonRouter extends BaseRouter {
|
|
|
22
23
|
GetAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
|
|
23
24
|
GetOne: (req: Request, res: Response, next: NextFunction) => void;
|
|
24
25
|
protected GetIdQueryParamWithCorrectType: () => Promise<ValidationChain>;
|
|
26
|
+
GetAdditionalFilters: (query: QueryString.ParsedQs) => {
|
|
27
|
+
[x: string]: string | string[] | QueryString.ParsedQs | QueryString.ParsedQs[] | undefined;
|
|
28
|
+
};
|
|
25
29
|
}
|
|
@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
12
|
+
var t = {};
|
|
13
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
14
|
+
t[p] = s[p];
|
|
15
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
16
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
17
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
18
|
+
t[p[i]] = s[p[i]];
|
|
19
|
+
}
|
|
20
|
+
return t;
|
|
21
|
+
};
|
|
11
22
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
23
|
exports.GeoJsonRouter = void 0;
|
|
13
24
|
const Geo_1 = require("../Geo");
|
|
@@ -82,6 +93,7 @@ class GeoJsonRouter extends BaseRouter_1.BaseRouter {
|
|
|
82
93
|
offset: Number(req.query.offset),
|
|
83
94
|
range: coords.range,
|
|
84
95
|
updatedSince: req.query.updatedSince,
|
|
96
|
+
additionalFilters: this.GetAdditionalFilters(req.query),
|
|
85
97
|
});
|
|
86
98
|
res.status(200).send(data);
|
|
87
99
|
}
|
|
@@ -119,6 +131,10 @@ class GeoJsonRouter extends BaseRouter_1.BaseRouter {
|
|
|
119
131
|
Logger_1.log.silly(message);
|
|
120
132
|
return idParam;
|
|
121
133
|
});
|
|
134
|
+
this.GetAdditionalFilters = (query) => {
|
|
135
|
+
const { districts, ids, latlng, limit, offset, range, updatedSince } = query, rest = __rest(query, ["districts", "ids", "latlng", "limit", "offset", "range", "updatedSince"]);
|
|
136
|
+
return Object.assign({}, rest);
|
|
137
|
+
};
|
|
122
138
|
this.model = inModel;
|
|
123
139
|
}
|
|
124
140
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeoJsonRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/routes/GeoJsonRouter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"GeoJsonRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/routes/GeoJsonRouter.ts"],"names":[],"mappings":"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"}
|