@golemio/energetics 1.4.13 → 1.5.0-dev.2088126876

package/dist/integration-engine/enapo/workers/task/EnapoPrediTask.js

@@ -0,0 +1,81 @@
+"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);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnapoPrediTask = void 0;
+const constants_1 = require("../../constants");
+const EnapoWorkerContainerToken_1 = require("../../ioc/EnapoWorkerContainerToken");
+const EnapoMeasurementsRepository_1 = require("../../repositories/EnapoMeasurementsRepository");
+const PreIncomingDataLogRepository_1 = require("../../repositories/PreIncomingDataLogRepository");
+const PreDailyMeasurementsTransformation_1 = require("../../transformations/pre/PreDailyMeasurementsTransformation");
+const PreMeasurementsTransformation_1 = require("../../transformations/pre/PreMeasurementsTransformation");
+const PreMetadataTransfromation_1 = require("../../transformations/pre/PreMetadataTransfromation");
+const EnapoPreInputSchema_1 = require("../../../../schema-definitions/datasources/enapo/EnapoPreInputSchema");
+const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
+const AbstractTaskJsonSchema_1 = require("@golemio/core/dist/integration-engine/workers/AbstractTaskJsonSchema");
+const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
+const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
+const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
+let EnapoPrediTask = exports.EnapoPrediTask = class EnapoPrediTask extends AbstractTaskJsonSchema_1.AbstractTaskJsonSchema {
+    constructor(config, measurementsRepository, logger, preMeasurementsTransformation, preDailyMeasurementsTransformation, preMetadataTransformation, dbConnector, preIncomingDataLogRepository) {
+        super(constants_1.ENAPO_WORKER_NAME);
+        this.config = config;
+        this.measurementsRepository = measurementsRepository;
+        this.logger = logger;
+        this.preMeasurementsTransformation = preMeasurementsTransformation;
+        this.preDailyMeasurementsTransformation = preDailyMeasurementsTransformation;
+        this.preMetadataTransformation = preMetadataTransformation;
+        this.dbConnector = dbConnector;
+        this.preIncomingDataLogRepository = preIncomingDataLogRepository;
+        this.queueName = "processPrediData";
+        this.queueTtl = 60 * 60 * 1000;
+        this.schema = new golemio_validator_1.JSONSchemaValidator("PrediInputDataValidator", EnapoPreInputSchema_1.enapoPreInputSchema);
+    }
+    async execute(data) {
+        const transaction = await this.dbConnector.getConnection().transaction();
+        try {
+            let transformedMeasurements = this.preMeasurementsTransformation.transformElement(data);
+            await this.measurementsRepository.bulkSave(transformedMeasurements, undefined, undefined, undefined, transaction);
+            transformedMeasurements = [];
+            let transformedDailyMeasurements = this.preDailyMeasurementsTransformation.transformElement(data);
+            await this.measurementsRepository.bulkSave(transformedDailyMeasurements, undefined, undefined, undefined, transaction);
+            transformedDailyMeasurements = [];
+            let prelog = this.preMetadataTransformation.transformElement(data);
+            await this.preIncomingDataLogRepository.bulkSave(prelog, undefined, undefined, undefined, transaction);
+            prelog = [];
+            await transaction.commit();
+        }
+        catch (err) {
+            await transaction.rollback();
+            if (err instanceof golemio_errors_1.AbstractGolemioError) {
+                throw err;
+            }
+            throw new golemio_errors_1.GeneralError("Failed to save ENAPO Predi data", this.constructor.name, err);
+        }
+    }
+};
+exports.EnapoPrediTask = EnapoPrediTask = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.SimpleConfig)),
+    __param(1, (0, tsyringe_1.inject)(EnapoWorkerContainerToken_1.EnapoWorkerContainerToken.EnapoMeasurementsRepository)),
+    __param(2, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
+    __param(3, (0, tsyringe_1.inject)(EnapoWorkerContainerToken_1.EnapoWorkerContainerToken.PreMeasurementsTransformation)),
+    __param(4, (0, tsyringe_1.inject)(EnapoWorkerContainerToken_1.EnapoWorkerContainerToken.PreDailyMeasurementsTransformation)),
+    __param(5, (0, tsyringe_1.inject)(EnapoWorkerContainerToken_1.EnapoWorkerContainerToken.PreMetadataTransformation)),
+    __param(6, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.PostgresConnector)),
+    __param(7, (0, tsyringe_1.inject)(EnapoWorkerContainerToken_1.EnapoWorkerContainerToken.PreIncomingDataLogRepository)),
+    __metadata("design:paramtypes", [Object, EnapoMeasurementsRepository_1.EnapoMeasurementsRepository, Object, PreMeasurementsTransformation_1.PreMeasurementsTransformation,
+        PreDailyMeasurementsTransformation_1.PreDailyMeasurementsTransformation,
+        PreMetadataTransfromation_1.PreMetadataTransformation, Object, PreIncomingDataLogRepository_1.PreIncomingDataLogRepository])
+], EnapoPrediTask);
+//# sourceMappingURL=EnapoPrediTask.js.map

package/dist/integration-engine/enapo/workers/task/EnapoPrediTask.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EnapoPrediTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/enapo/workers/task/EnapoPrediTask.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/controllers/helpers/parsePaginationParams.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="express" />
-import { Request } from "@golemio/core/dist/shared/express";
 import { IPaginationParams } from "../interfaces/IPaginationParams";
+import { Request } from "@golemio/core/dist/shared/express";
 export declare function parsePaginationParams(req: Request): IPaginationParams;

package/dist/output-gateway/controllers/helpers/parsePaginationParams.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parsePaginationParams = void 0;
+const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
 const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 function parsePaginationParams(req) {
     try {
+        const queryData = (0, express_validator_1.matchedData)(req);
         return {
-            limit: req.query.limit ? parseInt(req.query.limit) : undefined,
-            offset: req.query.offset ? parseInt(req.query.offset) : undefined,
+            limit: queryData.limit ? parseInt(queryData.limit) : undefined,
+            offset: queryData.offset ? parseInt(queryData.offset) : undefined,
         };
     }
     catch (err) {

package/dist/output-gateway/controllers/helpers/parsePaginationParams.js.map

@@ -1 +1 @@
-{"version":3,"file":"parsePaginationParams.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/helpers/parsePaginationParams.ts"],"names":[],"mappings":";;;AACA,6EAAwE;AAGxE,SAAgB,qBAAqB,CAAC,GAAY;IAC9C,IAAI;QACA,OAAO;YACH,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAe,CAAC,CAAC,CAAC,CAAC,SAAS;YACxE,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,MAAgB,CAAC,CAAC,CAAC,CAAC,SAAS;SAC9E,CAAC;KACL;IAAC,OAAO,GAAG,EAAE;QACV,MAAM,IAAI,6BAAY,CAAC,qBAAqB,EAAE,uBAAuB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;KACpF;AACL,CAAC;AATD,sDASC"}
+{"version":3,"file":"parsePaginationParams.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/helpers/parsePaginationParams.ts"],"names":[],"mappings":";;;AAEA,mFAA0E;AAC1E,6EAAwE;AAExE,SAAgB,qBAAqB,CAAC,GAAY;IAC9C,IAAI;QACA,MAAM,SAAS,GAAG,IAAA,+BAAW,EAAC,GAAG,CAAC,CAAC;QAEnC,OAAO;YACH,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAe,CAAC,CAAC,CAAC,CAAC,SAAS;YACxE,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAgB,CAAC,CAAC,CAAC,CAAC,SAAS;SAC9E,CAAC;KACL;IAAC,OAAO,GAAG,EAAE;QACV,MAAM,IAAI,6BAAY,CAAC,qBAAqB,EAAE,uBAAuB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;KACpF;AACL,CAAC;AAXD,sDAWC"}

package/dist/output-gateway/controllers/v2/BuildingsController.js

@@ -22,14 +22,16 @@ const Utils_1 = require("@golemio/core/dist/output-gateway/Utils");
 const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
 const AbstractController_1 = require("./AbstractController");
+const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
 let BuildingsController = exports.BuildingsController = class BuildingsController extends AbstractController_1.AbstractController {
     constructor(accessLimitationRepository, fullDataTransformation) {
         super(accessLimitationRepository);
         this.fullDataTransformation = fullDataTransformation;
         this.getAll = async (req, res, next) => {
             try {
+                const queryData = (0, express_validator_1.matchedData)(req);
                 const allowedOrganizations = await this.getAllowedOrganizationIds(req);
-                const fullParam = (0, Utils_1.parseBooleanQueryParam)(req.query.full);
+                const fullParam = (0, Utils_1.parseBooleanQueryParam)(queryData.full);
                 const transformedResult = fullParam
                     ? await this.getFullData(allowedOrganizations)
                     : await this.getPrimaryData(allowedOrganizations);

package/dist/output-gateway/controllers/v2/BuildingsController.js.map

@@ -1 +1 @@
-{"version":3,"file":"BuildingsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/BuildingsController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BuildingsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/BuildingsController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yEAAoE;AACpE,8FAAyF;AACzF,8FAAyF;AACzF,iGAA4F;AAC5F,2FAAsF;AACtF,mEAAiF;AAEjF,6EAAwE;AACxE,iEAAwE;AACxE,6DAA0D;AAC1D,mFAA0E;AAGnE,IAAM,mBAAmB,iCAAzB,MAAM,mBAAoB,SAAQ,uCAAkB;IAIvD,YAC6D,0BAAsD,EACtD,sBAA0D;QAEnH,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAF+B,2BAAsB,GAAtB,sBAAsB,CAA4B;QAOhH,WAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI;gBACA,MAAM,SAAS,GAAG,IAAA,+BAAW,EAAC,GAAG,CAAC,CAAC;gBACnC,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;gBACvE,MAAM,SAAS,GAAG,IAAA,8BAAsB,EAAC,SAAS,CAAC,IAAc,CAAC,CAAC;gBACnE,MAAM,iBAAiB,GAAG,SAAS;oBAC/B,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC;oBAC9C,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;gBACtD,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;aAC/B;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAC;QAEK,WAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI;gBACA,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;gBACvE,MAAM,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,EAAE,oBAAoB,CAAC,CAAC;gBAE/E,IAAI,MAAM,KAAK,IAAI,EAAE;oBACjB,MAAM,IAAI,6BAAY,CAAC,WAAW,EAAE,uBAAuB,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;iBAChF;gBACD,MAAM,iBAAiB,GAAG,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;gBAC/E,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;aAC/B;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAC;QAEM,gBAAW,GAAG,KAAK,EAAE,oBAAqC,EAAE,EAAE;YAClE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;YAC/E,MAAM,iBAAiB,GAAG,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC7E,OAAO,iBAAiB,CAAC;QAC7B,CAAC,CAAC;QAEM,mBAAc,GAAG,KAAK,EAAE,oBAAqC,EAAE,EAAE;YACrE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;YAC3E,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACrE,OAAO,iBAAiB,CAAC;QAC7B,CAAC,CAAC;QA5CE,IAAI,CAAC,mBAAmB,GAAG,IAAI,uDAA0B,EAAE,CAAC;QAC5D,IAAI,CAAC,cAAc,GAAG,IAAI,iDAAuB,EAAE,CAAC;IACxD,CAAC;CA2CJ,CAAA;8BAtDY,mBAAmB;IAD/B,IAAA,qBAAU,GAAE;IAMJ,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,0BAA0B,CAAC,CAAA;IACvD,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,0BAA0B,CAAC,CAAA;qCAD6B,uDAA0B;QACtB,uDAA0B;GAN9G,mBAAmB,CAsD/B"}

package/dist/output-gateway/controllers/v2/V2MeasurementsController.js

@@ -20,20 +20,22 @@ const MeasurementRepository_1 = require("../../repositories/MeasurementRepositor
 const luxon_1 = require("@golemio/core/dist/shared/luxon");
 const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
 const AbstractController_1 = require("./AbstractController");
+const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
 let V2MeasurementsController = exports.V2MeasurementsController = class V2MeasurementsController extends AbstractController_1.AbstractController {
     constructor(measurementRepository, accessLimitationRepository) {
         super(accessLimitationRepository);
         this.measurementRepository = measurementRepository;
         this.getMeasurements = async (req, res, next) => {
             try {
+                const queryData = (0, express_validator_1.matchedData)(req);
                 const allowedOrganizations = await this.getAllowedOrganizationIds(req);
                 const params = {
-                    variable: req.query.variable,
-                    type: req.query.type,
-                    addr1: req.query.addr1,
-                    addr2: req.query.addr2,
-                    dateFrom: req.query.dateFrom,
-                    dateTo: req.query.dateTo,
+                    variable: queryData.variable,
+                    type: queryData.type,
+                    addr1: queryData.addr1,
+                    addr2: queryData.addr2,
+                    dateFrom: queryData.dateFrom,
+                    dateTo: queryData.dateTo,
                     ...(0, parsePaginationParams_1.parsePaginationParams)(req),
                 };
                 const result = await this.measurementRepository.getMeasurements(params, allowedOrganizations);
@@ -45,15 +47,16 @@ let V2MeasurementsController = exports.V2MeasurementsController = class V2Measur
         };
         this.getMonthlyReadings = async (req, res, next) => {
             try {
+                const queryData = (0, express_validator_1.matchedData)(req);
                 const allowedOrganizations = await this.getAllowedOrganizationIds(req);
-                const month = parseInt(req.query.month);
-                const year = parseInt(req.query.year);
+                const month = parseInt(queryData.month);
+                const year = parseInt(queryData.year);
                 const startDateUtc = luxon_1.DateTime.fromJSDate(new Date(year, month - 1, 1), { zone: "Europe/Prague" });
                 const fromDate = startDateUtc.startOf("month").toISO();
                 const toDate = startDateUtc.endOf("month").toISO();
                 const params = {
-                    address: `/${req.query.addr1}/${req.query.addr2}`,
-                    variable: req.query.variable,
+                    address: `/${queryData.addr1}/${queryData.addr2}`,
+                    variable: queryData.variable,
                     from: fromDate,
                     to: toDate,
                 };

package/dist/output-gateway/controllers/v2/V2MeasurementsController.js.map

@@ -1 +1 @@
-{"version":3,"file":"V2MeasurementsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/V2MeasurementsController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"V2MeasurementsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/V2MeasurementsController.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/controllers/v2/V2OrganizationsController.js

@@ -23,6 +23,7 @@ const Utils_1 = require("@golemio/core/dist/output-gateway/Utils");
 const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
 const AbstractController_1 = require("./AbstractController");
+const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
 let V2OrganizationsController = exports.V2OrganizationsController = class V2OrganizationsController extends AbstractController_1.AbstractController {
     constructor(organizationsRepository, transformation, transformationDetail, accessLimitationRepository) {
         super(accessLimitationRepository);
@@ -31,9 +32,10 @@ let V2OrganizationsController = exports.V2OrganizationsController = class V2Orga
         this.transformationDetail = transformationDetail;
         this.getAll = async (req, res, next) => {
             try {
+                const queryData = (0, express_validator_1.matchedData)(req);
                 const allowedOrganizations = await this.getAllowedOrganizationIds(req);
                 const params = (0, parsePaginationParams_1.parsePaginationParams)(req);
-                const full = (0, Utils_1.parseBooleanQueryParam)(req.query.full) || false;
+                const full = (0, Utils_1.parseBooleanQueryParam)(queryData.full) || false;
                 let result = [];
                 if (!full) {
                     result = this.transformation.transformArray(await this.organizationsRepository.GetAllPublic(params, allowedOrganizations));

package/dist/output-gateway/controllers/v2/V2OrganizationsController.js.map

@@ -1 +1 @@
-{"version":3,"file":"V2OrganizationsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/V2OrganizationsController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"V2OrganizationsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/V2OrganizationsController.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/routers/v2/V2DevicesRouter.js

@@ -33,7 +33,7 @@ let V2DevicesRouter = exports.V2DevicesRouter = class V2DevicesRouter extends Ab
         this.initRoutes();
     }
     initRoutes() {
-        this.router.get("/", (0, express_validator_1.query)("accessLimit").exists(), Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)(this.path), this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getAll);
+        this.router.get("/", (0, express_validator_1.query)("accessLimit").exists(), (0, Validation_1.paginationLimitMiddleware)(this.path), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getAll);
         this.router.get("/:id", (0, express_validator_1.param)("id").exists().not().isEmpty({ ignore_whitespace: true }).not().isArray(), (0, express_validator_1.query)("accessLimit").exists(), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getOne);
     }
 };

package/dist/output-gateway/routers/v2/V2DevicesRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"V2DevicesRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v2/V2DevicesRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAAmD;AACnD,+DAA0D;AAC1D,kFAA6E;AAC7E,qCAAmD;AACnD,yEAAoE;AACpE,sFAAmF;AAEnF,+DAAuE;AACvE,6EAAkH;AAClH,mFAA2E;AAC3E,iEAAwE;AAEjE,IAAM,eAAe,6BAArB,MAAM,eAAgB,SAAQ,+BAAc;IAK/C,YAA8D,UAAuC;QACjG,KAAK,CAAC,2BAAY,CAAC,EAAE,EAAE,oBAAY,CAAC,CAAC;QAD6B,eAAU,GAAV,UAAU,CAAqB;QAH7F,WAAM,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,aAAa;QAC/B,yBAAoB,GAAG,EAAE,CAAC,CAAC,WAAW;QAK1C,IAAI,CAAC,qBAAqB,GAAG,0BAAqB,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACxH,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,EACpC,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,MAAM,EACN,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAC/E,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,wBAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;IACN,CAAC;CACJ,CAAA;0BAhCY,eAAe;IAD3B,IAAA,qBAAU,GAAE;IAMI,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,mBAAmB,CAAC,CAAA;qCAAqB,yCAAmB;GAL5F,eAAe,CAgC3B"}
+{"version":3,"file":"V2DevicesRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v2/V2DevicesRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAAmD;AACnD,+DAA0D;AAC1D,kFAA6E;AAC7E,qCAAmD;AACnD,yEAAoE;AACpE,sFAAmF;AAEnF,+DAAuE;AACvE,6EAAsG;AACtG,mFAA2E;AAC3E,iEAAwE;AAEjE,IAAM,eAAe,6BAArB,MAAM,eAAgB,SAAQ,+BAAc;IAK/C,YAA8D,UAAuC;QACjG,KAAK,CAAC,2BAAY,CAAC,EAAE,EAAE,oBAAY,CAAC,CAAC;QAD6B,eAAU,GAAV,UAAU,CAAqB;QAH7F,WAAM,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,aAAa;QAC/B,yBAAoB,GAAG,EAAE,CAAC,CAAC,WAAW;QAK1C,IAAI,CAAC,qBAAqB,GAAG,0BAAqB,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACxH,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,IAAA,sCAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,EACpC,wBAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,MAAM,EACN,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAC/E,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,wBAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;IACN,CAAC;CACJ,CAAA;0BA/BY,eAAe;IAD3B,IAAA,qBAAU,GAAE;IAMI,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,mBAAmB,CAAC,CAAA;qCAAqB,yCAAmB;GAL5F,eAAe,CA+B3B"}

package/dist/output-gateway/routers/v2/V2MeasurementsRouter.js

@@ -55,7 +55,7 @@ let V2MeasurementsRouter = exports.V2MeasurementsRouter = class V2MeasurementsRo
             (0, express_validator_1.query)("dateFrom").optional().isISO8601().not().isArray(),
             (0, express_validator_1.query)("dateTo").optional().isISO8601().not().isArray(),
             (0, express_validator_1.query)("accessLimit").exists(),
-        ], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)(this.path), this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getMeasurements);
+        ], (0, Validation_1.paginationLimitMiddleware)(this.path), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getMeasurements);
         this.router.get("/monthly-reading", [
             (0, express_validator_1.query)("addr1").exists().not().isEmpty({ ignore_whitespace: true }).not().isArray(),
             (0, express_validator_1.query)("addr2").exists().not().isEmpty({ ignore_whitespace: true }).not().isArray(),
@@ -63,7 +63,7 @@ let V2MeasurementsRouter = exports.V2MeasurementsRouter = class V2MeasurementsRo
             (0, express_validator_1.query)("year").exists().isInt().not().isArray(),
             (0, express_validator_1.query)("month").exists().isInt({ min: 1, max: 12 }).not().isArray(),
             (0, express_validator_1.query)("accessLimit").exists(),
-        ], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)(this.path), this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getMonthlyReadings);
+        ], (0, Validation_1.paginationLimitMiddleware)(this.path), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getMonthlyReadings);
     }
 };
 exports.V2MeasurementsRouter = V2MeasurementsRouter = __decorate([

package/dist/output-gateway/routers/v2/V2MeasurementsRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"V2MeasurementsRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v2/V2MeasurementsRouter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"V2MeasurementsRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v2/V2MeasurementsRouter.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/routers/v2/V2OrganizationsRouter.js

@@ -33,7 +33,7 @@ let V2OrganizationsRouter = exports.V2OrganizationsRouter = class V2Organization
         this.initRoutes();
     }
     initRoutes() {
-        this.router.get("/", [(0, express_validator_1.query)("full").optional().isBoolean().not().isArray()], (0, express_validator_1.query)("accessLimit").exists(), Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)(this.path), this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getAll);
+        this.router.get("/", [(0, express_validator_1.query)("full").optional().isBoolean().not().isArray()], (0, express_validator_1.query)("accessLimit").exists(), (0, Validation_1.paginationLimitMiddleware)(this.path), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getAll);
         this.router.get("/:id", (0, express_validator_1.param)("id").exists().not().isEmpty({ ignore_whitespace: true }).not().isArray(), (0, express_validator_1.query)("accessLimit").exists(), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(this.maxAge, this.staleWhileRevalidate), this.controller.getOne);
     }
 };

package/dist/output-gateway/routers/v2/V2OrganizationsRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"V2OrganizationsRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v2/V2OrganizationsRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAAwD;AACxD,+DAA0D;AAC1D,8FAAyF;AACzF,qCAAmD;AACnD,yEAAoE;AACpE,sFAAmF;AAEnF,+DAAuE;AACvE,6EAAkH;AAClH,mFAA2E;AAC3E,iEAAwE;AAGjE,IAAM,qBAAqB,mCAA3B,MAAM,qBAAsB,SAAQ,+BAAc;IAKrD,YAAoE,UAA6C;QAC7G,KAAK,CAAC,2BAAY,CAAC,EAAE,EAAE,yBAAiB,CAAC,CAAC;QAD8B,eAAU,GAAV,UAAU,CAA2B;QAHzG,WAAM,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,aAAa;QAC/B,yBAAoB,GAAG,EAAE,CAAC,CAAC,WAAW;QAK1C,IAAI,CAAC,qBAAqB,GAAG,0BAAqB,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACxH,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH,CAAC,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,EACtD,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,EACpC,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,MAAM,EACN,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAC/E,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,wBAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;IACN,CAAC;CACJ,CAAA;gCAjCY,qBAAqB;IADjC,IAAA,qBAAU,GAAE;IAMI,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,yBAAyB,CAAC,CAAA;qCAAqB,qDAAyB;GALxG,qBAAqB,CAiCjC"}
+{"version":3,"file":"V2OrganizationsRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v2/V2OrganizationsRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAAwD;AACxD,+DAA0D;AAC1D,8FAAyF;AACzF,qCAAmD;AACnD,yEAAoE;AACpE,sFAAmF;AAEnF,+DAAuE;AACvE,6EAAsG;AACtG,mFAA2E;AAC3E,iEAAwE;AAGjE,IAAM,qBAAqB,mCAA3B,MAAM,qBAAsB,SAAQ,+BAAc;IAKrD,YAAoE,UAA6C;QAC7G,KAAK,CAAC,2BAAY,CAAC,EAAE,EAAE,yBAAiB,CAAC,CAAC;QAD8B,eAAU,GAAV,UAAU,CAA2B;QAHzG,WAAM,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,aAAa;QAC/B,yBAAoB,GAAG,EAAE,CAAC,CAAC,WAAW;QAK1C,IAAI,CAAC,qBAAqB,GAAG,0BAAqB,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACxH,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH,CAAC,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,EACtD,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,IAAA,sCAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,EACpC,wBAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,MAAM,EACN,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAC/E,IAAA,yBAAK,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAC7B,wBAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;IACN,CAAC;CACJ,CAAA;gCAhCY,qBAAqB;IADjC,IAAA,qBAAU,GAAE;IAMI,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,yBAAyB,CAAC,CAAA;qCAAqB,qDAAyB;GALxG,qBAAqB,CAgCjC"}

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

@@ -11,14 +11,15 @@ exports.staticMeterSettingsJsonSchema = {
                 items: {
                     type: "object",
                     properties: {
-                        MeterSerialNumber: { type: "string" },
                         Name: { type: "string" },
                         Addr: { type: "string" },
-                        Meter: { type: "string" },
+                        Meter: { type: "string", nullable: true },
                         Type: { type: "string" },
                         Var: { type: "string" },
+                        MeId: { type: "number", nullable: true },
+                        EIC: { type: "string", nullable: true },
                     },
-                    required: ["Name", "Addr", "Meter", "Type", "Var"],
+                    required: ["Name", "Addr", "Type", "Var"],
                 },
             },
         },

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

@@ -1 +1 @@
-{"version":3,"file":"StaticMeterSettingsJsonSchema.js","sourceRoot":"","sources":["../../../src/schema-definitions/datasources/StaticMeterSettingsJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,6BAA6B,GAAyC;IAC/E,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE;QAClB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,kBAAkB,EAAE;gBAChB,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE;oBACH,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACR,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACrC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACxB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACxB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACzB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACxB,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;qBAC1B;oBACD,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC;iBACrD;aACJ;SACJ;QACD,QAAQ,EAAE,CAAC,oBAAoB,CAAC;KACnC;IACD,QAAQ,EAAE,EAAE;CACf,CAAC"}
+{"version":3,"file":"StaticMeterSettingsJsonSchema.js","sourceRoot":"","sources":["../../../src/schema-definitions/datasources/StaticMeterSettingsJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,6BAA6B,GAAyC;IAC/E,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE;QAClB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,kBAAkB,EAAE;gBAChB,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE;oBACH,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACR,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACxB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACxB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;wBACzC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACxB,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACvB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;wBACxC,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;qBAC1C;oBACD,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;iBAC5C;aACJ;SACJ;QACD,QAAQ,EAAE,CAAC,oBAAoB,CAAC;KACnC;IACD,QAAQ,EAAE,EAAE;CACf,CAAC"}

package/dist/schema-definitions/datasources/enapo/EnapoPreInputSchema.d.ts

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

package/dist/schema-definitions/datasources/enapo/EnapoPreInputSchema.js

@@ -0,0 +1,113 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enapoPreInputSchema = void 0;
+exports.enapoPreInputSchema = {
+    type: "object",
+    properties: {
+        stored_month: {
+            type: "object",
+            properties: {
+                year: { type: "integer" },
+                month: { type: "integer" },
+                month_name: { type: "string" },
+                days_in_stored_month: { type: "integer" },
+                EANs_in_total: { type: "integer" },
+                companies_in_total: { type: "integer" },
+                companies: {
+                    type: "object",
+                    patternProperties: {
+                        "^[0-9]+$": {
+                            type: "object",
+                            properties: {
+                                trade_name: { type: "string" },
+                                EAN_list: {
+                                    type: "object",
+                                    patternProperties: {
+                                        "^[0-9]+$": {
+                                            type: "object",
+                                            properties: {
+                                                daily_data_Wh_per_EAN: {
+                                                    type: "object",
+                                                    additionalProperties: true,
+                                                    properties: {
+                                                        T1_Wh_total: { type: "array", items: { type: "number" } },
+                                                        T2_Wh_total: { type: "array", items: { type: "number" } },
+                                                        T1_plus_T2_Wh_total: { type: "array", items: { type: "number" } },
+                                                        T1_Wh_raw_data: {
+                                                            type: "array",
+                                                            items: {
+                                                                type: "array",
+                                                                items: {
+                                                                    type: "array",
+                                                                    items: [{ type: "string" }, { type: "number" }],
+                                                                    minItems: 2,
+                                                                    maxItems: 2,
+                                                                },
+                                                            },
+                                                        },
+                                                        T2_Wh_raw_data: {
+                                                            type: "array",
+                                                            items: {
+                                                                type: "array",
+                                                                items: {
+                                                                    type: "array",
+                                                                    items: [{ type: "string" }, { type: "number" }],
+                                                                    minItems: 2,
+                                                                    maxItems: 2,
+                                                                },
+                                                            },
+                                                        },
+                                                    },
+                                                    required: [
+                                                        "T1_Wh_total",
+                                                        "T2_Wh_total",
+                                                        "T1_plus_T2_Wh_total",
+                                                        "T1_Wh_raw_data",
+                                                        "T2_Wh_raw_data",
+                                                    ],
+                                                },
+                                                consumption_point: { type: "string" },
+                                                address: { type: "string" },
+                                                tarif_type: { type: "string" },
+                                                tarif_1T2T: { type: "string" },
+                                                phases: { type: "string" },
+                                                circuit_breaker: { type: "string" },
+                                                location_type: { type: "string" },
+                                                found_in_converge_reports: { type: "string" },
+                                                type_B_meter: { type: "string" },
+                                                meter_replaced: { type: "string" },
+                                            },
+                                            additionalProperties: true,
+                                            required: [
+                                                "daily_data_Wh_per_EAN",
+                                                "address",
+                                                "tarif_type",
+                                                "tarif_1T2T",
+                                                "phases",
+                                                "circuit_breaker",
+                                                "location_type",
+                                                "meter_replaced",
+                                            ],
+                                        },
+                                    },
+                                    additionalProperties: true,
+                                    required: [],
+                                },
+                            },
+                            additionalProperties: true,
+                            required: ["EAN_list"],
+                        },
+                    },
+                    additionalProperties: true,
+                    required: [],
+                },
+            },
+            additionalProperties: true,
+            required: ["companies"],
+        },
+        project_name: { type: "string" },
+    },
+    additionalProperties: true,
+    required: ["stored_month"],
+};
+//# sourceMappingURL=EnapoPreInputSchema.js.map

package/dist/schema-definitions/datasources/enapo/EnapoPreInputSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EnapoPreInputSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/enapo/EnapoPreInputSchema.ts"],"names":[],"mappings":"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"}

package/dist/schema-definitions/datasources/helpers/MeasurementVariableEnum.d.ts

@@ -1,5 +1,10 @@
 export declare enum MeasurementVariable {
     Core = "core",
     Core2 = "core2",
-    CoreDiff = "corediff"
+    CoreDiff = "corediff",
+    EFwActi_VT = "EFwActi_VT",
+    EFwActi_NT = "EFwActi_NT",
+    EActi_VT_DaySum = "EActi_VT_DaySum",
+    EActi_NT_DaySum = "EActi_NT_DaySum",
+    EActi_VT_NT_DaySum = "EActi_VT_NT_DaySum"
 }

package/dist/schema-definitions/datasources/helpers/MeasurementVariableEnum.js

@@ -6,5 +6,10 @@ var MeasurementVariable;
     MeasurementVariable["Core"] = "core";
     MeasurementVariable["Core2"] = "core2";
     MeasurementVariable["CoreDiff"] = "corediff";
+    MeasurementVariable["EFwActi_VT"] = "EFwActi_VT";
+    MeasurementVariable["EFwActi_NT"] = "EFwActi_NT";
+    MeasurementVariable["EActi_VT_DaySum"] = "EActi_VT_DaySum";
+    MeasurementVariable["EActi_NT_DaySum"] = "EActi_NT_DaySum";
+    MeasurementVariable["EActi_VT_NT_DaySum"] = "EActi_VT_NT_DaySum";
 })(MeasurementVariable || (exports.MeasurementVariable = MeasurementVariable = {}));
 //# sourceMappingURL=MeasurementVariableEnum.js.map

package/dist/schema-definitions/datasources/helpers/MeasurementVariableEnum.js.map

@@ -1 +1 @@
-{"version":3,"file":"MeasurementVariableEnum.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/helpers/MeasurementVariableEnum.ts"],"names":[],"mappings":";;;AAAA,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC3B,oCAAa,CAAA;IACb,sCAAe,CAAA;IACf,4CAAqB,CAAA;AACzB,CAAC,EAJW,mBAAmB,mCAAnB,mBAAmB,QAI9B"}
+{"version":3,"file":"MeasurementVariableEnum.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/helpers/MeasurementVariableEnum.ts"],"names":[],"mappings":";;;AAAA,IAAY,mBASX;AATD,WAAY,mBAAmB;IAC3B,oCAAa,CAAA;IACb,sCAAe,CAAA;IACf,4CAAqB,CAAA;IACrB,gDAAyB,CAAA;IACzB,gDAAyB,CAAA;IACzB,0DAAmC,CAAA;IACnC,0DAAmC,CAAA;IACnC,gEAAyC,CAAA;AAC7C,CAAC,EATW,mBAAmB,mCAAnB,mBAAmB,QAS9B"}

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

@@ -5,12 +5,13 @@ export interface IStaticMeterSettings {
     };
 }
 export interface IMeasurementOption {
-    MeterSerialNumber: string;
     Name: string;
     Addr: string;
-    Meter: string;
+    Meter?: string;
     Type: string;
     Var: MeasurementVariable | string;
+    MeId?: number;
+    EIC?: string;
 }
 export interface ISelectedMeters {
     [placeId: string]: string;

package/dist/schema-definitions/datasources/interfaces/enapo/IEnapoMetadata.d.ts

@@ -0,0 +1,17 @@
+export interface IEnapoMetadata {
+    id: string;
+    id_type: "ean" | "eic";
+    source: string;
+    address: string;
+    location_type: string;
+    company_name: string;
+    company_id: string;
+    custom_fields: Partial<IEnapoCustomFields>;
+}
+export interface IEnapoCustomFields {
+    tarif_type: string;
+    tarif_1T2T: string;
+    phases: string;
+    circuit_breaker: string;
+    type_B_meter: boolean;
+}

package/dist/schema-definitions/datasources/interfaces/enapo/IEnapoMetadata.js

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

package/dist/schema-definitions/datasources/interfaces/enapo/IEnapoMetadata.js.map

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

package/dist/schema-definitions/datasources/interfaces/enapo/IPreIncomingDataLog.d.ts

@@ -0,0 +1,18 @@
+export interface IPreIncomingDataLog {
+    ean: string;
+    year: number;
+    month: number;
+    month_name: string;
+    days_in_stored_month: number;
+    consumption_point: string;
+    address: string;
+    location_type: string;
+    company_name: string;
+    company_id: string;
+    tarif_type: string;
+    tarif_1t2t: string;
+    phases: string;
+    circuit_breaker: string;
+    type_b_meter: string;
+    meter_replaced: string;
+}

package/dist/schema-definitions/datasources/interfaces/enapo/IPreIncomingDataLog.js

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

package/dist/schema-definitions/datasources/interfaces/enapo/IPreIncomingDataLog.js.map

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