@golemio/energetics 1.3.8-dev.1345014248 → 1.3.8-dev.1347421314

package/db/example/04_measurements.sql

@@ -1,27 +1,27 @@
 INSERT INTO consumption_energy_measurements ("timestamp", value, addr, var, "type", meter, "source", measurement_category, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by) VALUES
-('2023-05-02 04:59:44.000+02', 551.800000000000000, '/10.22/VF1/core', 'core', 'provider_value', '300017125', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
-('2023-05-02 04:59:11.000+02', 44592.000000000000000, '/10.12/EF1-VT/core', 'core', 'provider_value', '859182400303057720', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
-('2023-05-02 04:59:11.000+02', 2.000000000000000, '/10.12/EF1-NT/core', 'core', 'provider_value', '859182400303057720', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
-('2023-05-02 04:59:00.375+02', 11075.509765625000000, '/2.2/EP2/EFwActi', 'EFwActi', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
-('2023-05-02 04:59:00.115+02', 205.720001220703000, '/2.2/EP2/ERvReact', 'ERvReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
-('2023-05-02 04:58:59.862+02', 6666.450195312500000, '/2.2/EP2/EFwReact', 'EFwReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
-('2023-05-02 04:58:58.996+02', 898.159973144531000, '/2.2/EP1/EFwReact', 'EFwReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
-('2023-05-02 04:58:58.746+02', 8525.040039062500000, '/2.2/EP1/EFwActi', 'EFwActi', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
-('2023-05-02 04:58:57.871+02', 3481.060058593750000, '/2.2/EP1/ERvReact', 'ERvReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
-('2023-05-02 04:53:15.131+02', 17.700000762939500, '/2.5/Text/T', 'T', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
-('2023-05-02 04:53:15.131+02', -64.000000000000000, '/2.5/Text/RSSI', 'RSSI', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
-('2023-05-02 04:53:15.131+02', 1.000000000000000, '/2.5/Text/BAT', 'BAT', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
-('2023-05-02 04:51:33.697+02', 180790.000000000000000, '/2.2/TVP1/raw', 'raw', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
-('2023-05-02 04:00:00.000+02', 2709814.000000000000000, '/2.9/PF1/core', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
-('2023-05-02 04:00:00.001+02', 19.000000000000000, '/2.9/PF1/core2', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
-('2023-05-02 03:00:00.000+02', 2709812.000000000000000, '/2.9/PF1/core', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
-('2023-05-02 03:00:00.001+02', 3.000000000000000, '/2.9/PF1/core2', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
-('2023-05-02 00:00:00.000+02', 0.000000000000000, '/2.9/PF1/core', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
-('2023-05-02 00:00:00.001+02', 0.000000000000000, '/2.9/PF1/core2', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
-('2023-05-01 06:00:00.000+02', 2709721.000000000000000, '/2.9/PF1/core', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
-('2023-05-01 05:00:00.000+02', 2709705.000000000000000, '/2.9/PF1/core', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
-('2023-05-01 05:00:00.001+02', 20.000000000000000, '/2.9/PF1/core2', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
-('2023-05-01 04:00:00.000+02', 2709691.000000000000000, '/2.9/PF1/core', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
-('2023-05-01 04:00:00.001+02', 18.000000000000000, '/2.9/PF1/core2', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
-('2023-05-01 03:00:00.000+02', 2709680.000000000000000, '/2.9/PF1/core', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
-('2023-05-01 03:00:00.001+02', 14.000000000000000, '/2.9/PF1/core2', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL);
+('2023-05-02 04:59:44.000+02', 551.800000000000000, '/10.22/VF1', 'core', 'provider_value', '300017125', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
+('2023-05-02 04:59:11.000+02', 44592.000000000000000, '/10.12/EF1', 'VT', 'provider_value', '859182400303057720', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
+('2023-05-02 04:59:11.000+02', 2.000000000000000, '/10.12/EF1', 'NT', 'provider_value', '859182400303057720', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
+('2023-05-02 04:59:00.375+02', 11075.509765625000000, '/2.2/EP2', 'EFwActi', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
+('2023-05-02 04:59:00.115+02', 205.720001220703000, '/2.2/EP2', 'ERvReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
+('2023-05-02 04:58:59.862+02', 6666.450195312500000, '/2.2/EP2', 'EFwReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
+('2023-05-02 04:58:58.996+02', 898.159973144531000, '/2.2/EP1', 'EFwReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
+('2023-05-02 04:58:58.746+02', 8525.040039062500000, '/2.2/EP1', 'EFwActi', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
+('2023-05-02 04:58:57.871+02', 3481.060058593750000, '/2.2/EP1', 'ERvReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
+('2023-05-02 04:53:15.131+02', 17.700000762939500, '/2.5/Text', 'T', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
+('2023-05-02 04:53:15.131+02', -64.000000000000000, '/2.5/Text', 'RSSI', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
+('2023-05-02 04:53:15.131+02', 1.000000000000000, '/2.5/Text', 'BAT', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
+('2023-05-02 04:51:33.697+02', 180790.000000000000000, '/2.2/TVP1', 'raw', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
+('2023-05-02 04:00:00.000+02', 2709814.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
+('2023-05-02 04:00:00.001+02', 19.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
+('2023-05-02 03:00:00.000+02', 2709812.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
+('2023-05-02 03:00:00.001+02', 3.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
+('2023-05-02 00:00:00.000+02', 0.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
+('2023-05-02 00:00:00.001+02', 0.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
+('2023-05-01 06:00:00.000+02', 2709721.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
+('2023-05-01 05:00:00.000+02', 2709705.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
+('2023-05-01 05:00:00.001+02', 20.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
+('2023-05-01 04:00:00.000+02', 2709691.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
+('2023-05-01 04:00:00.001+02', 18.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
+('2023-05-01 03:00:00.000+02', 2709680.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
+('2023-05-01 03:00:00.001+02', 14.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL);

package/db/migrations/postgresql/20240625134438-fix-pk-measurements.js

@@ -0,0 +1,53 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+var fs = require('fs');
+var path = require('path');
+var Promise;
+
+/**
+  * We receive the dbmigrate dependency from dbmigrate initially.
+  * This enables us to not have to rely on NODE_PATH.
+  */
+exports.setup = function(options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+  Promise = options.Promise;
+};
+
+exports.up = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20240625134438-fix-pk-measurements-up.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports.down = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20240625134438-fix-pk-measurements-down.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports._meta = {
+  "version": 1
+};

package/db/migrations/postgresql/sqls/20240625134438-fix-pk-measurements-down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE consumption_energy_measurements DROP CONSTRAINT consumption_energy_measurements_pk;
+ALTER TABLE consumption_energy_measurements ADD CONSTRAINT consumption_energy_measurements_pkey PRIMARY KEY ("timestamp",addr,var,meter);

package/db/migrations/postgresql/sqls/20240625134438-fix-pk-measurements-up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE consumption_energy_measurements DROP CONSTRAINT consumption_energy_measurements_pkey;
+ALTER TABLE consumption_energy_measurements ADD CONSTRAINT consumption_energy_measurements_pk PRIMARY KEY ("timestamp",addr,var);

package/dist/integration-engine/commodity-providers/datasources/static-data/StaticMeterSettingsDataSourceCapitalDs.d.ts

@@ -0,0 +1,11 @@
+import { IStaticMeterSettings } from "../../../../schema-definitions/datasources/interfaces/IStaticMeterSettings";
+import { ISimpleConfig } from "@golemio/core/dist/helpers/configuration/ISimpleConfig";
+import { IDataSource } from "@golemio/core/dist/integration-engine";
+import { IDataSourceProvider } from "../interfaces/IDataSourceProvider";
+export declare class StaticMeterSettingsDataSourceCapitalDs implements IDataSourceProvider<IStaticMeterSettings> {
+    private config;
+    private static readonly DATASOURCE_NAME;
+    constructor(config: ISimpleConfig);
+    getDataSource(): IDataSource<IStaticMeterSettings>;
+    private getProtocolStrategy;
+}

package/dist/integration-engine/commodity-providers/datasources/static-data/StaticMeterSettingsDataSourceCapitalDs.js

@@ -0,0 +1,50 @@
+"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 StaticMeterSettingsDataSourceCapitalDs_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StaticMeterSettingsDataSourceCapitalDs = void 0;
+const StaticMeterSettingsJsonSchema_1 = require("../../../../schema-definitions/datasources/StaticMeterSettingsJsonSchema");
+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 golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
+const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
+let StaticMeterSettingsDataSourceCapitalDs = exports.StaticMeterSettingsDataSourceCapitalDs = StaticMeterSettingsDataSourceCapitalDs_1 = class StaticMeterSettingsDataSourceCapitalDs {
+    constructor(config) {
+        this.config = config;
+    }
+    getDataSource() {
+        const baseUrl = this.config.getValue("module.energetics.commodityProviders.staticData.baseUrl");
+        const urlPath = this.config.getValue("module.energetics.commodityProviders.staticData.metersettings.pathCapitalDistrict");
+        const url = new URL(urlPath, baseUrl);
+        return new integration_engine_1.DataSource(StaticMeterSettingsDataSourceCapitalDs_1.DATASOURCE_NAME, this.getProtocolStrategy(url), new integration_engine_1.JSONDataTypeStrategy({ resultsPath: "" }), new golemio_validator_1.JSONSchemaValidator(StaticMeterSettingsDataSourceCapitalDs_1.DATASOURCE_NAME, StaticMeterSettingsJsonSchema_1.staticMeterSettingsJsonSchema));
+    }
+    getProtocolStrategy(url) {
+        return new HTTPFetchProtocolStrategy_1.HTTPFetchProtocolStrategy({
+            headers: {
+                Accept: "application/json",
+            },
+            method: "GET",
+            timeoutInSeconds: 20,
+            url: url.toString(),
+        });
+    }
+};
+StaticMeterSettingsDataSourceCapitalDs.DATASOURCE_NAME = "StaticMeterSettingsCapitalDistrict";
+exports.StaticMeterSettingsDataSourceCapitalDs = StaticMeterSettingsDataSourceCapitalDs = StaticMeterSettingsDataSourceCapitalDs_1 = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.SimpleConfig)),
+    __metadata("design:paramtypes", [Object])
+], StaticMeterSettingsDataSourceCapitalDs);
+//# sourceMappingURL=StaticMeterSettingsDataSourceCapitalDs.js.map

package/dist/integration-engine/commodity-providers/datasources/static-data/StaticMeterSettingsDataSourceCapitalDs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"StaticMeterSettingsDataSourceCapitalDs.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/datasources/static-data/StaticMeterSettingsDataSourceCapitalDs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4HAA+F;AAG/F,wEAAqE;AACrE,8EAAsG;AACtG,6IAA0I;AAE1I,mFAAkF;AAClF,iEAAwE;AAIjE,IAAM,sCAAsC,+FAA5C,MAAM,sCAAsC;IAG/C,YAAoD,MAAqB;QAArB,WAAM,GAAN,MAAM,CAAe;IAAG,CAAC;IAEtE,aAAa;QAChB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAS,yDAAyD,CAAC,CAAC;QACxG,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAChC,mFAAmF,CACtF,CAAC;QACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEtC,OAAO,IAAI,+BAAU,CACjB,wCAAsC,CAAC,eAAe,EACtD,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAC7B,IAAI,yCAAoB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,EAC7C,IAAI,uCAAmB,CAAC,wCAAsC,CAAC,eAAe,EAAE,6DAA6B,CAAC,CACjH,CAAC;IACN,CAAC;IAEO,mBAAmB,CAAC,GAAQ;QAChC,OAAO,IAAI,qDAAyB,CAAC;YACjC,OAAO,EAAE;gBACL,MAAM,EAAE,kBAAkB;aAC7B;YACD,MAAM,EAAE,KAAK;YACb,gBAAgB,EAAE,EAAE;YACpB,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;SACtB,CAAC,CAAC;IACP,CAAC;;AA5BuB,sDAAe,GAAG,oCAAoC,AAAvC,CAAwC;iDADtE,sCAAsC;IADlD,IAAA,qBAAU,GAAE;IAII,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,YAAY,CAAC,CAAA;;GAHlC,sCAAsC,CA8BlD"}

package/dist/integration-engine/commodity-providers/ioc/Di.js

@@ -10,17 +10,20 @@ const FetchMeasurementOptionsStaticDataTask_1 = require("../workers/tasks/FetchM
 const FetchVeoliaMeasurementsTask_1 = require("../workers/tasks/FetchVeoliaMeasurementsTask");
 const Di_1 = require("../../ioc/Di");
 const PpasAveApiDataSourceProvider_1 = require("../datasources/ppas-ave-api/PpasAveApiDataSourceProvider");
+const PreElectroApiDataSourceProvider_1 = require("../datasources/pre-elektro-api/PreElectroApiDataSourceProvider");
+const PreElectroHelper_1 = require("../datasources/pre-elektro-api/helpers/PreElectroHelper");
 const StaticMeterSettingsRepository_1 = require("../repositories/StaticMeterSettingsRepository");
 const AveMeasurementTransformation_1 = require("../transformations/AveMeasurementTransformation");
 const PreElectroTransformation_1 = require("../transformations/PreElectroTransformation");
+const PtasWebMeasurementTransformation_1 = require("../transformations/PtasWebMeasurementTransformation");
+const FetchMeasurementsFromEEProvidersTask_1 = require("../workers/tasks/FetchMeasurementsFromEEProvidersTask");
 const FetchMeasurementsFromProvidersTask_1 = require("../workers/tasks/FetchMeasurementsFromProvidersTask");
+const FetchPpasEEMeasurementsTask_1 = require("../workers/tasks/FetchPpasEEMeasurementsTask");
 const FetchPpasMeasurementsTask_1 = require("../workers/tasks/FetchPpasMeasurementsTask");
 const FetchPreMeasurementDataTask_1 = require("../workers/tasks/FetchPreMeasurementDataTask");
-const WorkerContainerToken_1 = require("./WorkerContainerToken");
-const PreElectroApiDataSourceProvider_1 = require("../datasources/pre-elektro-api/PreElectroApiDataSourceProvider");
-const PreElectroHelper_1 = require("../datasources/pre-elektro-api/helpers/PreElectroHelper");
-const PtasWebMeasurementTransformation_1 = require("../transformations/PtasWebMeasurementTransformation");
 const FetchPtasWebScrapedMeasurementsTask_1 = require("../workers/tasks/FetchPtasWebScrapedMeasurementsTask");
+const WorkerContainerToken_1 = require("./WorkerContainerToken");
+const StaticMeterSettingsDataSourceCapitalDs_1 = require("../datasources/static-data/StaticMeterSettingsDataSourceCapitalDs");
 //#region Initialization
 const CommodityContainer = Di_1.VPalaceContainer.createChildContainer();
 exports.CommodityContainer = CommodityContainer;
@@ -35,6 +38,7 @@ CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.PreElect
 //#region Repositories
 CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.MeasurementRepository, MeasurementRepository_1.MeasurementRepository);
 CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.StaticMeterSettingsRepository, StaticMeterSettingsRepository_1.StaticMeterSettingsRepository);
+CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.StaticMeterSettingsDataSourceCapitalDs, StaticMeterSettingsDataSourceCapitalDs_1.StaticMeterSettingsDataSourceCapitalDs);
 //#endregion
 //#region Transformation
 CommodityContainer.registerSingleton(WorkerContainerToken_1.WorkerContainerToken.CemMeasurementTransformation, CemMeasurementTransformation_1.CemMeasurementTransformation);
@@ -46,8 +50,10 @@ CommodityContainer.registerSingleton(WorkerContainerToken_1.WorkerContainerToken
 //#endregion
 //#region Tasks
 CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.FetchMeasurementsFromProvidersTask, FetchMeasurementsFromProvidersTask_1.FetchMeasurementsFromProvidersTask);
+CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.FetchMeasurementsFromEEProvidersTask, FetchMeasurementsFromEEProvidersTask_1.FetchMeasurementsFromEEProvidersTask);
 CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.FetchVeoliaMeasurementsTask, FetchVeoliaMeasurementsTask_1.FetchVeoliaMeasurementsTask);
 CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.FetchPpasMeasurementsTask, FetchPpasMeasurementsTask_1.FetchPpasMeasurementsTask);
+CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.FetchPpasEEMeasurementsTask, FetchPpasEEMeasurementsTask_1.FetchPpasEEMeasurementsTask);
 CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.FetchMeasurementOptionsStaticDataTask, FetchMeasurementOptionsStaticDataTask_1.FetchMeasurementOptionsStaticDataTask);
 CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.FetchPreMeasurementDataTask, FetchPreMeasurementDataTask_1.FetchPreMeasurementDataTask);
 CommodityContainer.registerSingleton(WorkerContainerToken_1.WorkerContainerToken.FetchPtasWebScrapedMeasurementsTask, FetchPtasWebScrapedMeasurementsTask_1.FetchPtasWebScrapedMeasurementsTask);

package/dist/integration-engine/commodity-providers/ioc/Di.js.map

@@ -1 +1 @@
-{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,0GAA4H;AAC5H,8FAAgH;AAChH,4HAA8I;AAC9I,iFAAmG;AACnG,kGAAoH;AACpH,kHAAoI;AACpI,8FAAgH;AAChH,qCAA8C;AAE9C,2GAAwG;AACxG,iGAA8F;AAC9F,kGAA+F;AAC/F,0FAAuF;AACvF,4GAAyG;AACzG,0FAAuF;AACvF,8FAA2F;AAC3F,iEAA8D;AAC9D,oHAAiH;AACjH,8FAA2F;AAC3F,0GAAuG;AACvG,8GAA2G;AAE3G,wBAAwB;AACxB,MAAM,kBAAkB,GAAwB,qBAAgB,CAAC,oBAAoB,EAAE,CAAC;AAyC/E,gDAAkB;AAxC3B,YAAY;AAEZ,oBAAoB;AACpB,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,wBAAwB,EAAE,mDAAwB,CAAC,CAAC;AACrG,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC;AAC7G,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,kCAAkC,EAAE,uEAAkC,CAAC,CAAC;AACzH,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,qCAAqC,EAAE,6EAAqC,CAAC,CAAC;AAC/H,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,+BAA+B,EAAE,iEAA+B,CAAC,CAAC;AACnH,YAAY;AAEZ,sBAAsB;AACtB,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,qBAAqB,EAAE,6CAAqB,CAAC,CAAC;AAC/F,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC,CAAC;AAC/G,YAAY;AAEZ,wBAAwB;AACxB,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC;AACtH,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC;AACtH,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,wBAAwB,EAAE,mDAAwB,CAAC,CAAC;AAC9G,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,gCAAgC,EAAE,mEAAgC,CAAC,CAAC;AAC9H,YAAY;AAEZ,iBAAiB;AACjB,YAAY;AAEZ,eAAe;AACf,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,kCAAkC,EAAE,uEAAkC,CAAC,CAAC;AACzH,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AAC3G,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,yBAAyB,EAAE,qDAAyB,CAAC,CAAC;AACvG,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,qCAAqC,EAAE,6EAAqC,CAAC,CAAC;AAC/H,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AAC3G,kBAAkB,CAAC,iBAAiB,CAChC,2CAAoB,CAAC,mCAAmC,EACxD,yEAAmC,CACtC,CAAC;AACF,YAAY;AAEZ,iBAAiB;AACjB,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,gBAAgB,EAAE,mCAAgB,CAAC,CAAC"}
+{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,0GAA4H;AAC5H,8FAAgH;AAChH,4HAA8I;AAC9I,iFAAmG;AACnG,kGAAoH;AACpH,kHAAoI;AACpI,8FAAgH;AAChH,qCAA8C;AAE9C,2GAAwG;AACxG,oHAAiH;AACjH,8FAA2F;AAC3F,iGAA8F;AAC9F,kGAA+F;AAC/F,0FAAuF;AACvF,0GAAuG;AACvG,gHAA6G;AAC7G,4GAAyG;AACzG,8FAA2F;AAC3F,0FAAuF;AACvF,8FAA2F;AAC3F,8GAA2G;AAC3G,iEAA8D;AAC9D,8HAA2H;AAE3H,wBAAwB;AACxB,MAAM,kBAAkB,GAAwB,qBAAgB,CAAC,oBAAoB,EAAE,CAAC;AA4C/E,gDAAkB;AA3C3B,YAAY;AAEZ,oBAAoB;AACpB,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,wBAAwB,EAAE,mDAAwB,CAAC,CAAC;AACrG,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC;AAC7G,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,kCAAkC,EAAE,uEAAkC,CAAC,CAAC;AACzH,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,qCAAqC,EAAE,6EAAqC,CAAC,CAAC;AAC/H,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,+BAA+B,EAAE,iEAA+B,CAAC,CAAC;AACnH,YAAY;AAEZ,sBAAsB;AACtB,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,qBAAqB,EAAE,6CAAqB,CAAC,CAAC;AAC/F,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC,CAAC;AAC/G,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,sCAAsC,EAAE,+EAAsC,CAAC,CAAC;AACjI,YAAY;AAEZ,wBAAwB;AACxB,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC;AACtH,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC;AACtH,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,wBAAwB,EAAE,mDAAwB,CAAC,CAAC;AAC9G,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,gCAAgC,EAAE,mEAAgC,CAAC,CAAC;AAC9H,YAAY;AAEZ,iBAAiB;AACjB,YAAY;AAEZ,eAAe;AACf,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,kCAAkC,EAAE,uEAAkC,CAAC,CAAC;AACzH,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,oCAAoC,EAAE,2EAAoC,CAAC,CAAC;AAC7H,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AAC3G,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,yBAAyB,EAAE,qDAAyB,CAAC,CAAC;AACvG,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AAC3G,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,qCAAqC,EAAE,6EAAqC,CAAC,CAAC;AAC/H,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AAC3G,kBAAkB,CAAC,iBAAiB,CAChC,2CAAoB,CAAC,mCAAmC,EACxD,yEAAmC,CACtC,CAAC;AACF,YAAY;AAEZ,iBAAiB;AACjB,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,gBAAgB,EAAE,mCAAgB,CAAC,CAAC"}

package/dist/integration-engine/commodity-providers/ioc/WorkerContainerToken.d.ts

@@ -3,13 +3,16 @@ declare const WorkerContainerToken: {
     PpasAveApiDataSourceProvider: symbol;
     CommodityProviderDataSourceFactory: symbol;
     StaticMeterSettingsDataSourceProvider: symbol;
+    StaticMeterSettingsDataSourceCapitalDs: symbol;
     CemMeasurementTransformation: symbol;
     AveMeasurementTransformation: symbol;
     MeasurementRepository: symbol;
     StaticMeterSettingsRepository: symbol;
     FetchMeasurementsFromProvidersTask: symbol;
+    FetchMeasurementsFromEEProvidersTask: symbol;
     FetchVeoliaMeasurementsTask: symbol;
     FetchPpasMeasurementsTask: symbol;
+    FetchPpasEEMeasurementsTask: symbol;
     FetchMeasurementOptionsStaticDataTask: symbol;
     FetchPreMeasurementDataTask: symbol;
     PreElectroTransformation: symbol;
@@ -17,5 +20,6 @@ declare const WorkerContainerToken: {
     PreElectroHelper: symbol;
     PtasWebMeasurementTransformation: symbol;
     FetchPtasWebScrapedMeasurementsTask: symbol;
+    PrimaryBuildingsRepositoryIE: symbol;
 };
 export { WorkerContainerToken };

package/dist/integration-engine/commodity-providers/ioc/WorkerContainerToken.js

@@ -6,13 +6,16 @@ const WorkerContainerToken = {
     PpasAveApiDataSourceProvider: Symbol(),
     CommodityProviderDataSourceFactory: Symbol(),
     StaticMeterSettingsDataSourceProvider: Symbol(),
+    StaticMeterSettingsDataSourceCapitalDs: Symbol(),
     CemMeasurementTransformation: Symbol(),
     AveMeasurementTransformation: Symbol(),
     MeasurementRepository: Symbol(),
     StaticMeterSettingsRepository: Symbol(),
     FetchMeasurementsFromProvidersTask: Symbol(),
+    FetchMeasurementsFromEEProvidersTask: Symbol(),
     FetchVeoliaMeasurementsTask: Symbol(),
     FetchPpasMeasurementsTask: Symbol(),
+    FetchPpasEEMeasurementsTask: Symbol(),
     FetchMeasurementOptionsStaticDataTask: Symbol(),
     FetchPreMeasurementDataTask: Symbol(),
     PreElectroTransformation: Symbol(),
@@ -20,6 +23,7 @@ const WorkerContainerToken = {
     PreElectroHelper: Symbol(),
     PtasWebMeasurementTransformation: Symbol(),
     FetchPtasWebScrapedMeasurementsTask: Symbol(),
+    PrimaryBuildingsRepositoryIE: Symbol(),
 };
 exports.WorkerContainerToken = WorkerContainerToken;
 //# sourceMappingURL=WorkerContainerToken.js.map

package/dist/integration-engine/commodity-providers/ioc/WorkerContainerToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerContainerToken.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/ioc/WorkerContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,oBAAoB,GAAG;IACzB,wBAAwB,EAAE,MAAM,EAAE;IAClC,4BAA4B,EAAE,MAAM,EAAE;IACtC,kCAAkC,EAAE,MAAM,EAAE;IAC5C,qCAAqC,EAAE,MAAM,EAAE;IAC/C,4BAA4B,EAAE,MAAM,EAAE;IACtC,4BAA4B,EAAE,MAAM,EAAE;IACtC,qBAAqB,EAAE,MAAM,EAAE;IAC/B,6BAA6B,EAAE,MAAM,EAAE;IACvC,kCAAkC,EAAE,MAAM,EAAE;IAC5C,2BAA2B,EAAE,MAAM,EAAE;IACrC,yBAAyB,EAAE,MAAM,EAAE;IACnC,qCAAqC,EAAE,MAAM,EAAE;IAC/C,2BAA2B,EAAE,MAAM,EAAE;IACrC,wBAAwB,EAAE,MAAM,EAAE;IAClC,+BAA+B,EAAE,MAAM,EAAE;IACzC,gBAAgB,EAAE,MAAM,EAAE;IAC1B,gCAAgC,EAAE,MAAM,EAAE;IAC1C,mCAAmC,EAAE,MAAM,EAAE;CAChD,CAAC;AAEO,oDAAoB"}
+{"version":3,"file":"WorkerContainerToken.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/ioc/WorkerContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,oBAAoB,GAAG;IACzB,wBAAwB,EAAE,MAAM,EAAE;IAClC,4BAA4B,EAAE,MAAM,EAAE;IACtC,kCAAkC,EAAE,MAAM,EAAE;IAC5C,qCAAqC,EAAE,MAAM,EAAE;IAC/C,sCAAsC,EAAE,MAAM,EAAE;IAChD,4BAA4B,EAAE,MAAM,EAAE;IACtC,4BAA4B,EAAE,MAAM,EAAE;IACtC,qBAAqB,EAAE,MAAM,EAAE;IAC/B,6BAA6B,EAAE,MAAM,EAAE;IACvC,kCAAkC,EAAE,MAAM,EAAE;IAC5C,oCAAoC,EAAE,MAAM,EAAE;IAC9C,2BAA2B,EAAE,MAAM,EAAE;IACrC,yBAAyB,EAAE,MAAM,EAAE;IACnC,2BAA2B,EAAE,MAAM,EAAE;IACrC,qCAAqC,EAAE,MAAM,EAAE;IAC/C,2BAA2B,EAAE,MAAM,EAAE;IACrC,wBAAwB,EAAE,MAAM,EAAE;IAClC,+BAA+B,EAAE,MAAM,EAAE;IACzC,gBAAgB,EAAE,MAAM,EAAE;IAC1B,gCAAgC,EAAE,MAAM,EAAE;IAC1C,mCAAmC,EAAE,MAAM,EAAE;IAC7C,4BAA4B,EAAE,MAAM,EAAE;CACzC,CAAC;AAEO,oDAAoB"}

package/dist/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.d.ts

@@ -5,6 +5,5 @@ import { AbstractTransformation } from "@golemio/core/dist/helpers/transformatio
 export declare class AveMeasurementTransformation extends AbstractTransformation<IMeasurementOption & IAveApiDeviceDataDto, IMeasurementDto> {
     name: string;
     protected transformInternal: (data: IMeasurementOption & IAveApiDeviceDataDto) => IMeasurementDto;
-    private formatAddress;
     private getValue;
 }

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

@@ -21,7 +21,7 @@ let AveMeasurementTransformation = exports.AveMeasurementTransformation = class
             return {
                 source: CommodityProviderEnum_1.CommodityProvider.PpasInternetAveApi,
                 measurement_category: data.Name,
-                addr: this.formatAddress(data.Addr, data.Var),
+                addr: data.Addr,
                 meter: data.Meter,
                 timestamp: luxon_1.DateTime.fromISO(data.StandardTime, {
                     zone: PpasAveApiHelper_1.PpasAveApiHelper.API_DATE_TZ,
@@ -31,9 +31,6 @@ let AveMeasurementTransformation = exports.AveMeasurementTransformation = class
                 value: this.getValue(data, data.Var),
             };
         };
-        this.formatAddress = (address, variable) => {
-            return address + "/" + variable;
-        };
         this.getValue = (data, variable) => {
             switch (variable) {
                 case MeasurementVariableEnum_1.MeasurementVariable.Core:

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

@@ -1 +1 @@
-{"version":3,"file":"AveMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,2DAA2D;AAC3D,iEAAgE;AAChE,wFAAiF;AACjF,2FAAwF;AACxF,qHAAuF;AAGhF,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAAC,IAA+C,EAAmB,EAAE;YAC/F,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,kBAAkB;gBAC5C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAA0B,CAAC;gBACpE,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,gBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE;oBAC3C,IAAI,EAAE,mCAAgB,CAAC,WAAW;iBACrC,CAAC,CAAC,QAAQ,EAAE;gBACb,QAAQ,EAAE,IAAI,CAAC,GAAG;gBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,GAA0B,CAAC;aAC9D,CAAC;QACN,CAAC,CAAC;QAEM,kBAAa,GAAG,CAAC,OAAe,EAAE,QAA6B,EAAU,EAAE;YAC/E,OAAO,OAAO,GAAG,GAAG,GAAG,QAAQ,CAAC;QACpC,CAAC,CAAC;QAEM,aAAQ,GAAG,CAAC,IAA0B,EAAE,QAA6B,EAAU,EAAE;YACrF,QAAQ,QAAQ,EAAE;gBACd,KAAK,6CAAmB,CAAC,IAAI,CAAC;gBAC9B;oBACI,OAAO,IAAI,CAAC,eAAe,CAAC;gBAChC,KAAK,6CAAmB,CAAC,KAAK;oBAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC;aACrC;QACL,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;uCAlCY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;GACA,4BAA4B,CAkCxC"}
+{"version":3,"file":"AveMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,2DAA2D;AAC3D,iEAAgE;AAChE,wFAAiF;AACjF,2FAAwF;AACxF,qHAAuF;AAGhF,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAAC,IAA+C,EAAmB,EAAE;YAC/F,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,kBAAkB;gBAC5C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,gBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE;oBAC3C,IAAI,EAAE,mCAAgB,CAAC,WAAW;iBACrC,CAAC,CAAC,QAAQ,EAAE;gBACb,QAAQ,EAAE,IAAI,CAAC,GAAG;gBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,GAA0B,CAAC;aAC9D,CAAC;QACN,CAAC,CAAC;QAEM,aAAQ,GAAG,CAAC,IAA0B,EAAE,QAA6B,EAAU,EAAE;YACrF,QAAQ,QAAQ,EAAE;gBACd,KAAK,6CAAmB,CAAC,IAAI,CAAC;gBAC9B;oBACI,OAAO,IAAI,CAAC,eAAe,CAAC;gBAChC,KAAK,6CAAmB,CAAC,KAAK;oBAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC;aACrC;QACL,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;uCA9BY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;GACA,4BAA4B,CA8BxC"}

package/dist/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.d.ts

@@ -9,5 +9,5 @@ export declare class CemMeasurementTransformation extends AbstractTransformation
     protected transformInternal: (data: IMeasurementOption & ICemApiMeasurementDto & {
         counterTypeId: number;
     }) => IMeasurementDto;
-    private formatAddress;
+    private getVariable;
 }

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

@@ -19,22 +19,22 @@ let CemMeasurementTransformation = exports.CemMeasurementTransformation = class
             return {
                 source: CommodityProviderEnum_1.CommodityProvider.UnimonitorCemApi,
                 measurement_category: data.Name,
-                addr: this.formatAddress(data.Addr, data.counterTypeId, data.Var),
+                addr: data.Addr,
                 meter: data.Meter,
                 timestamp: new Date(data.timestamp),
-                variable: data.Var,
+                variable: this.getVariable(data.Var, data.counterTypeId),
                 type: data.Type,
                 value: data.value,
             };
         };
-        this.formatAddress = (address, counterTypeId, variable) => {
+        this.getVariable = (variable, counterTypeId) => {
             if (counterTypeId === helpers_1.UnimonitorCemApiHelper.counterType.ElHighTariff) {
-                address += "-VT"; // Vysoky tarif
+                return "VT"; // Vysoky tarif
             }
             else if (counterTypeId === helpers_1.UnimonitorCemApiHelper.counterType.ElLowTariff) {
-                address += "-NT"; // Nizky tarif
+                return "NT"; // Nizky tarif
             }
-            return address + "/" + variable;
+            return variable;
         };
     }
 };

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

@@ -1 +1 @@
-{"version":3,"file":"CemMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,iEAAgE;AAChE,wFAAiF;AACjF,2CAAqD;AAI9C,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAC1B,IAA4E,EAC7D,EAAE;YACjB,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,gBAAgB;gBAC1C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAA0B,CAAC;gBACxF,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;gBACnC,QAAQ,EAAE,IAAI,CAAC,GAAG;gBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;aACpB,CAAC;QACN,CAAC,CAAC;QAEM,kBAAa,GAAG,CAAC,OAAe,EAAE,aAAqB,EAAE,QAA6B,EAAU,EAAE;YACtG,IAAI,aAAa,KAAK,gCAAsB,CAAC,WAAW,CAAC,YAAY,EAAE;gBACnE,OAAO,IAAI,KAAK,CAAC,CAAC,eAAe;aACpC;iBAAM,IAAI,aAAa,KAAK,gCAAsB,CAAC,WAAW,CAAC,WAAW,EAAE;gBACzE,OAAO,IAAI,KAAK,CAAC,CAAC,cAAc;aACnC;YAED,OAAO,OAAO,GAAG,GAAG,GAAG,QAAQ,CAAC;QACpC,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;uCA9BY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;GACA,4BAA4B,CA8BxC"}
+{"version":3,"file":"CemMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,iEAAgE;AAChE,wFAAiF;AACjF,2CAAqD;AAI9C,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAC1B,IAA4E,EAC7D,EAAE;YACjB,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,gBAAgB;gBAC1C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;gBACnC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC;gBACxD,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;aACpB,CAAC;QACN,CAAC,CAAC;QAEM,gBAAW,GAAG,CAAC,QAAgB,EAAE,aAAqB,EAAU,EAAE;YACtE,IAAI,aAAa,KAAK,gCAAsB,CAAC,WAAW,CAAC,YAAY,EAAE;gBACnE,OAAO,IAAI,CAAC,CAAC,eAAe;aAC/B;iBAAM,IAAI,aAAa,KAAK,gCAAsB,CAAC,WAAW,CAAC,WAAW,EAAE;gBACzE,OAAO,IAAI,CAAC,CAAC,cAAc;aAC9B;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;uCA9BY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;GACA,4BAA4B,CA8BxC"}

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

@@ -16,7 +16,7 @@ let PreElectroTransformation = exports.PreElectroTransformation = class PreElect
         this.name = "PreElectroTransformation";
         this.transformInternal = (data) => {
             return {
-                addr: `${data.option.Addr}/${data.option.Var}`,
+                addr: data.option.Addr,
                 meter: data.option.Meter,
                 timestamp: new Date(data.measurement["Čas měření"] + " UTC"),
                 variable: data.option.Var,

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

@@ -1 +1 @@
-{"version":3,"file":"PreElectroTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/PreElectroTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,oHAAsF;AAEtF,6GAA0G;AAC1G,iEAAgE;AAGzD,IAAM,wBAAwB,sCAA9B,MAAM,wBAAyB,SAAQ,+CAG7C;IAHM;;QAII,SAAI,GAAG,0BAA0B,CAAC;QAE/B,sBAAiB,GAAG,CAC1B,IAAoF,EACrE,EAAE;YACjB,OAAO;gBACH,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;gBAC9C,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;gBAC5D,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACzB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;gBAC7C,MAAM,EAAE,iDAAqB,CAAC,UAAU;gBACxC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;aACzC,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;mCApBY,wBAAwB;IADpC,IAAA,qBAAU,GAAE;GACA,wBAAwB,CAoBpC"}
+{"version":3,"file":"PreElectroTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/PreElectroTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,oHAAsF;AAEtF,6GAA0G;AAC1G,iEAAgE;AAGzD,IAAM,wBAAwB,sCAA9B,MAAM,wBAAyB,SAAQ,+CAG7C;IAHM;;QAII,SAAI,GAAG,0BAA0B,CAAC;QAE/B,sBAAiB,GAAG,CAC1B,IAAoF,EACrE,EAAE;YACjB,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;gBAC5D,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACzB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;gBAC7C,MAAM,EAAE,iDAAqB,CAAC,UAAU;gBACxC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;aACzC,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;mCApBY,wBAAwB;IADpC,IAAA,qBAAU,GAAE;GACA,wBAAwB,CAoBpC"}

package/dist/integration-engine/commodity-providers/workers/CommodityWorker.js

@@ -15,9 +15,11 @@ class CommodityWorker extends integration_engine_1.AbstractWorker {
         };
         // Register tasks
         this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchMeasurementsFromProvidersTask));
+        this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchMeasurementsFromEEProvidersTask));
         this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchMeasurementOptionsStaticDataTask));
         this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchVeoliaMeasurementsTask));
         this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchPpasMeasurementsTask));
+        this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchPpasEEMeasurementsTask));
         this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchPreMeasurementDataTask));
         this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchPtasWebScrapedMeasurementsTask));
     }

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

@@ -1 +1 @@
-{"version":3,"file":"CommodityWorker.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/workers/CommodityWorker.ts"],"names":[],"mappings":";;;AAAA,8EAAuE;AAEvE,4CAA2C;AAC3C,kCAA+C;AAC/C,sEAAmE;AAEnE,MAAa,eAAgB,SAAQ,mCAAc;IAG/C;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,uBAAW,CAAC;QAmBtB,iBAAY,GAAG,CAAC,IAAW,EAAQ,EAAE;YACxC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QAjBE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,kCAAkC,CAAC,CAAC,CAAC;QAE9G,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,qCAAqC,CAAC,CAAC,CAAC;QAEjH,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAEvG,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,yBAAyB,CAAC,CAAC,CAAC;QAErG,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAEvG,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,mCAAmC,CAAC,CAAC,CAAC;IACnH,CAAC;CAMJ;AAxBD,0CAwBC"}
+{"version":3,"file":"CommodityWorker.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/workers/CommodityWorker.ts"],"names":[],"mappings":";;;AAAA,8EAAuE;AAEvE,4CAA2C;AAC3C,kCAA+C;AAC/C,sEAAmE;AAEnE,MAAa,eAAgB,SAAQ,mCAAc;IAG/C;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,uBAAW,CAAC;QAuBtB,iBAAY,GAAG,CAAC,IAAW,EAAQ,EAAE;YACxC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QArBE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,kCAAkC,CAAC,CAAC,CAAC;QAE9G,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,oCAAoC,CAAC,CAAC,CAAC;QAEhH,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,qCAAqC,CAAC,CAAC,CAAC;QAEjH,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAEvG,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,yBAAyB,CAAC,CAAC,CAAC;QAErG,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAEvG,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAEvG,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,mCAAmC,CAAC,CAAC,CAAC;IACnH,CAAC;CAMJ;AA5BD,0CA4BC"}

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

@@ -1,5 +1,5 @@
 import { CommodityProviderType } from "../../../../schema-definitions/models/helpers/CommodityProviderTypeEnum";
 import { IMeasurementsParams } from "./IMeasurementsParams";
 export interface IPpasMeasurementsParams extends IMeasurementsParams {
-    providerType: CommodityProviderType.PpasAveV | CommodityProviderType.PpasAveM;
+    providerType: CommodityProviderType.PpasAveV | CommodityProviderType.PpasAveM | CommodityProviderType.PpasAveA | CommodityProviderType.PpasAveC | CommodityProviderType.PpasAveMO;
 }

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

@@ -2,5 +2,5 @@ import { CommodityProviderType } from "../../../../schema-definitions/models/hel
 import { IPpasMeasurementsParams } from "../interfaces/IPpasMeasurementsParams";
 import { MeasurementsValidationSchema } from "./MeasurementsSchema";
 export declare class PpasMeasurementsValidationSchema extends MeasurementsValidationSchema implements IPpasMeasurementsParams {
-    providerType: CommodityProviderType.PpasAveV | CommodityProviderType.PpasAveM;
+    providerType: CommodityProviderType.PpasAveV | CommodityProviderType.PpasAveM | CommodityProviderType.PpasAveA | CommodityProviderType.PpasAveC | CommodityProviderType.PpasAveMO;
 }

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

@@ -17,7 +17,13 @@ class PpasMeasurementsValidationSchema extends MeasurementsSchema_1.Measurements
 }
 exports.PpasMeasurementsValidationSchema = PpasMeasurementsValidationSchema;
 __decorate([
-    (0, class_validator_1.IsEnum)([CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveV, CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveM]),
+    (0, class_validator_1.IsEnum)([
+        CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveV,
+        CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveM,
+        CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveA,
+        CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveC,
+        CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveMO,
+    ]),
     __metadata("design:type", String)
 ], PpasMeasurementsValidationSchema.prototype, "providerType", void 0);
 //# sourceMappingURL=PpasMeasurementsSchema.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"PpasMeasurementsSchema.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/schema/PpasMeasurementsSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uHAAsF;AACtF,+EAAmE;AAEnE,6DAAoE;AAEpE,MAAa,gCAAiC,SAAQ,iDAA4B;CAGjF;AAHD,4EAGC;AADG;IADC,IAAA,wBAAM,EAAC,CAAC,iDAAqB,CAAC,QAAQ,EAAE,iDAAqB,CAAC,QAAQ,CAAC,CAAC;;sEACM"}
+{"version":3,"file":"PpasMeasurementsSchema.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/schema/PpasMeasurementsSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uHAAsF;AACtF,+EAAmE;AAEnE,6DAAoE;AAEpE,MAAa,gCAAiC,SAAQ,iDAA4B;CAcjF;AAdD,4EAcC;AANG;IAPC,IAAA,wBAAM,EAAC;QACJ,iDAAqB,CAAC,QAAQ;QAC9B,iDAAqB,CAAC,QAAQ;QAC9B,iDAAqB,CAAC,QAAQ;QAC9B,iDAAqB,CAAC,QAAQ;QAC9B,iDAAqB,CAAC,SAAS;KAClC,CAAC;;sEAMoC"}

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

@@ -1,4 +1,5 @@
 import { StaticMeterSettingsDataSourceProvider } from "../../datasources/static-data/StaticMeterSettingsDataSourceProvider";
+import { StaticMeterSettingsDataSourceCapitalDs } from "../../datasources/static-data/StaticMeterSettingsDataSourceCapitalDs";
 import { StaticMeterSettingsRepository } from "../../repositories/StaticMeterSettingsRepository";
 import { ILogger } from "@golemio/core/dist/helpers/logger";
 import { AbstractEmptyTask } from "@golemio/core/dist/integration-engine/workers/AbstractEmptyTask";
@@ -6,9 +7,10 @@ export declare class FetchMeasurementOptionsStaticDataTask extends AbstractEmpty
     private logger;
     private staticDataSourceProvider;
     private meterSettingsRepository;
+    private meterSettingsRepositoryCapitalDistrict;
     readonly queueName = "fetchMeasurementOptionsStaticData";
     readonly queueTtl: number;
-    constructor(logger: ILogger, staticDataSourceProvider: StaticMeterSettingsDataSourceProvider, meterSettingsRepository: StaticMeterSettingsRepository);
+    constructor(logger: ILogger, staticDataSourceProvider: StaticMeterSettingsDataSourceProvider, meterSettingsRepository: StaticMeterSettingsRepository, meterSettingsRepositoryCapitalDistrict: StaticMeterSettingsDataSourceCapitalDs);
     protected execute(): Promise<void>;
     private lookupMeasurementsOptionsByKey;
 }

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

@@ -24,6 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FetchMeasurementOptionsStaticDataTask = void 0;
 const constants_1 = require("../../constants");
 const StaticMeterSettingsDataSourceProvider_1 = require("../../datasources/static-data/StaticMeterSettingsDataSourceProvider");
+const StaticMeterSettingsDataSourceCapitalDs_1 = require("../../datasources/static-data/StaticMeterSettingsDataSourceCapitalDs");
 const WorkerContainerToken_1 = require("../../ioc/WorkerContainerToken");
 const StaticMeterSettingsRepository_1 = require("../../repositories/StaticMeterSettingsRepository");
 const CommodityProviderTypeEnum_1 = require("../../../../schema-definitions/models/helpers/CommodityProviderTypeEnum");
@@ -37,24 +38,30 @@ const optionLookupKeys = {
     [CommodityProviderTypeEnum_1.CommodityProviderType.CemApiVeoliaElectro]: "CemElectroOptions",
     [CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveV]: "AveVOptions",
     [CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveM]: "AveMOptions",
+    [CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveA]: "AveHl.m.Prahaptions",
+    [CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveC]: "AveHlavni.m.Prahaptions",
+    [CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveMO]: "AveHlavni.mesto.Praha.64581ptions",
     [CommodityProviderTypeEnum_1.CommodityProviderType.PreOptions]: "PreOptions",
     [CommodityProviderTypeEnum_1.CommodityProviderType.PtasOptions]: "PtasOptions",
 };
 let FetchMeasurementOptionsStaticDataTask = exports.FetchMeasurementOptionsStaticDataTask = class FetchMeasurementOptionsStaticDataTask extends AbstractEmptyTask_1.AbstractEmptyTask {
-    constructor(logger, staticDataSourceProvider, meterSettingsRepository) {
+    constructor(logger, staticDataSourceProvider, meterSettingsRepository, meterSettingsRepositoryCapitalDistrict) {
         super(constants_1.WORKER_NAME);
         this.logger = logger;
         this.staticDataSourceProvider = staticDataSourceProvider;
         this.meterSettingsRepository = meterSettingsRepository;
+        this.meterSettingsRepositoryCapitalDistrict = meterSettingsRepositoryCapitalDistrict;
         this.queueName = "fetchMeasurementOptionsStaticData";
         this.queueTtl = 59 * 60 * 1000; // 59min
     }
     execute() {
         return __awaiter(this, void 0, void 0, function* () {
             const dataSource = this.staticDataSourceProvider.getDataSource();
+            const staticDataSourceCapitalDistrict = this.meterSettingsRepositoryCapitalDistrict.getDataSource();
+            const meterSettingsCapitalDistrict = yield staticDataSourceCapitalDistrict.getAll();
             const meterSettings = yield dataSource.getAll();
             for (const [commodityProvider, key] of Object.entries(optionLookupKeys)) {
-                const options = this.lookupMeasurementsOptionsByKey(meterSettings, key);
+                const options = this.lookupMeasurementsOptionsByKey(Object.assign(Object.assign({}, meterSettings), meterSettingsCapitalDistrict), key);
                 if (options.length === 0) {
                     continue;
                 }
@@ -76,7 +83,9 @@ exports.FetchMeasurementOptionsStaticDataTask = FetchMeasurementOptionsStaticDat
     __param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
     __param(1, (0, tsyringe_1.inject)(WorkerContainerToken_1.WorkerContainerToken.StaticMeterSettingsDataSourceProvider)),
     __param(2, (0, tsyringe_1.inject)(WorkerContainerToken_1.WorkerContainerToken.StaticMeterSettingsRepository)),
+    __param(3, (0, tsyringe_1.inject)(WorkerContainerToken_1.WorkerContainerToken.StaticMeterSettingsDataSourceCapitalDs)),
     __metadata("design:paramtypes", [Object, StaticMeterSettingsDataSourceProvider_1.StaticMeterSettingsDataSourceProvider,
-        StaticMeterSettingsRepository_1.StaticMeterSettingsRepository])
+        StaticMeterSettingsRepository_1.StaticMeterSettingsRepository,
+        StaticMeterSettingsDataSourceCapitalDs_1.StaticMeterSettingsDataSourceCapitalDs])
 ], FetchMeasurementOptionsStaticDataTask);
 //# sourceMappingURL=FetchMeasurementOptionsStaticDataTask.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"FetchMeasurementOptionsStaticDataTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgE;AAChE,+HAA8I;AAC9I,yEAAwF;AACxF,oGAAmH;AAEnH,uHAAsF;AACtF,yHAAwF;AACxF,wEAAqE;AAErE,uGAAoG;AACpG,6EAAwE;AACxE,iEAAwE;AAExE,MAAM,gBAAgB,GAAG;IACrB,CAAC,iDAAqB,CAAC,iBAAiB,CAAC,EAAE,iBAAiB;IAC5D,CAAC,iDAAqB,CAAC,mBAAmB,CAAC,EAAE,mBAAmB;IAChE,CAAC,iDAAqB,CAAC,QAAQ,CAAC,EAAE,aAAa;IAC/C,CAAC,iDAAqB,CAAC,QAAQ,CAAC,EAAE,aAAa;IAC/C,CAAC,iDAAqB,CAAC,UAAU,CAAC,EAAE,YAAY;IAChD,CAAC,iDAAqB,CAAC,WAAW,CAAC,EAAE,aAAa;CACrD,CAAC;AAGK,IAAM,qCAAqC,mDAA3C,MAAM,qCAAsC,SAAQ,qCAAiB;IAIxE,YAC8B,MAAuB,EAEjD,wBAAuE,EAEvE,uBAA8D;QAE9D,KAAK,CAAC,uBAAW,CAAC,CAAC;QANe,WAAM,GAAN,MAAM,CAAS;QAEzC,6BAAwB,GAAxB,wBAAwB,CAAuC;QAE/D,4BAAuB,GAAvB,uBAAuB,CAA+B;QARlD,cAAS,GAAG,mCAAmC,CAAC;QAChD,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,QAAQ;IAUnD,CAAC;IAEe,OAAO;;YACnB,MAAM,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC,aAAa,EAAE,CAAC;YACjE,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;YAEhD,KAAK,MAAM,CAAC,iBAAiB,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;gBACrE,MAAM,OAAO,GAAG,IAAI,CAAC,8BAA8B,CAAC,aAAa,EAAE,GAAiC,CAAC,CAAC;gBACtG,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;oBACtB,SAAS;iBACZ;gBAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,OAAO,CAAC,MAAM,4BAA4B,iBAAiB,EAAE,CAAC,CAAC;gBAC3F,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CACvC,iBAA0C,EAC1C,mDAAsB,CAAC,kBAAkB,EACzC,OAAO,CACV,CAAC;aACL;QACL,CAAC;KAAA;IAEO,8BAA8B,CAClC,aAAmC,EACnC,GAA+B;QAE/B,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,kBAAkB,CAAA,EAAE;YAC/B,MAAM,IAAI,6BAAY,CAAC,0CAA0C,GAAG,EAAE,CAAC,CAAC;SAC3E;QACD,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,kBAAkB,CAAC;IACxC,CAAC;CACJ,CAAA;gDA3CY,qCAAqC;IADjD,IAAA,qBAAU,GAAE;IAMJ,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;IACxB,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,qCAAqC,CAAC,CAAA;IAElE,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,6BAA6B,CAAC,CAAA;6CADzB,6EAAqC;QAEtC,6DAA6B;GATzD,qCAAqC,CA2CjD"}
+{"version":3,"file":"FetchMeasurementOptionsStaticDataTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgE;AAChE,+HAA8I;AAC9I,iIAAgJ;AAChJ,yEAAwF;AACxF,oGAAmH;AAEnH,uHAAsF;AACtF,yHAAwF;AACxF,wEAAqE;AAErE,uGAAoG;AACpG,6EAAwE;AACxE,iEAAwE;AAExE,MAAM,gBAAgB,GAAG;IACrB,CAAC,iDAAqB,CAAC,iBAAiB,CAAC,EAAE,iBAAiB;IAC5D,CAAC,iDAAqB,CAAC,mBAAmB,CAAC,EAAE,mBAAmB;IAChE,CAAC,iDAAqB,CAAC,QAAQ,CAAC,EAAE,aAAa;IAC/C,CAAC,iDAAqB,CAAC,QAAQ,CAAC,EAAE,aAAa;IAC/C,CAAC,iDAAqB,CAAC,QAAQ,CAAC,EAAE,qBAAqB;IACvD,CAAC,iDAAqB,CAAC,QAAQ,CAAC,EAAE,yBAAyB;IAC3D,CAAC,iDAAqB,CAAC,SAAS,CAAC,EAAE,mCAAmC;IACtE,CAAC,iDAAqB,CAAC,UAAU,CAAC,EAAE,YAAY;IAChD,CAAC,iDAAqB,CAAC,WAAW,CAAC,EAAE,aAAa;CACrD,CAAC;AAGK,IAAM,qCAAqC,mDAA3C,MAAM,qCAAsC,SAAQ,qCAAiB;IAIxE,YAC8B,MAAuB,EAEjD,wBAAuE,EAEvE,uBAA8D,EAE9D,sCAAsF;QAEtF,KAAK,CAAC,uBAAW,CAAC,CAAC;QARe,WAAM,GAAN,MAAM,CAAS;QAEzC,6BAAwB,GAAxB,wBAAwB,CAAuC;QAE/D,4BAAuB,GAAvB,uBAAuB,CAA+B;QAEtD,2CAAsC,GAAtC,sCAAsC,CAAwC;QAV1E,cAAS,GAAG,mCAAmC,CAAC;QAChD,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,QAAQ;IAYnD,CAAC;IAEe,OAAO;;YACnB,MAAM,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC,aAAa,EAAE,CAAC;YACjE,MAAM,+BAA+B,GAAG,IAAI,CAAC,sCAAsC,CAAC,aAAa,EAAE,CAAC;YACpG,MAAM,4BAA4B,GAAG,MAAM,+BAA+B,CAAC,MAAM,EAAE,CAAC;YACpF,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;YAEhD,KAAK,MAAM,CAAC,iBAAiB,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;gBACrE,MAAM,OAAO,GAAG,IAAI,CAAC,8BAA8B,iCAC1C,aAAa,GAAK,4BAA4B,GACnD,GAAiC,CACpC,CAAC;gBACF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;oBACtB,SAAS;iBACZ;gBAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,OAAO,CAAC,MAAM,4BAA4B,iBAAiB,EAAE,CAAC,CAAC;gBAC3F,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CACvC,iBAA0C,EAC1C,mDAAsB,CAAC,kBAAkB,EACzC,OAAO,CACV,CAAC;aACL;QACL,CAAC;KAAA;IAEO,8BAA8B,CAClC,aAAmC,EACnC,GAA+B;QAE/B,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,kBAAkB,CAAA,EAAE;YAC/B,MAAM,IAAI,6BAAY,CAAC,0CAA0C,GAAG,EAAE,CAAC,CAAC;SAC3E;QACD,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,kBAAkB,CAAC;IACxC,CAAC;CACJ,CAAA;gDAlDY,qCAAqC;IADjD,IAAA,qBAAU,GAAE;IAMJ,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;IACxB,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,qCAAqC,CAAC,CAAA;IAElE,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,6BAA6B,CAAC,CAAA;IAE1D,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,sCAAsC,CAAC,CAAA;6CAHlC,6EAAqC;QAEtC,6DAA6B;QAEd,+EAAsC;GAXjF,qCAAqC,CAkDjD"}

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

@@ -0,0 +1,11 @@
+import { AbstractTask } from "@golemio/core/dist/integration-engine";
+import { IDataEntrypointParams } from "../interfaces/IDataEntrypointParams";
+import { DataEntrypointValidationSchema } from "../schema/DataEntrypointSchema";
+export declare class FetchMeasurementsFromEEProvidersTask extends AbstractTask<IDataEntrypointParams> {
+    readonly queueName = "fetchMeasurementsFromEEProviders";
+    readonly queueTtl: number;
+    readonly schema: typeof DataEntrypointValidationSchema;
+    constructor();
+    execute(data: IDataEntrypointParams): Promise<void>;
+    private generateDateParams;
+}