@golemio/energetics 1.5.3-dev.2180893364 → 1.6.0-rc.2190853441

package/dist/integration-engine/enapo/workers/task/EnoBuildingTask.d.ts

@@ -5,12 +5,12 @@ import { EnoLocationRepository } from "../../repositories/eno/EnoLocationReposit
 import { EnoPropertyRepository } from "../../repositories/eno/EnoPropertyRepository";
 import { EnoRemovedGIDRepository } from "../../repositories/eno/EnoRemovedGIDRepository";
 import { ILogger } from "@golemio/core/dist/helpers";
-import { ISimpleConfig } from "@golemio/core/dist/helpers/configuration/ISimpleConfig";
 import { IDatabaseConnector } from "@golemio/core/dist/helpers/data-access/postgres/IDatabaseConnector";
 import { AbstractTask } from "@golemio/core/dist/integration-engine/workers/AbstractTask";
-import { IEnoDataTaskInput } from "../interfaces/IEnoDataTaskInput";
-import { EnoDataTaskInputSchema } from "../schema/EnoDataTaskInputSchema";
-export declare class EnoBuildingTask extends AbstractTask<IEnoDataTaskInput> {
+import { IEnoBuildingTaskInput } from "../interfaces/IEnoBuildingTaskInput";
+import { EnoBuildingTaskInputSchema } from "../schema/EnoBuildingTaskInputSchema";
+import { ISimpleConfig } from "@golemio/core/dist/helpers/configuration/ISimpleConfig";
+export declare class EnoBuildingTask extends AbstractTask<IEnoBuildingTaskInput> {
     private enoDatasourceFactory;
     private enoBuildingRepository;
     private enoPropertyRepository;
@@ -20,12 +20,13 @@ export declare class EnoBuildingTask extends AbstractTask<IEnoDataTaskInput> {
     private logger;
     protected dbConnector: IDatabaseConnector;
     private simpleConfig;
-    protected schema: typeof EnoDataTaskInputSchema;
+    protected schema: typeof EnoBuildingTaskInputSchema;
     queueName: string;
     queueTtl: number;
     private removedBuldingsStartDate;
+    private readonly ORGANIZATION_ID;
     constructor(enoDatasourceFactory: EnoDatasourceFactory, enoBuildingRepository: EnoBuildingRepository, enoPropertyRepository: EnoPropertyRepository, enoLocationRepository: EnoLocationRepository, enoAddressRepository: EnoAddressRepository, enoRemovedGIDRepository: EnoRemovedGIDRepository, logger: ILogger, dbConnector: IDatabaseConnector, simpleConfig: ISimpleConfig);
-    execute(data: IEnoDataTaskInput): Promise<void>;
+    execute(data: IEnoBuildingTaskInput): Promise<void>;
     private saveData;
     private getCurrentBuildingList;
     private getRemovedBuildingList;

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

@@ -25,13 +25,11 @@ const EnoRemovedGIDRepository_1 = require("../../repositories/eno/EnoRemovedGIDR
 const EnoBuildingTransformation_1 = require("../../transformations/eno/EnoBuildingTransformation");
 const EnumGIDTypes_1 = require("../../../../schema-definitions/models/eno/helpers/EnumGIDTypes");
 const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
-const integration_engine_1 = require("@golemio/core/dist/integration-engine");
 const AbstractTask_1 = require("@golemio/core/dist/integration-engine/workers/AbstractTask");
 const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const luxon_1 = require("@golemio/core/dist/shared/luxon");
 const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
-const IEnoDataTaskInput_1 = require("../interfaces/IEnoDataTaskInput");
-const EnoDataTaskInputSchema_1 = require("../schema/EnoDataTaskInputSchema");
+const EnoBuildingTaskInputSchema_1 = require("../schema/EnoBuildingTaskInputSchema");
 let EnoBuildingTask = exports.EnoBuildingTask = class EnoBuildingTask extends AbstractTask_1.AbstractTask {
     constructor(enoDatasourceFactory, enoBuildingRepository, enoPropertyRepository, enoLocationRepository, enoAddressRepository, enoRemovedGIDRepository, logger, dbConnector, simpleConfig) {
         super(constants_1.ENAPO_WORKER_NAME);
@@ -44,15 +42,16 @@ let EnoBuildingTask = exports.EnoBuildingTask = class EnoBuildingTask extends Ab
         this.logger = logger;
         this.dbConnector = dbConnector;
         this.simpleConfig = simpleConfig;
-        this.schema = EnoDataTaskInputSchema_1.EnoDataTaskInputSchema;
+        this.schema = EnoBuildingTaskInputSchema_1.EnoBuildingTaskInputSchema;
         this.queueName = "processEnoBuildings";
         this.queueTtl = 60 * 60 * 1000;
+        this.ORGANIZATION_ID = 1;
         this.removedBuldingsStartDate = this.simpleConfig.getValue("module.energetics.eno.removedBuldingsStartDate", "2025-01-01T00:00:00+01:00");
     }
     async execute(data) {
         try {
             const datasource = this.enoDatasourceFactory.getDatasource(EnoDatasourceFactory_1.ENO_ENDPOINT.BUILDINGS, data.source);
-            const listGID = data.type === IEnoDataTaskInput_1.EnumEnoDataType.CURRENT
+            const listGID = data.type === "current"
                 ? await this.getCurrentBuildingList(datasource, data)
                 : await this.getRemovedBuildingList(datasource, data);
             if (!listGID || (Array.isArray(listGID.return) && listGID.return.length === 0)) {
@@ -67,10 +66,6 @@ let EnoBuildingTask = exports.EnoBuildingTask = class EnoBuildingTask extends Ab
                 const transformation = new EnoBuildingTransformation_1.EnoBuildingTransformation(data.source);
                 const transformedData = transformation.transformArray(buildingDetails.return);
                 await this.saveData(transformedData);
-                integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "processEnoGeometry", {
-                    source: data.source,
-                    listGid: listGID.return,
-                });
             }
         }
         catch (err) {
@@ -100,14 +95,14 @@ let EnoBuildingTask = exports.EnoBuildingTask = class EnoBuildingTask extends Ab
     }
     async getCurrentBuildingList(datasource, data) {
         const listGID = await datasource.getData(EnoOperationEnum_1.EnoOperationBuildingEnum.LIST_BY_ORG, "", {
-            idOrganizace: constants_1.ENO_DEFAULT_ORGANIZATION_ID,
+            idOrganizace: this.ORGANIZATION_ID,
             ...(data.daysBack ? { datum: luxon_1.DateTime.now().minus({ days: data.daysBack }).toISO() } : {}),
         });
         return listGID;
     }
     async getRemovedBuildingList(datasource, data) {
         const listRemovedBuildingGID = await datasource.getData(EnoOperationEnum_1.EnoOperationBuildingEnum.REMOVED_LIST, "", {
-            idOrganizace: constants_1.ENO_DEFAULT_ORGANIZATION_ID,
+            idOrganizace: this.ORGANIZATION_ID,
             datum: data.daysBack ? luxon_1.DateTime.now().minus({ days: data.daysBack }).toISO() : this.removedBuldingsStartDate,
         });
         if (listRemovedBuildingGID) {

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

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

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

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

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

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

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

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

package/dist/schema-definitions/models/MeasurementsModel.d.ts

@@ -11,7 +11,6 @@ export declare class MeasurementModel extends Model<MeasurementModel, IMeasureme
     meter: string;
     source: string;
     measurement_category: string;
-    device_serial_number: string;
     static attributeModel: ModelAttributes<MeasurementModel, IMeasurementDto>;
     static attributesToUpdate: string[];
     static arrayJsonSchema: JSONSchemaType<IMeasurementDto[]>;

package/dist/schema-definitions/models/MeasurementsModel.js

@@ -31,7 +31,6 @@ MeasurementModel.attributeModel = {
     },
     source: sequelize_1.DataTypes.STRING(20),
     measurement_category: sequelize_1.DataTypes.STRING(50),
-    device_serial_number: sequelize_1.DataTypes.STRING(50),
 };
 MeasurementModel.attributesToUpdate = Object.keys(MeasurementModel.attributeModel).concat("updated_at");
 MeasurementModel.arrayJsonSchema = {
@@ -50,21 +49,8 @@ MeasurementModel.arrayJsonSchema = {
             meter: { type: "string" },
             source: { type: "string" },
             measurement_category: { type: "string" },
-            device_serial_number: {
-                oneOf: [{ type: "string" }, { type: "null", nullable: true }],
-            },
         },
-        required: [
-            "timestamp",
-            "value",
-            "addr",
-            "variable",
-            "type",
-            "meter",
-            "source",
-            "measurement_category",
-            "device_serial_number",
-        ],
+        required: ["timestamp", "value", "addr", "variable", "type", "meter", "source", "measurement_category"],
     },
 };
 //# sourceMappingURL=MeasurementsModel.js.map

package/dist/schema-definitions/models/MeasurementsModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"MeasurementsModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/MeasurementsModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAExF,2EAAsG;AAEtG,MAAa,gBAAiB,SAAQ,iBAAwC;;AAA9E,4CA2EC;AA1EiB,0BAAS,GAAG,iCAAiC,CAAC;AAY9C,+BAAc,GAAuD;IAC/E,SAAS,EAAE;QACP,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,IAAI;KACvB;IACD,KAAK,EAAE,qBAAS,CAAC,MAAM,CAAC;QACpB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,EAAE;KACZ,CAAC;IACF,IAAI,EAAE;QACF,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;KAC9B;IACD,QAAQ,EAAE;QACN,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;QAC3B,KAAK,EAAE,KAAK;KACf;IACD,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAC3B,KAAK,EAAE;QACH,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;KAC9B;IACD,MAAM,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IAC5B,oBAAoB,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IAC1C,oBAAoB,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;CAC7C,CAAC;AAEY,mCAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AAEvF,gCAAe,GAAsC;IAC/D,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,SAAS,EAAE;gBACP,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;aAC5B;YACD,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,4CAAqB,EAAE;YACzD,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,wCAAiB,EAAE;YACjD,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC1B,oBAAoB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxC,oBAAoB,EAAE;gBAClB,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aAChE;SACJ;QACD,QAAQ,EAAE;YACN,WAAW;YACX,OAAO;YACP,MAAM;YACN,UAAU;YACV,MAAM;YACN,OAAO;YACP,QAAQ;YACR,sBAAsB;YACtB,sBAAsB;SACzB;KACJ;CACJ,CAAC"}
+{"version":3,"file":"MeasurementsModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/MeasurementsModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAExF,2EAAsG;AAEtG,MAAa,gBAAiB,SAAQ,iBAAwC;;AAA9E,4CA4DC;AA3DiB,0BAAS,GAAG,iCAAiC,CAAC;AAW9C,+BAAc,GAAuD;IAC/E,SAAS,EAAE;QACP,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,IAAI;KACvB;IACD,KAAK,EAAE,qBAAS,CAAC,MAAM,CAAC;QACpB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,EAAE;KACZ,CAAC;IACF,IAAI,EAAE;QACF,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;KAC9B;IACD,QAAQ,EAAE;QACN,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;QAC3B,KAAK,EAAE,KAAK;KACf;IACD,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAC3B,KAAK,EAAE;QACH,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;KAC9B;IACD,MAAM,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IAC5B,oBAAoB,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;CAC7C,CAAC;AAEY,mCAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AAEvF,gCAAe,GAAsC;IAC/D,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,SAAS,EAAE;gBACP,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;aAC5B;YACD,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,4CAAqB,EAAE;YACzD,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,wCAAiB,EAAE;YACjD,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC1B,oBAAoB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC3C;QACD,QAAQ,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,sBAAsB,CAAC;KAC1G;CACJ,CAAC"}

package/dist/schema-definitions/models/eno/EJLookupModel.js

@@ -17,7 +17,7 @@ EJLookupModel.attributeModel = {
     druh_po: sequelize_1.DataTypes.TEXT,
     hlavni: sequelize_1.DataTypes.BOOLEAN,
     ic: sequelize_1.DataTypes.TEXT,
-    id: sequelize_1.DataTypes.NUMBER,
+    id: sequelize_1.DataTypes.TEXT,
     kod: sequelize_1.DataTypes.TEXT,
     kod_maj_evidencni_jednotka_hl: sequelize_1.DataTypes.TEXT,
     kod_maj_evidencni_jednotka_ot: sequelize_1.DataTypes.TEXT,

package/dist/schema-definitions/models/eno/EJLookupModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"EJLookupModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/models/eno/EJLookupModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAGxF,MAAa,aAAc,SAAQ,iBAAgB;;AAAnD,sCA6FC;AA5F0B,wBAAU,GAAG,iCAAiC,CAAC;AAmBxD,4BAAc,GAA8C;IACtE,IAAI,EAAE;QACF,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,IAAI;KACvB;IACD,OAAO,EAAE,qBAAS,CAAC,OAAO;IAC1B,cAAc,EAAE,qBAAS,CAAC,IAAI;IAC9B,aAAa,EAAE,qBAAS,CAAC,IAAI;IAC7B,OAAO,EAAE,qBAAS,CAAC,IAAI;IACvB,MAAM,EAAE,qBAAS,CAAC,OAAO;IACzB,EAAE,EAAE,qBAAS,CAAC,IAAI;IAClB,EAAE,EAAE,qBAAS,CAAC,MAAM;IACpB,GAAG,EAAE,qBAAS,CAAC,IAAI;IACnB,6BAA6B,EAAE,qBAAS,CAAC,IAAI;IAC7C,6BAA6B,EAAE,qBAAS,CAAC,IAAI;IAC7C,6BAA6B,EAAE,qBAAS,CAAC,IAAI;IAC7C,aAAa,EAAE,qBAAS,CAAC,IAAI;IAC7B,KAAK,EAAE,qBAAS,CAAC,IAAI;IACrB,WAAW,EAAE,qBAAS,CAAC,IAAI;IAC3B,QAAQ,EAAE,qBAAS,CAAC,IAAI;IACxB,GAAG,EAAE,qBAAS,CAAC,IAAI;CACtB,CAAC;AAEY,wBAAU,GAAgC;IACpD,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC5B,cAAc,EAAE;gBACZ,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;qBAC5B;oBACD,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;iBACnC;aACJ;YACD,aAAa,EAAE;gBACX,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;qBAC5B;oBACD,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;iBACnC;aACJ;YACD,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC3B,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtB,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtB,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACvB,6BAA6B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjD,6BAA6B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjD,6BAA6B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjD,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,WAAW,EAAE;gBACT,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;qBAC5B;oBACD,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;iBACnC;aACJ;YACD,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC1B;QACD,QAAQ,EAAE,CAAC,MAAM,CAAC;KACrB;CACJ,CAAC"}
+{"version":3,"file":"EJLookupModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/models/eno/EJLookupModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAGxF,MAAa,aAAc,SAAQ,iBAAgB;;AAAnD,sCA6FC;AA5F0B,wBAAU,GAAG,iCAAiC,CAAC;AAmBxD,4BAAc,GAA8C;IACtE,IAAI,EAAE;QACF,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,IAAI;KACvB;IACD,OAAO,EAAE,qBAAS,CAAC,OAAO;IAC1B,cAAc,EAAE,qBAAS,CAAC,IAAI;IAC9B,aAAa,EAAE,qBAAS,CAAC,IAAI;IAC7B,OAAO,EAAE,qBAAS,CAAC,IAAI;IACvB,MAAM,EAAE,qBAAS,CAAC,OAAO;IACzB,EAAE,EAAE,qBAAS,CAAC,IAAI;IAClB,EAAE,EAAE,qBAAS,CAAC,IAAI;IAClB,GAAG,EAAE,qBAAS,CAAC,IAAI;IACnB,6BAA6B,EAAE,qBAAS,CAAC,IAAI;IAC7C,6BAA6B,EAAE,qBAAS,CAAC,IAAI;IAC7C,6BAA6B,EAAE,qBAAS,CAAC,IAAI;IAC7C,aAAa,EAAE,qBAAS,CAAC,IAAI;IAC7B,KAAK,EAAE,qBAAS,CAAC,IAAI;IACrB,WAAW,EAAE,qBAAS,CAAC,IAAI;IAC3B,QAAQ,EAAE,qBAAS,CAAC,IAAI;IACxB,GAAG,EAAE,qBAAS,CAAC,IAAI;CACtB,CAAC;AAEY,wBAAU,GAAgC;IACpD,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC5B,cAAc,EAAE;gBACZ,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;qBAC5B;oBACD,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;iBACnC;aACJ;YACD,aAAa,EAAE;gBACX,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;qBAC5B;oBACD,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;iBACnC;aACJ;YACD,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC3B,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtB,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtB,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACvB,6BAA6B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjD,6BAA6B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjD,6BAA6B,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjD,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,WAAW,EAAE;gBACT,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;qBAC5B;oBACD,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;iBACnC;aACJ;YACD,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC1B;QACD,QAAQ,EAAE,CAAC,MAAM,CAAC;KACrB;CACJ,CAAC"}

package/dist/schema-definitions/models/interfaces/IMeasurementDto.d.ts

@@ -7,5 +7,4 @@ export interface IMeasurementDto {
     meter: string;
     source: string;
     measurement_category: string;
-    device_serial_number: string | null;
 }

package/docs/asyncapi.yaml

@@ -180,28 +180,6 @@ channels:
         messages:
             enoBuildingMessage:
                 $ref: "#/components/messages/energetics.EnoBuildingMessage"
-    energetics.processEnoStructures:
-        address: dataplatform.enapoenergetics.processEnoStructures
-        description: downloads structure (stavba) data from ENO SOAP/WSDL API including structures, properties, addresses, and locations. Supports full and incremental synchronization using daysBack parameter. After successful processing, triggers geometry download. Stores data in database tables (eno_stavba, eno_majetek, eno_adresa, eno_umisteni, eno_vyrazene_gid)
-        bindings:
-            amqp:
-                is: queue
-                queue:
-                    durable: true
-        messages:
-            enoStructureMessage:
-                $ref: "#/components/messages/energetics.EnoBuildingMessage"
-    energetics.processEnoGeometry:
-        address: dataplatform.enapoenergetics.processEnoGeometry
-        description: downloads geometry (polygons) for buildings and structures from ENO SOAP/WSDL API. Automatically triggered after building or structure synchronization. Stores data in database table (eno_geometrie)
-        bindings:
-            amqp:
-                is: queue
-                queue:
-                    durable: true
-        messages:
-            enoGeometryMessage:
-                $ref: "#/components/messages/energetics.EnoGeometryMessage"
 operations:
     energetics.fetchAccessConfiguration:
         action: "send"
@@ -267,14 +245,6 @@ operations:
         action: "send"
         channel:
             $ref: "#/channels/energetics.processEnoBuildings"
-    energetics.processEnoStructures:
-        action: "send"
-        channel:
-            $ref: "#/channels/energetics.processEnoStructures"
-    energetics.processEnoGeometry:
-        action: "send"
-        channel:
-            $ref: "#/channels/energetics.processEnoGeometry"
 components:
     messages:
         emptyMessage:
@@ -324,11 +294,6 @@ components:
                 type: object
                 $ref: "#/components/schemas/energetics.IEnoBuildingTaskInput"
                 additionalProperties: false
-        energetics.EnoGeometryMessage:
-            payload:
-                type: object
-                $ref: "#/components/schemas/energetics.IEnoGeometryTaskInput"
-                additionalProperties: false
     schemas:
         energetics.IFetchConsumptionInput:
             type: object
@@ -481,23 +446,4 @@ components:
                         - 30
                         - 90
             additionalProperties: false
-        energetics.IEnoGeometryTaskInput:
-            type: object
-            required:
-                - source
-                - listGid
-            properties:
-                source:
-                    type: string
-                    description: Data source identifier (e.g., "mhmp" for Hlavní město Praha)
-                    examples:
-                        - "mhmp"
-                listGid:
-                    type: array
-                    items:
-                        type: string
-                    description: List of GID identifiers for which to fetch geometry data
-                    examples:
-                        - ["GID312203", "GID311624"]
-            additionalProperties: false
 

package/docs/implementation_documentation.md

@@ -196,12 +196,6 @@ https://gitlab.com/operator-ict/golemio/projekty/energetika/p0262.prevzeti-energ
         -   `getBudovyVMajetku` - získání seznamu GID budov v majetku organizace
         -   `getDetailBudovy` - získání detailu budov podle seznamu GID
         -   `getVyrazeneBudovy` - získání seznamu GID vyřazených budov
-    -   Stavby:
-        -   `getStavbyVMajetku` - získání seznamu GID staveb v majetku organizace
-        -   `getDetailStavby` - získání detailu staveb podle seznamu GID
-        -   `getVyrazeneStavby` - získání seznamu GID vyřazených staveb
-    -   Geometrie:
-        -   `getGeometrie` - získání geometrie (polygonů) pro seznam GID budov/staveb
 
 ## Zpracování dat / transformace
 
@@ -558,74 +552,6 @@ Task stahuje data o budovách ze systému ENO včetně detailních informací o
 -   unit testy
     -   [EnoBuildingTask.test.ts](../test/integration-engine/enapo/task/EnoBuildingTask.test.ts)
 
-#### _task: EnoStructureTask_
-
-Task stahuje data o stavbách ze systému ENO včetně detailních informací o stavbách, adresách, umístění a majetkových vztazích. Podporuje plnou i inkrementální synchronizaci (pomocí parametru `daysBack`). Po úspěšném stažení staveb automaticky spouští stahování geometrií.
-
--   vstupní rabbitmq fronta
-    -   název: dataplatform.enapoenergetics.processEnoStructures
-    -   TTL: 1 hodina
-    -   parametry: `{ type, source, daysBack? }`
-        -   `type` - typ synchronizace (`current` | `removed`)
-        -   `source` - zdroj dat (např. `mhmp`)
-        -   `daysBack` - volitelný parametr pro inkrementální synchronizaci (počet dní zpětně)
-    -   validační schéma: [EnoBuildingTaskInputSchema](../src/integration-engine/enapo/workers/schema/EnoBuildingTaskInputSchema.ts)
--   závislé fronty (do kterých jsou odesílány zprávy z metody workeru)
-    -   dataplatform.enapoenergetics.processEnoGeometry - po úspěšném stažení staveb
--   datové zdroje
-    -   ENO SOAP/WSDL API (Structure endpoint)
-    -   [EnoDatasource](../src/integration-engine/enapo/datasources/eno/EnoDatasource.ts)
-    -   [EnoDatasourceFactory](../src/integration-engine/enapo/datasources/eno/EnoDatasourceFactory.ts)
--   transformace
-    -   [EnoStructureTransformation](../src/integration-engine/enapo/transformations/eno/EnoStructureTransformation.ts) - transformace dat staveb
-        -   Transformuje stavbu, majetek, adresy a umístění
-        -   Zpracovává pole adres a umístění s přidělením pořadí (poradi)
--   data modely
-    -   [StructureModel](../src/schema-definitions/models/eno/StructureModel.ts) tabulka `eno_stavba`
-    -   [PropertyModel](../src/schema-definitions/models/eno/PropertyModel.ts) tabulka `eno_majetek`
-    -   [AddressModel](../src/schema-definitions/models/eno/AddressModel.ts) tabulka `eno_adresa`
-    -   [LocationModel](../src/schema-definitions/models/eno/LocationModel.ts) tabulka `eno_umisteni`
-    -   [RemovedGIDModel](../src/schema-definitions/models/eno/RemovedGIDModel.ts) tabulka `eno_vyrazene_gid`
--   funkce
-    -   **Plná synchronizace**: Stáhne všechny stavby v majetku organizace (bez parametru `daysBack`)
-    -   **Inkrementální synchronizace**: Stáhne pouze stavby změněné za posledních X dní (s parametrem `daysBack`)
-    -   **Vyřazené stavby**: Pro typ `removed` ukládá GID vyřazených staveb do speciální tabulky
-    -   **Transakční zpracování**: Všechny operace zápisu probíhají v databázové transakci pro zajištění konzistence
-    -   **Automatické stažení geometrií**: Po úspěšném zpracování staveb odesílá zprávu do fronty pro stažení geometrií
--   unit testy
-    -   [EnoStructureTask.test.ts](../test/integration-engine/enapo/task/EnoStructureTask.test.ts)
-
-#### _task: EnoGeometryTask_
-
-Task stahuje geometrie (polygony) pro budovy a stavby ze systému ENO. Je automaticky spouštěn po dokončení synchronizace budov nebo staveb.
-
--   vstupní rabbitmq fronta
-    -   název: dataplatform.enapoenergetics.processEnoGeometry
-    -   TTL: 1 hodina
-    -   parametry: `{ source, listGid }`
-        -   `source` - zdroj dat (např. `mhmp`)
-        -   `listGid` - seznam GID pro které se má stáhnout geometrie
-    -   validační schéma: [EnoGeometryTaskInputSchema](../src/integration-engine/enapo/workers/schema/EnoGeometryTaskInputSchema.ts)
--   závislé fronty (do kterých jsou odesílány zprávy z metody workeru)
-    -   žádné
--   datové zdroje
-    -   ENO SOAP/WSDL API (Geometry endpoint)
-    -   [EnoDatasource](../src/integration-engine/enapo/datasources/eno/EnoDatasource.ts)
-    -   [EnoDatasourceFactory](../src/integration-engine/enapo/datasources/eno/EnoDatasourceFactory.ts)
--   transformace
-    -   [EnoGeometryTransformation](../src/integration-engine/enapo/transformations/eno/EnoGeometryTransformation.ts) - transformace geometrických dat
-        -   Zpracovává polygony ve formátu WKT (Well-Known Text)
-        -   Přiděluje pořadí (poradi) pro více geometrií se stejným GID
-        -   Podporuje EPSG kód pro souřadnicový systém
--   data modely
-    -   [GeometryModel](../src/schema-definitions/models/eno/GeometryModel.ts) tabulka `eno_geometrie`
--   funkce
-    -   **Stažení geometrií**: Stáhne geometrie pro zadaný seznam GID
-    -   **Podpora více geometrií**: Jeden GID může mít více geometrií (např. budova s více polygony), každá dostane unikátní pořadí
-    -   **EPSG kód**: Podporuje různé souřadnicové systémy (výchozí S-JTSK = 5514)
--   unit testy
-    -   [EnoGeometryTask.test.ts](../test/integration-engine/enapo/task/EnoGeometryTask.test.ts)
-
 ## Uložení dat
 
 -   typ databáze

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/energetics",
-    "version": "1.5.3-dev.2180893364",
+    "version": "1.6.0-rc.2190853441",
     "description": "Golemio Energetics Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -36,8 +36,8 @@
         "@commitlint/cli": "^11.0.0",
         "@commitlint/config-conventional": "^11.0.0",
         "@golemio/cli": "1.11.0",
-        "@golemio/core": "2.0.1",
-        "@golemio/db-common": "1.2.0",
+        "@golemio/core": "2.0.3",
+        "@golemio/db-common": "1.2.1",
         "@golemio/eslint-config": "1.1.2",
         "@types/chai": "4.2.3",
         "@types/chai-as-promised": "7.1.2",
@@ -72,7 +72,7 @@
         "typescript-transform-paths": "^3.4.6"
     },
     "peerDependencies": {
-        "@golemio/core": "2.0.1"
+        "@golemio/core": "2.0.3"
     },
     "dependencies": {
         "basic-ftp": "^5.0.2",

package/db/migrations/postgresql/20250213141826-add-device-serial-id.js

@@ -1,53 +0,0 @@
-'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', '20250213141826-add-device-serial-id-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', '20250213141826-add-device-serial-id-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/20251119123216-eno-stavby-geometrie.js

@@ -1,53 +0,0 @@
-'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', '20251119123216-eno-stavby-geometrie-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', '20251119123216-eno-stavby-geometrie-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/20251126125250-eno-ej-lookup-type-fix.js

@@ -1,53 +0,0 @@
-'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', '20251126125250-eno-ej-lookup-type-fix-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', '20251126125250-eno-ej-lookup-type-fix-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/20250213141826-add-device-serial-id-down.sql

@@ -1 +0,0 @@
-ALTER TABLE consumption_energy_measurements DROP COLUMN device_serial_number;

package/db/migrations/postgresql/sqls/20250213141826-add-device-serial-id-up.sql

@@ -1 +0,0 @@
-ALTER TABLE consumption_energy_measurements ADD COLUMN device_serial_number varchar(50);

package/db/migrations/postgresql/sqls/20251119123216-eno-stavby-geometrie-down.sql

@@ -1,2 +0,0 @@
-drop table eno_stavba;
-drop table eno_geometrie;