hoffmation-base 3.0.0-beta.1 → 3.0.0-beta.3

package/lib/server/devices/shelly/shellyTrv.js

@@ -44,6 +44,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             Kd: 9, // PID: Kd in 1/1000
         });
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this._setAutomaticModeId = `${this.info.fullID}.tmp.automaticTemperatureControl`;
         this._setExternalTempId = `${this.info.fullID}.ext.temperature`;

package/lib/server/devices/zigbee/BaseDevices/zigbeeHeater.js

@@ -39,6 +39,7 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         });
         this._seasonTurnOff = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this._iAutomaticInterval = services_1.Utils.guardedInterval(this.checkAutomaticChange, 300000, this); // Alle 5 Minuten prüfen
         services_1.TimeCallbackService.addCallback(new models_1.TimeCallback(`${this.info.fullID} Season Check`, models_1.TimeCallbackType.TimeOfDay, () => {

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

@@ -318,7 +318,7 @@ BEGIN
     create table if not exists hoffmation_schema."Settings"
     (
         "id"            varchar(60) not null,
-        "settings"      varchar not null,
+        "settings"      jsonb not null,
         "customname"    varchar(100) not null,
         date            timestamp   not null,
         constraint settings_pk
@@ -342,6 +342,12 @@ BEGIN
     alter table hoffmation_schema."EnergyCalculation"
       add "batteryLevel" double precision;
   END IF;
+  IF (SELECT pg_typeof(settings) = to_regtype('varchar')
+      FROM hoffmation_schema."Settings"
+      LIMIT 1) THEN
+      alter table hoffmation_schema."Settings"
+          alter column settings type jsonb using settings::jsonb;
+  END IF;
 END
 $$;`);
         this.initialized = true;
@@ -477,7 +483,7 @@ values ('${id}','${settings}','${customName}', '${new Date().toISOString()}')
     }
     /** @inheritDoc */
     async loadSettings(id) {
-        const dbResult = await this.query(`SELECT settings, id, date
+        const dbResult = await this.query(`SELECT settings::text, id, date
 from hoffmation_schema."Settings" 
 WHERE "id" = '${id}'
 ORDER BY "date" DESC