@golemio/energetics 1.4.9-dev.1622712529 → 1.4.9-dev.1628263535

package/dist/input-gateway/pre/PreCsvInputController.d.ts

@@ -0,0 +1,8 @@
+import { BaseController } from "@golemio/core/dist/input-gateway/controllers";
+import { PreCsvInputTransformation } from "../transformations/PreCsvInputTransformation";
+import { IPreCsvInput } from "../../schema-definitions/datasources/interfaces/IPreCsvInput";
+export declare class PreCsvInputController extends BaseController {
+    private transformation;
+    constructor(transformation: PreCsvInputTransformation);
+    processData: (inputData: IPreCsvInput[]) => Promise<void>;
+}

package/dist/input-gateway/pre/PreCsvInputController.js

@@ -0,0 +1,42 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PreCsvInputController = void 0;
+const controllers_1 = require("@golemio/core/dist/input-gateway/controllers");
+const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
+const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
+const constants_1 = require("../../integration-engine/commodity-providers/constants");
+const PreCsvInputSchema_1 = require("../../schema-definitions/datasources/PreCsvInputSchema");
+class PreCsvInputController extends controllers_1.BaseController {
+    constructor(transformation) {
+        super(constants_1.WORKER_NAME, new golemio_validator_1.JSONSchemaValidator("PreCsvInputController", PreCsvInputSchema_1.preCsvInputSchema));
+        this.transformation = transformation;
+        this.processData = (inputData) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.validator.Validate(inputData);
+                const eanMeasurement = this.transformation.transformElement(inputData);
+                yield this.sendMessageToExchange("input." + this.queuePrefix + ".processPreEanMeasurements", JSON.stringify(eanMeasurement), {
+                    persistent: true,
+                });
+            }
+            catch (err) {
+                if (err instanceof golemio_errors_1.AbstractGolemioError) {
+                    throw err;
+                }
+                else {
+                    throw new golemio_errors_1.GeneralError("Error while validating input data.", this.name, err, 422);
+                }
+            }
+        });
+    }
+}
+exports.PreCsvInputController = PreCsvInputController;
+//# sourceMappingURL=PreCsvInputController.js.map

package/dist/input-gateway/pre/PreCsvInputController.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PreCsvInputController.js","sourceRoot":"","sources":["../../../src/input-gateway/pre/PreCsvInputController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8EAA8E;AAC9E,mFAAkF;AAClF,6EAA8F;AAC9F,sFAAgE;AAEhE,8FAAuE;AAGvE,MAAa,qBAAsB,SAAQ,4BAAc;IACrD,YAAoB,cAAyC;QACzD,KAAK,CAAC,uBAAW,EAAE,IAAI,uCAAmB,CAAC,uBAAuB,EAAE,qCAAiB,CAAC,CAAC,CAAC;QADxE,mBAAc,GAAd,cAAc,CAA2B;QAItD,gBAAW,GAAG,CAAO,SAAyB,EAAE,EAAE;YACrD,IAAI;gBACA,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBACzC,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;gBACvE,MAAM,IAAI,CAAC,qBAAqB,CAC5B,QAAQ,GAAG,IAAI,CAAC,WAAW,GAAG,4BAA4B,EAC1D,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAC9B;oBACI,UAAU,EAAE,IAAI;iBACnB,CACJ,CAAC;aACL;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,GAAG,YAAY,qCAAoB,EAAE;oBACrC,MAAM,GAAG,CAAC;iBACb;qBAAM;oBACH,MAAM,IAAI,6BAAY,CAAC,oCAAoC,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;iBACrF;aACJ;QACL,CAAC,CAAA,CAAC;IApBF,CAAC;CAqBJ;AAxBD,sDAwBC"}

package/dist/input-gateway/pre/PreInputRouter.d.ts

@@ -2,10 +2,13 @@
 import { Router } from "@golemio/core/dist/shared/express";
 export declare class PreInputRouter {
     router: Router;
-    private controller;
+    private jsonInputController;
+    private csvInputController;
+    private csvParser;
     constructor();
     private initRoutes;
     private postPreJson;
+    private postPreCsv;
 }
 declare const preInputRouter: Router;
 export { preInputRouter };

package/dist/input-gateway/pre/PreInputRouter.js

@@ -12,16 +12,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.preInputRouter = exports.PreInputRouter = void 0;
 const express_1 = require("@golemio/core/dist/shared/express");
 const helpers_1 = require("@golemio/core/dist/input-gateway/helpers");
-const PreInputController_1 = require("./PreInputController");
+const PreJsonInputController_1 = require("./PreJsonInputController");
 const PreDataExtractor_1 = require("../helpers/PreDataExtractor");
+const ioc_1 = require("@golemio/core/dist/input-gateway/ioc");
+const PreCsvInputController_1 = require("./PreCsvInputController");
+const PreCsvInputTransformation_1 = require("../transformations/PreCsvInputTransformation");
 class PreInputRouter {
     constructor() {
         this.initRoutes = () => {
             this.router.post("/", (0, helpers_1.checkContentTypeMiddleware)(["application/json"]), this.postPreJson);
+            this.router.post("/csv", (0, helpers_1.checkContentTypeMiddleware)(["text/csv"]), this.csvParser.getMiddleware({
+                delimiter: ";",
+                shouldIncludeHeaders: true,
+            }), this.postPreCsv);
         };
         this.postPreJson = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.controller.processData(req.body);
+                yield this.jsonInputController.processData(req.body);
+                res.sendStatus(204);
+            }
+            catch (err) {
+                next(err);
+            }
+        });
+        this.postPreCsv = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.csvInputController.processData(req.body);
                 res.sendStatus(204);
             }
             catch (err) {
@@ -29,7 +45,9 @@ class PreInputRouter {
             }
         });
         this.router = (0, express_1.Router)();
-        this.controller = new PreInputController_1.PreInputController(new PreDataExtractor_1.PreDataExtractor());
+        this.jsonInputController = new PreJsonInputController_1.PreJsonInputController(new PreDataExtractor_1.PreDataExtractor());
+        this.csvInputController = new PreCsvInputController_1.PreCsvInputController(new PreCsvInputTransformation_1.PreCsvInputTransformation());
+        this.csvParser = ioc_1.InputGatewayContainer.resolve(ioc_1.ContainerToken.CsvParserMiddleware);
         this.initRoutes();
     }
 }

package/dist/input-gateway/pre/PreInputRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"PreInputRouter.js","sourceRoot":"","sources":["../../../src/input-gateway/pre/PreInputRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA4F;AAC5F,sEAAsF;AACtF,6DAAgE;AAChE,kEAAgE;AAEhE,MAAa,cAAc;IAIvB;QAMQ,eAAU,GAAG,GAAS,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,IAAA,oCAA0B,EAAC,CAAC,kBAAkB,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC9F,CAAC,CAAC;QAEM,gBAAW,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAiB,EAAE;YAC3F,IAAI;gBACA,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC5C,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;aACvB;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAA,CAAC;QAhBE,IAAI,CAAC,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,IAAI,uCAAkB,CAAC,IAAI,mCAAgB,EAAE,CAAC,CAAC;QACjE,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;CAcJ;AAtBD,wCAsBC;AAED,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC,MAAM,CAAC;AAC1C,wCAAc"}
+{"version":3,"file":"PreInputRouter.js","sourceRoot":"","sources":["../../../src/input-gateway/pre/PreInputRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA4F;AAC5F,sEAAsF;AACtF,qEAAwE;AACxE,kEAAgE;AAChE,8DAA6F;AAE7F,mEAAsE;AACtE,4FAA0F;AAE1F,MAAa,cAAc;IAMvB;QAQQ,eAAU,GAAG,GAAS,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,IAAA,oCAA0B,EAAC,CAAC,kBAAkB,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAC1F,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,MAAM,EACN,IAAA,oCAA0B,EAAC,CAAC,UAAU,CAAC,CAAC,EACxC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;gBACzB,SAAS,EAAE,GAAG;gBACd,oBAAoB,EAAE,IAAI;aAC7B,CAAC,EACF,IAAI,CAAC,UAAU,CAClB,CAAC;QACN,CAAC,CAAC;QAEM,gBAAW,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAiB,EAAE;YAC3F,IAAI;gBACA,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACrD,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;aACvB;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAA,CAAC;QAEM,eAAU,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAiB,EAAE;YAC1F,IAAI;gBACA,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACpD,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;aACvB;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAA,CAAC;QApCE,IAAI,CAAC,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;QACvB,IAAI,CAAC,mBAAmB,GAAG,IAAI,+CAAsB,CAAC,IAAI,mCAAgB,EAAE,CAAC,CAAC;QAC9E,IAAI,CAAC,kBAAkB,GAAG,IAAI,6CAAqB,CAAC,IAAI,qDAAyB,EAAE,CAAC,CAAC;QACrF,IAAI,CAAC,SAAS,GAAG,2BAAqB,CAAC,OAAO,CAAsB,oBAAc,CAAC,mBAAmB,CAAC,CAAC;QACxG,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;CAgCJ;AA5CD,wCA4CC;AAED,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC,MAAM,CAAC;AAC1C,wCAAc"}

package/dist/input-gateway/pre/{PreInputController.d.ts → PreJsonInputController.d.ts}

@@ -1,7 +1,7 @@
 import { BaseController } from "@golemio/core/dist/input-gateway/controllers";
 import { IPreJsonInput } from "../../schema-definitions/datasources/interfaces/IPreJsonInput";
 import { PreDataExtractor } from "../helpers/PreDataExtractor";
-export declare class PreInputController extends BaseController {
+export declare class PreJsonInputController extends BaseController {
     private preDataExtractor;
     constructor(preDataExtractor: PreDataExtractor);
     processData: (inputData: IPreJsonInput) => Promise<void>;

package/dist/input-gateway/pre/{PreInputController.js → PreJsonInputController.js}

@@ -9,15 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PreInputController = void 0;
+exports.PreJsonInputController = void 0;
 const controllers_1 = require("@golemio/core/dist/input-gateway/controllers");
 const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
 const PreJsonInputSchema_1 = require("../../schema-definitions/datasources/PreJsonInputSchema");
 const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const constants_1 = require("../../integration-engine/commodity-providers/constants");
-class PreInputController extends controllers_1.BaseController {
+class PreJsonInputController extends controllers_1.BaseController {
     constructor(preDataExtractor) {
-        super(constants_1.WORKER_NAME, new golemio_validator_1.JSONSchemaValidator("PreInputController", PreJsonInputSchema_1.preJsonInputSchema));
+        super(constants_1.WORKER_NAME, new golemio_validator_1.JSONSchemaValidator("PreJsonInputController", PreJsonInputSchema_1.preJsonInputSchema));
         this.preDataExtractor = preDataExtractor;
         this.processData = (inputData) => __awaiter(this, void 0, void 0, function* () {
             try {
@@ -40,5 +40,5 @@ class PreInputController extends controllers_1.BaseController {
         });
     }
 }
-exports.PreInputController = PreInputController;
-//# sourceMappingURL=PreInputController.js.map
+exports.PreJsonInputController = PreJsonInputController;
+//# sourceMappingURL=PreJsonInputController.js.map

package/dist/input-gateway/pre/PreJsonInputController.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PreJsonInputController.js","sourceRoot":"","sources":["../../../src/input-gateway/pre/PreJsonInputController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8EAA8E;AAC9E,mFAAkF;AAClF,gGAAyE;AAGzE,6EAA8F;AAC9F,sFAAgE;AAEhE,MAAa,sBAAuB,SAAQ,4BAAc;IACtD,YAAoB,gBAAkC;QAClD,KAAK,CAAC,uBAAW,EAAE,IAAI,uCAAmB,CAAC,wBAAwB,EAAE,uCAAkB,CAAC,CAAC,CAAC;QAD1E,qBAAgB,GAAhB,gBAAgB,CAAkB;QAI/C,gBAAW,GAAG,CAAO,SAAwB,EAAE,EAAE;YACpD,IAAI;gBACA,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBACzC,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;gBAChF,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;oBAC1C,MAAM,IAAI,CAAC,qBAAqB,CAC5B,QAAQ,GAAG,IAAI,CAAC,WAAW,GAAG,4BAA4B,EAC1D,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAC9B;wBACI,UAAU,EAAE,IAAI;qBACnB,CACJ,CAAC;iBACL;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,GAAG,YAAY,qCAAoB,EAAE;oBACrC,MAAM,GAAG,CAAC;iBACb;qBAAM;oBACH,MAAM,IAAI,6BAAY,CAAC,oCAAoC,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;iBACrF;aACJ;QACL,CAAC,CAAA,CAAC;IAtBF,CAAC;CAuBJ;AA1BD,wDA0BC"}

package/dist/input-gateway/pre/index.d.ts

@@ -1,2 +1,2 @@
 export * from "./PreInputRouter";
-export * from "./PreInputController";
+export * from "./PreJsonInputController";

package/dist/input-gateway/pre/index.js

@@ -15,5 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./PreInputRouter"), exports);
-__exportStar(require("./PreInputController"), exports);
+__exportStar(require("./PreJsonInputController"), exports);
 //# sourceMappingURL=index.js.map

package/dist/input-gateway/pre/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/input-gateway/pre/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,uDAAqC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/input-gateway/pre/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,2DAAyC"}

package/dist/input-gateway/transformations/PreCsvInputTransformation.d.ts

@@ -0,0 +1,8 @@
+import { AbstractTransformation } from "@golemio/core/dist/helpers/transformation/AbstractTransformation";
+import { IPreCsvInput } from "../../schema-definitions/datasources/interfaces/IPreCsvInput";
+import { IPreEanMeasurement } from "../../integration-engine/commodity-providers/workers/interfaces/IPreEanMeasurement";
+export declare class PreCsvInputTransformation extends AbstractTransformation<IPreCsvInput[], IPreEanMeasurement> {
+    name: string;
+    protected transformInternal: (data: IPreCsvInput[]) => IPreEanMeasurement;
+    private getEan;
+}

package/dist/input-gateway/transformations/PreCsvInputTransformation.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PreCsvInputTransformation = void 0;
+const AbstractTransformation_1 = require("@golemio/core/dist/helpers/transformation/AbstractTransformation");
+class PreCsvInputTransformation extends AbstractTransformation_1.AbstractTransformation {
+    constructor() {
+        super(...arguments);
+        this.name = "PreCsvInputTransformation";
+        this.transformInternal = (data) => {
+            const T1_Wh_raw_data = [];
+            const ean = this.getEan(data[0]);
+            for (const row of data) {
+                const consumptionValue = row[Object.keys(row)[2]];
+                T1_Wh_raw_data.push([row["Konec intervalu"], parseInt(consumptionValue)]);
+            }
+            return { ean, T1_Wh_raw_data };
+        };
+        this.getEan = (data) => {
+            const keys = Object.keys(data);
+            return keys[2].substring(0, 18);
+        };
+    }
+}
+exports.PreCsvInputTransformation = PreCsvInputTransformation;
+//# sourceMappingURL=PreCsvInputTransformation.js.map

package/dist/input-gateway/transformations/PreCsvInputTransformation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PreCsvInputTransformation.js","sourceRoot":"","sources":["../../../src/input-gateway/transformations/PreCsvInputTransformation.ts"],"names":[],"mappings":";;;AAAA,6GAA0G;AAI1G,MAAa,yBAA0B,SAAQ,+CAA0D;IAAzG;;QACW,SAAI,GAAG,2BAA2B,CAAC;QAEhC,sBAAiB,GAAG,CAAC,IAAoB,EAAsB,EAAE;YACvE,MAAM,cAAc,GAA4B,EAAE,CAAC;YACnD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAEjC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;gBACpB,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAClD,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;aAC7E;YAED,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC;QACnC,CAAC,CAAC;QAEM,WAAM,GAAG,CAAC,IAAkB,EAAU,EAAE;YAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/B,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACpC,CAAC,CAAC;IACN,CAAC;CAAA;AAnBD,8DAmBC"}

package/dist/integration-engine/commodity-providers/helper/PreMeasurementFilter.d.ts

@@ -0,0 +1,4 @@
+import { IPreEanMeasurement } from "../workers/interfaces/IPreEanMeasurement";
+export declare class PreMeasurementFilter {
+    static sumDuplicates(measurementInput: IPreEanMeasurement): IPreEanMeasurement;
+}

package/dist/integration-engine/commodity-providers/helper/PreMeasurementFilter.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PreMeasurementFilter = void 0;
+class PreMeasurementFilter {
+    static sumDuplicates(measurementInput) {
+        const clean = new Map();
+        for (const row of measurementInput.T1_Wh_raw_data) {
+            clean.has(row[0]) ? clean.set(row[0], clean.get(row[0]) + row[1]) : clean.set(row[0], row[1]);
+        }
+        const T1_Wh_raw_data = Array.from(clean, ([k, v]) => [k, v]);
+        return { ean: measurementInput.ean, T1_Wh_raw_data };
+    }
+}
+exports.PreMeasurementFilter = PreMeasurementFilter;
+//# sourceMappingURL=PreMeasurementFilter.js.map

package/dist/integration-engine/commodity-providers/helper/PreMeasurementFilter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PreMeasurementFilter.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/helper/PreMeasurementFilter.ts"],"names":[],"mappings":";;;AAEA,MAAa,oBAAoB;IACtB,MAAM,CAAC,aAAa,CAAC,gBAAoC;QAC5D,MAAM,KAAK,GAAwB,IAAI,GAAG,EAAE,CAAC;QAE7C,KAAK,MAAM,GAAG,IAAI,gBAAgB,CAAC,cAAc,EAAE;YAC/C,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SAClG;QAED,MAAM,cAAc,GAA4B,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAEtF,OAAO,EAAE,GAAG,EAAE,gBAAgB,CAAC,GAAG,EAAE,cAAc,EAAE,CAAC;IACzD,CAAC;CACJ;AAZD,oDAYC"}

package/dist/integration-engine/commodity-providers/workers/interfaces/IPreEanMeasurement.d.ts

@@ -1,4 +1,4 @@
 export interface IPreEanMeasurement {
     ean: string;
-    T1_Wh_raw_data: Array<[date: string, value: number]>;
+    T1_Wh_raw_data: Array<[string, number]>;
 }

package/dist/integration-engine/commodity-providers/workers/schema/PreEanMeasurementSchema.d.ts

@@ -1,5 +1,5 @@
 import { IPreEanMeasurement } from "../interfaces/IPreEanMeasurement";
 export declare class PreEanMeasurementSchema implements IPreEanMeasurement {
-    T1_Wh_raw_data: Array<[date: string, value: number]>;
+    T1_Wh_raw_data: Array<[string, number]>;
     ean: string;
 }

package/dist/integration-engine/commodity-providers/workers/schema/PreEanMeasurementSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"PreEanMeasurementSchema.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/schema/PreEanMeasurementSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+EAA8E;AAE9E,MAAa,uBAAuB;CAMnC;AAND,0DAMC;AAJG;IADC,IAAA,yBAAO,GAAE;8BACO,KAAK;+DAAgC;AAGtD;IADC,IAAA,0BAAQ,GAAE;;oDACE"}
+{"version":3,"file":"PreEanMeasurementSchema.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/schema/PreEanMeasurementSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+EAA8E;AAE9E,MAAa,uBAAuB;CAMnC;AAND,0DAMC;AAJG;IADC,IAAA,yBAAO,GAAE;8BACO,KAAK;+DAAmB;AAGzC;IADC,IAAA,0BAAQ,GAAE;;oDACE"}

package/dist/integration-engine/commodity-providers/workers/tasks/ProcessPreEanMeasurementsTask.js

@@ -33,6 +33,7 @@ const StaticDataResourceTypeEnum_1 = require("../../../../schema-definitions/mod
 const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const integration_engine_1 = require("@golemio/core/dist/integration-engine");
 const constants_1 = require("../../constants");
+const PreMeasurementFilter_1 = require("../../helper/PreMeasurementFilter");
 let ProcessPreEanMeasurementsTask = exports.ProcessPreEanMeasurementsTask = class ProcessPreEanMeasurementsTask extends integration_engine_1.AbstractTask {
     constructor(meterSettingsRepository, measurementRepository, transformation) {
         super(constants_1.WORKER_NAME);
@@ -55,7 +56,7 @@ let ProcessPreEanMeasurementsTask = exports.ProcessPreEanMeasurementsTask = clas
             }
             const measurements = this.transformation.transformElement({
                 option,
-                measurementInput,
+                measurementInput: PreMeasurementFilter_1.PreMeasurementFilter.sumDuplicates(measurementInput),
             });
             yield this.measurementRepository.bulkSave(measurements);
         });

package/dist/integration-engine/commodity-providers/workers/tasks/ProcessPreEanMeasurementsTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProcessPreEanMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/ProcessPreEanMeasurementsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAwE;AACxE,yEAAwF;AAExF,qGAAoH;AACpH,oGAAmH;AACnH,oFAAmG;AAEnG,+EAAyG;AACzG,uHAAsF;AACtF,yHAAwF;AAExF,6EAAwE;AACxE,8EAAqE;AACrE,+CAAgE;AAGzD,IAAM,6BAA6B,2CAAnC,MAAM,6BAA8B,SAAQ,iCAAgC;IAK/E,YAEI,uBAA8D,EACV,qBAAsD,EAC/C,cAAsD;QAEjH,KAAK,CAAC,uBAAW,CAAC,CAAC;QAJX,4BAAuB,GAAvB,uBAAuB,CAA+B;QACA,0BAAqB,GAArB,qBAAqB,CAAuB;QACrC,mBAAc,GAAd,cAAc,CAA8B;QAR3G,WAAM,GAAG,iDAAuB,CAAC;QAC3B,cAAS,GAAG,2BAA2B,CAAC;QACxC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAS1C,CAAC;IAEe,OAAO,CAAC,gBAAoC;;YACxD,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CACjE,iDAAqB,CAAC,eAAe,EACrC,mDAAsB,CAAC,kBAAkB,CAC5C,CAAC;YAEF,IAAI,CAAC,kBAAkB,EAAE;gBACrB,MAAM,IAAI,6BAAY,CAAC,+BAA+B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aAClF;YAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,IAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,gBAAgB,CAAC,GAAG,CAAC,CAAC;YAE1G,IAAI,CAAC,MAAM,EAAE;gBACT,MAAM,IAAI,6BAAY,CAAC,yCAAyC,GAAG,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aACnH;YAED,MAAM,YAAY,GAAsB,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC;gBACzE,MAAM;gBACN,gBAAgB;aACnB,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC5D,CAAC;KAAA;CACJ,CAAA;wCArCY,6BAA6B;IADzC,IAAA,qBAAU,GAAE;IAOJ,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,6BAA6B,CAAC,CAAA;IAE1D,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,qBAAqB,CAAC,CAAA;IAClD,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,4BAA4B,CAAC,CAAA;qCAFzB,6DAA6B;QACuB,6CAAqB;QACrB,2DAA4B;GAT5G,6BAA6B,CAqCzC"}
+{"version":3,"file":"ProcessPreEanMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/ProcessPreEanMeasurementsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAwE;AACxE,yEAAwF;AAExF,qGAAoH;AACpH,oGAAmH;AACnH,oFAAmG;AAEnG,+EAAyG;AACzG,uHAAsF;AACtF,yHAAwF;AAExF,6EAAwE;AACxE,8EAAqE;AACrE,+CAAgE;AAChE,4EAA2F;AAGpF,IAAM,6BAA6B,2CAAnC,MAAM,6BAA8B,SAAQ,iCAAgC;IAK/E,YAEI,uBAA8D,EACV,qBAAsD,EAC/C,cAAsD;QAEjH,KAAK,CAAC,uBAAW,CAAC,CAAC;QAJX,4BAAuB,GAAvB,uBAAuB,CAA+B;QACA,0BAAqB,GAArB,qBAAqB,CAAuB;QACrC,mBAAc,GAAd,cAAc,CAA8B;QAR3G,WAAM,GAAG,iDAAuB,CAAC;QAC3B,cAAS,GAAG,2BAA2B,CAAC;QACxC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAS1C,CAAC;IAEe,OAAO,CAAC,gBAAoC;;YACxD,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CACjE,iDAAqB,CAAC,eAAe,EACrC,mDAAsB,CAAC,kBAAkB,CAC5C,CAAC;YAEF,IAAI,CAAC,kBAAkB,EAAE;gBACrB,MAAM,IAAI,6BAAY,CAAC,+BAA+B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aAClF;YAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,IAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,gBAAgB,CAAC,GAAG,CAAC,CAAC;YAE1G,IAAI,CAAC,MAAM,EAAE;gBACT,MAAM,IAAI,6BAAY,CAAC,yCAAyC,GAAG,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aACnH;YAED,MAAM,YAAY,GAAsB,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC;gBACzE,MAAM;gBACN,gBAAgB,EAAE,2CAAoB,CAAC,aAAa,CAAC,gBAAgB,CAAC;aACzE,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC5D,CAAC;KAAA;CACJ,CAAA;wCArCY,6BAA6B;IADzC,IAAA,qBAAU,GAAE;IAOJ,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,6BAA6B,CAAC,CAAA;IAE1D,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,qBAAqB,CAAC,CAAA;IAClD,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,4BAA4B,CAAC,CAAA;qCAFzB,6DAA6B;QACuB,6CAAqB;QACrB,2DAA4B;GAT5G,6BAA6B,CAqCzC"}

package/dist/schema-definitions/datasources/PreCsvInputSchema.d.ts

@@ -0,0 +1,3 @@
+import { JSONSchemaType } from "@golemio/core/dist/shared/ajv";
+import { IPreCsvInput } from "./interfaces/IPreCsvInput";
+export declare const preCsvInputSchema: JSONSchemaType<IPreCsvInput[]>;

package/dist/schema-definitions/datasources/PreCsvInputSchema.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.preCsvInputSchema = void 0;
+exports.preCsvInputSchema = {
+    type: "array",
+    items: {
+        type: "object",
+        properties: {
+            "Počátek intervalu": { type: "string", pattern: "^\\d{1,2}.\\d{1,2}.\\d{4} \\d{2}:\\d{2}$" },
+            "Konec intervalu": { type: "string", pattern: "^\\d{1,2}.\\d{1,2}.\\d{4} \\d{2}:\\d{2}$" },
+        },
+        patternProperties: {
+            "^[0-9]{18} - Činná - spotřeba [kW]$": { type: "string" },
+        },
+        additionalProperties: true,
+        required: ["Konec intervalu"],
+    },
+};
+//# sourceMappingURL=PreCsvInputSchema.js.map

package/dist/schema-definitions/datasources/PreCsvInputSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PreCsvInputSchema.js","sourceRoot":"","sources":["../../../src/schema-definitions/datasources/PreCsvInputSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,iBAAiB,GAAmC;IAC7D,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,mBAAmB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,0CAA0C,EAAE;YAC5F,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,0CAA0C,EAAE;SAC7F;QACD,iBAAiB,EAAE;YACf,qCAAqC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC5D;QACD,oBAAoB,EAAE,IAAI;QAC1B,QAAQ,EAAE,CAAC,iBAAiB,CAAC;KAChC;CACJ,CAAC"}

package/dist/schema-definitions/datasources/interfaces/IPreCsvInput.d.ts

@@ -0,0 +1,5 @@
+export interface IPreCsvInput {
+    "Počátek intervalu": string;
+    "Konec intervalu": string;
+    [eanCinna: string]: string;
+}

package/dist/schema-definitions/datasources/interfaces/IPreCsvInput.js

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

package/dist/schema-definitions/datasources/interfaces/IPreCsvInput.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IPreCsvInput.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/interfaces/IPreCsvInput.ts"],"names":[],"mappings":""}

package/docs/implementation_documentation.md

@@ -20,6 +20,14 @@ Modul slouží k ukládání dat o spotřebě energií v budovách a jednotlivý
       - Na IG chodí větší soubory (např. 20M). Proto se na IG rozdělí podle měřidel a vyříznou se jen data, co zpracováváme.
         Dál to postupuje na IE přes rabbit do [ProcessPreEanMeasurementsTask](../src/integration-engine/commodity-providers/workers/tasks/ProcessPreEanMeasurementsTask.ts).
 
+#### _POST /pre/csv_
+
+-   Endpoint pro příjem historických dat PRE v CSV formátu (POST na /pre/csv).
+    - Očekávaný [formát dat](../src/schema-definitions/datasources/interfaces/IPreCsvInput.ts)
+    - V IG se CSV převede na stejný formát, jako /pre používá endpoint a dál na IE postupuje stejně.
+      Tj. přes rabbit do [ProcessPreEanMeasurementsTask](../src/integration-engine/commodity-providers/workers/tasks/ProcessPreEanMeasurementsTask.ts).
+
+
 ### Data aktivně stahujeme
 
 **Dostupní poskytovatelé**:
@@ -266,6 +274,7 @@ Přijímá data o spotřebách od PRE z IG (viz. nahoře)
 -   datový zdroj je PRE IG endpoint (viz. nahoře)
 -   transformace
     -   [PreMeasurementTransformation](../src/integration-engine/commodity-providers/transformations/PreMeasurementTransformation.ts)
+    -   Vstupní hodnoty se stejným datem měření se sčítají. Duplicitní timestamp vzniká při přechodu na zimní čas.
 -   data modely
     -   odsud si bere statická data: [StaticMeterSettingsModel](../src/schema-definitions/models/StaticMeterSettingsModel.ts) tabulka `commodity_static_meter_settings`
     -   sem ukládá: [MeasurementModel](../src/schema-definitions/models/MeasurementsModel.ts) tabulka `consumption_energy_measurements`

package/docs/openapi-input.yaml

@@ -101,7 +101,30 @@ paths:
                     $ref: "#/components/responses/UnauthorizedError"
                 422:
                     description: Error while validating input data
+    /pre/csv:
+        post:
+            tags:
+                - ⚡ Energetics
+            summary: Receive and save PRE data in CSV format
+            requestBody:
+                content:
+                    text/csv:
+                        schema:
+                            $ref: "#/components/schemas/PreCsvMeasurement"
+                        examples:
+                            text/csv:
+                                summary: Sample data
+                                value:
+                                    "Počátek intervalu;Konec intervalu;859182400300027238 - Činná - spotřeba [kW];859182400300027238 - Induktivní - spotřeba [kVAr];859182400300027238 - Kapacitní - spotřeba [kVAr];
 
+                                     01.01.2021 00:00;01.01.2021 00:15;57,000;0,000;5,000;"
+            responses:
+                204:
+                    description: OK
+                401:
+                    $ref: "#/components/responses/UnauthorizedError"
+                422:
+                    description: Error while validating input data
 components:
     responses:
         UnauthorizedError:
@@ -145,6 +168,16 @@ components:
                     type: string
                 Status odečtu:
                     type: string
+        PreCsvMeasurement:
+            type: object
+            properties:
+                Počátek intervalu:
+                    type: string
+                Konec intervalu:
+                    type: string
+            required:
+                - Počátek intervalu
+                - Konec intervalu
         PreMeasurement:
             type: object
             properties:

package/package.json

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

package/dist/input-gateway/pre/PreInputController.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"PreInputController.js","sourceRoot":"","sources":["../../../src/input-gateway/pre/PreInputController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8EAA8E;AAC9E,mFAAkF;AAClF,gGAAyE;AAGzE,6EAA8F;AAC9F,sFAAgE;AAEhE,MAAa,kBAAmB,SAAQ,4BAAc;IAClD,YAAoB,gBAAkC;QAClD,KAAK,CAAC,uBAAW,EAAE,IAAI,uCAAmB,CAAC,oBAAoB,EAAE,uCAAkB,CAAC,CAAC,CAAC;QADtE,qBAAgB,GAAhB,gBAAgB,CAAkB;QAI/C,gBAAW,GAAG,CAAO,SAAwB,EAAE,EAAE;YACpD,IAAI;gBACA,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBACzC,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;gBAChF,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;oBAC1C,MAAM,IAAI,CAAC,qBAAqB,CAC5B,QAAQ,GAAG,IAAI,CAAC,WAAW,GAAG,4BAA4B,EAC1D,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAC9B;wBACI,UAAU,EAAE,IAAI;qBACnB,CACJ,CAAC;iBACL;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,GAAG,YAAY,qCAAoB,EAAE;oBACrC,MAAM,GAAG,CAAC;iBACb;qBAAM;oBACH,MAAM,IAAI,6BAAY,CAAC,oCAAoC,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;iBACrF;aACJ;QACL,CAAC,CAAA,CAAC;IAtBF,CAAC;CAuBJ;AA1BD,gDA0BC"}