@golemio/energetics 1.4.12 → 1.4.13-dev.1899264140

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/EnapoMeasurementsModel.d.ts

@@ -0,0 +1,17 @@
+import { JSONSchemaType } from "@golemio/core/dist/shared/ajv";
+import { Model, ModelAttributes } from "@golemio/core/dist/shared/sequelize";
+import { IEnapoMeasurementsDto } from "./interfaces/IEnapoMeasurmentsDto";
+export declare class EnapoMeasurementsModel extends Model<IEnapoMeasurementsDto> implements IEnapoMeasurementsDto {
+    static TABLE_NAME: string;
+    static REPOSITORY_NAME: string;
+    static JSON_SCHEMA_VALIDATOR_NAME: string;
+    eic: string;
+    value: number;
+    timestamp: Date;
+    var: string;
+    source: string;
+    place_id: string;
+    device_serial_number: string;
+    static attributeModel: ModelAttributes<EnapoMeasurementsModel, IEnapoMeasurementsDto>;
+    static jsonSchema: JSONSchemaType<IEnapoMeasurementsDto[]>;
+}

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

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnapoMeasurementsModel = void 0;
+const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
+const MeasurementConstants_1 = require("./constants/MeasurementConstants");
+class EnapoMeasurementsModel extends sequelize_1.Model {
+}
+exports.EnapoMeasurementsModel = EnapoMeasurementsModel;
+EnapoMeasurementsModel.TABLE_NAME = "enapo_measurements";
+EnapoMeasurementsModel.REPOSITORY_NAME = "EnapoMeasurementsRepository";
+EnapoMeasurementsModel.JSON_SCHEMA_VALIDATOR_NAME = "EnapoMeasurementsRepositoryValidator";
+EnapoMeasurementsModel.attributeModel = {
+    eic: {
+        type: sequelize_1.DataTypes.STRING(50),
+        allowNull: false,
+    },
+    value: {
+        type: sequelize_1.DataTypes.DECIMAL(30, 15),
+        allowNull: false,
+    },
+    timestamp: {
+        type: sequelize_1.DataTypes.DATE,
+        allowNull: false,
+        primaryKey: true,
+    },
+    var: {
+        type: sequelize_1.DataTypes.STRING(255),
+        allowNull: false,
+        primaryKey: true,
+    },
+    source: {
+        type: sequelize_1.DataTypes.STRING(20),
+        allowNull: false,
+    },
+    place_id: {
+        type: sequelize_1.DataTypes.STRING(50),
+        allowNull: false,
+        primaryKey: true,
+    },
+    device_serial_number: {
+        type: sequelize_1.DataTypes.STRING(50),
+        allowNull: false,
+    },
+};
+EnapoMeasurementsModel.jsonSchema = {
+    type: "array",
+    items: {
+        type: "object",
+        properties: {
+            eic: { type: "string" },
+            value: { type: "number" },
+            timestamp: { type: "object", required: ["toISOString"] },
+            var: { type: "string", enum: MeasurementConstants_1.MEASUREMENT_VARIABLES },
+            source: { type: "string" },
+            place_id: { type: "string" },
+            device_serial_number: { type: "string" },
+        },
+        required: ["eic", "value", "timestamp", "var", "source", "place_id", "device_serial_number"],
+    },
+};
+//# sourceMappingURL=EnapoMeasurementsModel.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"EnapoMeasurementsModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/EnapoMeasurementsModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAExF,2EAAyE;AAEzE,MAAa,sBAAuB,SAAQ,iBAA4B;;AAAxE,wDA+DC;AA9DiB,iCAAU,GAAG,oBAAoB,CAAC;AAClC,sCAAe,GAAG,6BAA6B,CAAC;AAChD,iDAA0B,GAAG,sCAAsC,CAAC;AAUpE,qCAAc,GAAmE;IAC3F,GAAG,EAAE;QACD,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,SAAS,EAAE,KAAK;KACnB;IACD,KAAK,EAAE;QACH,IAAI,EAAE,qBAAS,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC;QAC/B,SAAS,EAAE,KAAK;KACnB;IACD,SAAS,EAAE;QACP,IAAI,EAAE,qBAAS,CAAC,IAAI;QACpB,SAAS,EAAE,KAAK;QAChB,UAAU,EAAE,IAAI;KACnB;IACD,GAAG,EAAE;QACD,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;QAC3B,SAAS,EAAE,KAAK;QAChB,UAAU,EAAE,IAAI;KACnB;IACD,MAAM,EAAE;QACJ,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,SAAS,EAAE,KAAK;KACnB;IACD,QAAQ,EAAE;QACN,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,SAAS,EAAE,KAAK;QAChB,UAAU,EAAE,IAAI;KACnB;IACD,oBAAoB,EAAE;QAClB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,SAAS,EAAE,KAAK;KACnB;CACJ,CAAC;AAEY,iCAAU,GAA4C;IAChE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACvB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,aAAa,CAAC,EAAE;YACxD,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,4CAAqB,EAAE;YACpD,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC1B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,oBAAoB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC3C;QACD,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,sBAAsB,CAAC;KAC/F;CACJ,CAAC"}

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/IEnapoMeasurmentsDto.d.ts

@@ -0,0 +1,9 @@
+export interface IEnapoMeasurementsDto {
+    eic: string;
+    value: number;
+    timestamp: Date;
+    var: string;
+    source: string;
+    place_id: string;
+    device_serial_number: string;
+}

package/dist/schema-definitions/models/interfaces/IEnapoMeasurmentsDto.js

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

package/dist/schema-definitions/models/interfaces/IEnapoMeasurmentsDto.js.map

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

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/energetics",
-    "version": "1.4.12",
+    "version": "1.4.13-dev.1899264140",
     "description": "Golemio Energetics Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -71,7 +71,7 @@
         "typescript-transform-paths": "^3.4.6"
     },
     "peerDependencies": {
-        "@golemio/core": ">=1.8.4"
+        "@golemio/core": "1.12.3-dev.1387916806"
     },
     "dependencies": {
         "basic-ftp": "^5.0.2",