@golemio/flow 1.3.4-dev.1844193115 → 1.3.4-rc.1848543200
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/CountersWorker.js +11 -20
- package/dist/integration-engine/CountersWorker.js.map +1 -1
- package/dist/integration-engine/FlowWorker.js +57 -71
- package/dist/integration-engine/FlowWorker.js.map +1 -1
- package/dist/integration-engine/queueDefinitions.js +0 -57
- package/dist/integration-engine/queueDefinitions.js.map +1 -1
- package/dist/integration-engine/transformations/EcoCounterMeasurementsTransformation.js +2 -11
- package/dist/integration-engine/transformations/EcoCounterMeasurementsTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/EcoCounterTransformation.js +9 -18
- package/dist/integration-engine/transformations/EcoCounterTransformation.js.map +1 -1
- package/dist/output-gateway/PedestriansRouter.js +8 -17
- package/dist/output-gateway/PedestriansRouter.js.map +1 -1
- package/dist/output-gateway/models/PedestriansLocationsModel.js +6 -15
- package/dist/output-gateway/models/PedestriansLocationsModel.js.map +1 -1
- package/dist/output-gateway/models/PedestriansMeasurementsModel.js +5 -14
- package/dist/output-gateway/models/PedestriansMeasurementsModel.js.map +1 -1
- package/package.json +4 -4
- package/dist/integration-engine/FlowWorkerTest.d.ts +0 -29
- package/dist/integration-engine/FlowWorkerTest.js +0 -469
- package/dist/integration-engine/FlowWorkerTest.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EcoCounterMeasurementsTransformation.js","sourceRoot":"","sources":["../../../src/integration-engine/transformations/EcoCounterMeasurementsTransformation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"EcoCounterMeasurementsTransformation.js","sourceRoot":"","sources":["../../../src/integration-engine/transformations/EcoCounterMeasurementsTransformation.ts"],"names":[],"mappings":";;;AAAA,mDAAgC;AAChC,2FAA4G;AAC5G,kEAA+D;AAE/D,MAAa,oCAAqC,SAAQ,oCAAkB;IAGxE;QACI,KAAK,EAAE,CAAC;QAIF,qBAAgB,GAAG,KAAK,EAAE,OAAY,EAAgB,EAAE;YAC9D,wGAAwG;YACxG,sGAAsG;YACtG,gBAAgB;YAEhB,MAAM,YAAY,GAAG,IAAA,mBAAQ,EAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;YAEjG,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;YAE3D,MAAM,GAAG,GAAG;gBACR,aAAa,EAAE,IAAI;gBACnB,YAAY,EAAE,IAAI;gBAClB,aAAa,EAAE,YAAY,CAAC,MAAM,EAAE;gBACpC,WAAW,EAAE,UAAU,CAAC,MAAM,EAAE;gBAChC,KAAK,EAAE,OAAO,CAAC,MAAM;aACxB,CAAC;YAEF,OAAO,GAAG,CAAC;QACf,CAAC,CAAC;QArBE,IAAI,CAAC,IAAI,GAAG,eAAQ,CAAC,UAAU,CAAC,IAAI,GAAG,4BAA4B,CAAC;IACxE,CAAC;CAqBJ;AA3BD,oFA2BC"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.EcoCounterTransformation = void 0;
|
|
13
4
|
const _sch_1 = require("../../schema-definitions");
|
|
@@ -18,7 +9,7 @@ class EcoCounterTransformation extends integration_engine_1.BaseTransformation {
|
|
|
18
9
|
/**
|
|
19
10
|
* Overrides BaseTransformation::transform
|
|
20
11
|
*/
|
|
21
|
-
this.transform = (data) =>
|
|
12
|
+
this.transform = async (data) => {
|
|
22
13
|
const res = {
|
|
23
14
|
directions: [],
|
|
24
15
|
directionsPedestrians: [],
|
|
@@ -26,8 +17,8 @@ class EcoCounterTransformation extends integration_engine_1.BaseTransformation {
|
|
|
26
17
|
locationsPedestrians: [],
|
|
27
18
|
};
|
|
28
19
|
if (data instanceof Array) {
|
|
29
|
-
const promises = data.map((element, i) =>
|
|
30
|
-
const elemRes =
|
|
20
|
+
const promises = data.map(async (element, i) => {
|
|
21
|
+
const elemRes = await this.transformElement(element);
|
|
31
22
|
if (elemRes) {
|
|
32
23
|
res.directions = res.directions.concat(elemRes.directions);
|
|
33
24
|
res.directionsPedestrians = res.directionsPedestrians.concat(elemRes.directionsPedestrians);
|
|
@@ -35,12 +26,12 @@ class EcoCounterTransformation extends integration_engine_1.BaseTransformation {
|
|
|
35
26
|
res.locationsPedestrians.push(elemRes.locationPedestrians);
|
|
36
27
|
}
|
|
37
28
|
return;
|
|
38
|
-
})
|
|
39
|
-
|
|
29
|
+
});
|
|
30
|
+
await Promise.all(promises);
|
|
40
31
|
return res;
|
|
41
32
|
}
|
|
42
33
|
else {
|
|
43
|
-
const elemRes =
|
|
34
|
+
const elemRes = await this.transformElement(data);
|
|
44
35
|
if (elemRes) {
|
|
45
36
|
res.directions = res.directions.concat(elemRes.directions);
|
|
46
37
|
res.directionsPedestrians = res.directionsPedestrians.concat(elemRes.directionsPedestrians);
|
|
@@ -49,8 +40,8 @@ class EcoCounterTransformation extends integration_engine_1.BaseTransformation {
|
|
|
49
40
|
}
|
|
50
41
|
return res;
|
|
51
42
|
}
|
|
52
|
-
}
|
|
53
|
-
this.transformElement = (element) =>
|
|
43
|
+
};
|
|
44
|
+
this.transformElement = async (element) => {
|
|
54
45
|
const res = {
|
|
55
46
|
directions: element.channels
|
|
56
47
|
? element.channels
|
|
@@ -91,7 +82,7 @@ class EcoCounterTransformation extends integration_engine_1.BaseTransformation {
|
|
|
91
82
|
},
|
|
92
83
|
};
|
|
93
84
|
return res;
|
|
94
|
-
}
|
|
85
|
+
};
|
|
95
86
|
this.name = _sch_1.Counters.ecoCounter.name + "Transformation";
|
|
96
87
|
}
|
|
97
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EcoCounterTransformation.js","sourceRoot":"","sources":["../../../src/integration-engine/transformations/EcoCounterTransformation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"EcoCounterTransformation.js","sourceRoot":"","sources":["../../../src/integration-engine/transformations/EcoCounterTransformation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.pedestriansRouter = exports.PedestriansRouter = void 0;
|
|
13
4
|
const Di_1 = require("./ioc/Di");
|
|
@@ -21,15 +12,15 @@ class PedestriansRouter extends BaseRouter_1.BaseRouter {
|
|
|
21
12
|
super();
|
|
22
13
|
this.pedestriansLocationsModel = new models_1.PedestriansLocationsModel();
|
|
23
14
|
this.pedestriansMeasurementsModel = new models_1.PedestriansMeasurementsModel();
|
|
24
|
-
this.GetPedestriansLocations = (req, res, next) =>
|
|
15
|
+
this.GetPedestriansLocations = async (req, res, next) => {
|
|
25
16
|
try {
|
|
26
|
-
const data =
|
|
17
|
+
const data = await this.pedestriansLocationsModel.GetAll({
|
|
27
18
|
locationId: req.query.locationId,
|
|
28
19
|
locationName: req.query.locationName,
|
|
29
20
|
limit: req.query.limit ? +req.query.limit : undefined,
|
|
30
21
|
offset: req.query.offset ? +req.query.offset : undefined,
|
|
31
22
|
});
|
|
32
|
-
if (!
|
|
23
|
+
if (!data?.length)
|
|
33
24
|
return res.status(404).send();
|
|
34
25
|
else
|
|
35
26
|
res.status(200).send(data);
|
|
@@ -37,10 +28,10 @@ class PedestriansRouter extends BaseRouter_1.BaseRouter {
|
|
|
37
28
|
catch (err) {
|
|
38
29
|
next(err);
|
|
39
30
|
}
|
|
40
|
-
}
|
|
41
|
-
this.GetPedestriansMeasurements = (req, res, next) =>
|
|
31
|
+
};
|
|
32
|
+
this.GetPedestriansMeasurements = async (req, res, next) => {
|
|
42
33
|
try {
|
|
43
|
-
const data =
|
|
34
|
+
const data = await this.pedestriansMeasurementsModel.GetAll({
|
|
44
35
|
locationId: req.query.locationId,
|
|
45
36
|
directionId: req.query.directionId,
|
|
46
37
|
limit: req.query.limit ? +req.query.limit : undefined,
|
|
@@ -48,7 +39,7 @@ class PedestriansRouter extends BaseRouter_1.BaseRouter {
|
|
|
48
39
|
from: req.query.from,
|
|
49
40
|
to: req.query.to,
|
|
50
41
|
});
|
|
51
|
-
if (!
|
|
42
|
+
if (!data?.length)
|
|
52
43
|
return res.status(404).send();
|
|
53
44
|
else
|
|
54
45
|
res.status(200).send(data);
|
|
@@ -56,7 +47,7 @@ class PedestriansRouter extends BaseRouter_1.BaseRouter {
|
|
|
56
47
|
catch (err) {
|
|
57
48
|
next(err);
|
|
58
49
|
}
|
|
59
|
-
}
|
|
50
|
+
};
|
|
60
51
|
this.cacheHeaderMiddleware = Di_1.FlowContainer.resolve(ioc_1.ContainerToken.CacheHeaderMiddleware);
|
|
61
52
|
this.router.get("/locations", [
|
|
62
53
|
(0, express_validator_1.query)("locationId").optional().not().isEmpty({ ignore_whitespace: true }).not().isArray(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PedestriansRouter.js","sourceRoot":"","sources":["../../src/output-gateway/PedestriansRouter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PedestriansRouter.js","sourceRoot":"","sources":["../../src/output-gateway/PedestriansRouter.ts"],"names":[],"mappings":";;;AAAA,iCAA2C;AAE3C,6EAAkH;AAClH,+DAAuE;AACvE,oFAAiF;AAEjF,mFAAoE;AACpE,qCAAqF;AAErF,MAAa,iBAAkB,SAAQ,uBAAU;IAK7C;QACI,KAAK,EAAE,CAAC;QALF,8BAAyB,GAA8B,IAAI,kCAAyB,EAAE,CAAC;QACvF,iCAA4B,GAAiC,IAAI,qCAA4B,EAAE,CAAC;QAmCnG,4BAAuB,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACvF,IAAI;gBACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC;oBACrD,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,UAAoB;oBAC1C,YAAY,EAAE,GAAG,CAAC,KAAK,CAAC,YAAsB;oBAC9C,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;oBACrD,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;iBAC3D,CAAC,CAAC;gBAEH,IAAI,CAAC,IAAI,EAAE,MAAM;oBAAE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;;oBAC5C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnC;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAC;QAEK,+BAA0B,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YAC1F,IAAI;gBACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC;oBACxD,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,UAAoB;oBAC1C,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC,WAAqB;oBAC5C,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;oBACrD,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;oBACxD,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,IAAc;oBAC9B,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,EAAY;iBAC7B,CAAC,CAAC;gBAEH,IAAI,CAAC,IAAI,EAAE,MAAM;oBAAE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;;oBAC5C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnC;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAC;QA9DE,IAAI,CAAC,qBAAqB,GAAG,kBAAa,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QAChH,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,YAAY,EACZ;YACI,IAAA,yBAAK,EAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;YACzF,IAAA,yBAAK,EAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;SAC9F,EACD,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,mBAAmB,CAAC,EAC9C,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,EACtD,IAAI,CAAC,uBAAuB,CAC/B,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,eAAe,EACf;YACI,IAAA,yBAAK,EAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;YACzF,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;YAC1F,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;YACpD,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;SACrD,EACD,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,mBAAmB,CAAC,EAC9C,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,EACtD,IAAI,CAAC,0BAA0B,CAClC,CAAC;IACN,CAAC;CAmCJ;AAtED,8CAsEC;AAED,MAAM,iBAAiB,GAAW,IAAI,iBAAiB,EAAE,CAAC,MAAM,CAAC;AAExD,8CAAiB"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -32,7 +23,7 @@ class PedestriansLocationsModel extends models_1.SequelizeModel {
|
|
|
32
23
|
* @param {string} [options.locationName] Human readable location name<br>
|
|
33
24
|
* @returns Array of the retrieved records
|
|
34
25
|
*/
|
|
35
|
-
this.GetAll = (options = {}) =>
|
|
26
|
+
this.GetAll = async (options = {}) => {
|
|
36
27
|
const { limit, offset, locationId, locationName } = options;
|
|
37
28
|
try {
|
|
38
29
|
const and = sequelize_1.default.Op.and;
|
|
@@ -59,7 +50,7 @@ class PedestriansLocationsModel extends models_1.SequelizeModel {
|
|
|
59
50
|
];
|
|
60
51
|
order.push(["location_id", "DESC"]);
|
|
61
52
|
// Request to pedestrians_locations_api
|
|
62
|
-
const pedestriansLocationsData =
|
|
53
|
+
const pedestriansLocationsData = await this.sequelizeModel.findAll({
|
|
63
54
|
attributes,
|
|
64
55
|
limit,
|
|
65
56
|
offset,
|
|
@@ -72,7 +63,7 @@ class PedestriansLocationsModel extends models_1.SequelizeModel {
|
|
|
72
63
|
SELECT *
|
|
73
64
|
FROM ${index_1.Flow.pgSchema}.v_pedestrians_directions_api
|
|
74
65
|
`;
|
|
75
|
-
let pedestriansDirectionsFromDB =
|
|
66
|
+
let pedestriansDirectionsFromDB = await database_1.sequelizeConnection?.query(pedestriansDirectionsQuery);
|
|
76
67
|
const pedestriansDirectionsData = (pedestriansDirectionsFromDB || [])[0];
|
|
77
68
|
// datatransformation to responseArr
|
|
78
69
|
let responseArr = [];
|
|
@@ -111,10 +102,10 @@ class PedestriansLocationsModel extends models_1.SequelizeModel {
|
|
|
111
102
|
catch (err) {
|
|
112
103
|
throw new golemio_errors_1.GeneralError("Database error", "PedestriansLocationsModel", err, 500);
|
|
113
104
|
}
|
|
114
|
-
}
|
|
115
|
-
this.GetOne = (id) =>
|
|
105
|
+
};
|
|
106
|
+
this.GetOne = async (id) => {
|
|
116
107
|
return null;
|
|
117
|
-
}
|
|
108
|
+
};
|
|
118
109
|
}
|
|
119
110
|
}
|
|
120
111
|
exports.PedestriansLocationsModel = PedestriansLocationsModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PedestriansLocationsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/PedestriansLocationsModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PedestriansLocationsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/PedestriansLocationsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -32,7 +23,7 @@ class PedestriansMeasurementsModel extends models_1.SequelizeModel {
|
|
|
32
23
|
* @param {string} [options.to] ISO date<br>
|
|
33
24
|
* @returns Array of the retrieved records
|
|
34
25
|
*/
|
|
35
|
-
this.GetAll = (options = {}) =>
|
|
26
|
+
this.GetAll = async (options = {}) => {
|
|
36
27
|
const { limit, offset, locationId, directionId, from, to } = options;
|
|
37
28
|
try {
|
|
38
29
|
// Request to pedestrians_detections_api
|
|
@@ -63,7 +54,7 @@ class PedestriansMeasurementsModel extends models_1.SequelizeModel {
|
|
|
63
54
|
}
|
|
64
55
|
const attributes = ["measured_from", "measured_to", "location_id", "direction_id", "value", "quality"];
|
|
65
56
|
order.push(["location_id", "DESC"]);
|
|
66
|
-
return
|
|
57
|
+
return await this.sequelizeModel.findAll({
|
|
67
58
|
attributes,
|
|
68
59
|
limit,
|
|
69
60
|
offset,
|
|
@@ -75,10 +66,10 @@ class PedestriansMeasurementsModel extends models_1.SequelizeModel {
|
|
|
75
66
|
catch (err) {
|
|
76
67
|
throw new golemio_errors_1.GeneralError("Database error", "PedestriansMeasurementsModel", err, 500);
|
|
77
68
|
}
|
|
78
|
-
}
|
|
79
|
-
this.GetOne = (id) =>
|
|
69
|
+
};
|
|
70
|
+
this.GetOne = async (id) => {
|
|
80
71
|
return null;
|
|
81
|
-
}
|
|
72
|
+
};
|
|
82
73
|
}
|
|
83
74
|
}
|
|
84
75
|
exports.PedestriansMeasurementsModel = PedestriansMeasurementsModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PedestriansMeasurementsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/PedestriansMeasurementsModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PedestriansMeasurementsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/PedestriansMeasurementsModel.ts"],"names":[],"mappings":";;;;;;AAAA,oFAA4D;AAC5D,6EAAwE;AACxE,qEAA0E;AAC1E,0DAAkC;AAElC,MAAa,4BAA6B,SAAQ,uBAAc;IAC5D;QACI,KAAK,CACD,YAAI,CAAC,0BAA0B,CAAC,IAAI,EACpC,YAAI,CAAC,0BAA0B,CAAC,WAAW,EAC3C,YAAI,CAAC,0BAA0B,CAAC,yBAAyB,EACzD;YACI,MAAM,EAAE,YAAI,CAAC,QAAQ;SACxB,CACJ,CAAC;QAGN;;;;;;;;;WASG;QACI,WAAM,GAAG,KAAK,EACjB,UAOI,EAAE,EACM,EAAE;YACd,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;YACrE,IAAI;gBACA,wCAAwC;gBACxC,MAAM,GAAG,GAAW,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC;gBACrC,MAAM,KAAK,GAAU,EAAE,CAAC;gBACxB,MAAM,KAAK,GAAQ;oBACf,CAAC,GAAG,CAAC,EAAE,EAAE;iBACZ,CAAC;gBAEF,IAAI,UAAU,EAAE;oBACZ,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;iBAChD;gBAED,IAAI,WAAW,EAAE;oBACb,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC;iBAClD;gBAED,IAAI,IAAI,EAAE;oBACN,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACZ,aAAa,EAAE;4BACX,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI;yBAC3B;qBACJ,CAAC,CAAC;iBACN;gBAED,IAAI,EAAE,EAAE;oBACJ,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACZ,WAAW,EAAE;4BACT,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE;yBACzB;qBACJ,CAAC,CAAC;iBACN;gBAED,MAAM,UAAU,GAAa,CAAC,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;gBAEjH,KAAK,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;gBAEpC,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBACrC,UAAU;oBACV,KAAK;oBACL,MAAM;oBACN,KAAK;oBACL,GAAG,EAAE,IAAI;oBACT,KAAK;iBACR,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,gBAAgB,EAAE,8BAA8B,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aACtF;QACL,CAAC,CAAC;QAEK,WAAM,GAAG,KAAK,EAAE,EAAU,EAA0B,EAAE;YACzD,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC;IA1EF,CAAC;CA2EJ;AArFD,oEAqFC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/flow",
|
|
3
|
-
"version": "1.3.4-
|
|
3
|
+
"version": "1.3.4-rc.1848543200",
|
|
4
4
|
"description": "Golemio Flow Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -35,9 +35,9 @@
|
|
|
35
35
|
"@apideck/portman": "^1.26.5",
|
|
36
36
|
"@commitlint/cli": "^11.0.0",
|
|
37
37
|
"@commitlint/config-conventional": "^11.0.0",
|
|
38
|
-
"@golemio/cli": "1.
|
|
39
|
-
"@golemio/core": "1.
|
|
40
|
-
"@golemio/db-common": "1.
|
|
38
|
+
"@golemio/cli": "1.10.0",
|
|
39
|
+
"@golemio/core": "1.20.7",
|
|
40
|
+
"@golemio/db-common": "1.2.0",
|
|
41
41
|
"@golemio/eslint-config": "1.1.2",
|
|
42
42
|
"@types/chai": "^4.2.3",
|
|
43
43
|
"@types/chai-as-promised": "^7.1.2",
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
import { BaseWorker } from "@golemio/core/dist/integration-engine/workers";
|
|
2
|
-
/**
|
|
3
|
-
* Temporary worker for testing purposes
|
|
4
|
-
*/
|
|
5
|
-
export declare class FlowWorkerTest extends BaseWorker {
|
|
6
|
-
private static testSchema;
|
|
7
|
-
private test_url;
|
|
8
|
-
private cubesDataSource;
|
|
9
|
-
private analyticsDataSource;
|
|
10
|
-
private sinksDataSource;
|
|
11
|
-
private sinksHistoryDataSource;
|
|
12
|
-
private flowCubesModel;
|
|
13
|
-
private flowMeasurementModel;
|
|
14
|
-
private flowODMeasurementModel;
|
|
15
|
-
private flowSinksModel;
|
|
16
|
-
private queuePrefix;
|
|
17
|
-
constructor();
|
|
18
|
-
private getHistoryIntervalFromMsg;
|
|
19
|
-
refreshCubes: (msg: any) => Promise<void>;
|
|
20
|
-
getAnalytics: (msg: any) => Promise<void>;
|
|
21
|
-
getSinks: (msg: any) => Promise<void>;
|
|
22
|
-
getSinksHistoryPayloads: (msg: any) => Promise<void>;
|
|
23
|
-
getSinksHistory: (msg: any) => Promise<void>;
|
|
24
|
-
private getMeasurementsDistribution;
|
|
25
|
-
private getMeasurementsOdMatrix;
|
|
26
|
-
private getHistoryPayload;
|
|
27
|
-
private getTimeRanges;
|
|
28
|
-
private getHttpSettings;
|
|
29
|
-
}
|