@golemio/bicycle-counters 1.3.5-dev.1819469861 → 1.3.5-rc.1826437828
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/transformations/CameaMeasurementsTransformation.js +9 -18
- package/dist/integration-engine/transformations/CameaMeasurementsTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/CameaTransformation.js +9 -18
- package/dist/integration-engine/transformations/CameaTransformation.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/integration-engine/workers/tasks/RefreshCameaDataLastXHoursInDBTask.js +10 -21
- package/dist/integration-engine/workers/tasks/RefreshCameaDataLastXHoursInDBTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/RefreshCameaDataPreviousDayInDBTask.js +10 -21
- package/dist/integration-engine/workers/tasks/RefreshCameaDataPreviousDayInDBTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/RefreshCameaDataSpecificDayInDBTask.js +14 -25
- package/dist/integration-engine/workers/tasks/RefreshCameaDataSpecificDayInDBTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/RefreshEcoCounterDataInDBTask.js +12 -23
- package/dist/integration-engine/workers/tasks/RefreshEcoCounterDataInDBTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/UpdateCameaTask.js +49 -60
- package/dist/integration-engine/workers/tasks/UpdateCameaTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/UpdateEcoCounterTask.js +45 -56
- package/dist/integration-engine/workers/tasks/UpdateEcoCounterTask.js.map +1 -1
- package/dist/output-gateway/BicycleCountersRouter.js +7 -16
- package/dist/output-gateway/BicycleCountersRouter.js.map +1 -1
- package/dist/output-gateway/models/BicycleCountersDetectionsModel.js +4 -13
- package/dist/output-gateway/models/BicycleCountersDetectionsModel.js.map +1 -1
- package/dist/output-gateway/models/BicycleCountersDirectionsModel.js +2 -11
- package/dist/output-gateway/models/BicycleCountersDirectionsModel.js.map +1 -1
- package/dist/output-gateway/models/BicycleCountersLocationsModel.js +5 -14
- package/dist/output-gateway/models/BicycleCountersLocationsModel.js.map +1 -1
- package/dist/output-gateway/models/BicycleCountersTemperaturesModel.js +4 -13
- package/dist/output-gateway/models/BicycleCountersTemperaturesModel.js.map +1 -1
- package/package.json +3 -3
|
@@ -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.CameaMeasurementsTransformation = void 0;
|
|
13
4
|
const transformations_1 = require("@golemio/core/dist/integration-engine/transformations");
|
|
@@ -19,14 +10,14 @@ class CameaMeasurementsTransformation extends transformations_1.BaseTransformati
|
|
|
19
10
|
/**
|
|
20
11
|
* Overrides BaseTransformation::transform
|
|
21
12
|
*/
|
|
22
|
-
this.transform = (data) =>
|
|
13
|
+
this.transform = async (data) => {
|
|
23
14
|
const res = {
|
|
24
15
|
detections: [],
|
|
25
16
|
temperatures: [],
|
|
26
17
|
};
|
|
27
18
|
if (data instanceof Array) {
|
|
28
|
-
const promises = data.map((element, i) =>
|
|
29
|
-
const elemRes =
|
|
19
|
+
const promises = data.map(async (element, i) => {
|
|
20
|
+
const elemRes = await this.transformElement(element);
|
|
30
21
|
if (elemRes) {
|
|
31
22
|
res.detections = res.detections.concat(elemRes.detections);
|
|
32
23
|
if (elemRes.temperature) {
|
|
@@ -34,12 +25,12 @@ class CameaMeasurementsTransformation extends transformations_1.BaseTransformati
|
|
|
34
25
|
}
|
|
35
26
|
}
|
|
36
27
|
return;
|
|
37
|
-
})
|
|
38
|
-
|
|
28
|
+
});
|
|
29
|
+
await Promise.all(promises);
|
|
39
30
|
return res;
|
|
40
31
|
}
|
|
41
32
|
else {
|
|
42
|
-
const elemRes =
|
|
33
|
+
const elemRes = await this.transformElement(data);
|
|
43
34
|
if (elemRes) {
|
|
44
35
|
res.detections = res.detections.concat(elemRes.detections);
|
|
45
36
|
if (elemRes.temperature) {
|
|
@@ -48,8 +39,8 @@ class CameaMeasurementsTransformation extends transformations_1.BaseTransformati
|
|
|
48
39
|
}
|
|
49
40
|
return res;
|
|
50
41
|
}
|
|
51
|
-
}
|
|
52
|
-
this.transformElement = (element) =>
|
|
42
|
+
};
|
|
43
|
+
this.transformElement = async (element) => {
|
|
53
44
|
const measuredFrom = DateTime_1.DateTime.fromISO(element.datetime).setTimeZone("Europe/Prague");
|
|
54
45
|
const measuredTo = measuredFrom.clone().add(5, "minutes");
|
|
55
46
|
const res = {
|
|
@@ -73,7 +64,7 @@ class CameaMeasurementsTransformation extends transformations_1.BaseTransformati
|
|
|
73
64
|
: null,
|
|
74
65
|
};
|
|
75
66
|
return res;
|
|
76
|
-
}
|
|
67
|
+
};
|
|
77
68
|
this.name = index_1.BicycleCounters.camea.name + "Measurements";
|
|
78
69
|
}
|
|
79
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CameaMeasurementsTransformation.js","sourceRoot":"","sources":["../../../src/integration-engine/transformations/CameaMeasurementsTransformation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CameaMeasurementsTransformation.js","sourceRoot":"","sources":["../../../src/integration-engine/transformations/CameaMeasurementsTransformation.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.CameaTransformation = void 0;
|
|
13
4
|
const transformations_1 = require("@golemio/core/dist/integration-engine/transformations");
|
|
@@ -18,33 +9,33 @@ class CameaTransformation extends transformations_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
|
locations: [],
|
|
25
16
|
};
|
|
26
17
|
if (data instanceof Array) {
|
|
27
|
-
const promises = data.map((element, i) =>
|
|
28
|
-
const elemRes =
|
|
18
|
+
const promises = data.map(async (element, i) => {
|
|
19
|
+
const elemRes = await this.transformElement(element);
|
|
29
20
|
if (elemRes) {
|
|
30
21
|
res.directions = res.directions.concat(elemRes.directions);
|
|
31
22
|
res.locations.push(elemRes.location);
|
|
32
23
|
}
|
|
33
24
|
return;
|
|
34
|
-
})
|
|
35
|
-
|
|
25
|
+
});
|
|
26
|
+
await Promise.all(promises);
|
|
36
27
|
return res;
|
|
37
28
|
}
|
|
38
29
|
else {
|
|
39
|
-
const elemRes =
|
|
30
|
+
const elemRes = await this.transformElement(data);
|
|
40
31
|
if (elemRes) {
|
|
41
32
|
res.directions = res.directions.concat(elemRes.directions);
|
|
42
33
|
res.locations.push(elemRes.location);
|
|
43
34
|
}
|
|
44
35
|
return res;
|
|
45
36
|
}
|
|
46
|
-
}
|
|
47
|
-
this.transformElement = (element) =>
|
|
37
|
+
};
|
|
38
|
+
this.transformElement = async (element) => {
|
|
48
39
|
const res = {
|
|
49
40
|
directions: element.directions
|
|
50
41
|
? element.directions.map((direction) => ({
|
|
@@ -64,7 +55,7 @@ class CameaTransformation extends transformations_1.BaseTransformation {
|
|
|
64
55
|
},
|
|
65
56
|
};
|
|
66
57
|
return res;
|
|
67
|
-
}
|
|
58
|
+
};
|
|
68
59
|
this.name = index_1.BicycleCounters.camea.name;
|
|
69
60
|
}
|
|
70
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CameaTransformation.js","sourceRoot":"","sources":["../../../src/integration-engine/transformations/CameaTransformation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CameaTransformation.js","sourceRoot":"","sources":["../../../src/integration-engine/transformations/CameaTransformation.ts"],"names":[],"mappings":";;;AAAA,2FAA4G;AAC5G,0DAA6C;AAO7C,MAAa,mBAAoB,SAAQ,oCAAkB;IAGvD;QACI,KAAK,EAAE,CAAC;QAIZ;;WAEG;QACI,cAAS,GAAG,KAAK,EAAE,IAAiB,EAAqB,EAAE;YAC9D,MAAM,GAAG,GAAa;gBAClB,UAAU,EAAE,EAAE;gBACd,SAAS,EAAE,EAAE;aAChB,CAAC;YAEF,IAAI,IAAI,YAAY,KAAK,EAAE;gBACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE;oBAC3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;oBACrD,IAAI,OAAO,EAAE;wBACT,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;wBAC3D,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;qBACxC;oBACD,OAAO;gBACX,CAAC,CAAC,CAAC;gBACH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC5B,OAAO,GAAG,CAAC;aACd;iBAAM;gBACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;gBAClD,IAAI,OAAO,EAAE;oBACT,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;oBAC3D,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;iBACxC;gBACD,OAAO,GAAG,CAAC;aACd;QACL,CAAC,CAAC;QAEQ,qBAAgB,GAAG,KAAK,EAAE,OAAY,EAAiD,EAAE;YAC/F,MAAM,GAAG,GAAG;gBACR,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC1B,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAA8B,EAAE,EAAE,CAAC,CAAC;wBACxD,EAAE,EAAE,QAAQ,GAAG,SAAS,CAAC,EAAE;wBAC3B,YAAY,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW;wBAC5C,IAAI,EAAE,SAAS,CAAC,IAAI;wBACpB,SAAS,EAAE,SAAS,CAAC,EAAE;qBAC1B,CAAC,CAAC;oBACL,CAAC,CAAC,EAAE;gBACR,QAAQ,EAAE;oBACN,EAAE,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW;oBAClC,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,SAAS,EAAE,OAAO,CAAC,WAAW;iBACjC;aACJ,CAAC;YACF,OAAO,GAAG,CAAC;QACf,CAAC,CAAC;QArDE,IAAI,CAAC,IAAI,GAAG,uBAAe,CAAC,KAAK,CAAC,IAAI,CAAC;IAC3C,CAAC;CAqDJ;AA3DD,kDA2DC"}
|
|
@@ -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.EcoCounterMeasurementsTransformation = void 0;
|
|
13
4
|
const transformations_1 = require("@golemio/core/dist/integration-engine/transformations");
|
|
@@ -16,7 +7,7 @@ const DateTime_1 = require("@golemio/core/dist/helpers/DateTime");
|
|
|
16
7
|
class EcoCounterMeasurementsTransformation extends transformations_1.BaseTransformation {
|
|
17
8
|
constructor() {
|
|
18
9
|
super();
|
|
19
|
-
this.transformElement = (element) =>
|
|
10
|
+
this.transformElement = async (element) => {
|
|
20
11
|
// Repair UTC date, because EcoCounter API is actually working with local Europe/Prague time, not ISO!!!
|
|
21
12
|
// Returned value 07:00:00+0000 is some hybrid between UTC time with offset 07:00:00+0100 and pure UTC
|
|
22
13
|
// 06:00:00+0000
|
|
@@ -32,7 +23,7 @@ class EcoCounterMeasurementsTransformation extends transformations_1.BaseTransfo
|
|
|
32
23
|
value: element.counts,
|
|
33
24
|
};
|
|
34
25
|
return res;
|
|
35
|
-
}
|
|
26
|
+
};
|
|
36
27
|
this.name = index_1.BicycleCounters.ecoCounter.name + "Measurements";
|
|
37
28
|
}
|
|
38
29
|
}
|
|
@@ -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,2FAA4G;AAC5G,0DAA6C;AAC7C,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;YAChB,MAAM,YAAY,GAAG,mBAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE;gBACpF,QAAQ,EAAE,eAAe;aAC5B,CAAC,CAAC;YACH,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,WAAW,EAAE;gBACzC,WAAW,EAAE,UAAU,CAAC,WAAW,EAAE;gBACrC,KAAK,EAAE,OAAO,CAAC,MAAM;aACxB,CAAC;YAEF,OAAO,GAAG,CAAC;QACf,CAAC,CAAC;QArBE,IAAI,CAAC,IAAI,GAAG,uBAAe,CAAC,UAAU,CAAC,IAAI,GAAG,cAAc,CAAC;IACjE,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 transformations_1 = require("@golemio/core/dist/integration-engine/transformations");
|
|
@@ -23,7 +14,7 @@ class EcoCounterTransformation extends transformations_1.BaseTransformation {
|
|
|
23
14
|
/**
|
|
24
15
|
* Overrides BaseTransformation::transform
|
|
25
16
|
*/
|
|
26
|
-
this.transform = (data) =>
|
|
17
|
+
this.transform = async (data) => {
|
|
27
18
|
const res = {
|
|
28
19
|
directions: [],
|
|
29
20
|
directionsPedestrians: [],
|
|
@@ -31,8 +22,8 @@ class EcoCounterTransformation extends transformations_1.BaseTransformation {
|
|
|
31
22
|
locationsPedestrians: [],
|
|
32
23
|
};
|
|
33
24
|
if (data instanceof Array) {
|
|
34
|
-
const promises = data.map((element, i) =>
|
|
35
|
-
const elemRes =
|
|
25
|
+
const promises = data.map(async (element, i) => {
|
|
26
|
+
const elemRes = await this.transformElement(element);
|
|
36
27
|
if (elemRes) {
|
|
37
28
|
res.directions = res.directions.concat(elemRes.directions);
|
|
38
29
|
res.directionsPedestrians = res.directionsPedestrians.concat(elemRes.directionsPedestrians);
|
|
@@ -40,12 +31,12 @@ class EcoCounterTransformation extends transformations_1.BaseTransformation {
|
|
|
40
31
|
res.locationsPedestrians.push(elemRes.locationPedestrians);
|
|
41
32
|
}
|
|
42
33
|
return;
|
|
43
|
-
})
|
|
44
|
-
|
|
34
|
+
});
|
|
35
|
+
await Promise.all(promises);
|
|
45
36
|
return res;
|
|
46
37
|
}
|
|
47
38
|
else {
|
|
48
|
-
const elemRes =
|
|
39
|
+
const elemRes = await this.transformElement(data);
|
|
49
40
|
if (elemRes) {
|
|
50
41
|
res.directions = res.directions.concat(elemRes.directions);
|
|
51
42
|
res.directionsPedestrians = res.directionsPedestrians.concat(elemRes.directionsPedestrians);
|
|
@@ -54,8 +45,8 @@ class EcoCounterTransformation extends transformations_1.BaseTransformation {
|
|
|
54
45
|
}
|
|
55
46
|
return res;
|
|
56
47
|
}
|
|
57
|
-
}
|
|
58
|
-
this.transformElement = (element) =>
|
|
48
|
+
};
|
|
49
|
+
this.transformElement = async (element) => {
|
|
59
50
|
const res = {
|
|
60
51
|
directions: element.channels
|
|
61
52
|
? element.channels
|
|
@@ -96,7 +87,7 @@ class EcoCounterTransformation extends transformations_1.BaseTransformation {
|
|
|
96
87
|
},
|
|
97
88
|
};
|
|
98
89
|
return res;
|
|
99
|
-
}
|
|
90
|
+
};
|
|
100
91
|
this.name = index_1.BicycleCounters.ecoCounter.name;
|
|
101
92
|
}
|
|
102
93
|
}
|
|
@@ -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.RefreshCameaDataLastXHoursInDBTask = void 0;
|
|
13
4
|
const CameaDataSource_1 = require("../../datasources/CameaDataSource");
|
|
@@ -25,20 +16,18 @@ class RefreshCameaDataLastXHoursInDBTask extends integration_engine_1.AbstractEm
|
|
|
25
16
|
this.locationsRepo = new repositories_1.LocationsRepository();
|
|
26
17
|
this.directionsRepo = new repositories_1.DirectionRepository();
|
|
27
18
|
}
|
|
28
|
-
execute() {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
duration: BicycleCountersWorker_1.CameaRefreshDurations.last3Hours,
|
|
38
|
-
});
|
|
19
|
+
async execute() {
|
|
20
|
+
const data = await this.dataSourceCamea.getAll();
|
|
21
|
+
const transformedData = await this.cameaTransformation.transform(data);
|
|
22
|
+
await this.locationsRepo.save(transformedData.locations);
|
|
23
|
+
await this.directionsRepo.save(transformedData.directions);
|
|
24
|
+
const promises = transformedData.locations.map((p) => {
|
|
25
|
+
return integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "updateCamea", {
|
|
26
|
+
id: p.vendor_id,
|
|
27
|
+
duration: BicycleCountersWorker_1.CameaRefreshDurations.last3Hours,
|
|
39
28
|
});
|
|
40
|
-
yield Promise.all(promises);
|
|
41
29
|
});
|
|
30
|
+
await Promise.all(promises);
|
|
42
31
|
}
|
|
43
32
|
}
|
|
44
33
|
exports.RefreshCameaDataLastXHoursInDBTask = RefreshCameaDataLastXHoursInDBTask;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RefreshCameaDataLastXHoursInDBTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/RefreshCameaDataLastXHoursInDBTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RefreshCameaDataLastXHoursInDBTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/RefreshCameaDataLastXHoursInDBTask.ts"],"names":[],"mappings":";;;AAAA,uEAAoE;AACpE,8EAAoG;AACpG,qDAA4E;AAC5E,mFAA8E;AAC9E,oEAAiE;AAEjE,MAAa,kCAAmC,SAAQ,sCAAiB;IASrE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QATP,cAAS,GAAG,gCAAgC,CAAC;QAC7C,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QASpD,IAAI,CAAC,eAAe,GAAG,iCAAe,CAAC,aAAa,EAAE,CAAC;QACvD,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,EAAE,CAAC;QACrD,IAAI,CAAC,aAAa,GAAG,IAAI,kCAAmB,EAAE,CAAC;QAC/C,IAAI,CAAC,cAAc,GAAG,IAAI,kCAAmB,EAAE,CAAC;IACpD,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;QACjD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvE,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAE3D,MAAM,QAAQ,GAAG,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACjD,OAAO,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,EAAE;gBACvE,EAAE,EAAE,CAAC,CAAC,SAAS;gBACf,QAAQ,EAAE,6CAAqB,CAAC,UAAU;aAC7C,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;CACJ;AA/BD,gFA+BC"}
|
|
@@ -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.RefreshCameaDataPreviousDayInDBTask = void 0;
|
|
13
4
|
const CameaDataSource_1 = require("../../datasources/CameaDataSource");
|
|
@@ -25,20 +16,18 @@ class RefreshCameaDataPreviousDayInDBTask extends integration_engine_1.AbstractE
|
|
|
25
16
|
this.locationsRepo = new repositories_1.LocationsRepository();
|
|
26
17
|
this.directionsRepo = new repositories_1.DirectionRepository();
|
|
27
18
|
}
|
|
28
|
-
execute() {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
duration: BicycleCountersWorker_1.CameaRefreshDurations.previousDay,
|
|
38
|
-
});
|
|
19
|
+
async execute() {
|
|
20
|
+
const data = await this.dataSourceCamea.getAll();
|
|
21
|
+
const transformedData = await this.cameaTransformation.transform(data);
|
|
22
|
+
await this.locationsRepo.save(transformedData.locations);
|
|
23
|
+
await this.directionsRepo.save(transformedData.directions);
|
|
24
|
+
const promises = transformedData.locations.map((p) => {
|
|
25
|
+
return integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "updateCamea", {
|
|
26
|
+
id: p.vendor_id,
|
|
27
|
+
duration: BicycleCountersWorker_1.CameaRefreshDurations.previousDay,
|
|
39
28
|
});
|
|
40
|
-
yield Promise.all(promises);
|
|
41
29
|
});
|
|
30
|
+
await Promise.all(promises);
|
|
42
31
|
}
|
|
43
32
|
}
|
|
44
33
|
exports.RefreshCameaDataPreviousDayInDBTask = RefreshCameaDataPreviousDayInDBTask;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RefreshCameaDataPreviousDayInDBTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/RefreshCameaDataPreviousDayInDBTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RefreshCameaDataPreviousDayInDBTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/RefreshCameaDataPreviousDayInDBTask.ts"],"names":[],"mappings":";;;AAAA,uEAAoE;AACpE,8EAAoG;AACpG,qDAA4E;AAC5E,mFAA8E;AAC9E,oEAAiE;AAEjE,MAAa,mCAAoC,SAAQ,sCAAiB;IAStE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QATP,cAAS,GAAG,iCAAiC,CAAC;QAC9C,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QASpD,IAAI,CAAC,eAAe,GAAG,iCAAe,CAAC,aAAa,EAAE,CAAC;QACvD,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,EAAE,CAAC;QACrD,IAAI,CAAC,aAAa,GAAG,IAAI,kCAAmB,EAAE,CAAC;QAC/C,IAAI,CAAC,cAAc,GAAG,IAAI,kCAAmB,EAAE,CAAC;IACpD,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;QACjD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvE,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAE3D,MAAM,QAAQ,GAAG,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACjD,OAAO,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,EAAE;gBACvE,EAAE,EAAE,CAAC,CAAC,SAAS;gBACf,QAAQ,EAAE,6CAAqB,CAAC,WAAW;aAC9C,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;CACJ;AA/BD,kFA+BC"}
|
|
@@ -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.RefreshCameaDataSpecificDayInDBTask = void 0;
|
|
13
4
|
const UpdateCameaSchema_1 = require("./../../schema/UpdateCameaSchema");
|
|
@@ -28,24 +19,22 @@ class RefreshCameaDataSpecificDayInDBTask extends integration_engine_1.AbstractT
|
|
|
28
19
|
this.locationsRepo = new repositories_1.LocationsRepository();
|
|
29
20
|
this.directionsRepo = new repositories_1.DirectionRepository();
|
|
30
21
|
}
|
|
31
|
-
execute(inputData) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
id: p.vendor_id,
|
|
45
|
-
});
|
|
22
|
+
async execute(inputData) {
|
|
23
|
+
if (!inputData?.date) {
|
|
24
|
+
throw new golemio_errors_1.GeneralError("Message must contain the date property.", this.constructor.name);
|
|
25
|
+
}
|
|
26
|
+
const data = await this.dataSourceCamea.getAll();
|
|
27
|
+
const transformedData = await this.cameaTransformation.transform(data);
|
|
28
|
+
await this.locationsRepo.save(transformedData.locations);
|
|
29
|
+
await this.directionsRepo.save(transformedData.directions);
|
|
30
|
+
const promises = transformedData.locations.map((p) => {
|
|
31
|
+
return integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "updateCamea", {
|
|
32
|
+
date: inputData.date,
|
|
33
|
+
duration: BicycleCountersWorker_1.CameaRefreshDurations.specificDay,
|
|
34
|
+
id: p.vendor_id,
|
|
46
35
|
});
|
|
47
|
-
yield Promise.all(promises);
|
|
48
36
|
});
|
|
37
|
+
await Promise.all(promises);
|
|
49
38
|
}
|
|
50
39
|
}
|
|
51
40
|
exports.RefreshCameaDataSpecificDayInDBTask = RefreshCameaDataSpecificDayInDBTask;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RefreshCameaDataSpecificDayInDBTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/RefreshCameaDataSpecificDayInDBTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RefreshCameaDataSpecificDayInDBTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/RefreshCameaDataSpecificDayInDBTask.ts"],"names":[],"mappings":";;;AAAA,wEAA+E;AAC/E,uEAAoE;AACpE,8EAA+F;AAC/F,qDAA4E;AAC5E,6EAAwE;AACxE,mFAA8E;AAC9E,oEAAiE;AAEjE,MAAa,mCAAoC,SAAQ,iCAAmB;IAUxE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAVb,WAAM,GAAG,wCAAoB,CAAC;QACxB,cAAS,GAAG,iCAAiC,CAAC;QAC9C,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QASlD,IAAI,CAAC,eAAe,GAAG,iCAAe,CAAC,aAAa,EAAE,CAAC;QACvD,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,EAAE,CAAC;QACrD,IAAI,CAAC,aAAa,GAAG,IAAI,kCAAmB,EAAE,CAAC;QAC/C,IAAI,CAAC,cAAc,GAAG,IAAI,kCAAmB,EAAE,CAAC;IACpD,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,SAAgB;QACpC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE;YAClB,MAAM,IAAI,6BAAY,CAAC,yCAAyC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SAC5F;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;QACjD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvE,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAE3D,MAAM,QAAQ,GAAG,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACjD,OAAO,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,EAAE;gBACvE,IAAI,EAAE,SAAS,CAAC,IAAc;gBAC9B,QAAQ,EAAE,6CAAqB,CAAC,WAAW;gBAC3C,EAAE,EAAE,CAAC,CAAC,SAAS;aAClB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;CACJ;AArCD,kFAqCC"}
|
|
@@ -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.RefreshEcoCounterDataInDBTask = void 0;
|
|
13
4
|
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
@@ -24,22 +15,20 @@ class RefreshEcoCounterDataInDBTask extends integration_engine_1.AbstractEmptyTa
|
|
|
24
15
|
this.locationsRepo = new repositories_1.LocationsRepository();
|
|
25
16
|
this.directionsRepo = new repositories_1.DirectionRepository();
|
|
26
17
|
}
|
|
27
|
-
execute() {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
locations_id: p.locations_id,
|
|
39
|
-
});
|
|
18
|
+
async execute() {
|
|
19
|
+
const data = await this.dataSourceCamea.getAll();
|
|
20
|
+
const transformedData = await this.ecoCounterTransformation.transform(data);
|
|
21
|
+
await this.locationsRepo.save(transformedData.locations);
|
|
22
|
+
await this.directionsRepo.save(transformedData.directions);
|
|
23
|
+
const promises = transformedData.directions.map((p) => {
|
|
24
|
+
return integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "updateEcoCounter", {
|
|
25
|
+
category: "bicycle",
|
|
26
|
+
directions_id: p.id,
|
|
27
|
+
id: p.vendor_id,
|
|
28
|
+
locations_id: p.locations_id,
|
|
40
29
|
});
|
|
41
|
-
yield Promise.all(promises);
|
|
42
30
|
});
|
|
31
|
+
await Promise.all(promises);
|
|
43
32
|
}
|
|
44
33
|
}
|
|
45
34
|
exports.RefreshEcoCounterDataInDBTask = RefreshEcoCounterDataInDBTask;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RefreshEcoCounterDataInDBTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/RefreshEcoCounterDataInDBTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RefreshEcoCounterDataInDBTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/RefreshEcoCounterDataInDBTask.ts"],"names":[],"mappings":";;;AAAA,8EAAoG;AACpG,qDAA4E;AAC5E,6FAAwF;AACxF,mDAAwD;AAExD,MAAa,6BAA8B,SAAQ,sCAAiB;IAShE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QATP,cAAS,GAAG,2BAA2B,CAAC;QACxC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QASpD,IAAI,CAAC,eAAe,GAAG,mCAAqB,CAAC,aAAa,EAAE,CAAC;QAC7D,IAAI,CAAC,wBAAwB,GAAG,IAAI,mDAAwB,EAAE,CAAC;QAC/D,IAAI,CAAC,aAAa,GAAG,IAAI,kCAAmB,EAAE,CAAC;QAC/C,IAAI,CAAC,cAAc,GAAG,IAAI,kCAAmB,EAAE,CAAC;IACpD,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;QAEjD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE5E,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAE3D,MAAM,QAAQ,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAClD,OAAO,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,EAAE;gBAC5E,QAAQ,EAAE,SAAS;gBACnB,aAAa,EAAE,CAAC,CAAC,EAAE;gBACnB,EAAE,EAAE,CAAC,CAAC,SAAS;gBACf,YAAY,EAAE,CAAC,CAAC,YAAY;aAC/B,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;CACJ;AAnCD,sEAmCC"}
|
|
@@ -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.UpdateCameaTask = void 0;
|
|
13
4
|
const CameaCountersMeasurementsDataSource_1 = require("../../datasources/CameaCountersMeasurementsDataSource");
|
|
@@ -31,57 +22,55 @@ class UpdateCameaTask extends integration_engine_1.AbstractTask {
|
|
|
31
22
|
this.dataSourceCameaMeasurements = CameaCountersMeasurementsDataSource_1.CameaCountersMeasurementsDataSource.getDataSource();
|
|
32
23
|
this.temperaturesRepo = new repositories_1.TemperaturesRepository();
|
|
33
24
|
}
|
|
34
|
-
execute(inputData) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
yield this.temperaturesRepo.saveBySqlFunction(transformedData.temperatures, ["locations_id", "measured_from"]);
|
|
84
|
-
});
|
|
25
|
+
async execute(inputData) {
|
|
26
|
+
const id = inputData.id;
|
|
27
|
+
const duration = inputData.duration;
|
|
28
|
+
const now = (0, DateTime_1.dateTime)(new Date()).setTimeZone("UTC");
|
|
29
|
+
let from;
|
|
30
|
+
let to;
|
|
31
|
+
switch (duration) {
|
|
32
|
+
case BicycleCountersWorker_1.CameaRefreshDurations.last3Hours:
|
|
33
|
+
const step = 5;
|
|
34
|
+
const remainder = step - (now.toDate().getMinutes() % step);
|
|
35
|
+
const nowRounded = (0, DateTime_1.dateTime)(new Date(now.toDate().setUTCSeconds(0, 0))).add(remainder, "minutes");
|
|
36
|
+
const nowMinus12h = nowRounded.clone().subtract(3, "hours");
|
|
37
|
+
to = nowRounded.format("yyyy-LL-dd HH:mm:ss");
|
|
38
|
+
from = nowMinus12h.format("yyyy-LL-dd HH:mm:ss");
|
|
39
|
+
break;
|
|
40
|
+
case BicycleCountersWorker_1.CameaRefreshDurations.previousDay:
|
|
41
|
+
const todayStart = (0, DateTime_1.dateTime)(new Date(now.toDate().setUTCHours(0, 0, 0, 0)));
|
|
42
|
+
const yesterdayStart = todayStart.clone().subtract(1, "days");
|
|
43
|
+
to = todayStart.format("yyyy-LL-dd HH:mm:ss");
|
|
44
|
+
from = yesterdayStart.format("yyyy-LL-dd HH:mm:ss");
|
|
45
|
+
break;
|
|
46
|
+
case BicycleCountersWorker_1.CameaRefreshDurations.specificDay:
|
|
47
|
+
const date = inputData.date;
|
|
48
|
+
const dayStart = (0, DateTime_1.dateTime)(new Date(new Date(date).setUTCHours(0, 0, 0, 0)));
|
|
49
|
+
const nextDayStart = dayStart.clone().add(1, "days");
|
|
50
|
+
to = nextDayStart.format("yyyy-LL-dd HH:mm:ss");
|
|
51
|
+
from = dayStart.format("yyyy-LL-dd HH:mm:ss");
|
|
52
|
+
break;
|
|
53
|
+
default:
|
|
54
|
+
throw new golemio_errors_1.RecoverableError(`Undefined Camea refresh duration value.`, this.constructor.name);
|
|
55
|
+
}
|
|
56
|
+
let url = integration_engine_1.config.datasources.BicycleCountersCameaMeasurements;
|
|
57
|
+
url = url.replace(":id", id);
|
|
58
|
+
url = url.replace(":from", from);
|
|
59
|
+
url = url.replace(":to", to);
|
|
60
|
+
this.dataSourceCameaMeasurements.setProtocolStrategy(new HTTPFetchProtocolStrategy_1.HTTPFetchProtocolStrategy({
|
|
61
|
+
headers: {},
|
|
62
|
+
responseType: "json",
|
|
63
|
+
method: "GET",
|
|
64
|
+
url,
|
|
65
|
+
}));
|
|
66
|
+
const data = await this.dataSourceCameaMeasurements.getAll();
|
|
67
|
+
const transformedData = await this.cameaMeasurementsTransformation.transform(data);
|
|
68
|
+
await this.detectionsRepo.saveBySqlFunction(transformedData.detections, [
|
|
69
|
+
"locations_id",
|
|
70
|
+
"directions_id",
|
|
71
|
+
"measured_from",
|
|
72
|
+
]);
|
|
73
|
+
await this.temperaturesRepo.saveBySqlFunction(transformedData.temperatures, ["locations_id", "measured_from"]);
|
|
85
74
|
}
|
|
86
75
|
}
|
|
87
76
|
exports.UpdateCameaTask = UpdateCameaTask;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateCameaTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/UpdateCameaTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"UpdateCameaTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/UpdateCameaTask.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.UpdateEcoCounterTask = void 0;
|
|
13
4
|
const EcoCounterMeasurementsDataSource_1 = require("../../datasources/EcoCounterMeasurementsDataSource");
|
|
@@ -27,53 +18,51 @@ class UpdateEcoCounterTask extends integration_engine_1.AbstractTask {
|
|
|
27
18
|
this.detectionsRepo = new DetectionsRepository_1.DetectionsRepository();
|
|
28
19
|
this.ecoCounterMeasurementsTransformation = new EcoCounterMeasurementsTransformation_1.EcoCounterMeasurementsTransformation();
|
|
29
20
|
}
|
|
30
|
-
execute(inputData) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
}
|
|
76
|
-
});
|
|
21
|
+
async execute(inputData) {
|
|
22
|
+
const locationsId = inputData.locations_id;
|
|
23
|
+
const directionsId = inputData.directions_id;
|
|
24
|
+
const category = inputData.category;
|
|
25
|
+
const id = inputData.id;
|
|
26
|
+
// EcoCounter API is actually working with local Europe/Prague time, not ISO!!!
|
|
27
|
+
// so we have to send local time to request.
|
|
28
|
+
// Furthermore, the returned dates are START of the measurement interval, so if we want measurements
|
|
29
|
+
// from interval between 06:00 and 07:00 UTC (which is local 07:00 - 08:00), we have to send parameters
|
|
30
|
+
// from=07:00 and to=07:45, because it returns all the measurements where from and to parameters are INCLUDED.
|
|
31
|
+
const now = new Date();
|
|
32
|
+
const step = 15;
|
|
33
|
+
const remainder = now.getMinutes() % step;
|
|
34
|
+
// rounded to nearest next 15 minutes
|
|
35
|
+
const nowRound = (0, DateTime_1.dateTime)(now).subtract(remainder, "minutes").toDate().setUTCSeconds(0, 0);
|
|
36
|
+
const strTo = (0, DateTime_1.dateTime)(new Date(nowRound), { timeZone: "UTC" })
|
|
37
|
+
.setTimeZone("Europe/Prague")
|
|
38
|
+
.subtract(step, "minutes")
|
|
39
|
+
.format("yyyy-LL-dd'T'HH:mm:ss");
|
|
40
|
+
const strFrom = (0, DateTime_1.dateTime)(new Date(nowRound), { timeZone: "UTC" })
|
|
41
|
+
.setTimeZone("Europe/Prague")
|
|
42
|
+
.subtract(12, "hours")
|
|
43
|
+
.format("yyyy-LL-dd'T'HH:mm:ss");
|
|
44
|
+
let url = integration_engine_1.config.datasources.BicycleCountersEcoCounterMeasurements;
|
|
45
|
+
url = url.replace(":id", id);
|
|
46
|
+
url = url.replace(":from", strFrom);
|
|
47
|
+
url = url.replace(":to", strTo);
|
|
48
|
+
url = url.replace(":step", `${step}m`);
|
|
49
|
+
url = url.replace(":complete", "true");
|
|
50
|
+
this.dataSourceEcoCounterMeasurements.setProtocolStrategy(new HTTPFetchProtocolStrategy_1.HTTPFetchProtocolStrategy({
|
|
51
|
+
headers: {
|
|
52
|
+
Authorization: `Bearer ${integration_engine_1.config.datasources.CountersEcoCounterTokens.PRAHA}`,
|
|
53
|
+
},
|
|
54
|
+
responseType: "json",
|
|
55
|
+
method: "GET",
|
|
56
|
+
url,
|
|
57
|
+
}));
|
|
58
|
+
const data = await this.dataSourceEcoCounterMeasurements.getAll();
|
|
59
|
+
if (category === "bicycle") {
|
|
60
|
+
await this.detectionsRepo.saveBySqlFunction((await this.ecoCounterMeasurementsTransformation.transform(data)).map((x) => {
|
|
61
|
+
x.directions_id = directionsId;
|
|
62
|
+
x.locations_id = locationsId;
|
|
63
|
+
return x;
|
|
64
|
+
}), ["locations_id", "directions_id", "measured_from"]);
|
|
65
|
+
}
|
|
77
66
|
}
|
|
78
67
|
}
|
|
79
68
|
exports.UpdateEcoCounterTask = UpdateEcoCounterTask;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateEcoCounterTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/UpdateEcoCounterTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"UpdateEcoCounterTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/UpdateEcoCounterTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,15 +4,6 @@
|
|
|
4
4
|
* Router /WEB LAYER/: maps routes to specific controller functions, passes request parameters and handles responses.
|
|
5
5
|
* Handles web logic (http request, response). Sets response headers, handles error responses.
|
|
6
6
|
*/
|
|
7
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
8
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
9
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
10
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
11
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
12
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
13
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
14
|
-
});
|
|
15
|
-
};
|
|
16
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
8
|
exports.bicycleCountersRouter = exports.BicycleCountersRouter = void 0;
|
|
18
9
|
const Geo_1 = require("@golemio/core/dist/output-gateway/Geo");
|
|
@@ -28,10 +19,10 @@ class BicycleCountersRouter extends BaseRouter_1.BaseRouter {
|
|
|
28
19
|
super();
|
|
29
20
|
// Assign router to the express.Router() instance
|
|
30
21
|
this.router = (0, express_1.Router)();
|
|
31
|
-
this.GetAll = (req, res, next) =>
|
|
22
|
+
this.GetAll = async (req, res, next) => {
|
|
32
23
|
try {
|
|
33
|
-
const coords =
|
|
34
|
-
const data =
|
|
24
|
+
const coords = await (0, Geo_1.parseCoordinates)(req.query.latlng, req.query.range);
|
|
25
|
+
const data = await this.BicycleCountersLocationsModel.GetAll({
|
|
35
26
|
lat: coords.lat,
|
|
36
27
|
limit: Number(req.query.limit) || undefined,
|
|
37
28
|
lng: coords.lng,
|
|
@@ -43,19 +34,19 @@ class BicycleCountersRouter extends BaseRouter_1.BaseRouter {
|
|
|
43
34
|
catch (err) {
|
|
44
35
|
next(err);
|
|
45
36
|
}
|
|
46
|
-
}
|
|
37
|
+
};
|
|
47
38
|
/**
|
|
48
39
|
* get method for get BicycleCountersDetections or BicycleCountersTemperatures depending on given model
|
|
49
40
|
*/
|
|
50
41
|
this.GetData = (model) => {
|
|
51
|
-
return (req, res, next) =>
|
|
42
|
+
return async (req, res, next) => {
|
|
52
43
|
try {
|
|
53
44
|
// to make it a bit foolproof
|
|
54
45
|
const isoDateTo = req.query.to ? new Date(req.query.to) : null;
|
|
55
46
|
// imho we should limit date range
|
|
56
47
|
const isoDateFrom = req.query.from ? new Date(req.query.from) : null;
|
|
57
48
|
const aggregate = req.query.aggregate === "true";
|
|
58
|
-
const data =
|
|
49
|
+
const data = await model.GetAll({
|
|
59
50
|
aggregate,
|
|
60
51
|
id: this.ConvertToArray(req.query.id || []),
|
|
61
52
|
isoDateFrom,
|
|
@@ -78,7 +69,7 @@ class BicycleCountersRouter extends BaseRouter_1.BaseRouter {
|
|
|
78
69
|
catch (err) {
|
|
79
70
|
next(err);
|
|
80
71
|
}
|
|
81
|
-
}
|
|
72
|
+
};
|
|
82
73
|
};
|
|
83
74
|
/**
|
|
84
75
|
* transforms raw DB output ILocation[] to desired IGeoJSONFeatureCollection
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BicycleCountersRouter.js","sourceRoot":"","sources":["../../src/output-gateway/BicycleCountersRouter.ts"],"names":[],"mappings":";AAAA;;;;GAIG
|
|
1
|
+
{"version":3,"file":"BicycleCountersRouter.js","sourceRoot":"","sources":["../../src/output-gateway/BicycleCountersRouter.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,+DAI+C;AAC/C,6EAAkH;AAClH,oFAAiF;AACjF,+DAA4F;AAC5F,mFAAoE;AAEpE,iCAAsD;AAEtD,+DAAuE;AACvE,qCAA8E;AAK9E,MAAa,qBAAsB,SAAQ,uBAAU;IASjD;QACI,KAAK,EAAE,CAAC;QATZ,iDAAiD;QAC1C,WAAM,GAAW,IAAA,gBAAM,GAAE,CAAC;QAmB1B,WAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI;gBACA,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAgB,EAAC,GAAG,CAAC,KAAK,CAAC,MAAgB,EAAE,GAAG,CAAC,KAAK,CAAC,KAAe,CAAC,CAAC;gBAC7F,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC;oBACzD,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,SAAS;oBAC3C,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;oBACrC,KAAK,EAAE,MAAM,CAAC,KAAK;iBACtB,CAAC,CAAC;gBAEH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;aACvD;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAC;QAEF;;WAEG;QACI,YAAO,GAAG,CAAC,KAAwE,EAAE,EAAE;YAC1F,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;gBAC7D,IAAI;oBACA,6BAA6B;oBAC7B,MAAM,SAAS,GAAQ,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;oBAC9E,kCAAkC;oBAClC,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;oBAC/E,MAAM,SAAS,GAAI,GAAG,CAAC,KAAK,CAAC,SAAoB,KAAK,MAAM,CAAC;oBAE7D,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC;wBAC5B,SAAS;wBACT,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;wBAC3C,WAAW;wBACX,SAAS;wBACT,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,SAAS;wBAC3C,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;qBACxC,CAAC,CAAC;oBAEH,IAAI,CAAC,OAAO,CAAC,CAAC,OAAmB,EAAE,EAAE;wBACjC,IAAI,SAAS,EAAE;4BACX,OAAO,CAAC,aAAa,GAAG,CAAC,WAAW,IAAI,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;4BAC9E,OAAO,CAAC,WAAW,GAAG,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;4BAC9D,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;yBACzD;6BAAM;4BACH,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC;yBACjC;oBACL,CAAC,CAAC,CAAC;oBAEH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC9B;gBAAC,OAAO,GAAG,EAAE;oBACV,IAAI,CAAC,GAAG,CAAC,CAAC;iBACb;YACL,CAAC,CAAC;QACN,CAAC,CAAC;QAEF;;;WAGG;QACK,uBAAkB,GAAG,CAAC,SAAsB,EAA6B,EAAE;YAC/E,MAAM,cAAc,GAA0B,EAAE,CAAC;YACjD,MAAM,OAAO,GAA8B,EAAE,CAAC;YAC9C,SAAS,CAAC,OAAO,CAAC,CAAC,QAAmB,EAAE,EAAE;gBACtC,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,SAAS,EAAE;oBACpC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;wBACjD,EAAE,EAAE,QAAQ,CAAC,eAAe,CAAC;wBAC7B,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC;qBACpC,CAAC,CAAC;iBACN;qBAAM;oBACH,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC;oBAC7C,cAAc,CAAC,IAAI,CAAC;wBAChB,UAAU,EAAE;4BACR;gCACI,EAAE,EAAE,QAAQ,CAAC,eAAe,CAAC;gCAC7B,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC;6BACpC;yBACJ;wBACD,EAAE,EAAE,QAAQ,CAAC,EAAE;wBACf,GAAG,EAAE,QAAQ,CAAC,GAAG;wBACjB,GAAG,EAAE,QAAQ,CAAC,GAAG;wBACjB,IAAI,EAAE,QAAQ,CAAC,IAAI;wBACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;wBACrB,UAAU,EAAE,QAAQ,CAAC,UAAU;qBAClC,CAAC,CAAC;iBACN;YACL,CAAC,CAAC,CAAC;YACH,OAAO,IAAA,mCAA6B,EAAC,cAAc,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC7E,CAAC,CAAC;QAEF;;;WAGG;QACK,eAAU,GAAG,CAAC,MAAwB,EAAQ,EAAE;YACpD,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,eAAe,EACf;gBACI,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBACpD,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBAClD,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;gBACjE,IAAA,yBAAK,EAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;aAC5D,EACD,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,uBAAuB,CAAC,EAClD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,EACtD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CACtD,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,aAAa,EACb;gBACI,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBACpD,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBAClD,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;gBACjE,IAAA,yBAAK,EAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;aAC5D,EACD,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,uBAAuB,CAAC,EAClD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,EACtD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CACpD,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH,CAAC,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,IAAA,yBAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,EAC/G,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,uBAAuB,CAAC,EAClD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,EACtD,IAAI,CAAC,MAAM,CACd,CAAC;QACN,CAAC,CAAC;QA/IE,IAAI,CAAC,qBAAqB,GAAG,6BAAwB,CAAC,OAAO,CACzD,oBAAc,CAAC,qBAAqB,CACvC,CAAC;QAEF,IAAI,CAAC,6BAA6B,GAAG,eAAM,CAAC,6BAA6B,CAAC;QAC1E,IAAI,CAAC,8BAA8B,GAAG,eAAM,CAAC,8BAA8B,CAAC;QAC5E,IAAI,CAAC,gCAAgC,GAAG,eAAM,CAAC,gCAAgC,CAAC;QAChF,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;CAwIJ;AA3JD,sDA2JC;AAED,MAAM,qBAAqB,GAAW,IAAI,qBAAqB,EAAE,CAAC,MAAM,CAAC;AAEhE,sDAAqB"}
|
|
@@ -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 BicycleCountersDetectionsModel extends models_1.SequelizeModel {
|
|
|
32
23
|
* @param {array} [options.id[]] direction_ids (locations_id? // To discuss)
|
|
33
24
|
* @returns Array of the retrieved records
|
|
34
25
|
*/
|
|
35
|
-
this.GetAll = (options = {}) =>
|
|
26
|
+
this.GetAll = async (options = {}) => {
|
|
36
27
|
const { limit, offset, isoDateFrom, isoDateTo, id, aggregate } = options;
|
|
37
28
|
try {
|
|
38
29
|
const order = [["directions_id", "desc"]];
|
|
@@ -75,7 +66,7 @@ class BicycleCountersDetectionsModel extends models_1.SequelizeModel {
|
|
|
75
66
|
};
|
|
76
67
|
}
|
|
77
68
|
}
|
|
78
|
-
return
|
|
69
|
+
return await this.sequelizeModel.findAll({
|
|
79
70
|
attributes,
|
|
80
71
|
group,
|
|
81
72
|
limit,
|
|
@@ -88,8 +79,8 @@ class BicycleCountersDetectionsModel extends models_1.SequelizeModel {
|
|
|
88
79
|
catch (err) {
|
|
89
80
|
throw new golemio_errors_1.GeneralError("Database error", "BicycleCountersDetectionsModel", err, 500);
|
|
90
81
|
}
|
|
91
|
-
}
|
|
92
|
-
this.GetOne = () =>
|
|
82
|
+
};
|
|
83
|
+
this.GetOne = async () => null;
|
|
93
84
|
this.sequelizeModel.removeAttribute("update_batch_id");
|
|
94
85
|
this.sequelizeModel.removeAttribute("create_batch_id");
|
|
95
86
|
this.sequelizeModel.removeAttribute("updated_by");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BicycleCountersDetectionsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/BicycleCountersDetectionsModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BicycleCountersDetectionsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/BicycleCountersDetectionsModel.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.BicycleCountersDirectionsModel = void 0;
|
|
13
4
|
const models_1 = require("@golemio/core/dist/output-gateway/models");
|
|
@@ -17,8 +8,8 @@ class BicycleCountersDirectionsModel extends models_1.SequelizeModel {
|
|
|
17
8
|
super(index_1.BicycleCounters.directions.name, index_1.BicycleCounters.directions.pgTableName, index_1.BicycleCounters.directions.outputSequelizeAttributes, {
|
|
18
9
|
schema: index_1.BicycleCounters.pgSchema,
|
|
19
10
|
});
|
|
20
|
-
this.GetAll = () =>
|
|
21
|
-
this.GetOne = () =>
|
|
11
|
+
this.GetAll = async () => null;
|
|
12
|
+
this.GetOne = async () => null;
|
|
22
13
|
}
|
|
23
14
|
}
|
|
24
15
|
exports.BicycleCountersDirectionsModel = BicycleCountersDirectionsModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BicycleCountersDirectionsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/BicycleCountersDirectionsModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BicycleCountersDirectionsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/BicycleCountersDirectionsModel.ts"],"names":[],"mappings":";;;AAAA,qEAA0E;AAC1E,0DAA6C;AAE7C,MAAa,8BAA+B,SAAQ,uBAAc;IAC9D;QACI,KAAK,CACD,uBAAe,CAAC,UAAU,CAAC,IAAI,EAC/B,uBAAe,CAAC,UAAU,CAAC,WAAW,EACtC,uBAAe,CAAC,UAAU,CAAC,yBAAyB,EACpD;YACI,MAAM,EAAE,uBAAe,CAAC,QAAQ;SACnC,CACJ,CAAC;QAGC,WAAM,GAAG,KAAK,IAAmB,EAAE,CAAC,IAAI,CAAC;QAEzC,WAAM,GAAG,KAAK,IAAmB,EAAE,CAAC,IAAI,CAAC;IAJhD,CAAC;CAKJ;AAfD,wEAeC"}
|
|
@@ -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
|
};
|
|
@@ -39,7 +30,7 @@ class BicycleCountersLocationsModel extends models_1.SequelizeModel {
|
|
|
39
30
|
* Only data within this range will be returned.
|
|
40
31
|
* @returns Array of the retrieved records
|
|
41
32
|
*/
|
|
42
|
-
this.GetAll = (options = {}) =>
|
|
33
|
+
this.GetAll = async (options = {}) => {
|
|
43
34
|
const { limit, offset, lat, lng, range } = options;
|
|
44
35
|
try {
|
|
45
36
|
const order = [];
|
|
@@ -48,7 +39,7 @@ class BicycleCountersLocationsModel extends models_1.SequelizeModel {
|
|
|
48
39
|
{
|
|
49
40
|
as: "directions",
|
|
50
41
|
attributes: ["id", "name"],
|
|
51
|
-
model: database_1.sequelizeConnection
|
|
42
|
+
model: database_1.sequelizeConnection?.models[index_1.BicycleCounters.directions.pgTableName],
|
|
52
43
|
},
|
|
53
44
|
];
|
|
54
45
|
let where = {};
|
|
@@ -62,7 +53,7 @@ class BicycleCountersLocationsModel extends models_1.SequelizeModel {
|
|
|
62
53
|
}
|
|
63
54
|
}
|
|
64
55
|
order.push(["id", "asc"]);
|
|
65
|
-
return
|
|
56
|
+
return await this.sequelizeModel.findAll({
|
|
66
57
|
attributes,
|
|
67
58
|
include,
|
|
68
59
|
limit,
|
|
@@ -75,8 +66,8 @@ class BicycleCountersLocationsModel extends models_1.SequelizeModel {
|
|
|
75
66
|
catch (err) {
|
|
76
67
|
throw new golemio_errors_1.GeneralError("Database error", "BicycleCountersLocationsModel", err, 500);
|
|
77
68
|
}
|
|
78
|
-
}
|
|
79
|
-
this.GetOne = () =>
|
|
69
|
+
};
|
|
70
|
+
this.GetOne = async () => null;
|
|
80
71
|
this.sequelizeModel.removeAttribute("vendor_id");
|
|
81
72
|
this.sequelizeModel.removeAttribute("update_batch_id");
|
|
82
73
|
this.sequelizeModel.removeAttribute("create_batch_id");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BicycleCountersLocationsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/BicycleCountersLocationsModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BicycleCountersLocationsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/BicycleCountersLocationsModel.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 BicycleCountersTemperaturesModel extends models_1.SequelizeModel {
|
|
|
32
23
|
* @param {array} [options.id[]] locations_ids
|
|
33
24
|
* @returns Array of the retrieved records
|
|
34
25
|
*/
|
|
35
|
-
this.GetAll = (options = {}) =>
|
|
26
|
+
this.GetAll = async (options = {}) => {
|
|
36
27
|
const { limit, offset, isoDateFrom, isoDateTo, id, aggregate } = options;
|
|
37
28
|
try {
|
|
38
29
|
const order = [["locations_id", "desc"]];
|
|
@@ -63,7 +54,7 @@ class BicycleCountersTemperaturesModel extends models_1.SequelizeModel {
|
|
|
63
54
|
[sequelize_1.default.Op.lte]: isoDateTo.getTime(),
|
|
64
55
|
};
|
|
65
56
|
}
|
|
66
|
-
return
|
|
57
|
+
return await this.sequelizeModel.findAll({
|
|
67
58
|
attributes,
|
|
68
59
|
group,
|
|
69
60
|
limit,
|
|
@@ -76,8 +67,8 @@ class BicycleCountersTemperaturesModel extends models_1.SequelizeModel {
|
|
|
76
67
|
catch (err) {
|
|
77
68
|
throw new golemio_errors_1.GeneralError("Database error", "BicycleCountersTemperaturesModel", err, 500);
|
|
78
69
|
}
|
|
79
|
-
}
|
|
80
|
-
this.GetOne = () =>
|
|
70
|
+
};
|
|
71
|
+
this.GetOne = async () => null;
|
|
81
72
|
this.sequelizeModel.removeAttribute("update_batch_id");
|
|
82
73
|
this.sequelizeModel.removeAttribute("create_batch_id");
|
|
83
74
|
this.sequelizeModel.removeAttribute("updated_by");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BicycleCountersTemperaturesModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/BicycleCountersTemperaturesModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BicycleCountersTemperaturesModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/BicycleCountersTemperaturesModel.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.5-
|
|
3
|
+
"version": "1.3.5-rc.1826437828",
|
|
4
4
|
"description": "Golemio Bicycle Counters Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -33,8 +33,8 @@
|
|
|
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": "1.
|
|
36
|
+
"@golemio/cli": "1.9.2",
|
|
37
|
+
"@golemio/core": "1.20.6",
|
|
38
38
|
"@golemio/db-common": "1.1.4",
|
|
39
39
|
"@golemio/eslint-config": "1.1.2",
|
|
40
40
|
"@types/chai": "4.2.3",
|