hoffmation-base 1.0.63 → 1.0.66

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

@@ -38,13 +38,15 @@ values ('${new Date().toISOString()}',${heater.humidity},${heater.iTemperature},
 ;
     `);
     }
-    async getCount(device) {
-        const dbResult = await this.query(`SELECT * FROM hoffmation_schema."DailyMovementCount" WHERE "deviceID" = '${device.info.fullID}'`);
+    async motionSensorTodayCount(device) {
+        const dbResult = await this.query(`SELECT Count(*) 
+from hoffmation_schema."MotionSensorDeviceData" 
+WHERE "deviceID" = '${device.id}' and "movementDetected" and date >= CURRENT_DATE AND date < CURRENT_DATE + INTERVAL '1 DAY'`);
         if (dbResult !== null && dbResult.length > 0) {
             return dbResult[0];
         }
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Es gibt noch keinen persistierten Counter für ${device.info.fullName}`);
-        return new models_1.CountToday(device.info.fullID, 0);
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Es gibt noch keine persistierten Bewegungen für ${device.info.fullName}`);
+        return new models_1.CountToday(0);
     }
     getShutterCalibration(_device) {
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Postgres doesn't support Shutter Calibration yet.`);
@@ -88,25 +90,6 @@ create table "CurrentIllumination"
 
 alter table "CurrentIllumination"
     owner to postgres;
-    END IF;
-    IF (SELECT to_regclass('hoffmation_schema."DailyMovementCount"') IS NULL) Then
--- auto-generated definition
-create table "DailyMovementCount"
-(
-    counter    integer,
-    date       timestamp   not null,
-    "deviceID" varchar(60) not null,
-    "roomName" varchar(30) not null
-        constraint dailymovementcount_basicrooms_name_fk
-            references hoffmation_schema."BasicRooms",
-    constraint dailymovementcount_pk
-        primary key (date, "deviceID")
-);
-
-alter table "DailyMovementCount"
-    owner to postgres;
-
-
     END IF;
     IF (SELECT to_regclass('hoffmation_schema."EnergyCalculation"') IS NULL) Then
 create table "EnergyCalculation"
@@ -147,21 +130,6 @@ create unique index heatgroupcollection_name_uindex
     on "HeatGroupCollection" (name);
 
     END IF;
-    IF (SELECT to_regclass('hoffmation_schema."PresenceToday"') IS NULL) Then
-create table "PresenceToday"
-(
-    counter    integer,
-    "deviceID" varchar(60) not null
-        constraint presencetoday_pk
-            primary key
-);
-
-alter table "PresenceToday"
-    owner to postgres;
-
-create unique index presencetoday_deviceid_uindex
-    on "PresenceToday" ("deviceID");
-    END IF;
 
 IF (SELECT to_regclass('hoffmation_schema."AcDeviceData"') IS NULL) Then    
   create table hoffmation_schema."AcDeviceData"
@@ -178,6 +146,21 @@ IF (SELECT to_regclass('hoffmation_schema."AcDeviceData"') IS NULL) Then
     owner to postgres;
 END IF;
 
+
+IF (SELECT to_regclass('hoffmation_schema."LampDeviceData"') IS NULL) Then    
+  create table hoffmation_schema."LampDeviceData"
+  (
+      "deviceID" varchar(60) not null,
+      "on"       boolean,
+      date       timestamp   not null,
+      constraint lampdevicedata_pk
+          primary key ("deviceID", date)
+  );
+
+  alter table hoffmation_schema."LampDeviceData"
+    owner to postgres;
+END IF;
+
 IF (SELECT to_regclass('hoffmation_schema."MotionSensorDeviceData"') IS NULL) Then    
   create table hoffmation_schema."MotionSensorDeviceData"
   (
@@ -217,6 +200,12 @@ $$;`);
         this.query(`
 insert into hoffmation_schema."AcDeviceData" ("deviceID", "on", "date", "roomTemperature")
 values ('${device.id}', ${device.on}, '${new Date().toISOString()}', ${device.temperature});
+    `);
+    }
+    persistLamp(device) {
+        this.query(`
+insert into hoffmation_schema."LampDeviceData" ("deviceID", "on", "date")
+values ('${device.id}', ${device.lightOn}, '${new Date().toISOString()}');
     `);
     }
     persistMotionSensor(device) {
@@ -234,28 +223,6 @@ values ('${data.roomName}','${data.deviceID}',${data.currentIllumination},'${dat
     persistShutterCalibration(_data) {
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Postgres doesn't support Shutter Calibration yet.`);
     }
-    persistTodayCount(device, count, oldCount) {
-        this.query(`
-  insert into hoffmation_schema."PresenceToday" (counter, "deviceID")
-  values (${count}, '${device.id}')
-    ON CONFLICT ("deviceID")
-    DO UPDATE SET
-        counter = ${count}
-  ;    
-      `);
-        if (count === 0) {
-            const date = new Date();
-            date.setHours(-24, 0, 0, 0);
-            this.query(`
-  insert into hoffmation_schema."DailyMovementCount" (counter, "date", "deviceID", "roomName")
-  values (${oldCount}, '${date.toISOString()}', '${device.id}', '${device.info.room}')
-    ON CONFLICT ("deviceID", "date")
-    DO UPDATE SET
-        counter = ${oldCount}
-  ;    
-      `);
-        }
-    }
     async readTemperaturDataPoint(heater, limit) {
         const dbResult = await this.query(`
 SELECT * FROM hoffmation_schema."TemperaturData" 

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

@@ -110,7 +110,7 @@ class TimeCallbackService {
             devices_1.Devices.midnightReset();
         }, 0, 0, 0);
         const daily3oClockRecalc = new models_1.TimeCallback('Daily3oClockRecalc', models_1.TimeCallbackType.TimeOfDay, () => {
-            devices_1.Devices.resetPraesenzCount();
+            devices_1.Devices.resetDetectionsToday();
         }, 0, 3, 0);
         TimeCallbackService.recalcSunTimes();
         TimeCallbackService.addCallback(dailyRecalc);

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

@@ -12,9 +12,8 @@ const settings_service_1 = require("../settings-service");
 exports.DAYMS = 24 * 60 * 60 * 1000;
 class Utils {
     static get anyDboActive() {
-        var _a, _b;
-        return (((_a = settings_service_1.SettingsService.settings.persistence) === null || _a === void 0 ? void 0 : _a.mongo) !== undefined ||
-            ((_b = settings_service_1.SettingsService.settings.persistence) === null || _b === void 0 ? void 0 : _b.postgreSql) !== undefined);
+        var _a;
+        return ((_a = settings_service_1.SettingsService.settings.persistence) === null || _a === void 0 ? void 0 : _a.postgreSql) !== undefined;
     }
     static get timeTilMidnight() {
         return new Date(Utils.nowMS() + exports.DAYMS).setHours(0, 0, 0, 0) - Utils.nowMS();