hoffmation-base 1.1.48 → 1.2.1

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

@@ -6,6 +6,7 @@ const devices_1 = require("../../devices");
 const pg_1 = require("pg");
 const log_service_1 = require("../log-service");
 const DeviceCapability_1 = require("../../devices/DeviceCapability");
+const utils_1 = require("../utils");
 class PostgreSqlPersist {
     constructor(conf) {
         this.initialized = false;
@@ -32,24 +33,6 @@ values ('${device.id}','${device.info.room}','${device.info.allDevicesKey}','${d
         "alldeviceskey" = '${device.info.allDevicesKey}',
         "customname" = '${device.info.customName}',
         "devtype" = ${device.deviceType}
-;
-    `);
-    }
-    addTemperaturDataPoint(heater) {
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Persisting Temperatur Data for ${heater.info.customName}`);
-        this.query(`
-insert into hoffmation_schema."TemperaturData" ("date", "humidity", "istTemperatur", "level", "name", "sollTemperatur")
-values ('${new Date().toISOString()}',${heater.humidity},${heater.iTemperature},${heater.iLevel / 100},'${heater.info.customName}',${heater.desiredTemperature});`);
-        this.query(`
-insert into hoffmation_schema."HeatGroupCollection" ("date", "humidity", "istTemperatur", "level", "name", "sollTemperatur")
-values ('${new Date().toISOString()}',${heater.humidity},${heater.iTemperature},${heater.iLevel},'${heater.info.customName}',${heater.desiredTemperature})
-    ON CONFLICT (name)
-    DO UPDATE SET
-        "date" = '${new Date().toISOString()}',
-        "humidity" = ${heater.humidity},
-        "istTemperatur" = ${heater.iTemperature},
-        "level" = ${heater.iLevel},
-        "sollTemperatur" = ${heater.desiredTemperature}
 ;
     `);
     }
@@ -169,23 +152,6 @@ BEGIN
     create unique index energycalculation_startdate_uindex
       on hoffmation_schema."EnergyCalculation" ("startDate");
 
-  END IF;
-  IF (SELECT to_regclass('hoffmation_schema."HeatGroupCollection"') IS NULL) Then
-    create table hoffmation_schema."HeatGroupCollection"
-    (
-        date             timestamp,
-        humidity         integer,
-        "istTemperatur"  double precision,
-        level            integer,
-        name             varchar(60) not null
-            constraint heatgroupcollection_pk
-                primary key,
-        "sollTemperatur" double precision
-    );
-
-    create unique index heatgroupcollection_name_uindex
-      on hoffmation_schema."HeatGroupCollection" (name);
-
   END IF;
 
   IF (SELECT to_regclass('hoffmation_schema."AcDeviceData"') IS NULL) Then    
@@ -259,6 +225,53 @@ BEGIN
     
   END IF;
 
+  IF (SELECT to_regclass('hoffmation_schema."HumiditySensorDeviceData"') IS NULL) Then  
+    create table if not exists hoffmation_schema."HumiditySensorDeviceData"
+    (
+        "deviceID"        varchar(60) not null
+            constraint "HumiditySensorDeviceData_DeviceInfo_null_fk"
+                references hoffmation_schema."DeviceInfo"
+                on delete set null,
+        humidity          double precision,
+        date              timestamp   not null,
+        constraint humiditysensordevicedata_pk
+            primary key ("deviceID", date)
+    );
+    
+  END IF;
+
+  IF (SELECT to_regclass('hoffmation_schema."BatteryDeviceData"') IS NULL) Then  
+    create table if not exists hoffmation_schema."BatteryDeviceData"
+    (
+        "deviceID"        varchar(60) not null
+            constraint "BatteryDeviceData_DeviceInfo_null_fk"
+                references hoffmation_schema."DeviceInfo"
+                on delete set null,
+        battery          double precision,
+        date              timestamp   not null,
+        constraint batterydevicedata_pk
+            primary key ("deviceID", date)
+    );
+    
+  END IF;
+
+  IF (SELECT to_regclass('hoffmation_schema."ZigbeeDeviceData"') IS NULL) Then
+    create table if not exists hoffmation_schema."ZigbeeDeviceData"
+    (
+        "deviceID"        varchar(60) not null
+            constraint "ZigbeeDeviceData_DeviceInfo_null_fk"
+                references hoffmation_schema."DeviceInfo"
+                on delete set null,
+        date              timestamp   not null,
+        available          boolean,
+        linkQuality          double precision,
+        lastUpdate          timestamp,
+        constraint zigbeedevicedata_pk
+            primary key ("deviceID", date)
+    );
+
+  END IF;
+
   
     
   IF (SELECT to_regclass('hoffmation_schema."HeaterDeviceData"') IS NULL) Then
@@ -277,21 +290,6 @@ BEGIN
     );
     
   END IF;
-    
-  IF (SELECT to_regclass('hoffmation_schema."TemperaturData"') IS NULL) Then
-    create table hoffmation_schema."TemperaturData"
-    (
-        date             timestamp,
-        humidity         integer,
-        "istTemperatur"  double precision,
-        level            integer,
-        name             text,
-        "sollTemperatur" double precision,
-        constraint temperaturdata_pk
-            unique (date, name)
-    );
-    
-  END IF;
 END
 $$;`);
         this.initialized = true;
@@ -355,6 +353,25 @@ values ('${device.id}', ${currentLevel}, '${new Date().toISOString()}', ${desire
         this.query(`
 insert into hoffmation_schema."TemperatureSensorDeviceData" ("deviceID", "temperature", "date", "roomTemperature")
 values ('${device.id}', ${device.iTemperature}, '${new Date().toISOString()}', ${roomTemp !== null && roomTemp !== void 0 ? roomTemp : 'null'});
+    `);
+    }
+    persistHumiditySensor(device) {
+        this.query(`
+insert into hoffmation_schema."HumiditySensorDeviceData" ("deviceID", "humidity", "date")
+values ('${device.id}', ${device.humidity}, '${new Date().toISOString()}');
+    `);
+    }
+    persistBatteryDevice(device) {
+        this.query(`
+insert into hoffmation_schema."BatteryDeviceData" ("deviceID", "battery", "date")
+values ('${device.id}', ${utils_1.Utils.round(device.battery, 1)}, '${new Date().toISOString()}');
+    `);
+    }
+    persistZigbeeDevice(device) {
+        const dateValue = device.lastUpdate.getTime() > 0 ? device.lastUpdate.toISOString() : 'null';
+        this.query(`
+insert into hoffmation_schema."ZigbeeDeviceData" ("deviceID", "date", "available", "linkQuality", "lastUpdate")
+values ('${device.id}', '${new Date().toISOString()}', ${device.available}, ${device.linkQuality}, '${dateValue}');
     `);
     }
     persistIlluminationSensor(device) {
@@ -365,18 +382,6 @@ values ('${device.id}', ${device.currentIllumination}, '${new Date().toISOString
     persistShutterCalibration(_data) {
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Postgres doesn't support Shutter Calibration yet.`);
     }
-    async readTemperaturDataPoint(heater, limit) {
-        const dbResult = await this.query(`
-SELECT * FROM hoffmation_schema."TemperaturData" 
-WHERE name = '${heater.info.customName}'
-ORDER BY "date" DESC
-LIMIT ${limit}
-    `);
-        if (dbResult !== null && dbResult.length > 0) {
-            return dbResult;
-        }
-        return [];
-    }
     persistEnergyManager(calc) {
         this.query(`
 insert into hoffmation_schema."EnergyCalculation" ("startDate", "endDate", "selfConsumedKwH", "injectedKwH",

package/lib/server/services/time-callback-service.js

@@ -62,7 +62,7 @@ class TimeCallbackService {
             }
         }
         let sunset = new Date(TimeCallbackService._todaySunSet.getTime() + pOffset.sunset * 60 * 1000);
-        const maximumSunset = pOffset.getNextMaximumSunset();
+        const maximumSunset = pOffset.getNextMaximumSunset(now);
         if (maximumSunset.getDate() !== sunset.getDate()) {
             maximumSunset.setDate(maximumSunset.getDate() - 1);
         }
@@ -73,7 +73,7 @@ class TimeCallbackService {
         if (now > sunset) {
             return models_1.TimeOfDay.AfterSunset;
         }
-        const minimumSunrise = pOffset.getNextMinimumSunrise();
+        const minimumSunrise = pOffset.getNextMinimumSunrise(now);
         let sunrise = new Date(TimeCallbackService._todaySunRise.getTime() + pOffset.sunrise * 60 * 1000);
         if (minimumSunrise.getDate() !== sunrise.getDate()) {
             minimumSunrise.setDate(minimumSunrise.getDate() - 1);

package/lib/server/services/utils/iDisposeable.d.ts

@@ -0,0 +1,3 @@
+export interface iDisposable {
+    dispose(): void;
+}

package/lib/server/services/utils/iDisposeable.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/server/services/utils/index.d.ts

@@ -1,2 +1,3 @@
 export * from './ringstorage';
 export * from './utils';
+export * from './iDisposeable';

package/lib/server/services/utils/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ringstorage"), exports);
 __exportStar(require("./utils"), exports);
+__exportStar(require("./iDisposeable"), exports);