@golemio/energetics 1.8.3 → 1.9.0-dev.2567800850

package/dist/integration-engine/commodity-providers/transformations/PtasWebMeasurementTransformation.js

@@ -30,6 +30,7 @@ let PtasWebMeasurementTransformation = exports.PtasWebMeasurementTransformation
                 type: data.option.Type,
                 value: parseFloat(data.measurement["Odečet"].replaceAll(" ", "").replace(",", ".")),
                 measurement_category: data.option.Name,
+                device_serial_number: data.measurement["Výrobní číslo"],
             };
         };
     }

package/dist/integration-engine/commodity-providers/transformations/PtasWebMeasurementTransformation.js.map

@@ -1 +1 @@
-{"version":3,"file":"PtasWebMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/PtasWebMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,oHAAsF;AAEtF,6GAA0G;AAC1G,2DAA2D;AAC3D,iEAAgE;AAGzD,IAAM,gCAAgC,8CAAtC,MAAM,gCAAiC,SAAQ,+CAGrD;IAHM;;QAII,SAAI,GAAG,kCAAkC,CAAC;QACzC,sBAAiB,GAAG,eAAe,CAAC;QAElC,sBAAiB,GAAG,CAAC,IAAwE,EAAmB,EAAE;YACxH,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,MAAM,EAAE,iDAAqB,CAAC,WAAW;gBACzC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,SAAS,EAAE,gBAAQ,CAAC,UAAU,CAC1B,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,EACvE,IAAI,CAAC,iBAAiB,EACtB;oBACI,IAAI,EAAE,eAAe;iBACxB,CACJ;qBACI,KAAK,EAAE;qBACP,QAAQ,EAAE;gBACf,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACzB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACnF,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;aACzC,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;2CA3BY,gCAAgC;IAD5C,IAAA,qBAAU,GAAE;GACA,gCAAgC,CA2B5C"}
+{"version":3,"file":"PtasWebMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/PtasWebMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,oHAAsF;AAEtF,6GAA0G;AAC1G,2DAA2D;AAC3D,iEAAgE;AAGzD,IAAM,gCAAgC,8CAAtC,MAAM,gCAAiC,SAAQ,+CAGrD;IAHM;;QAII,SAAI,GAAG,kCAAkC,CAAC;QACzC,sBAAiB,GAAG,eAAe,CAAC;QAElC,sBAAiB,GAAG,CAAC,IAAwE,EAAmB,EAAE;YACxH,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,MAAM,EAAE,iDAAqB,CAAC,WAAW;gBACzC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAM;gBACzB,SAAS,EAAE,gBAAQ,CAAC,UAAU,CAC1B,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,EACvE,IAAI,CAAC,iBAAiB,EACtB;oBACI,IAAI,EAAE,eAAe;iBACxB,CACJ;qBACI,KAAK,EAAE;qBACP,QAAQ,EAAE;gBACf,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACzB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACnF,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtC,oBAAoB,EAAE,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC;aAC1D,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;2CA5BY,gCAAgC;IAD5C,IAAA,qBAAU,GAAE;GACA,gCAAgC,CA4B5C"}

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

@@ -13,7 +13,6 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FetchPpasEEMeasurementsTask = void 0;
-const PpasAveApiHelper_1 = require("../../datasources/ppas-ave-api/helpers/PpasAveApiHelper");
 const WorkerContainerToken_1 = require("../../ioc/WorkerContainerToken");
 const MeasurementRepository_1 = require("../../repositories/MeasurementRepository");
 const StaticMeterSettingsRepository_1 = require("../../repositories/StaticMeterSettingsRepository");
@@ -39,24 +38,23 @@ let FetchPpasEEMeasurementsTask = exports.FetchPpasEEMeasurementsTask = class Fe
         else {
             measurementOptions = this.splitOptionsByVars(measurementOptions);
         }
-        const { baseUrl, config } = this.getProviderConfig(data);
-        const aveApiHelper = new PpasAveApiHelper_1.PpasAveApiHelper(baseUrl, config);
-        const sessionId = await aveApiHelper.createSession();
+        const { apikey: apiKey } = this.getProviderConfig(data);
         try {
-            const places = await this.getDataFromDataSource("Places", sessionId);
+            const places = await this.getDataFromDataSource("Places", apiKey);
             let consumptionData = [];
             for (const place of places) {
-                const options = measurementOptions.filter((item) => item.MeterSerialNumber === place.DeviceSerialNumber);
+                const options = measurementOptions.filter((item) => item.EIC === place.eic);
                 if (options.length === 0) {
                     continue;
                 }
-                this.logger.info(`Fetching data for device ${place.DeviceSerialNumber}`);
-                const measurementChunkGenerator = this.generateMeasurements({ ...data, placeId: place.Id }, sessionId);
+                this.logger.info(`Fetching data for device ${place.serialNumber}`);
+                const measurementChunkGenerator = this.generateMeasurements({ ...data, deviceId: place.deviceId }, apiKey);
                 for await (const measurements of measurementChunkGenerator) {
                     for (const option of options) {
                         const consumptionBatch = measurements.map((item) => this.measurementTransformation.transformElement({
                             ...item,
                             ...option,
+                            serialNumber: place.serialNumber,
                         }));
                         consumptionData = consumptionData.concat(consumptionBatch);
                     }
@@ -64,8 +62,11 @@ let FetchPpasEEMeasurementsTask = exports.FetchPpasEEMeasurementsTask = class Fe
             }
             await this.saveConsumptionData(consumptionData);
         }
-        finally {
-            await aveApiHelper.terminateSession(sessionId);
+        catch (err) {
+            if (err instanceof golemio_errors_1.AbstractGolemioError) {
+                throw err;
+            }
+            throw new golemio_errors_1.GeneralError(`Unable to download ppas ee measurements`, this.constructor.name, err);
         }
     }
 };

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

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

package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.d.ts

@@ -23,14 +23,11 @@ export declare class FetchPpasMeasurementsTask extends AbstractFetchMeasurements
     schema: typeof PpasMeasurementsValidationSchema;
     constructor(config: ISimpleConfig, logger: ILogger, dataSourceFactory: ICommodityProviderDataSourceFactory, measurementTransformation: AveMeasurementTransformation, measurementRepository: MeasurementRepository, meterSettingsRepository: StaticMeterSettingsRepository);
     execute(data: IPpasMeasurementsParams): Promise<void>;
-    protected getProviderConfig(data: IPpasMeasurementsParams): {
-        baseUrl: string;
-        config: IAveConfig;
-    };
+    protected getProviderConfig(data: IPpasMeasurementsParams): IAveConfig;
     /** Splits the measurement options into individual options (multiple variables) */
     protected splitOptionsByVars(options: IMeasurementOption[]): IMeasurementOption[];
     protected generateMeasurements(data: IPpasMeasurementsParams & {
-        placeId: number;
-    }, sessionId: string): AsyncGenerator<IAveApiDeviceDataDto[]>;
-    protected getDataFromDataSource<T extends AveApiDtoUnion>(resourceTypeKey: keyof typeof PpasAveApiHelper.resourceType, sessionId: string, params?: IAveApiDeviceDataParams): Promise<T[]>;
+        deviceId: string;
+    }, apiKey: string): AsyncGenerator<IAveApiDeviceDataDto[]>;
+    protected getDataFromDataSource<T extends AveApiDtoUnion>(resourceTypeKey: keyof typeof PpasAveApiHelper.resourceType, apiKey: string, params?: IAveApiDeviceDataParams): Promise<T[]>;
 }

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

@@ -48,24 +48,23 @@ let FetchPpasMeasurementsTask = exports.FetchPpasMeasurementsTask = class FetchP
         else {
             measurementOptions = this.splitOptionsByVars(measurementOptions);
         }
-        const { baseUrl, config } = this.getProviderConfig(data);
-        const aveApiHelper = new PpasAveApiHelper_1.PpasAveApiHelper(baseUrl, config);
-        const sessionId = await aveApiHelper.createSession();
+        const { apikey: apiKey } = this.getProviderConfig(data);
         try {
-            const places = await this.getDataFromDataSource("Places", sessionId);
+            const places = await this.getDataFromDataSource("Places", apiKey);
             let consumptionData = [];
             for (const place of places) {
-                const options = measurementOptions.filter((item) => item.MeterSerialNumber === place.DeviceSerialNumber);
+                const options = measurementOptions.filter((item) => item.EIC === place.eic);
                 if (options.length === 0) {
                     continue;
                 }
-                this.logger.info(`Fetching data for device ${place.DeviceSerialNumber}`);
-                const measurementChunkGenerator = this.generateMeasurements({ ...data, placeId: place.Id }, sessionId);
+                this.logger.info(`Fetching data for device ${place.serialNumber}`);
+                const measurementChunkGenerator = this.generateMeasurements({ ...data, deviceId: place.deviceId }, apiKey);
                 for await (const measurements of measurementChunkGenerator) {
                     for (const option of options) {
                         const consumptionBatch = measurements.map((item) => this.measurementTransformation.transformElement({
                             ...item,
                             ...option,
+                            serialNumber: place.serialNumber,
                         }));
                         consumptionData = consumptionData.concat(consumptionBatch);
                     }
@@ -73,15 +72,15 @@ let FetchPpasMeasurementsTask = exports.FetchPpasMeasurementsTask = class FetchP
             }
             await this.saveConsumptionData(consumptionData);
         }
-        finally {
-            await aveApiHelper.terminateSession(sessionId);
+        catch (err) {
+            if (err instanceof golemio_errors_1.AbstractGolemioError) {
+                throw err;
+            }
+            throw new golemio_errors_1.GeneralError(`Unable to download ppas measurements`, this.constructor.name, err);
         }
     }
     getProviderConfig(data) {
-        return {
-            baseUrl: this.config.getValue("module.energetics.commodityProviders.ppas_ave_api.baseUrl"),
-            config: this.config.getValue(`module.energetics.commodityProviders.${data.providerType}`),
-        };
+        return this.config.getValue(`module.energetics.commodityProviders.${data.providerType}`);
     }
     /** Splits the measurement options into individual options (multiple variables) */
     splitOptionsByVars(options) {
@@ -92,25 +91,23 @@ let FetchPpasMeasurementsTask = exports.FetchPpasMeasurementsTask = class FetchP
         }
         return result;
     }
-    async *generateMeasurements(data, sessionId) {
+    async *generateMeasurements(data, apiKey) {
         const dateFrom = luxon_1.DateTime.fromISO(data.dateFrom).startOf("day");
         const dateTo = luxon_1.DateTime.fromISO(data.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");
-            yield this.getDataFromDataSource("DeviceData", sessionId, {
-                placeId: data.placeId,
-                dateFrom: start.toISODate(),
-                dateTo: end.toISODate(),
-                isoDate: "1",
-                // fill all measurement values (we need the OperatingAmount and ConvertDifference values)
-                dataType: AveDataTypeEnum_1.AveDataType.RawData.toString(),
+            yield this.getDataFromDataSource("DeviceData", apiKey, {
+                deviceId: data.deviceId,
+                from: start.toUTC().toISO({ suppressMilliseconds: true }),
+                to: end.toUTC().toISO({ suppressMilliseconds: true }),
+                dataType: AveDataTypeEnum_1.AveDataType.HourlyData,
             });
         }
     }
-    getDataFromDataSource(resourceTypeKey, sessionId, params) {
-        const dataSource = this.dataSourceFactory.getDataSource(CommodityProviderEnum_1.CommodityProvider.PpasInternetAveApi, PpasAveApiHelper_1.PpasAveApiHelper.resourceType[resourceTypeKey], sessionId, params);
+    getDataFromDataSource(resourceTypeKey, apiKey, params) {
+        const dataSource = this.dataSourceFactory.getDataSource(CommodityProviderEnum_1.CommodityProvider.PpasInternetAveApi, PpasAveApiHelper_1.PpasAveApiHelper.resourceType[resourceTypeKey], apiKey, params);
         return dataSource.getAll();
     }
 };

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

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

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

@@ -51,7 +51,7 @@ let FetchPreMeasurementDataTask = exports.FetchPreMeasurementDataTask = class Fe
             let batch = [];
             const { data: measurements } = await this.dataSourceProvider.getMeasurements(file);
             for (const measurement of measurements) {
-                const option = measurementOptions.find((item) => item.MeterSerialNumber === measurement["ELM"] && item.Meter === measurement["EAN"]);
+                const option = measurementOptions.find((item) => item.Meter === measurement["EAN"]);
                 if (!option) {
                     continue;
                 }

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

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

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

@@ -52,7 +52,7 @@ let FetchVeoliaMeasurementsTask = exports.FetchVeoliaMeasurementsTask = class Fe
             const counters = await this.getDataFromDataSource("Counters", authCookie);
             let consumptionData = [];
             for (const device of devices) {
-                const options = measurementOptions.find((item) => item.MeterSerialNumber === device.me_serial);
+                const options = measurementOptions.find((item) => item.MeId.toString() === device.me_id.toString());
                 if (!options) {
                     continue;
                 }
@@ -64,7 +64,9 @@ let FetchVeoliaMeasurementsTask = exports.FetchVeoliaMeasurementsTask = class Fe
                         const consumptionBatch = measurements.map((item) => this.measurementTransformation.transformElement({
                             ...item,
                             ...options,
+                            ...device,
                             counterTypeId: counter.pot_id,
+                            meSerial: device.me_serial,
                         }));
                         consumptionData = consumptionData.concat(consumptionBatch);
                     }

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

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

package/dist/integration-engine/enapo/datasources/porsenna/PorsennaDataSource.d.ts

@@ -0,0 +1,15 @@
+import { IConsumptionApiCollection } from "../../../../schema-definitions/datasources/enapo/porsenna/interfaces/IConsumptionApiEntry";
+import { IGaugeApiCollection, IGaugeApiDto } from "../../../../schema-definitions/datasources/enapo/porsenna/interfaces/IGaugeApiDto";
+import { PorsennaDataSourceProvider } from "./PorsennaDataSourceProvider";
+export declare class PorsennaDataSource {
+    private dataSourceBuilder;
+    private static readonly DATASOURCE_NAME;
+    private BASE_ENDPOINT;
+    private gaugeValidator;
+    private consumptionValidator;
+    constructor(dataSourceBuilder: PorsennaDataSourceProvider);
+    getAllGaugesByPage(source: string, page: number): Promise<IGaugeApiCollection>;
+    getGaugeConsumption(source: string, id: string, from: string | number, to: string | number): Promise<IConsumptionApiCollection>;
+    generateAsyncPages(source: string): AsyncGenerator<IGaugeApiDto>;
+    private parseLastPage;
+}

package/dist/integration-engine/enapo/datasources/porsenna/PorsennaDataSource.js

@@ -0,0 +1,67 @@
+"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); }
+};
+var PorsennaDataSource_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PorsennaDataSource = void 0;
+const EnapoWorkerContainerToken_1 = require("../../ioc/EnapoWorkerContainerToken");
+const PorsennaJsonSchema_1 = require("../../../../schema-definitions/datasources/enapo/porsenna/PorsennaJsonSchema");
+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");
+const PorsennaDataSourceProvider_1 = require("./PorsennaDataSourceProvider");
+let PorsennaDataSource = exports.PorsennaDataSource = PorsennaDataSource_1 = class PorsennaDataSource {
+    constructor(dataSourceBuilder) {
+        this.dataSourceBuilder = dataSourceBuilder;
+        this.BASE_ENDPOINT = "/gauges";
+        this.gaugeValidator = new golemio_validator_1.JSONSchemaValidator(PorsennaDataSource_1.DATASOURCE_NAME + "Gauges", PorsennaJsonSchema_1.porsennaGaugeCollectionJsonSchema);
+        this.consumptionValidator = new golemio_validator_1.JSONSchemaValidator(PorsennaDataSource_1.DATASOURCE_NAME + "Consumption", PorsennaJsonSchema_1.porsennaConsumptionCollectionJsonSchema);
+    }
+    async getAllGaugesByPage(source, page) {
+        const result = this.dataSourceBuilder.getDataSource(source, this.BASE_ENDPOINT, this.gaugeValidator, { page });
+        return (await result.getAll());
+    }
+    async getGaugeConsumption(source, id, from, to) {
+        const endpoint = `${this.BASE_ENDPOINT}/${id}/consumption/yearly`;
+        const result = this.dataSourceBuilder.getDataSource(source, endpoint, this.consumptionValidator, { from, to });
+        return (await result.getAll());
+    }
+    async *generateAsyncPages(source) {
+        const firstPage = await this.getAllGaugesByPage(source, 1);
+        const lastPage = this.parseLastPage(firstPage);
+        for (const member of firstPage.member ?? [])
+            yield member;
+        for (let index = 2; index <= lastPage; index++) {
+            const nextPage = await this.getAllGaugesByPage(source, index);
+            for (const member of nextPage.member ?? [])
+                yield member;
+        }
+    }
+    parseLastPage(page) {
+        const lastUrl = page.view?.last;
+        if (!lastUrl)
+            return 1;
+        const match = lastUrl.match(/page=(\d+)/);
+        if (!match) {
+            throw new golemio_errors_1.GeneralError(`Cannot parse last page from view.last: ${lastUrl}`, "PorsennaDataSource", undefined, 500);
+        }
+        return parseInt(match[1], 10);
+    }
+};
+PorsennaDataSource.DATASOURCE_NAME = "PorsennaDataSource";
+exports.PorsennaDataSource = PorsennaDataSource = PorsennaDataSource_1 = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(EnapoWorkerContainerToken_1.EnapoWorkerContainerToken.PorsennaDataSourceProvider)),
+    __metadata("design:paramtypes", [PorsennaDataSourceProvider_1.PorsennaDataSourceProvider])
+], PorsennaDataSource);
+//# sourceMappingURL=PorsennaDataSource.js.map

package/dist/integration-engine/enapo/datasources/porsenna/PorsennaDataSource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PorsennaDataSource.js","sourceRoot":"","sources":["../../../../../src/integration-engine/enapo/datasources/porsenna/PorsennaDataSource.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mFAAoF;AACpF,qHAG4D;AAG5D,6EAAwE;AACxE,mFAAkF;AAClF,iEAAwE;AACxE,6EAA0E;AAGnE,IAAM,kBAAkB,uDAAxB,MAAM,kBAAkB;IAM3B,YACkE,iBAAqD;QAA7C,sBAAiB,GAAjB,iBAAiB,CAA4B;QAL/G,kBAAa,GAAG,SAAS,CAAC;QAO9B,IAAI,CAAC,cAAc,GAAG,IAAI,uCAAmB,CACzC,oBAAkB,CAAC,eAAe,GAAG,QAAQ,EAC7C,sDAAiC,CACpC,CAAC;QACF,IAAI,CAAC,oBAAoB,GAAG,IAAI,uCAAmB,CAC/C,oBAAkB,CAAC,eAAe,GAAG,aAAa,EAClD,4DAAuC,CAC1C,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,MAAc,EAAE,IAAY;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/G,OAAO,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,CAAwB,CAAC;IAC1D,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC5B,MAAc,EACd,EAAU,EACV,IAAqB,EACrB,EAAmB;QAEnB,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,aAAa,IAAI,EAAE,qBAAqB,CAAC;QAClE,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/G,OAAO,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,CAA8B,CAAC;IAChE,CAAC;IAEM,KAAK,CAAC,CAAC,kBAAkB,CAAC,MAAc;QAC3C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAE/C,KAAK,MAAM,MAAM,IAAI,SAAS,CAAC,MAAM,IAAI,EAAE;YAAE,MAAM,MAAM,CAAC;QAE1D,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,IAAI,QAAQ,EAAE,KAAK,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAC9D,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,MAAM,IAAI,EAAE;gBAAE,MAAM,MAAM,CAAC;SAC5D;IACL,CAAC;IAEO,aAAa,CAAC,IAAyB;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC;QAChC,IAAI,CAAC,OAAO;YAAE,OAAO,CAAC,CAAC;QAEvB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,EAAE;YACR,MAAM,IAAI,6BAAY,CAAC,0CAA0C,OAAO,EAAE,EAAE,oBAAoB,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;SACrH;QACD,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAClC,CAAC;;AAvDuB,kCAAe,GAAG,oBAAoB,AAAvB,CAAwB;6BADtD,kBAAkB;IAD9B,IAAA,qBAAU,GAAE;IAQJ,WAAA,IAAA,iBAAM,EAAC,qDAAyB,CAAC,0BAA0B,CAAC,CAAA;qCAA4B,uDAA0B;GAP9G,kBAAkB,CAyD9B"}

package/dist/integration-engine/enapo/datasources/porsenna/PorsennaDataSourceProvider.d.ts

@@ -0,0 +1,10 @@
+import { ISimpleConfig } from "@golemio/core/dist/helpers/configuration/ISimpleConfig";
+import { DataSource } from "@golemio/core/dist/integration-engine";
+import { JSONSchemaValidator } from "@golemio/core/dist/shared/golemio-validator";
+export declare class PorsennaDataSourceProvider {
+    private simpleConfig;
+    private static readonly DATASOURCE_NAME;
+    constructor(simpleConfig: ISimpleConfig);
+    getDataSource(source: string, endpoint: string, schema: JSONSchemaValidator, params?: Record<string, string | number>): DataSource;
+    private getDistrictConfig;
+}

package/dist/integration-engine/enapo/datasources/porsenna/PorsennaDataSourceProvider.js

@@ -0,0 +1,52 @@
+"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); }
+};
+var PorsennaDataSourceProvider_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PorsennaDataSourceProvider = void 0;
+const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
+const integration_engine_1 = require("@golemio/core/dist/integration-engine");
+const HTTPFetchProtocolStrategy_1 = require("@golemio/core/dist/integration-engine/datasources/protocol-strategy/HTTPFetchProtocolStrategy");
+const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
+const url_1 = require("url");
+let PorsennaDataSourceProvider = exports.PorsennaDataSourceProvider = PorsennaDataSourceProvider_1 = class PorsennaDataSourceProvider {
+    constructor(simpleConfig) {
+        this.simpleConfig = simpleConfig;
+    }
+    getDataSource(source, endpoint, schema, params) {
+        const { url: baseUrl, token } = this.getDistrictConfig(source);
+        const queryEntries = params
+            ? Object.entries(params).map(([paramName, paramValue]) => [paramName, String(paramValue)])
+            : [];
+        const queryString = queryEntries.length > 0 ? `?${new url_1.URLSearchParams(queryEntries).toString()}` : "";
+        const url = new URL(endpoint + queryString, baseUrl);
+        return new integration_engine_1.DataSource(PorsennaDataSourceProvider_1.DATASOURCE_NAME, new HTTPFetchProtocolStrategy_1.HTTPFetchProtocolStrategy({
+            headers: { Authorization: `Bearer ${token}` },
+            method: "GET",
+            timeoutInSeconds: 60,
+            url: url.toString(),
+        }), new integration_engine_1.JSONDataTypeStrategy({ resultsPath: "" }), schema);
+    }
+    getDistrictConfig(source) {
+        const url = this.simpleConfig.getValue(`module.energetics.porsenna.city_districts.${source}.url`);
+        const token = this.simpleConfig.getValue(`module.energetics.porsenna.city_districts.${source}.token`);
+        return { url, token };
+    }
+};
+PorsennaDataSourceProvider.DATASOURCE_NAME = "PorsennaDataSource";
+exports.PorsennaDataSourceProvider = PorsennaDataSourceProvider = PorsennaDataSourceProvider_1 = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.SimpleConfig)),
+    __metadata("design:paramtypes", [Object])
+], PorsennaDataSourceProvider);
+//# sourceMappingURL=PorsennaDataSourceProvider.js.map

package/dist/integration-engine/enapo/datasources/porsenna/PorsennaDataSourceProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PorsennaDataSourceProvider.js","sourceRoot":"","sources":["../../../../../src/integration-engine/enapo/datasources/porsenna/PorsennaDataSourceProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,wEAAqE;AACrE,8EAAyF;AACzF,6IAA0I;AAE1I,iEAAwE;AACxE,6BAAsC;AAG/B,IAAM,0BAA0B,uEAAhC,MAAM,0BAA0B;IAGnC,YAAoD,YAA2B;QAA3B,iBAAY,GAAZ,YAAY,CAAe;IAAG,CAAC;IAE5E,aAAa,CAChB,MAAc,EACd,QAAgB,EAChB,MAA2B,EAC3B,MAAwC;QAExC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAE/D,MAAM,YAAY,GAAG,MAAM;YACvB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,EAAoB,EAAE,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;YAC5G,CAAC,CAAC,EAAE,CAAC;QACT,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,qBAAe,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtG,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,GAAG,WAAW,EAAE,OAAO,CAAC,CAAC;QAErD,OAAO,IAAI,+BAAU,CACjB,4BAA0B,CAAC,eAAe,EAC1C,IAAI,qDAAyB,CAAC;YAC1B,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE;YAC7C,MAAM,EAAE,KAAK;YACb,gBAAgB,EAAE,EAAE;YACpB,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;SACtB,CAAC,EACF,IAAI,yCAAoB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,EAC7C,MAAM,CACT,CAAC;IACN,CAAC;IAEO,iBAAiB,CAAC,MAAc;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAS,6CAA6C,MAAM,MAAM,CAAC,CAAC;QAC1G,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAS,6CAA6C,MAAM,QAAQ,CAAC,CAAC;QAC9G,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;IAC1B,CAAC;;AAnCuB,0CAAe,GAAG,oBAAoB,AAAvB,CAAwB;qCADtD,0BAA0B;IADtC,IAAA,qBAAU,GAAE;IAII,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,YAAY,CAAC,CAAA;;GAHlC,0BAA0B,CAqCtC"}

package/dist/integration-engine/enapo/datasources/porsenna/interfaces/IConsumptionApiEntry.d.ts

@@ -0,0 +1,7 @@
+import { IConsumptionApiEntry } from "../../../../../schema-definitions/datasources/enapo/porsenna/interfaces/IConsumptionApiEntry";
+export interface IConsumptionTransformationInput {
+    entry: IConsumptionApiEntry;
+    deviceId: string;
+    source: string;
+    gaugeType: string | undefined;
+}

package/dist/integration-engine/enapo/datasources/porsenna/interfaces/IConsumptionApiEntry.js

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

package/dist/integration-engine/enapo/datasources/porsenna/interfaces/IConsumptionApiEntry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IConsumptionApiEntry.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/enapo/datasources/porsenna/interfaces/IConsumptionApiEntry.ts"],"names":[],"mappings":""}

package/dist/integration-engine/enapo/datasources/porsenna/interfaces/IGaugeApiDto.d.ts

@@ -0,0 +1,5 @@
+import { IGaugeApiDto } from "../../../../../schema-definitions/datasources/enapo/porsenna/interfaces/IGaugeApiDto";
+export interface IGaugeTransformationInput {
+    gauge: IGaugeApiDto;
+    source: string;
+}

package/dist/integration-engine/enapo/datasources/porsenna/interfaces/IGaugeApiDto.js

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

package/dist/integration-engine/enapo/datasources/porsenna/interfaces/IGaugeApiDto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IGaugeApiDto.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/enapo/datasources/porsenna/interfaces/IGaugeApiDto.ts"],"names":[],"mappings":""}

package/dist/integration-engine/enapo/helpers/IntervalGenerator.d.ts

@@ -3,4 +3,5 @@ import { DateTime, Interval } from "@golemio/core/dist/shared/luxon";
 export declare class IntervalGenerator {
     static getIntervals(from: DateTime, to: DateTime, daySplit: number): Interval[];
     static generateIntervalsFromTargetDays(data: IDataEntrypointParams, daySplit: number): Interval[];
+    static generateIntervalsFromYears(yearFrom: string, yearTo: string): Interval[];
 }

package/dist/integration-engine/enapo/helpers/IntervalGenerator.js

@@ -15,6 +15,12 @@ class IntervalGenerator {
         const intervals = luxon_1.Interval.fromDateTimes(leftBoundDate, currentDate).splitBy({ days: daySplit });
         return intervals;
     }
+    static generateIntervalsFromYears(yearFrom, yearTo) {
+        const startOfYearFrom = luxon_1.DateTime.fromISO(new Date(yearFrom).toISOString()).startOf("year");
+        const startOfYearTo = luxon_1.DateTime.fromISO(new Date(yearTo).toISOString()).startOf("year");
+        const intervals = luxon_1.Interval.fromDateTimes(startOfYearFrom, startOfYearTo).splitBy({ years: 1 });
+        return intervals;
+    }
 }
 exports.IntervalGenerator = IntervalGenerator;
 //# sourceMappingURL=IntervalGenerator.js.map

package/dist/integration-engine/enapo/helpers/IntervalGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"IntervalGenerator.js","sourceRoot":"","sources":["../../../../src/integration-engine/enapo/helpers/IntervalGenerator.ts"],"names":[],"mappings":";;;AACA,2DAAqE;AAErE,MAAa,iBAAiB;IACnB,MAAM,CAAC,YAAY,CAAC,IAAc,EAAE,EAAY,EAAE,QAAgB;QACrE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjC,MAAM,SAAS,GAAG,gBAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEvF,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,+BAA+B,CAAC,IAA2B,EAAE,QAAgB;QACvF,MAAM,WAAW,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QACpE,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,gBAAQ,CAAC,aAAa,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACjG,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AAfD,8CAeC"}
+{"version":3,"file":"IntervalGenerator.js","sourceRoot":"","sources":["../../../../src/integration-engine/enapo/helpers/IntervalGenerator.ts"],"names":[],"mappings":";;;AACA,2DAAqE;AAErE,MAAa,iBAAiB;IACnB,MAAM,CAAC,YAAY,CAAC,IAAc,EAAE,EAAY,EAAE,QAAgB;QACrE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjC,MAAM,SAAS,GAAG,gBAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEvF,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,+BAA+B,CAAC,IAA2B,EAAE,QAAgB;QACvF,MAAM,WAAW,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QACpE,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,gBAAQ,CAAC,aAAa,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACjG,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,0BAA0B,CAAC,QAAgB,EAAE,MAAc;QACrE,MAAM,eAAe,GAAG,gBAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3F,MAAM,aAAa,GAAG,gBAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvF,MAAM,SAAS,GAAG,gBAAQ,CAAC,aAAa,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/F,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AAtBD,8CAsBC"}

package/dist/integration-engine/enapo/interfaces/IPPasPlaces.d.ts

@@ -1,48 +1,5 @@
 export interface IPPasPlaces {
-    Id: number;
-    Eic: string;
-    CustomerName: string;
-    PlaceName: string;
-    PayerName: string;
-    PayerId: string;
-    CustomerId: string;
-    PlaceId: string;
-    DeviceLocation: string;
-    Terminated: boolean;
-    Region: string;
-    RegionId: number;
-    ConnectionMethod: string;
-    PurchaseCategory: string;
-    ConvertCoefficient: number;
-    DeviceType: string;
-    IdentificationNumber: string;
-    LastData: string;
-    DeviceSerialNumber: string;
-    PlaceStreet: string;
-    PayerStreet: string;
-    PlaceCity: string;
-    PayerCity: string;
-    PlaceZipCode: string;
-    PayerZipCode: string;
-    Dealer: string;
-    ReadingCategory: string;
-    ValidatedBy: string;
-    ValidatedTill: string;
-    IsDataValidated: boolean;
-    ValidationNote: string;
-    Gps: string;
-    Device: number;
-    ReadRequestStatus: number;
-    ReadDescription: string;
-    Note: string;
-    Group: string;
-    Workplace: string;
-    HasTimeWindows: boolean;
-    HasBattery: boolean;
-    HasGasComposition: boolean;
-    BatteryCapacity: number;
-    BatteryVoltage: number;
-    DailyData: boolean;
-    ScadaId: string;
-    ParentDevice: string;
+    eic: string;
+    placeId: number;
+    serialNumber: number;
 }