@golemio/energetics 1.10.0 → 1.10.1-dev.2573865208

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

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

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

@@ -11,6 +11,7 @@ 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,6 +31,7 @@ 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 = {
@@ -49,8 +50,21 @@ 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"],
+        required: [
+            "timestamp",
+            "value",
+            "addr",
+            "variable",
+            "type",
+            "meter",
+            "source",
+            "measurement_category",
+            "device_serial_number",
+        ],
     },
 };
 //# 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,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"}
+{"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"}

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

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

package/docs/implementation_documentation.md

@@ -115,11 +115,13 @@ https://gitlab.com/operator-ict/golemio/projekty/energetika/p0262.prevzeti-energ
 #### _PPAS (Pražská plynárenská) InternetAVE API_
 
 -   zdroj dat
-    -   url: https://iave.ppas.cz/website/api (module.energetics.commodityProviders.ppas_ave_api.baseUrl)
-    -   API dokumentace: https://www.ave-system.com/Content/download/AveRestApiDocumentation.pdf
+    -   url: https://aveapi.ppas.cz/api/v1 (module.energetics.commodityProviders.ppas_ave_api.baseUrl)
+    -   API dokumentace: https://aveapi.ppas.cz/api/docs/v1 (interaktivní Swagger: https://aveapi.ppas.cz/api/swagger/ui/index)
+    -   endpointy: `/devices` (seznam OM), `/devices/{deviceId}/data/archive` (archivní data)
+    -   autentizace: HTTP header `X-API-Key` (per-uživatel apiKey v configu, např. `module.energetics.commodityProviders.ppas_ave_api_mo.apiKey`)
 -   formát dat
     -   protokol: http
-    -   datový typ: json
+    -   datový typ: json (archive endpoint vrací columnar `{ headers, rows }` — rozbaluje se v [ArchiveDataTypeStrategy](../src/integration-engine/commodity-providers/datasources/ppas-ave-api/helpers/ArchiveDataTypeStrategy.ts))
     -   validační schéma: [Places](../src/schema-definitions/datasources/commodity-providers/AveApiPlacesJsonSchema.ts), [DeviceData](../src/schema-definitions/datasources/commodity-providers/AveApiDeviceDataJsonSchema.ts)
     -   příklad vstupnich dat: viz [test](../test/integration-engine/commodity-providers/FetchPpasMeasurementsTask.test.ts)
 -   frekvence stahování

package/package.json

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