@golemio/energetics 1.2.4 → 1.2.5-dev.877451681
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/helpers/UnimonitorCemApiHelper.js +2 -2
- package/dist/integration-engine/helpers/UnimonitorCemApiHelper.js.map +1 -1
- package/dist/integration-engine/workers/EnergeticsBaseWorker.js +2 -2
- package/dist/integration-engine/workers/EnergeticsBaseWorker.js.map +1 -1
- package/dist/integration-engine/workers/EnergeticsVpalacWorker.js +2 -2
- package/dist/integration-engine/workers/EnergeticsVpalacWorker.js.map +1 -1
- package/dist/integration-engine/workers/oict-energetika/data-access/ConsumptionRepository.js +1 -1
- package/dist/integration-engine/workers/oict-energetika/data-access/ConsumptionRepository.js.map +1 -1
- package/dist/integration-engine/workers/oict-energetika/datasources/OictDataSourceFactory.js +1 -1
- package/dist/integration-engine/workers/oict-energetika/datasources/OictDataSourceFactory.js.map +1 -1
- package/dist/integration-engine/workers/oict-energetika/datasources/helpers/OictApiHelper.d.ts +1 -0
- package/dist/integration-engine/workers/oict-energetika/datasources/helpers/OictApiHelper.js +12 -1
- package/dist/integration-engine/workers/oict-energetika/datasources/helpers/OictApiHelper.js.map +1 -1
- package/dist/integration-engine/workers/oict-energetika/tasks/FetchBuildingsTask.js +1 -1
- package/dist/integration-engine/workers/oict-energetika/tasks/FetchBuildingsTask.js.map +1 -1
- package/dist/integration-engine/workers/oict-energetika/tasks/FetchConsumptionTask.js +5 -5
- package/dist/integration-engine/workers/oict-energetika/tasks/FetchConsumptionTask.js.map +1 -1
- package/dist/integration-engine/workers/oict-energetika/tasks/FetchDataTask.js +4 -3
- package/dist/integration-engine/workers/oict-energetika/tasks/FetchDataTask.js.map +1 -1
- package/dist/integration-engine/workers/oict-energetika/tasks/FetchDevicesTask.js +1 -1
- package/dist/integration-engine/workers/oict-energetika/tasks/FetchDevicesTask.js.map +1 -1
- package/package.json +4 -4
|
@@ -65,7 +65,7 @@ UnimonitorCemApi.createSession = () => __awaiter(void 0, void 0, void 0, functio
|
|
|
65
65
|
};
|
|
66
66
|
}
|
|
67
67
|
catch (err) {
|
|
68
|
-
throw new golemio_errors_1.
|
|
68
|
+
throw new golemio_errors_1.GeneralError("Cannot retrieve Unimonitor CEM API authorization token", UnimonitorCemApi.name, err);
|
|
69
69
|
}
|
|
70
70
|
});
|
|
71
71
|
/**
|
|
@@ -87,7 +87,7 @@ UnimonitorCemApi.terminateSession = (authCookie) => __awaiter(void 0, void 0, vo
|
|
|
87
87
|
yield axios_1.default.get(axiosUrl, axiosConfig);
|
|
88
88
|
}
|
|
89
89
|
catch (err) {
|
|
90
|
-
throw new golemio_errors_1.
|
|
90
|
+
throw new golemio_errors_1.GeneralError("Cannot terminate Unimonitor CEM API session", UnimonitorCemApi.name, err);
|
|
91
91
|
}
|
|
92
92
|
});
|
|
93
93
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UnimonitorCemApiHelper.js","sourceRoot":"","sources":["../../../src/integration-engine/helpers/UnimonitorCemApiHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"UnimonitorCemApiHelper.js","sourceRoot":"","sources":["../../../src/integration-engine/helpers/UnimonitorCemApiHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,13 +24,13 @@ class EnergeticsBaseWorker extends workers_1.BaseWorker {
|
|
|
24
24
|
dataStream = yield dataSourceStream;
|
|
25
25
|
}
|
|
26
26
|
catch (err) {
|
|
27
|
-
throw new golemio_errors_1.
|
|
27
|
+
throw new golemio_errors_1.GeneralError("Error while getting data.", this.constructor.name, err);
|
|
28
28
|
}
|
|
29
29
|
try {
|
|
30
30
|
yield dataStream.setDataProcessor(onDataFunction).proceed();
|
|
31
31
|
}
|
|
32
32
|
catch (err) {
|
|
33
|
-
throw new golemio_errors_1.
|
|
33
|
+
throw new golemio_errors_1.GeneralError("Error while processing data.", this.constructor.name, err);
|
|
34
34
|
}
|
|
35
35
|
});
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnergeticsBaseWorker.js","sourceRoot":"","sources":["../../../src/integration-engine/workers/EnergeticsBaseWorker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"EnergeticsBaseWorker.js","sourceRoot":"","sources":["../../../src/integration-engine/workers/EnergeticsBaseWorker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAwE;AAExE,2EAA2E;AAM3E,MAAe,oBAAqB,SAAQ,oBAAU;IAClD;QACI,KAAK,EAAE,CAAC;QAGZ;;WAEG;QACO,sBAAiB,GAAG,CAC1B,gBAA2C,EAC3C,cAA4C,EAC/B,EAAE;YACf,IAAI,UAA4B,CAAC;YAEjC,IAAI;gBACA,UAAU,GAAG,MAAM,gBAAgB,CAAC;aACvC;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,2BAA2B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACnF;YAED,IAAI;gBACA,MAAM,UAAU,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC;aAC/D;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,8BAA8B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACtF;QACL,CAAC,CAAA,CAAC;IAtBF,CAAC;CAuBJ;AAEoB,oDAAoB"}
|
|
@@ -38,7 +38,7 @@ class EnergeticsVpalacWorker extends workers_1.EnergeticsBaseWorker {
|
|
|
38
38
|
throw new Error("targetDays in message must be a number.");
|
|
39
39
|
}
|
|
40
40
|
catch (err) {
|
|
41
|
-
throw new golemio_errors_1.
|
|
41
|
+
throw new golemio_errors_1.GeneralError("Cron message parsing error", this.constructor.name, err);
|
|
42
42
|
}
|
|
43
43
|
const now = (0, moment_timezone_1.default)().tz(helpers_1.UnimonitorCemApi.API_DATE_TZ);
|
|
44
44
|
const dateFrom = now.clone().subtract(targetDays, "days").format(helpers_1.UnimonitorCemApi.API_DATE_FORMAT);
|
|
@@ -60,7 +60,7 @@ class EnergeticsVpalacWorker extends workers_1.EnergeticsBaseWorker {
|
|
|
60
60
|
throw new Error("targetHours in message must be a number.");
|
|
61
61
|
}
|
|
62
62
|
catch (err) {
|
|
63
|
-
throw new golemio_errors_1.
|
|
63
|
+
throw new golemio_errors_1.GeneralError("Cron message parsing error", this.constructor.name, err);
|
|
64
64
|
}
|
|
65
65
|
const now = (0, moment_timezone_1.default)().tz(helpers_1.UnimonitorCemApi.API_DATE_TZ);
|
|
66
66
|
const timeFrom = now.clone().subtract(targetHours, "hour").valueOf().toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnergeticsVpalacWorker.js","sourceRoot":"","sources":["../../../src/integration-engine/workers/EnergeticsVpalacWorker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4DAAoC;AACpC,gGAA+D;AAE/D,mDAAwC;AACxC,mFAAkF;AAClF,
|
|
1
|
+
{"version":3,"file":"EnergeticsVpalacWorker.js","sourceRoot":"","sources":["../../../src/integration-engine/workers/EnergeticsVpalacWorker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4DAAoC;AACpC,gGAA+D;AAE/D,mDAAwC;AACxC,mFAAkF;AAClF,6EAAwE;AAExE,yEAAsE;AACtE,mFAK2D;AAC3D,yEAA6E;AAC7E,wCAA+C;AAC/C,wDAO6B;AAC7B,gCAA+D;AAE/D,MAAM,sBAAuB,SAAQ,8BAAoB;IAmBrD;QACI,KAAK,EAAE,CAAC;QAyJZ;;WAEG;QACI,mBAAc,GAAG,CAAO,GAAQ,EAAiB,EAAE;YACtD,IAAI,UAAkB,CAAC;YAEvB,IAAI;gBACA,UAAU,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,UAAU,CAAC;gBAC5D,IAAI,CAAC,UAAU;oBAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;aAC/E;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,4BAA4B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACpF;YACD,MAAM,GAAG,GAAG,IAAA,yBAAM,GAAE,CAAC,EAAE,CAAC,0BAAgB,CAAC,WAAW,CAAC,CAAC;YACtD,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,0BAAgB,CAAC,eAAe,CAAC,CAAC;YACnG,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,0BAAgB,CAAC,eAAe,CAAC,CAAC;YAC5D,MAAM,UAAU,GAAe;gBAC3B,IAAI,EAAE,QAAQ;gBACd,EAAE,EAAE,MAAM;aACb,CAAC;YAEF,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC5C,CAAC,CAAA,CAAC;QAEF;;WAEG;QACI,oBAAe,GAAG,CAAO,GAAQ,EAAiB,EAAE;YACvD,IAAI,WAAmB,CAAC;YAExB,IAAI;gBACA,WAAW,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,WAAW,CAAC;gBAC9D,IAAI,CAAC,WAAW;oBAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;aACjF;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,4BAA4B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACpF;YAED,MAAM,GAAG,GAAG,IAAA,yBAAM,GAAE,CAAC,EAAE,CAAC,0BAAgB,CAAC,WAAW,CAAC,CAAC;YACtD,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;YAChF,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;YACxC,MAAM,UAAU,GAAe;gBAC3B,OAAO,EAAE,QAAQ;gBACjB,KAAK,EAAE,MAAM;aAChB,CAAC;YAEF,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC5C,CAAC,CAAA,CAAC;QAEF;;WAEG;QACK,qBAAgB,GAAG,CAAO,UAAsB,EAAiB,EAAE;YACvE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,0BAAgB,CAAC,aAAa,EAAE,CAAC;YAE9D,6BAA6B;YAC7B,IAAI,CAAC,2BAA2B,CAAC,gBAAgB,CAAC,qBAAqB,CACnE,IAAI,CAAC,qBAAqB,CAAC,0BAAgB,CAAC,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,CAAC,CAChG,CAAC;YAEF,IAAI,CAAC,kCAAkC,CAAC,gBAAgB,CAAC,qBAAqB,CAC1E,IAAI,CAAC,qBAAqB,CAAC,0BAAgB,CAAC,YAAY,CAAC,kBAAkB,EAAE,UAAU,EAAE,UAAU,CAAC,CACvG,CAAC;YAEF,IAAI,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,qBAAqB,CACjE,IAAI,CAAC,qBAAqB,CAAC,0BAAgB,CAAC,YAAY,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,CAAC,CAC9F,CAAC;YAEF,IAAI,CAAC,sCAAsC,CAAC,gBAAgB,CAAC,qBAAqB,CAC9E,IAAI,CAAC,qBAAqB,CAAC,0BAAgB,CAAC,YAAY,CAAC,sBAAsB,EAAE,UAAU,kBACvF,GAAG,EAAE,KAAK,IACP,UAAU,EACf,CACL,CAAC;YAEF,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,qBAAqB,CAC7D,IAAI,CAAC,qBAAqB,CAAC,0BAAgB,CAAC,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,CAC1F,CAAC;YAEF,mBAAmB;YACnB,MAAM,WAAW,GAAyB,EAAE,CAAC;YAE7C,WAAW,CAAC,IAAI,CACZ,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAO,IAAS,EAAE,EAAE;gBACtF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBACnF,MAAM,YAAY,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,IAAwB,EAAE,EAAE;oBAClE,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClD,CAAC,CAAC,CAAC;gBAEH,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACpC,CAAC,CAAA,CAAC,CACL,CAAC;YAEF,WAAW,CAAC,IAAI,CACZ,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAO,IAAS,EAAE,EAAE;gBAC7F,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,sCAAsC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBAC1F,MAAM,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACnE,CAAC,CAAA,CAAC,CACL,CAAC;YAEF,WAAW,CAAC,IAAI,CACZ,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAO,IAAS,EAAE,EAAE;gBACpF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBACjF,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC1D,CAAC,CAAA,CAAC,CACL,CAAC;YAEF,WAAW,CAAC,IAAI,CACZ,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,sCAAsC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAO,IAAS,EAAE,EAAE;gBACjG,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,0CAA0C,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBAC9F,MAAM,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACvE,CAAC,CAAA,CAAC,CACL,CAAC;YAEF,WAAW,CAAC,IAAI,CACZ,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAO,IAAS,EAAE,EAAE;gBAChF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBAC7E,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACtD,CAAC,CAAA,CAAC,CACL,CAAC;YAEF,2BAA2B;YAC3B,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAE/B,wBAAwB;YACxB,MAAM,0BAAgB,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACxD,CAAC,CAAA,CAAC;QAEF;;WAEG;QACK,0BAAqB,GAAG,CAAC,YAAoB,EAAE,UAAkB,EAAE,gBAAgB,GAAG,EAAE,EAAiB,EAAE;YAC/G,MAAM,MAAM,GAAG,IAAI,eAAe,iBAC9B,EAAE,EAAE,YAAY,IACb,gBAAgB,EACrB,CAAC;YAEH,OAAO;gBACH,OAAO,EAAE;oBACL,MAAM,EAAE,UAAU;iBACrB;gBACD,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,KAAK;gBACd,GAAG,EAAE,GAAG,eAAM,CAAC,WAAW,CAAC,0BAA0B,CAAC,GAAG,IAAI,MAAM,EAAE;aACxE,CAAC;QACN,CAAC,CAAC;QAtSE,qBAAqB;QACrB,IAAI,CAAC,2BAA2B,GAAG,IAAI,gCAAkB,CACrD,uBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,GAAG,YAAY,EACvD,IAAI,0CAA4B,CAAC;YAC7B,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,EAAE;YACV,GAAG,EAAE,EAAE;SACV,CAAC,CAAC,oBAAoB,CAAC,oBAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAC9C,IAAI,kCAAoB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,EAC7C,IAAI,uCAAmB,CACnB,uBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,GAAG,YAAY,EACvD,uBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAC3D,CACJ,CAAC;QAEF,IAAI,CAAC,+BAA+B,GAAG,IAAI,iDAA+B,EAAE,CAAC;QAC7E,IAAI,CAAC,sBAAsB,GAAG,IAAI,sBAAa,CAC3C,uBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,GAAG,OAAO,EAClD;YACI,yBAAyB,EAAE,uBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,yBAAyB;YACxF,WAAW,EAAE,uBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW;YAC5D,QAAQ,EAAE,uBAAgB,CAAC,QAAQ;YACnC,UAAU,EAAE,gBAAgB;SAC/B,EACD,IAAI,uCAAmB,CACnB,uBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,GAAG,gBAAgB,EAC3D,uBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,gBAAgB,CACvD,CACJ,CAAC;QAEF,6BAA6B;QAC7B,IAAI,CAAC,kCAAkC,GAAG,IAAI,gCAAkB,CAC5D,uBAAgB,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,GAAG,YAAY,EAC9D,IAAI,0CAA4B,CAAC;YAC7B,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,EAAE;YACV,GAAG,EAAE,EAAE;SACV,CAAC,CAAC,oBAAoB,CAAC,oBAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAC9C,IAAI,kCAAoB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,EAC7C,IAAI,uCAAmB,CACnB,uBAAgB,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,GAAG,YAAY,EAC9D,uBAAgB,CAAC,MAAM,CAAC,kBAAkB,CAAC,oBAAoB,CAClE,CACJ,CAAC;QAEF,IAAI,CAAC,sCAAsC,GAAG,IAAI,wDAAsC,EAAE,CAAC;QAC3F,IAAI,CAAC,6BAA6B,GAAG,IAAI,sBAAa,CAClD,uBAAgB,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,GAAG,OAAO,EACzD;YACI,yBAAyB,EAAE,uBAAgB,CAAC,MAAM,CAAC,kBAAkB,CAAC,yBAAyB;YAC/F,WAAW,EAAE,uBAAgB,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW;YACnE,QAAQ,EAAE,uBAAgB,CAAC,QAAQ;YACnC,UAAU,EAAE,gBAAgB;SAC/B,EACD,IAAI,uCAAmB,CACnB,uBAAgB,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,GAAG,gBAAgB,EAClE,uBAAgB,CAAC,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAC9D,CACJ,CAAC;QAEF,oBAAoB;QACpB,IAAI,CAAC,yBAAyB,GAAG,IAAI,gCAAkB,CACnD,uBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,YAAY,EACrD,IAAI,0CAA4B,CAAC;YAC7B,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,EAAE;YACV,GAAG,EAAE,EAAE;SACV,CAAC,CAAC,oBAAoB,CAAC,oBAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAC9C,IAAI,kCAAoB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,EAC7C,IAAI,uCAAmB,CACnB,uBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,YAAY,EACrD,uBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB,CACzD,CACJ,CAAC;QAEF,IAAI,CAAC,6BAA6B,GAAG,IAAI,+CAA6B,EAAE,CAAC;QACzE,IAAI,CAAC,oBAAoB,GAAG,IAAI,sBAAa,CACzC,uBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,OAAO,EAChD;YACI,yBAAyB,EAAE,uBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,yBAAyB;YACtF,WAAW,EAAE,uBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW;YAC1D,QAAQ,EAAE,uBAAgB,CAAC,QAAQ;YACnC,UAAU,EAAE,gBAAgB;SAC/B,EACD,IAAI,uCAAmB,CACnB,uBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,gBAAgB,EACzD,uBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,gBAAgB,CACrD,CACJ,CAAC;QAEF,kCAAkC;QAClC,IAAI,CAAC,sCAAsC,GAAG,IAAI,gCAAkB,CAChE,uBAAgB,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,GAAG,YAAY,EAClE,IAAI,0CAA4B,CAAC;YAC7B,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,EAAE;YACV,GAAG,EAAE,EAAE;SACV,CAAC,CAAC,oBAAoB,CAAC,oBAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAC9C,IAAI,kCAAoB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,EAC7C,IAAI,uCAAmB,CACnB,uBAAgB,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,GAAG,YAAY,EAClE,uBAAgB,CAAC,MAAM,CAAC,sBAAsB,CAAC,oBAAoB,CACtE,CACJ,CAAC;QAEF,IAAI,CAAC,0CAA0C,GAAG,IAAI,4DAA0C,EAAE,CAAC;QACnG,IAAI,CAAC,iCAAiC,GAAG,IAAI,sBAAa,CACtD,uBAAgB,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,GAAG,OAAO,EAC7D;YACI,yBAAyB,EAAE,uBAAgB,CAAC,MAAM,CAAC,sBAAsB,CAAC,yBAAyB;YACnG,WAAW,EAAE,uBAAgB,CAAC,MAAM,CAAC,sBAAsB,CAAC,WAAW;YACvE,QAAQ,EAAE,uBAAgB,CAAC,QAAQ;YACnC,UAAU,EAAE,gBAAgB;SAC/B,EACD,IAAI,uCAAmB,CACnB,uBAAgB,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,GAAG,gBAAgB,EACtE,uBAAgB,CAAC,MAAM,CAAC,sBAAsB,CAAC,gBAAgB,CAClE,CACJ,CAAC;QAEF,eAAe;QACf,IAAI,CAAC,qBAAqB,GAAG,IAAI,gCAAkB,CAC/C,uBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,YAAY,EACjD,IAAI,0CAA4B,CAAC;YAC7B,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,EAAE;YACV,GAAG,EAAE,EAAE;SACV,CAAC,CAAC,oBAAoB,CAAC,oBAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAC9C,IAAI,kCAAoB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,EAC7C,IAAI,uCAAmB,CACnB,uBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,YAAY,EACjD,uBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CACrD,CACJ,CAAC;QAEF,IAAI,CAAC,yBAAyB,GAAG,IAAI,2CAAyB,EAAE,CAAC;QACjE,IAAI,CAAC,gBAAgB,GAAG,IAAI,sBAAa,CACrC,uBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,OAAO,EAC5C;YACI,yBAAyB,EAAE,uBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB;YAClF,WAAW,EAAE,uBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW;YACtD,QAAQ,EAAE,uBAAgB,CAAC,QAAQ;YACnC,UAAU,EAAE,gBAAgB;SAC/B,EACD,IAAI,uCAAmB,CACnB,uBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,gBAAgB,EACrD,uBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CACjD,CACJ,CAAC;IACN,CAAC;CAkJJ;AAEQ,wDAAsB"}
|
package/dist/integration-engine/workers/oict-energetika/data-access/ConsumptionRepository.js
CHANGED
|
@@ -28,7 +28,7 @@ class ConsumptionRepository extends models_1.PostgresModel {
|
|
|
28
28
|
return yield this.sequelizeModel.bulkCreate(data, { ignoreDuplicates: true });
|
|
29
29
|
}
|
|
30
30
|
catch (err) {
|
|
31
|
-
throw new golemio_errors_1.
|
|
31
|
+
throw new golemio_errors_1.GeneralError(`[${this.constructor.name}] Could not save data: ${err.message}`, this.constructor.name, err);
|
|
32
32
|
}
|
|
33
33
|
});
|
|
34
34
|
}
|
package/dist/integration-engine/workers/oict-energetika/data-access/ConsumptionRepository.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConsumptionRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/data-access/ConsumptionRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAwC;AACxC,6FAAgE;AAChE,yEAAqF;AACrF,
|
|
1
|
+
{"version":3,"file":"ConsumptionRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/data-access/ConsumptionRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAwC;AACxC,6FAAgE;AAChE,yEAAqF;AACrF,6EAAwE;AACxE,mFAAkF;AAElF,MAAa,qBAAsB,SAAQ,sBAAa;IACpD;QACI,KAAK,CACD,uBAAuB,EACvB;YACI,WAAW,EAAE,mCAAgB,CAAC,UAAU;YACxC,QAAQ,EAAE,uBAAgB,CAAC,QAAQ;YACnC,yBAAyB,EAAE,mCAAgB,CAAC,cAAc;YAC1D,UAAU,EAAE,gBAAgB;SAC/B,EACD,IAAI,uCAAmB,CAAC,gCAAgC,EAAE,mCAAgB,CAAC,eAAe,CAAC,CAC9F,CAAC;QAGC,aAAQ,GAAG,CAAO,IAAwB,EAA+B,EAAE;YAC9E,IAAI;gBACA,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAmB,IAAI,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;aACnG;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,0BAA0B,GAAG,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACxH;QACL,CAAC,CAAA,CAAC;IARF,CAAC;CASJ;AArBD,sDAqBC"}
|
package/dist/integration-engine/workers/oict-energetika/datasources/OictDataSourceFactory.js
CHANGED
|
@@ -12,7 +12,7 @@ class OictDataSourceFactory {
|
|
|
12
12
|
url.searchParams.set("dateTo", dateParams.dateTo);
|
|
13
13
|
}
|
|
14
14
|
return new datasources_1.DataSource(helpers_1.OictApiHelper.API_NAME + resourceType + "DataSource", new datasources_1.HTTPProtocolStrategy({
|
|
15
|
-
headers:
|
|
15
|
+
headers: helpers_1.OictApiHelper.getResourceHeader(resourceType),
|
|
16
16
|
method: "GET",
|
|
17
17
|
timeout: 60000,
|
|
18
18
|
url: url.toString(),
|
package/dist/integration-engine/workers/oict-energetika/datasources/OictDataSourceFactory.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OictDataSourceFactory.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/datasources/OictDataSourceFactory.ts"],"names":[],"mappings":";;;AAAA,yEAAsE;AACtE,mFAA2H;AAC3H,uCAA4D;AAO5D,MAAa,qBAAqB;IACvB,MAAM,CAAC,aAAa,CAAC,YAA8B,EAAE,UAAwB;QAChF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,uBAAa,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,eAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;QAE1G,IAAI,UAAU,EAAE;YACZ,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;YACtD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;SACrD;QAED,OAAO,IAAI,wBAAU,CACjB,uBAAa,CAAC,QAAQ,GAAG,YAAY,GAAG,YAAY,EACpD,IAAI,kCAAoB,CAAC;YACrB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"OictDataSourceFactory.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/datasources/OictDataSourceFactory.ts"],"names":[],"mappings":";;;AAAA,yEAAsE;AACtE,mFAA2H;AAC3H,uCAA4D;AAO5D,MAAa,qBAAqB;IACvB,MAAM,CAAC,aAAa,CAAC,YAA8B,EAAE,UAAwB;QAChF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,uBAAa,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,eAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;QAE1G,IAAI,UAAU,EAAE;YACZ,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;YACtD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;SACrD;QAED,OAAO,IAAI,wBAAU,CACjB,uBAAa,CAAC,QAAQ,GAAG,YAAY,GAAG,YAAY,EACpD,IAAI,kCAAoB,CAAC;YACrB,OAAO,EAAE,uBAAa,CAAC,iBAAiB,CAAC,YAAY,CAAC;YACtD,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,KAAK;YACd,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;SACtB,CAAC,EACF,IAAI,kCAAoB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,EAC7C,uBAAa,CAAC,YAAY,CAAC,YAAY,CAAC,CAC3C,CAAC;IACN,CAAC;CACJ;AArBD,sDAqBC"}
|
package/dist/integration-engine/workers/oict-energetika/datasources/helpers/OictApiHelper.d.ts
CHANGED
|
@@ -8,5 +8,6 @@ export declare enum OictResourceType {
|
|
|
8
8
|
export declare class OictApiHelper {
|
|
9
9
|
static API_NAME: string;
|
|
10
10
|
static getResourcePath(resourceType: OictResourceType): string;
|
|
11
|
+
static getResourceHeader(resourceType: OictResourceType): Record<string, string>;
|
|
11
12
|
static getValidator(resourceType: OictResourceType): JSONSchemaValidator;
|
|
12
13
|
}
|
package/dist/integration-engine/workers/oict-energetika/datasources/helpers/OictApiHelper.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.OictApiHelper = exports.OictResourceType = void 0;
|
|
|
4
4
|
const datasources_1 = require("../../../../../schema-definitions/datasources");
|
|
5
5
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
6
6
|
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
7
|
+
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
7
8
|
var OictResourceType;
|
|
8
9
|
(function (OictResourceType) {
|
|
9
10
|
OictResourceType["Buildings"] = "Buildings";
|
|
@@ -28,6 +29,16 @@ class OictApiHelper {
|
|
|
28
29
|
return "devices/full";
|
|
29
30
|
}
|
|
30
31
|
}
|
|
32
|
+
static getResourceHeader(resourceType) {
|
|
33
|
+
switch (resourceType) {
|
|
34
|
+
case OictResourceType.Buildings:
|
|
35
|
+
case OictResourceType.ConsumptionVisapp:
|
|
36
|
+
case OictResourceType.Devices:
|
|
37
|
+
return integration_engine_1.config.datasources.OICTEnergetikaApiHeaders;
|
|
38
|
+
case OictResourceType.Consumption:
|
|
39
|
+
return integration_engine_1.config.datasources.OICTEnergetikaConsumptionApiHeaders;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
31
42
|
static getValidator(resourceType) {
|
|
32
43
|
const validatorName = `${OictApiHelper.API_NAME}${resourceType}Validator`;
|
|
33
44
|
switch (resourceType) {
|
|
@@ -39,7 +50,7 @@ class OictApiHelper {
|
|
|
39
50
|
case OictResourceType.Devices:
|
|
40
51
|
return new golemio_validator_1.JSONSchemaValidator(validatorName, datasources_1.oictDevicesJsonSchema);
|
|
41
52
|
default:
|
|
42
|
-
throw new golemio_errors_1.
|
|
53
|
+
throw new golemio_errors_1.GeneralError(`Unknown resource type: ${resourceType}`, "OictApiHelper");
|
|
43
54
|
}
|
|
44
55
|
}
|
|
45
56
|
}
|
package/dist/integration-engine/workers/oict-energetika/datasources/helpers/OictApiHelper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OictApiHelper.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/workers/oict-energetika/datasources/helpers/OictApiHelper.ts"],"names":[],"mappings":";;;AAAA,+EAA6G;AAC7G,
|
|
1
|
+
{"version":3,"file":"OictApiHelper.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/workers/oict-energetika/datasources/helpers/OictApiHelper.ts"],"names":[],"mappings":";;;AAAA,+EAA6G;AAC7G,6EAAwE;AACxE,mFAAkF;AAClF,8EAA+D;AAE/D,IAAY,gBAKX;AALD,WAAY,gBAAgB;IACxB,2CAAuB,CAAA;IACvB,+CAA2B,CAAA;IAC3B,2DAAuC,CAAA;IACvC,uCAAmB,CAAA;AACvB,CAAC,EALW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAK3B;AAED,MAAa,aAAa;IAGf,MAAM,CAAC,eAAe,CAAC,YAA8B;QACxD,QAAQ,YAAY,EAAE;YAClB,mCAAmC;YACnC,KAAK,gBAAgB,CAAC,SAAS;gBAC3B,OAAO,gBAAgB,CAAC;YAE5B,4CAA4C;YAC5C,KAAK,gBAAgB,CAAC,WAAW;gBAC7B,OAAO,kBAAkB,CAAC;YAE9B,iCAAiC;YACjC,KAAK,gBAAgB,CAAC,iBAAiB;gBACnC,OAAO,aAAa,CAAC;YAEzB,+DAA+D;YAC/D,KAAK,gBAAgB,CAAC,OAAO;gBACzB,OAAO,cAAc,CAAC;SAC7B;IACL,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,YAA8B;QAC1D,QAAQ,YAAY,EAAE;YAClB,KAAK,gBAAgB,CAAC,SAAS,CAAC;YAChC,KAAK,gBAAgB,CAAC,iBAAiB,CAAC;YACxC,KAAK,gBAAgB,CAAC,OAAO;gBACzB,OAAO,2BAAM,CAAC,WAAW,CAAC,wBAAwB,CAAC;YAEvD,KAAK,gBAAgB,CAAC,WAAW;gBAC7B,OAAO,2BAAM,CAAC,WAAW,CAAC,mCAAmC,CAAC;SACrE;IACL,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,YAA8B;QACrD,MAAM,aAAa,GAAG,GAAG,aAAa,CAAC,QAAQ,GAAG,YAAY,WAAW,CAAC;QAE1E,QAAQ,YAAY,EAAE;YAClB,KAAK,gBAAgB,CAAC,SAAS;gBAC3B,OAAO,IAAI,uCAAmB,CAAC,aAAa,EAAE,qCAAuB,CAAC,CAAC;YAE3E,KAAK,gBAAgB,CAAC,WAAW,CAAC;YAClC,KAAK,gBAAgB,CAAC,iBAAiB;gBACnC,OAAO,IAAI,uCAAmB,CAAC,aAAa,EAAE,uCAAyB,CAAC,CAAC;YAE7E,KAAK,gBAAgB,CAAC,OAAO;gBACzB,OAAO,IAAI,uCAAmB,CAAC,aAAa,EAAE,mCAAqB,CAAC,CAAC;YAEzE;gBACI,MAAM,IAAI,6BAAY,CAAC,0BAA0B,YAAY,EAAE,EAAE,eAAe,CAAC,CAAC;SACzF;IACL,CAAC;;AApDL,sCAqDC;AApDiB,sBAAQ,GAAG,gBAAgB,CAAC"}
|
|
@@ -35,7 +35,7 @@ class FetchBuildingsTask extends workers_1.AbstractEmptyTask {
|
|
|
35
35
|
}
|
|
36
36
|
catch (err) {
|
|
37
37
|
helpers_1.log.error(err);
|
|
38
|
-
throw new golemio_errors_1.
|
|
38
|
+
throw new golemio_errors_1.GeneralError("Failed to fetch buldings", this.constructor.name, err);
|
|
39
39
|
}
|
|
40
40
|
});
|
|
41
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchBuildingsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/tasks/FetchBuildingsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAAoE;AACpE,2EAAkF;AAClF,
|
|
1
|
+
{"version":3,"file":"FetchBuildingsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/tasks/FetchBuildingsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAAoE;AACpE,2EAAkF;AAClF,6EAAwE;AACxE,4EAAyE;AACzE,oDAA0D;AAC1D,gFAA6E;AAC7E,wFAAqF;AAErF,MAAa,kBAAmB,SAAQ,2BAAiB;IAOrD,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAPP,cAAS,GAAG,gBAAgB,CAAC;QAC7B,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QAOpD,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,EAAE,CAAC;QACrD,IAAI,CAAC,uBAAuB,GAAG,IAAI,iDAAuB,EAAE,CAAC;IACjE,CAAC;IAEe,OAAO;;YACnB,MAAM,UAAU,GAAG,6CAAqB,CAAC,aAAa,CAAC,0BAAgB,CAAC,SAAS,CAAC,CAAC;YAEnF,IAAI;gBACA,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;gBACvC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBAC3E,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aACxD;YAAC,OAAO,GAAG,EAAE;gBACV,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM,IAAI,6BAAY,CAAC,0BAA0B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aAClF;QACL,CAAC;KAAA;CACJ;AAzBD,gDAyBC"}
|
|
@@ -39,18 +39,18 @@ class FetchConsumptionTask extends workers_1.AbstractTask {
|
|
|
39
39
|
}
|
|
40
40
|
catch (err) {
|
|
41
41
|
helpers_1.log.error(err);
|
|
42
|
-
throw new golemio_errors_1.
|
|
42
|
+
throw new golemio_errors_1.GeneralError("Failed to fetch consumption data", this.constructor.name, err);
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
});
|
|
46
46
|
}
|
|
47
47
|
*getDataSources(dateParams) {
|
|
48
|
-
const dateFrom = luxon_1.DateTime.fromISO(dateParams.dateFrom)
|
|
49
|
-
const dateTo = luxon_1.DateTime.fromISO(dateParams.dateTo)
|
|
48
|
+
const dateFrom = luxon_1.DateTime.fromISO(dateParams.dateFrom);
|
|
49
|
+
const dateTo = luxon_1.DateTime.fromISO(dateParams.dateTo);
|
|
50
50
|
const intervals = luxon_1.Interval.fromDateTimes(dateFrom, dateTo).splitBy({ days: 5 });
|
|
51
51
|
for (const interval of intervals) {
|
|
52
|
-
const start = interval.start
|
|
53
|
-
const end = interval.end
|
|
52
|
+
const start = interval.start;
|
|
53
|
+
const end = interval.end;
|
|
54
54
|
yield OictDataSourceFactory_1.OictDataSourceFactory.getDataSource(helpers_2.OictResourceType.Consumption, {
|
|
55
55
|
dateFrom: start.toISODate(),
|
|
56
56
|
dateTo: end.toISODate(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchConsumptionTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/tasks/FetchConsumptionTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2EAAoE;AACpE,2EAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"FetchConsumptionTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/tasks/FetchConsumptionTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2EAAoE;AACpE,2EAA6E;AAC7E,6EAAwE;AACxE,2DAAqE;AACrE,gFAA6E;AAC7E,gFAA6E;AAC7E,oDAA0D;AAE1D,6EAAoF;AACpF,4FAAyF;AAEzF,MAAa,oBAAqB,SAAQ,sBAAoC;IAQ1E,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QARP,cAAS,GAAG,kBAAkB,CAAC;QAC/B,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,WAAW;QAC3C,WAAM,GAAG,yDAAgC,CAAC;QAOtD,IAAI,CAAC,qBAAqB,GAAG,IAAI,6CAAqB,EAAE,CAAC;QACzD,IAAI,CAAC,yBAAyB,GAAG,IAAI,qDAAyB,EAAE,CAAC;IACrE,CAAC;IAEe,OAAO,CAAC,UAAkC;;YACtD,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;YAEpD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;gBAClC,IAAI;oBACA,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;oBACvC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;oBAC7E,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;iBAC9D;gBAAC,OAAO,GAAG,EAAE;oBACV,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACf,MAAM,IAAI,6BAAY,CAAC,kCAAkC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;iBAC1F;aACJ;QACL,CAAC;KAAA;IAEO,CAAC,cAAc,CAAC,UAAkC;QACtD,MAAM,QAAQ,GAAG,gBAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,gBAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,SAAS,GAAG,gBAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QAEhF,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;YAC7B,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;YAEzB,MAAM,6CAAqB,CAAC,aAAa,CAAC,0BAAgB,CAAC,WAAW,EAAE;gBACpE,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE;gBAC3B,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;aAC1B,CAAC,CAAC;YAEH,MAAM,6CAAqB,CAAC,aAAa,CAAC,0BAAgB,CAAC,iBAAiB,EAAE;gBAC1E,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE;gBAC3B,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;aAC1B,CAAC,CAAC;SACN;IACL,CAAC;CACJ;AAjDD,oDAiDC"}
|
|
@@ -32,11 +32,12 @@ class FetchDataTask extends workers_1.AbstractTask {
|
|
|
32
32
|
}
|
|
33
33
|
*generateDateParams(targetDays) {
|
|
34
34
|
const currentDate = luxon_1.DateTime.now().startOf("day");
|
|
35
|
+
const rightBoundDate = currentDate.plus({ days: 1 });
|
|
35
36
|
const leftBoundDate = currentDate.minus({ days: targetDays });
|
|
36
|
-
const intervals = luxon_1.Interval.fromDateTimes(leftBoundDate,
|
|
37
|
+
const intervals = luxon_1.Interval.fromDateTimes(leftBoundDate, rightBoundDate).splitBy({ months: 1 });
|
|
37
38
|
for (const interval of intervals) {
|
|
38
|
-
const start = interval.start
|
|
39
|
-
const end = interval.end
|
|
39
|
+
const start = interval.start;
|
|
40
|
+
const end = interval.end;
|
|
40
41
|
yield {
|
|
41
42
|
dateFrom: start.toISODate(),
|
|
42
43
|
dateTo: end.toISODate(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchDataTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/tasks/FetchDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2FAAqF;AACrF,2EAA6E;AAC7E,2DAAqE;AAGrE,+DAAsE;AAEtE,MAAa,aAAc,SAAQ,sBAA6B;IAK5D,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QALP,cAAS,GAAG,WAAW,CAAC;QACxB,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QACxC,WAAM,GAAG,2CAAyB,CAAC;IAInD,CAAC;IAEe,OAAO,CAAC,EAAE,UAAU,EAAmB;;YACnD,MAAM,8BAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;YACjF,MAAM,8BAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;YAE/E,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE;gBAC1D,MAAM,8BAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,EAAE,UAAU,CAAC,CAAC;aAC9F;QACL,CAAC;KAAA;IAEO,CAAC,kBAAkB,CAAC,UAAkB;QAC1C,MAAM,WAAW,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QAC9D,MAAM,SAAS,GAAG,gBAAQ,CAAC,aAAa,CAAC,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"FetchDataTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/tasks/FetchDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2FAAqF;AACrF,2EAA6E;AAC7E,2DAAqE;AAGrE,+DAAsE;AAEtE,MAAa,aAAc,SAAQ,sBAA6B;IAK5D,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QALP,cAAS,GAAG,WAAW,CAAC;QACxB,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QACxC,WAAM,GAAG,2CAAyB,CAAC;IAInD,CAAC;IAEe,OAAO,CAAC,EAAE,UAAU,EAAmB;;YACnD,MAAM,8BAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;YACjF,MAAM,8BAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;YAE/E,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE;gBAC1D,MAAM,8BAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,EAAE,UAAU,CAAC,CAAC;aAC9F;QACL,CAAC;KAAA;IAEO,CAAC,kBAAkB,CAAC,UAAkB;QAC1C,MAAM,WAAW,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QACrD,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QAC9D,MAAM,SAAS,GAAG,gBAAQ,CAAC,aAAa,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAE/F,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;YAC7B,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;YAEzB,MAAM;gBACF,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE;gBAC3B,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;aAC1B,CAAC;SACL;IACL,CAAC;CACJ;AAlCD,sCAkCC"}
|
|
@@ -35,7 +35,7 @@ class FetchDevicesTask extends workers_1.AbstractEmptyTask {
|
|
|
35
35
|
}
|
|
36
36
|
catch (err) {
|
|
37
37
|
helpers_1.log.error(err);
|
|
38
|
-
throw new golemio_errors_1.
|
|
38
|
+
throw new golemio_errors_1.GeneralError("Failed to fetch devices", this.constructor.name, err);
|
|
39
39
|
}
|
|
40
40
|
});
|
|
41
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchDevicesTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/tasks/FetchDevicesTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAAoE;AACpE,2EAAkF;AAClF,
|
|
1
|
+
{"version":3,"file":"FetchDevicesTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/tasks/FetchDevicesTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAAoE;AACpE,2EAAkF;AAClF,6EAAwE;AACxE,wEAAqE;AACrE,oDAA0D;AAC1D,gFAA6E;AAC7E,oFAAiF;AAEjF,MAAa,gBAAiB,SAAQ,2BAAiB;IAOnD,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAPP,cAAS,GAAG,cAAc,CAAC;QAC3B,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QAOpD,IAAI,CAAC,iBAAiB,GAAG,IAAI,qCAAiB,EAAE,CAAC;QACjD,IAAI,CAAC,qBAAqB,GAAG,IAAI,6CAAqB,EAAE,CAAC;IAC7D,CAAC;IAEe,OAAO;;YACnB,MAAM,UAAU,GAAG,6CAAqB,CAAC,aAAa,CAAC,0BAAgB,CAAC,OAAO,CAAC,CAAC;YAEjF,IAAI;gBACA,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;gBACvC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBACzE,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aACtD;YAAC,OAAO,GAAG,EAAE;gBACV,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM,IAAI,6BAAY,CAAC,yBAAyB,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACjF;QACL,CAAC;KAAA;CACJ;AAzBD,4CAyBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/energetics",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.5-dev.877451681",
|
|
4
4
|
"description": "Golemio Energetics Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"@commitlint/cli": "^11.0.0",
|
|
33
33
|
"@commitlint/config-conventional": "^11.0.0",
|
|
34
34
|
"@golemio/cli": "1.3.3",
|
|
35
|
-
"@golemio/core": "1.
|
|
35
|
+
"@golemio/core": "1.7.0-dev.877344481",
|
|
36
36
|
"@golemio/eslint-config": "1.1.0",
|
|
37
37
|
"@ovos-media/ts-transform-paths": "^1.7.18-1",
|
|
38
38
|
"@types/chai": "4.2.3",
|
|
@@ -59,10 +59,10 @@
|
|
|
59
59
|
"typescript": "4.7.2"
|
|
60
60
|
},
|
|
61
61
|
"peerDependencies": {
|
|
62
|
-
"@golemio/core": ">=1.
|
|
62
|
+
"@golemio/core": ">=1.7.0"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
65
|
"JSONStream": "^1.3.5"
|
|
66
66
|
},
|
|
67
67
|
"overrides": {}
|
|
68
|
-
}
|
|
68
|
+
}
|