hoffmation-base 1.1.0 → 1.1.3

package/lib/server/services/dbo/postgreSqlPersist.js

@@ -4,6 +4,7 @@ exports.PostgreSqlPersist = void 0;
 const models_1 = require("../../../models");
 const pg_1 = require("pg");
 const log_service_1 = require("../log-service");
+const DeviceCapability_1 = require("../../devices/DeviceCapability");
 class PostgreSqlPersist {
     constructor(config) {
         this.initialized = false;
@@ -24,7 +25,7 @@ values ('${room.roomName}',${room.settings.etage})
         this.query(`
 insert into hoffmation_schema."DeviceInfo" ("deviceid", "roomname", "alldeviceskey", "customname", "devtype")
 values ('${device.id}','${device.info.room}','${device.info.allDevicesKey}','${device.info.customName}', ${device.deviceType})
-    ON CONFLICT (name)
+    ON CONFLICT ("deviceid")
     DO UPDATE SET
         "roomname" = '${device.info.room}',
         "alldeviceskey" = '${device.info.allDevicesKey}',
@@ -123,6 +124,25 @@ create table "CurrentIllumination"
 alter table "CurrentIllumination"
     owner to postgres;
     END IF;
+    
+    IF (SELECT to_regclass('hoffmation_schema."ButtonSwitchPresses"') IS NULL) Then
+create table if not exists hoffmation_schema."ButtonSwitchPresses"
+(
+    "deviceID"         varchar(60) not null
+        constraint "ButtonSwitchPresses_DeviceInfo_null_fk"
+            references hoffmation_schema."DeviceInfo"
+            on delete set null,
+    "pressType" int,
+    "buttonName" varchar(30),
+    date               timestamp   not null,
+    constraint buttonswitchpresses_pk
+        primary key ("deviceID", "pressType", date)
+);
+
+alter table hoffmation_schema."ButtonSwitchPresses"
+    owner to postgres;
+    END IF;
+    
     IF (SELECT to_regclass('hoffmation_schema."EnergyCalculation"') IS NULL) Then
 create table "EnergyCalculation"
 (
@@ -179,17 +199,17 @@ IF (SELECT to_regclass('hoffmation_schema."AcDeviceData"') IS NULL) Then
 END IF;
 
 
-IF (SELECT to_regclass('hoffmation_schema."LampDeviceData"') IS NULL) Then    
-  create table hoffmation_schema."LampDeviceData"
+IF (SELECT to_regclass('hoffmation_schema."ActuatorDeviceData"') IS NULL) Then    
+  create table hoffmation_schema."ActuatorDeviceData"
   (
       "deviceID" varchar(60) not null,
       "on"       boolean,
       date       timestamp   not null,
-      constraint lampdevicedata_pk
+      constraint ActuatorDeviceData_pk
           primary key ("deviceID", date)
   );
 
-  alter table hoffmation_schema."LampDeviceData"
+  alter table hoffmation_schema."ActuatorDeviceData"
     owner to postgres;
 END IF;
 
@@ -206,6 +226,23 @@ IF (SELECT to_regclass('hoffmation_schema."MotionSensorDeviceData"') IS NULL) Th
   alter table hoffmation_schema."MotionSensorDeviceData"
     owner to postgres;
 END IF;
+
+IF (SELECT to_regclass('hoffmation_schema."ShutterDeviceData"') IS NULL) Then    
+  create table if not exists hoffmation_schema."ShutterDeviceData"
+(
+    "deviceID"         varchar(60) not null
+        constraint "ShutterDeviceData_DeviceInfo_null_fk"
+            references hoffmation_schema."DeviceInfo"
+            on delete set null,
+    "position" double precision,
+    date               timestamp   not null,
+    constraint shutterdevicedata_pk
+        primary key ("deviceID", date)
+);
+
+alter table hoffmation_schema."ShutterDeviceData"
+    owner to postgres;
+END IF;
     
     IF (SELECT to_regclass('hoffmation_schema."TemperaturData"') IS NULL) Then
 create table "TemperaturData"
@@ -234,16 +271,32 @@ insert into hoffmation_schema."AcDeviceData" ("deviceID", "on", "date", "roomTem
 values ('${device.id}', ${device.on}, '${new Date().toISOString()}', ${device.temperature});
     `);
     }
-    persistLamp(device) {
+    persistActuator(device) {
+        let percentage = undefined;
+        if (device.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.dimmablelamp)) {
+            percentage = device.brightness;
+        }
+        this.query(`
+insert into hoffmation_schema."ActuatorDeviceData" ("deviceID", "on", "date", "percentage")
+values ('${device.id}', ${device.actuatorOn}, '${new Date().toISOString()}', ${percentage !== null && percentage !== void 0 ? percentage : 'null'});
+    `);
+    }
+    persistSwitchInput(device, pressType, buttonName) {
         this.query(`
-insert into hoffmation_schema."LampDeviceData" ("deviceID", "on", "date")
-values ('${device.id}', ${device.lightOn}, '${new Date().toISOString()}');
+insert into hoffmation_schema."ButtonSwitchPresses" ("deviceID", "pressType", "buttonName", "date")
+values ('${device.id}', ${pressType}, '${buttonName}', '${new Date().toISOString()}');
     `);
     }
     persistMotionSensor(device) {
         this.query(`
 insert into hoffmation_schema."MotionSensorDeviceData" ("deviceID", "movementDetected", "date")
 values ('${device.id}', ${device.movementDetected}, '${new Date().toISOString()}');
+    `);
+    }
+    persistShutter(device) {
+        this.query(`
+insert into hoffmation_schema."ShutterDeviceData" ("deviceID", "position", "date")
+values ('${device.id}', ${device.currentLevel}, '${new Date().toISOString()}');
     `);
     }
     persistCurrentIllumination(data) {