@golemio/bicycle-counters 1.2.6-dev.914431471 → 1.2.6-dev.935025111
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 +2 -5
- package/dist/integration-engine/transformations/CameaMeasurementsTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/EcoCounterMeasurementsTransformation.js +4 -6
- package/dist/integration-engine/transformations/EcoCounterMeasurementsTransformation.js.map +1 -1
- package/dist/integration-engine/workers/tasks/UpdateCameaTask.js +14 -18
- package/dist/integration-engine/workers/tasks/UpdateCameaTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/UpdateEcoCounterTask.js +12 -9
- package/dist/integration-engine/workers/tasks/UpdateEcoCounterTask.js.map +1 -1
- package/package.json +3 -3
|
@@ -8,14 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.CameaMeasurementsTransformation = void 0;
|
|
16
|
-
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
17
13
|
const transformations_1 = require("@golemio/core/dist/integration-engine/transformations");
|
|
18
14
|
const index_1 = require("../../schema-definitions/index");
|
|
15
|
+
const DateTime_1 = require("@golemio/core/dist/helpers/DateTime");
|
|
19
16
|
class CameaMeasurementsTransformation extends transformations_1.BaseTransformation {
|
|
20
17
|
constructor() {
|
|
21
18
|
super();
|
|
@@ -53,7 +50,7 @@ class CameaMeasurementsTransformation extends transformations_1.BaseTransformati
|
|
|
53
50
|
}
|
|
54
51
|
});
|
|
55
52
|
this.transformElement = (element) => __awaiter(this, void 0, void 0, function* () {
|
|
56
|
-
const measuredFrom =
|
|
53
|
+
const measuredFrom = DateTime_1.DateTime.fromISO(element.datetime).setTimeZone("Europe/Prague");
|
|
57
54
|
const measuredTo = measuredFrom.clone().add(5, "minutes");
|
|
58
55
|
const res = {
|
|
59
56
|
detections: element.directions
|
|
@@ -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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"}
|
|
@@ -8,14 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.EcoCounterMeasurementsTransformation = void 0;
|
|
16
|
-
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
17
13
|
const transformations_1 = require("@golemio/core/dist/integration-engine/transformations");
|
|
18
14
|
const index_1 = require("../../schema-definitions/index");
|
|
15
|
+
const DateTime_1 = require("@golemio/core/dist/helpers/DateTime");
|
|
19
16
|
class EcoCounterMeasurementsTransformation extends transformations_1.BaseTransformation {
|
|
20
17
|
constructor() {
|
|
21
18
|
super();
|
|
@@ -23,8 +20,9 @@ class EcoCounterMeasurementsTransformation extends transformations_1.BaseTransfo
|
|
|
23
20
|
// Repair UTC date, because EcoCounter API is actually working with local Europe/Prague time, not ISO!!!
|
|
24
21
|
// Returned value 07:00:00+0000 is some hybrid between UTC time with offset 07:00:00+0100 and pure UTC
|
|
25
22
|
// 06:00:00+0000
|
|
26
|
-
const
|
|
27
|
-
|
|
23
|
+
const measuredFrom = DateTime_1.DateTime.fromFormat(element.date.split("+")[0], "yyyy-LL-dd'T'TT", {
|
|
24
|
+
timeZone: "Europe/Prague",
|
|
25
|
+
});
|
|
28
26
|
const measuredTo = measuredFrom.clone().add(15, "minutes");
|
|
29
27
|
const res = {
|
|
30
28
|
directions_id: null,
|
|
@@ -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,CAAO,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,OAAO,EAAE;gBACrC,WAAW,EAAE,UAAU,CAAC,OAAO,EAAE;gBACjC,KAAK,EAAE,OAAO,CAAC,MAAM;aACxB,CAAC;YAEF,OAAO,GAAG,CAAC;QACf,CAAC,CAAA,CAAC;QArBE,IAAI,CAAC,IAAI,GAAG,uBAAe,CAAC,UAAU,CAAC,IAAI,GAAG,cAAc,CAAC;IACjE,CAAC;CAqBJ;AA3BD,oFA2BC"}
|
|
@@ -8,16 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.UpdateCameaTask = void 0;
|
|
16
13
|
const UpdateCameaSchema_1 = require("./../../schema/UpdateCameaSchema");
|
|
17
14
|
const DetectionsRepository_1 = require("../../repositories/DetectionsRepository");
|
|
18
15
|
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
19
16
|
const repositories_1 = require("../../repositories");
|
|
20
|
-
const
|
|
17
|
+
const DateTime_1 = require("@golemio/core/dist/helpers/DateTime");
|
|
21
18
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
22
19
|
const CameaCountersMeasurementsDataSource_1 = require("../../datasources/CameaCountersMeasurementsDataSource");
|
|
23
20
|
const CameaMeasurementsTransformation_1 = require("../../transformations/CameaMeasurementsTransformation");
|
|
@@ -37,31 +34,30 @@ class UpdateCameaTask extends integration_engine_1.AbstractTask {
|
|
|
37
34
|
return __awaiter(this, void 0, void 0, function* () {
|
|
38
35
|
const id = inputData.id;
|
|
39
36
|
const duration = inputData.duration;
|
|
40
|
-
const now =
|
|
37
|
+
const now = (0, DateTime_1.dateTime)(new Date()).setTimeZone("UTC");
|
|
41
38
|
let from;
|
|
42
39
|
let to;
|
|
43
40
|
switch (duration) {
|
|
44
41
|
case BicycleCountersWorker_1.CameaRefreshDurations.last3Hours:
|
|
45
42
|
const step = 5;
|
|
46
|
-
const remainder = step - (now.
|
|
47
|
-
|
|
48
|
-
const nowRounded = now.clone().add(remainder, "minutes").seconds(0).milliseconds(0);
|
|
43
|
+
const remainder = step - (now.toDate().getMinutes() % step);
|
|
44
|
+
const nowRounded = (0, DateTime_1.dateTime)(new Date(now.toDate().setUTCSeconds(0, 0))).add(remainder, "minutes");
|
|
49
45
|
const nowMinus12h = nowRounded.clone().subtract(3, "hours");
|
|
50
|
-
to = nowRounded.format("
|
|
51
|
-
from = nowMinus12h.format("
|
|
46
|
+
to = nowRounded.format("yyyy-LL-dd HH:mm:ss");
|
|
47
|
+
from = nowMinus12h.format("yyyy-LL-dd HH:mm:ss");
|
|
52
48
|
break;
|
|
53
49
|
case BicycleCountersWorker_1.CameaRefreshDurations.previousDay:
|
|
54
|
-
const todayStart =
|
|
55
|
-
const yesterdayStart = todayStart.clone().subtract(1, "
|
|
56
|
-
to = todayStart.format("
|
|
57
|
-
from = yesterdayStart.format("
|
|
50
|
+
const todayStart = (0, DateTime_1.dateTime)(new Date(now.toDate().setUTCHours(0, 0, 0, 0)));
|
|
51
|
+
const yesterdayStart = todayStart.clone().subtract(1, "days");
|
|
52
|
+
to = todayStart.format("yyyy-LL-dd HH:mm:ss");
|
|
53
|
+
from = yesterdayStart.format("yyyy-LL-dd HH:mm:ss");
|
|
58
54
|
break;
|
|
59
55
|
case BicycleCountersWorker_1.CameaRefreshDurations.specificDay:
|
|
60
56
|
const date = inputData.date;
|
|
61
|
-
const dayStart = (0,
|
|
62
|
-
const nextDayStart = dayStart.clone().add(1, "
|
|
63
|
-
to = nextDayStart.format("
|
|
64
|
-
from = dayStart.format("
|
|
57
|
+
const dayStart = (0, DateTime_1.dateTime)(new Date(new Date(date).setUTCHours(0, 0, 0, 0)));
|
|
58
|
+
const nextDayStart = dayStart.clone().add(1, "days");
|
|
59
|
+
to = nextDayStart.format("yyyy-LL-dd HH:mm:ss");
|
|
60
|
+
from = dayStart.format("yyyy-LL-dd HH:mm:ss");
|
|
65
61
|
break;
|
|
66
62
|
default:
|
|
67
63
|
throw new golemio_errors_1.RecoverableError(`Undefined Camea refresh duration value.`, this.constructor.name);
|
|
@@ -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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"}
|
|
@@ -8,17 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.UpdateEcoCounterTask = void 0;
|
|
16
13
|
const DetectionsRepository_1 = require("../../repositories/DetectionsRepository");
|
|
17
14
|
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
18
|
-
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
19
15
|
const EcoCounterMeasurementsDataSource_1 = require("../../datasources/EcoCounterMeasurementsDataSource");
|
|
20
16
|
const EcoCounterMeasurementsTransformation_1 = require("../../transformations/EcoCounterMeasurementsTransformation");
|
|
21
17
|
const UpdateEcoCounterSchema_1 = require("../../schema/UpdateEcoCounterSchema");
|
|
18
|
+
const DateTime_1 = require("@golemio/core/dist/helpers/DateTime");
|
|
22
19
|
class UpdateEcoCounterTask extends integration_engine_1.AbstractTask {
|
|
23
20
|
constructor(queuePrefix) {
|
|
24
21
|
super(queuePrefix);
|
|
@@ -40,13 +37,19 @@ class UpdateEcoCounterTask extends integration_engine_1.AbstractTask {
|
|
|
40
37
|
// Furthermore, the returned dates are START of the measurement interval, so if we want measurements
|
|
41
38
|
// from interval between 06:00 and 07:00 UTC (which is local 07:00 - 08:00), we have to send parameters
|
|
42
39
|
// from=07:00 and to=07:45, because it returns all the measurements where from and to parameters are INCLUDED.
|
|
43
|
-
const now =
|
|
40
|
+
const now = new Date();
|
|
44
41
|
const step = 15;
|
|
45
|
-
const remainder = now.
|
|
42
|
+
const remainder = now.getMinutes() % step;
|
|
46
43
|
// rounded to nearest next 15 minutes
|
|
47
|
-
const
|
|
48
|
-
const strTo =
|
|
49
|
-
|
|
44
|
+
const nowRound = (0, DateTime_1.dateTime)(now).subtract(remainder, "minutes").toDate().setUTCSeconds(0, 0);
|
|
45
|
+
const strTo = (0, DateTime_1.dateTime)(new Date(nowRound), { timeZone: "UTC" })
|
|
46
|
+
.setTimeZone("Europe/Prague")
|
|
47
|
+
.subtract(step, "minutes")
|
|
48
|
+
.format("yyyy-LL-dd'T'HH:mm:ss");
|
|
49
|
+
const strFrom = (0, DateTime_1.dateTime)(new Date(nowRound), { timeZone: "UTC" })
|
|
50
|
+
.setTimeZone("Europe/Prague")
|
|
51
|
+
.subtract(12, "hours")
|
|
52
|
+
.format("yyyy-LL-dd'T'HH:mm:ss");
|
|
50
53
|
let url = integration_engine_1.config.datasources.BicycleCountersEcoCounterMeasurements;
|
|
51
54
|
url = url.replace(":id", id);
|
|
52
55
|
url = url.replace(":from", strFrom);
|
|
@@ -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":";;;;;;;;;;;;AAAA,kFAA+E;AAC/E,8EAA+G;AAC/G,yGAAoG;AACpG,qHAAgH;AAChH,gFAA6G;AAC7G,kEAA+D;AAE/D,MAAa,oBAAqB,SAAQ,iCAAoC;IAW1E,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAXb,WAAM,GAAG,yDAAgC,CAAC;QACpC,cAAS,GAAG,kBAAkB,CAAC;QAC/B,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QAWpD,IAAI,CAAC,gCAAgC,GAAG,mEAAgC,CAAC,aAAa,EAAE,CAAC;QACzF,IAAI,CAAC,cAAc,GAAG,IAAI,2CAAoB,EAAE,CAAC;QACjD,IAAI,CAAC,oCAAoC,GAAG,IAAI,2EAAoC,EAAE,CAAC;IAC3F,CAAC;IAEe,OAAO,CAAC,SAAiC;;YACrD,MAAM,WAAW,GAAG,SAAS,CAAC,YAAY,CAAC;YAC3C,MAAM,YAAY,GAAG,SAAS,CAAC,aAAa,CAAC;YAC7C,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;YACpC,MAAM,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;YAExB,+EAA+E;YAC/E,4CAA4C;YAC5C,oGAAoG;YACpG,uGAAuG;YACvG,8GAA8G;YAC9G,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YAEvB,MAAM,IAAI,GAAG,EAAE,CAAC;YAEhB,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC;YAE1C,qCAAqC;YACrC,MAAM,QAAQ,GAAG,IAAA,mBAAQ,EAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAE3F,MAAM,KAAK,GAAG,IAAA,mBAAQ,EAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;iBAC1D,WAAW,CAAC,eAAe,CAAC;iBAC5B,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;iBACzB,MAAM,CAAC,uBAAuB,CAAC,CAAC;YAErC,MAAM,OAAO,GAAG,IAAA,mBAAQ,EAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;iBAC5D,WAAW,CAAC,eAAe,CAAC;iBAC5B,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;iBACrB,MAAM,CAAC,uBAAuB,CAAC,CAAC;YAErC,IAAI,GAAG,GAAG,2BAAM,CAAC,WAAW,CAAC,qCAAqC,CAAC;YACnE,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC7B,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACpC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,IAAI,GAAG,CAAC,CAAC;YACvC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAEvC,IAAI,CAAC,gCAAgC,CAAC,mBAAmB,CACrD,IAAI,yCAAoB,CAAC;gBACrB,OAAO,EAAE;oBACL,aAAa,EAAE,UAAU,2BAAM,CAAC,WAAW,CAAC,wBAAwB,CAAC,KAAK,EAAE;iBAC/E;gBACD,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,KAAK;gBACb,GAAG;aACN,CAAC,CACL,CAAC;YAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC,MAAM,EAAE,CAAC;YAElE,IAAI,QAAQ,KAAK,SAAS,EAAE;gBACxB,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CACvC,CACI,MAAM,IAAI,CAAC,oCAAoC,CAAC,SAAS,CAAC,IAAI,CAAC,CAClE,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE;oBACb,CAAC,CAAC,aAAa,GAAG,YAAY,CAAC;oBAC/B,CAAC,CAAC,YAAY,GAAG,WAAW,CAAC;oBAC7B,OAAO,CAAC,CAAC;gBACb,CAAC,CAAC,EACF,CAAC,cAAc,EAAE,eAAe,EAAE,eAAe,CAAC,CACrD,CAAC;aACL;QACL,CAAC;KAAA;CACJ;AAlFD,oDAkFC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/bicycle-counters",
|
|
3
|
-
"version": "1.2.6-dev.
|
|
3
|
+
"version": "1.2.6-dev.935025111",
|
|
4
4
|
"description": "Golemio Bicycle Counters Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"@commitlint/cli": "^11.0.0",
|
|
34
34
|
"@commitlint/config-conventional": "^11.0.0",
|
|
35
35
|
"@golemio/cli": "1.4.3",
|
|
36
|
-
"@golemio/core": "1.8.
|
|
36
|
+
"@golemio/core": "1.8.4-dev.930077621",
|
|
37
37
|
"@golemio/db-common": "1.1.1",
|
|
38
38
|
"@golemio/eslint-config": "1.1.1",
|
|
39
39
|
"@types/chai": "4.2.3",
|
|
@@ -65,6 +65,6 @@
|
|
|
65
65
|
"typescript-transform-paths": "^3.4.6"
|
|
66
66
|
},
|
|
67
67
|
"peerDependencies": {
|
|
68
|
-
"@golemio/core": ">=1.
|
|
68
|
+
"@golemio/core": ">=1.8.4"
|
|
69
69
|
}
|
|
70
70
|
}
|