@golemio/energetics 1.0.14-dev.740182146 → 1.0.14-dev.741957153

package/dist/integration-engine/workers/oict-energetika/interfaces/IFetchConsumptionInput.d.ts

@@ -0,0 +1,4 @@
+export interface IFetchConsumptionInput {
+    dateFrom: string;
+    dateTo: string;
+}

package/dist/integration-engine/workers/oict-energetika/interfaces/IFetchConsumptionInput.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=IFetchConsumptionInput.js.map

package/dist/integration-engine/workers/oict-energetika/interfaces/IFetchConsumptionInput.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IFetchConsumptionInput.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/interfaces/IFetchConsumptionInput.ts"],"names":[],"mappings":""}

package/dist/integration-engine/workers/oict-energetika/schema/FetchConsumptionSchema.d.ts

@@ -0,0 +1,5 @@
+import { IFetchConsumptionInput } from "../interfaces/IFetchConsumptionInput";
+export declare class FetchConsumptionValidationSchema implements IFetchConsumptionInput {
+    dateFrom: string;
+    dateTo: string;
+}

package/dist/integration-engine/workers/oict-energetika/schema/FetchConsumptionSchema.js

@@ -0,0 +1,25 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FetchConsumptionValidationSchema = void 0;
+const class_validator_1 = require("@golemio/core/dist/shared/class-validator");
+class FetchConsumptionValidationSchema {
+}
+__decorate([
+    (0, class_validator_1.IsISO8601)({ strict: true }),
+    __metadata("design:type", String)
+], FetchConsumptionValidationSchema.prototype, "dateFrom", void 0);
+__decorate([
+    (0, class_validator_1.IsISO8601)({ strict: true }),
+    __metadata("design:type", String)
+], FetchConsumptionValidationSchema.prototype, "dateTo", void 0);
+exports.FetchConsumptionValidationSchema = FetchConsumptionValidationSchema;
+//# sourceMappingURL=FetchConsumptionSchema.js.map

package/dist/integration-engine/workers/oict-energetika/schema/FetchConsumptionSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FetchConsumptionSchema.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/schema/FetchConsumptionSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+EAAsE;AAGtE,MAAa,gCAAgC;CAM5C;AAJG;IADC,IAAA,2BAAS,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;;kEACV;AAGlB;IADC,IAAA,2BAAS,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;;gEACZ;AALpB,4EAMC"}

package/dist/integration-engine/workers/oict-energetika/tasks/FetchConsumptionTask.d.ts

@@ -1,13 +1,13 @@
 import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
-import { IFetchDataInput } from "../interfaces/IFetchDataInput";
-import { FetchDataValidationSchema } from "../schema/FetchDataSchema";
-export declare class FetchConsumptionTask extends AbstractTask<IFetchDataInput> {
+import { IFetchConsumptionInput } from "../interfaces/IFetchConsumptionInput";
+import { FetchConsumptionValidationSchema } from "../schema/FetchConsumptionSchema";
+export declare class FetchConsumptionTask extends AbstractTask<IFetchConsumptionInput> {
     readonly queueName = "fetchConsumption";
     readonly queueTtl: number;
-    readonly schema: typeof FetchDataValidationSchema;
+    readonly schema: typeof FetchConsumptionValidationSchema;
     private readonly consumptionRepository;
     private readonly consumptionTransformation;
     constructor(queuePrefix: string);
-    protected execute({ targetDays }: IFetchDataInput): Promise<void>;
+    protected execute(dateParams: IFetchConsumptionInput): Promise<void>;
     private getDataSources;
 }

package/dist/integration-engine/workers/oict-energetika/tasks/FetchConsumptionTask.js

@@ -15,22 +15,22 @@ const workers_1 = require("@golemio/core/dist/integration-engine/workers");
 const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const luxon_1 = require("@golemio/core/dist/shared/luxon");
 const ConsumptionRepository_1 = require("../data-access/ConsumptionRepository");
-const helpers_2 = require("../datasources/helpers");
 const OictDataSourceFactory_1 = require("../datasources/OictDataSourceFactory");
-const FetchDataSchema_1 = require("../schema/FetchDataSchema");
+const helpers_2 = require("../datasources/helpers");
+const FetchConsumptionSchema_1 = require("../schema/FetchConsumptionSchema");
 const ConsumptionTransformation_1 = require("../transformations/ConsumptionTransformation");
 class FetchConsumptionTask extends workers_1.AbstractTask {
     constructor(queuePrefix) {
         super(queuePrefix);
         this.queueName = "fetchConsumption";
-        this.queueTtl = 29 * 60 * 1000; // 29 minutes
-        this.schema = FetchDataSchema_1.FetchDataValidationSchema;
+        this.queueTtl = 10 * 60 * 60 * 1000; // 10 hours
+        this.schema = FetchConsumptionSchema_1.FetchConsumptionValidationSchema;
         this.consumptionRepository = new ConsumptionRepository_1.ConsumptionRepository();
         this.consumptionTransformation = new ConsumptionTransformation_1.ConsumptionTransformation();
     }
-    execute({ targetDays }) {
+    execute(dateParams) {
         return __awaiter(this, void 0, void 0, function* () {
-            const dataSources = this.getDataSources(targetDays);
+            const dataSources = this.getDataSources(dateParams);
             for (const dataSource of dataSources) {
                 try {
                     const data = yield dataSource.getAll();
@@ -44,10 +44,10 @@ class FetchConsumptionTask extends workers_1.AbstractTask {
             }
         });
     }
-    *getDataSources(targetDays) {
-        const currentDate = luxon_1.DateTime.now().startOf("day");
-        const dateFrom = currentDate.minus({ days: targetDays });
-        const intervals = luxon_1.Interval.fromDateTimes(dateFrom, currentDate).splitBy({ days: 5 });
+    *getDataSources(dateParams) {
+        const dateFrom = luxon_1.DateTime.fromISO(dateParams.dateFrom).startOf("day");
+        const dateTo = luxon_1.DateTime.fromISO(dateParams.dateTo).startOf("day");
+        const intervals = luxon_1.Interval.fromDateTimes(dateFrom, dateTo).splitBy({ days: 5 });
         for (const interval of intervals) {
             const start = interval.start.startOf("day");
             const end = interval.end.startOf("day");

package/dist/integration-engine/workers/oict-energetika/tasks/FetchConsumptionTask.js.map

@@ -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,6EAAuE;AACvE,2DAAqE;AACrE,gFAA6E;AAC7E,oDAA0D;AAC1D,gFAA6E;AAE7E,+DAAsE;AACtE,4FAAyF;AAEzF,MAAa,oBAAqB,SAAQ,sBAA6B;IAQnE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QARP,cAAS,GAAG,kBAAkB,CAAC;QAC/B,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QACxC,WAAM,GAAG,2CAAyB,CAAC;QAO/C,IAAI,CAAC,qBAAqB,GAAG,IAAI,6CAAqB,EAAE,CAAC;QACzD,IAAI,CAAC,yBAAyB,GAAG,IAAI,qDAAyB,EAAE,CAAC;IACrE,CAAC;IAEe,OAAO,CAAC,EAAE,UAAU,EAAmB;;YACnD,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,4BAAW,CAAC,kCAAkC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;iBAC1G;aACJ;QACL,CAAC;KAAA;IAEO,CAAC,cAAc,CAAC,UAAkB;QACtC,MAAM,WAAW,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QACzD,MAAM,SAAS,GAAG,gBAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QAErF,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5C,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAExC,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"}
+{"version":3,"file":"FetchConsumptionTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/tasks/FetchConsumptionTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2EAAoE;AACpE,2EAA6E;AAC7E,6EAAuE;AACvE,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,4BAAW,CAAC,kCAAkC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;iBAC1G;aACJ;QACL,CAAC;KAAA;IAEO,CAAC,cAAc,CAAC,UAAkC;QACtD,MAAM,QAAQ,GAAG,gBAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,gBAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAClE,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,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5C,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAExC,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"}

package/dist/integration-engine/workers/oict-energetika/tasks/FetchDataTask.d.ts

@@ -7,4 +7,5 @@ export declare class FetchDataTask extends AbstractTask<IFetchDataInput> {
     readonly schema: typeof FetchDataValidationSchema;
     constructor(queuePrefix: string);
     protected execute({ targetDays }: IFetchDataInput): Promise<void>;
+    private generateDateParams;
 }

package/dist/integration-engine/workers/oict-energetika/tasks/FetchDataTask.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FetchDataTask = void 0;
 const queueprocessors_1 = require("@golemio/core/dist/integration-engine/queueprocessors");
 const workers_1 = require("@golemio/core/dist/integration-engine/workers");
+const luxon_1 = require("@golemio/core/dist/shared/luxon");
 const FetchDataSchema_1 = require("../schema/FetchDataSchema");
 class FetchDataTask extends workers_1.AbstractTask {
     constructor(queuePrefix) {
@@ -24,9 +25,24 @@ class FetchDataTask extends workers_1.AbstractTask {
         return __awaiter(this, void 0, void 0, function* () {
             yield queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchBuildings", {});
             yield queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchDevices", {});
-            yield queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchConsumption", { targetDays });
+            for (const dateParams of this.generateDateParams(targetDays)) {
+                yield queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchConsumption", dateParams);
+            }
         });
     }
+    *generateDateParams(targetDays) {
+        const currentDate = luxon_1.DateTime.now().startOf("day");
+        const leftBoundDate = currentDate.minus({ days: targetDays });
+        const intervals = luxon_1.Interval.fromDateTimes(leftBoundDate, currentDate).splitBy({ months: 1 });
+        for (const interval of intervals) {
+            const start = interval.start.startOf("day");
+            const end = interval.end.startOf("day");
+            yield {
+                dateFrom: start.toISODate(),
+                dateTo: end.toISODate(),
+            };
+        }
+    }
 }
 exports.FetchDataTask = FetchDataTask;
 //# sourceMappingURL=FetchDataTask.js.map

package/dist/integration-engine/workers/oict-energetika/tasks/FetchDataTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"FetchDataTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/workers/oict-energetika/tasks/FetchDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2FAAqF;AACrF,2EAA6E;AAE7E,+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;YAC/E,MAAM,8BAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QACnG,CAAC;KAAA;CACJ;AAdD,sCAcC"}
+{"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,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAE5F,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5C,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAExC,MAAM;gBACF,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE;gBAC3B,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;aAC1B,CAAC;SACL;IACL,CAAC;CACJ;AAjCD,sCAiCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/energetics",
-    "version": "1.0.14-dev.740182146",
+    "version": "1.0.14-dev.741957153",
     "description": "Golemio Energetics Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",