@golemio/bicycle-counters 1.3.6-dev.1826477184 → 1.3.6-rc.2098065560
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.
|
@@ -21,12 +21,13 @@ class BicycleCountersRouter extends BaseRouter_1.BaseRouter {
|
|
|
21
21
|
this.router = (0, express_1.Router)();
|
|
22
22
|
this.GetAll = async (req, res, next) => {
|
|
23
23
|
try {
|
|
24
|
-
const
|
|
24
|
+
const queryData = (0, express_validator_1.matchedData)(req);
|
|
25
|
+
const coords = await (0, Geo_1.parseCoordinates)(queryData.latlng, queryData.range);
|
|
25
26
|
const data = await this.BicycleCountersLocationsModel.GetAll({
|
|
26
27
|
lat: coords.lat,
|
|
27
|
-
limit: Number(
|
|
28
|
+
limit: Number(queryData.limit) || undefined,
|
|
28
29
|
lng: coords.lng,
|
|
29
|
-
offset: Number(
|
|
30
|
+
offset: Number(queryData.offset) || 0,
|
|
30
31
|
range: coords.range,
|
|
31
32
|
});
|
|
32
33
|
res.status(200).send(this.NormalizeLocations(data));
|
|
@@ -41,18 +42,19 @@ class BicycleCountersRouter extends BaseRouter_1.BaseRouter {
|
|
|
41
42
|
this.GetData = (model) => {
|
|
42
43
|
return async (req, res, next) => {
|
|
43
44
|
try {
|
|
45
|
+
const queryData = (0, express_validator_1.matchedData)(req);
|
|
44
46
|
// to make it a bit foolproof
|
|
45
|
-
const isoDateTo =
|
|
47
|
+
const isoDateTo = queryData.to ? new Date(queryData.to) : null;
|
|
46
48
|
// imho we should limit date range
|
|
47
|
-
const isoDateFrom =
|
|
48
|
-
const aggregate =
|
|
49
|
+
const isoDateFrom = queryData.from ? new Date(queryData.from) : null;
|
|
50
|
+
const aggregate = queryData.aggregate === "true";
|
|
49
51
|
const data = await model.GetAll({
|
|
50
52
|
aggregate,
|
|
51
|
-
id: this.ConvertToArray(
|
|
53
|
+
id: this.ConvertToArray(queryData.id || []),
|
|
52
54
|
isoDateFrom,
|
|
53
55
|
isoDateTo,
|
|
54
|
-
limit: Number(
|
|
55
|
-
offset: Number(
|
|
56
|
+
limit: Number(queryData.limit) || undefined,
|
|
57
|
+
offset: Number(queryData.offset) || 0,
|
|
56
58
|
});
|
|
57
59
|
data.forEach((element) => {
|
|
58
60
|
if (aggregate) {
|
|
@@ -115,14 +117,14 @@ class BicycleCountersRouter extends BaseRouter_1.BaseRouter {
|
|
|
115
117
|
(0, express_validator_1.query)("to").optional().isISO8601().not().isArray(),
|
|
116
118
|
(0, express_validator_1.query)("id").optional().not().isEmpty({ ignore_whitespace: true }),
|
|
117
119
|
(0, express_validator_1.query)("aggregate").optional().isBoolean().not().isArray(),
|
|
118
|
-
],
|
|
120
|
+
], (0, Validation_1.paginationLimitMiddleware)("BicycleCountersRouter"), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(60 * 60, 300), this.GetData(this.BicycleCountersTemperaturesModel));
|
|
119
121
|
this.router.get("/detections", [
|
|
120
122
|
(0, express_validator_1.query)("from").optional().isISO8601().not().isArray(),
|
|
121
123
|
(0, express_validator_1.query)("to").optional().isISO8601().not().isArray(),
|
|
122
124
|
(0, express_validator_1.query)("id").optional().not().isEmpty({ ignore_whitespace: true }),
|
|
123
125
|
(0, express_validator_1.query)("aggregate").optional().isBoolean().not().isArray(),
|
|
124
|
-
],
|
|
125
|
-
this.router.get("/", [(0, express_validator_1.query)("latlng").optional().isLatLong().not().isArray(), (0, express_validator_1.query)("range").optional().isNumeric().not().isArray()],
|
|
126
|
+
], (0, Validation_1.paginationLimitMiddleware)("BicycleCountersRouter"), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(60 * 60, 300), this.GetData(this.BicycleCountersDetectionsModel));
|
|
127
|
+
this.router.get("/", [(0, express_validator_1.query)("latlng").optional().isLatLong().not().isArray(), (0, express_validator_1.query)("range").optional().isNumeric().not().isArray()], (0, Validation_1.paginationLimitMiddleware)("BicycleCountersRouter"), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(60 * 60, 300), this.GetAll);
|
|
126
128
|
};
|
|
127
129
|
this.cacheHeaderMiddleware = Di_1.BicycleCountersContainer.resolve(ioc_1.ContainerToken.CacheHeaderMiddleware);
|
|
128
130
|
this.BicycleCountersLocationsModel = models_1.models.BicycleCountersLocationsModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BicycleCountersRouter.js","sourceRoot":"","sources":["../../src/output-gateway/BicycleCountersRouter.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,+DAI+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"BicycleCountersRouter.js","sourceRoot":"","sources":["../../src/output-gateway/BicycleCountersRouter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/bicycle-counters",
|
|
3
|
-
"version": "1.3.6-
|
|
3
|
+
"version": "1.3.6-rc.2098065560",
|
|
4
4
|
"description": "Golemio Bicycle Counters Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -33,9 +33,9 @@
|
|
|
33
33
|
"@apideck/portman": "^1.31.1",
|
|
34
34
|
"@commitlint/cli": "^11.0.0",
|
|
35
35
|
"@commitlint/config-conventional": "^11.0.0",
|
|
36
|
-
"@golemio/cli": "1.
|
|
37
|
-
"@golemio/core": "
|
|
38
|
-
"@golemio/db-common": "1.
|
|
36
|
+
"@golemio/cli": "1.11.0",
|
|
37
|
+
"@golemio/core": "2.0.0",
|
|
38
|
+
"@golemio/db-common": "1.2.0",
|
|
39
39
|
"@golemio/eslint-config": "1.1.2",
|
|
40
40
|
"@types/chai": "4.2.3",
|
|
41
41
|
"@types/chai-as-promised": "7.1.2",
|