hoffmation-base 0.1.1 → 0.1.5

package/server/services/calendar/m/303/274ll-service.ts

@@ -1,146 +1,147 @@
-import { async, VEvent } from 'node-ical';
-import { ServerLogService } from '../log-service';
-import { TimeCallbackService } from '../time-callback-service';
-import { LogLevel } from '../../../models/logLevel';
-import { TimeCallback, TimeCallbackType } from '../../../models/timeCallback';
-import { iMuellSettings } from '../../config/iConfig';
-import { Utils } from '../utils/utils';
-import { MuellTonne } from './muell-tonne';
-import { OwnSonosDevice } from '../Sonos/sonos-service';
-
-export class MuellService {
-  public static alleTonnen: Array<{ name: string; date: Date }> = [];
-  public static blaueTonne: MuellTonne;
-  public static graueTonne: MuellTonne;
-  public static gelbeTonne: MuellTonne;
-  public static brauneTonne: MuellTonne;
-  public static updateTimeCallback: TimeCallback;
-  public static checkTimeCallback: TimeCallback;
-  private static lastCheck: Date = new Date(0);
-  private static _calendarURL: string;
-  private static _active: boolean = false;
-  private static defaultSonosDevice: OwnSonosDevice | undefined = undefined;
-
-  public static months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-
-  public static intialize(config: iMuellSettings, defaultSonosDevice: OwnSonosDevice | undefined): void {
-    this._active = true;
-    this._calendarURL = config.calendarURL;
-    this.updateTimeCallback = new TimeCallback(
-      'MuelltonnenServiceUpdater',
-      TimeCallbackType.TimeOfDay,
-      () => {
-        this.updateCalendar(false);
-      },
-      0,
-      2,
-      0,
-    );
-    TimeCallbackService.addCallback(this.updateTimeCallback);
-
-    this.checkTimeCallback = new TimeCallback(
-      'MuelltonnenServiceChecker',
-      TimeCallbackType.TimeOfDay,
-      () => {
-        this.checkAll();
-      },
-      0,
-      18,
-      0,
-    );
-    TimeCallbackService.addCallback(this.checkTimeCallback);
-
-    this.updateCalendar();
-  }
-
-  public static updateCalendar(checkAfterwards: boolean = true): void {
-    ServerLogService.writeLog(LogLevel.Debug, `Muell Service wird nun initialisiert`);
-    async.fromURL(this._calendarURL).then((data) => {
-      this.gelbeTonne = new MuellTonne('Gelbe Tonne', this.defaultSonosDevice);
-      this.graueTonne = new MuellTonne('Graue Tonne', this.defaultSonosDevice);
-      this.blaueTonne = new MuellTonne('Blaue Tonne', this.defaultSonosDevice);
-      this.brauneTonne = new MuellTonne('Braune Tonne', this.defaultSonosDevice);
-      this.alleTonnen = [];
-      const todayMidnight: number = new Date().setHours(0, 0, 0, 0);
-      for (const k in data) {
-        if (!data.hasOwnProperty(k)) {
-          continue;
-        }
-
-        if (data[k].type !== 'VEVENT') {
-          continue;
-        }
-
-        const ev = data[k] as VEvent;
-        ServerLogService.writeLog(
-          LogLevel.DeepTrace,
-          `${ev.summary} is in ${ev.location} on the ${ev.start.getDate()} of ${
-            this.months[ev.start.getMonth()]
-          } at ${ev.start.toLocaleTimeString('en-GB')}`,
-        );
-
-        if (ev.start.getTime() < todayMidnight) {
-          continue;
-        }
-
-        this.alleTonnen.push({name: ev.summary, date: ev.start});
-        switch (ev.summary) {
-          case this.gelbeTonne.name:
-            this.gelbeTonne.dates.push(ev.start);
-            break;
-          case this.graueTonne.name:
-            this.graueTonne.dates.push(ev.start);
-            break;
-          case this.blaueTonne.name:
-            this.blaueTonne.dates.push(ev.start);
-            break;
-          case this.brauneTonne.name:
-            this.brauneTonne.dates.push(ev.start);
-            break;
-          default:
-            ServerLogService.writeLog(LogLevel.Warn, `Unbekannte Mülltonne (${ev.summary})`);
-        }
-      }
-
-      this.gelbeTonne.sortDates();
-      this.graueTonne.sortDates();
-      this.blaueTonne.sortDates();
-      this.brauneTonne.sortDates();
-      this.alleTonnen = this.alleTonnen.sort((a, b) => a.date.getTime() - b.date.getTime());
-      if (checkAfterwards) {
-        this.checkAll();
-      }
-    });
-  }
-
-  public static checkAll(pRetries: number = 10): void {
-    if (!this._active) {
-      return;
-    }
-
-    const now: Date = new Date();
-    if (now.getTime() - this.lastCheck.getTime() < 60000 && now.getDate() === this.lastCheck.getDate()) {
-      ServerLogService.writeLog(LogLevel.Trace, `MüllService.checkAll: Skipped weil wir gerade erst geprüft hatten.`);
-      return;
-    }
-
-    if (this.gelbeTonne === undefined) {
-      if (pRetries > 0) {
-        ServerLogService.writeLog(LogLevel.Warn, `Der Müllservice ist noch nicht bereit --> warten`);
-        Utils.guardedTimeout(() => {
-          MuellService.checkAll(pRetries - 1);
-        }, 1000);
-      } else {
-        ServerLogService.writeLog(LogLevel.Error, `Der Müllservice ist trotz Warten nicht bereit --> Abbruch`);
-      }
-
-      return;
-    }
-
-    this.lastCheck = now;
-    this.gelbeTonne.check();
-    this.graueTonne.check();
-    this.blaueTonne.check();
-    this.brauneTonne.check();
-  }
-}
+import { async, VEvent } from 'node-ical';
+import { ServerLogService } from '../log-service';
+import { TimeCallbackService } from '../time-callback-service';
+import { LogLevel } from '../../../models/logLevel';
+import { TimeCallback, TimeCallbackType } from '../../../models/timeCallback';
+import { iMuellSettings } from '../../config/iConfig';
+import { Utils } from '../utils/utils';
+import { MuellTonne } from './muell-tonne';
+import { OwnSonosDevice } from '../Sonos/sonos-service';
+
+export class MuellService {
+  public static alleTonnen: Array<{ name: string; date: Date }> = [];
+  public static blaueTonne: MuellTonne;
+  public static graueTonne: MuellTonne;
+  public static gelbeTonne: MuellTonne;
+  public static brauneTonne: MuellTonne;
+  public static updateTimeCallback: TimeCallback;
+  public static checkTimeCallback: TimeCallback;
+  private static lastCheck: Date = new Date(0);
+  private static _calendarURL: string;
+  private static _active: boolean = false;
+  private static defaultSonosDevice: OwnSonosDevice | undefined = undefined;
+
+  public static months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+
+  public static intialize(config: iMuellSettings, defaultSonosDevice: OwnSonosDevice | undefined): void {
+    this.defaultSonosDevice = defaultSonosDevice;
+    this._active = true;
+    this._calendarURL = config.calendarURL;
+    this.updateTimeCallback = new TimeCallback(
+      'MuelltonnenServiceUpdater',
+      TimeCallbackType.TimeOfDay,
+      () => {
+        this.updateCalendar(false);
+      },
+      0,
+      2,
+      0,
+    );
+    TimeCallbackService.addCallback(this.updateTimeCallback);
+
+    this.checkTimeCallback = new TimeCallback(
+      'MuelltonnenServiceChecker',
+      TimeCallbackType.TimeOfDay,
+      () => {
+        this.checkAll();
+      },
+      0,
+      18,
+      0,
+    );
+    TimeCallbackService.addCallback(this.checkTimeCallback);
+
+    this.updateCalendar();
+  }
+
+  public static updateCalendar(checkAfterwards: boolean = true): void {
+    ServerLogService.writeLog(LogLevel.Debug, `Muell Service wird nun initialisiert`);
+    async.fromURL(this._calendarURL).then((data) => {
+      this.gelbeTonne = new MuellTonne('Gelbe Tonne', this.defaultSonosDevice);
+      this.graueTonne = new MuellTonne('Graue Tonne', this.defaultSonosDevice);
+      this.blaueTonne = new MuellTonne('Blaue Tonne', this.defaultSonosDevice);
+      this.brauneTonne = new MuellTonne('Braune Tonne', this.defaultSonosDevice);
+      this.alleTonnen = [];
+      const todayMidnight: number = new Date().setHours(0, 0, 0, 0);
+      for (const k in data) {
+        if (!data.hasOwnProperty(k)) {
+          continue;
+        }
+
+        if (data[k].type !== 'VEVENT') {
+          continue;
+        }
+
+        const ev = data[k] as VEvent;
+        ServerLogService.writeLog(
+          LogLevel.DeepTrace,
+          `${ev.summary} is in ${ev.location} on the ${ev.start.getDate()} of ${
+            this.months[ev.start.getMonth()]
+          } at ${ev.start.toLocaleTimeString('en-GB')}`,
+        );
+
+        if (ev.start.getTime() < todayMidnight) {
+          continue;
+        }
+
+        this.alleTonnen.push({ name: ev.summary, date: ev.start });
+        switch (ev.summary) {
+          case this.gelbeTonne.name:
+            this.gelbeTonne.dates.push(ev.start);
+            break;
+          case this.graueTonne.name:
+            this.graueTonne.dates.push(ev.start);
+            break;
+          case this.blaueTonne.name:
+            this.blaueTonne.dates.push(ev.start);
+            break;
+          case this.brauneTonne.name:
+            this.brauneTonne.dates.push(ev.start);
+            break;
+          default:
+            ServerLogService.writeLog(LogLevel.Warn, `Unbekannte Mülltonne (${ev.summary})`);
+        }
+      }
+
+      this.gelbeTonne.sortDates();
+      this.graueTonne.sortDates();
+      this.blaueTonne.sortDates();
+      this.brauneTonne.sortDates();
+      this.alleTonnen = this.alleTonnen.sort((a, b) => a.date.getTime() - b.date.getTime());
+      if (checkAfterwards) {
+        this.checkAll();
+      }
+    });
+  }
+
+  public static checkAll(pRetries: number = 10): void {
+    if (!this._active) {
+      return;
+    }
+
+    const now: Date = new Date();
+    if (now.getTime() - this.lastCheck.getTime() < 60000 && now.getDate() === this.lastCheck.getDate()) {
+      ServerLogService.writeLog(LogLevel.Trace, `MüllService.checkAll: Skipped weil wir gerade erst geprüft hatten.`);
+      return;
+    }
+
+    if (this.gelbeTonne === undefined) {
+      if (pRetries > 0) {
+        ServerLogService.writeLog(LogLevel.Warn, `Der Müllservice ist noch nicht bereit --> warten`);
+        Utils.guardedTimeout(() => {
+          MuellService.checkAll(pRetries - 1);
+        }, 1000);
+      } else {
+        ServerLogService.writeLog(LogLevel.Error, `Der Müllservice ist trotz Warten nicht bereit --> Abbruch`);
+      }
+
+      return;
+    }
+
+    this.lastCheck = now;
+    this.gelbeTonne.check();
+    this.graueTonne.check();
+    this.blaueTonne.check();
+    this.brauneTonne.check();
+  }
+}

package/server/services/dbo/persist.ts

@@ -1,125 +1,125 @@
-import { Mongo } from 'meteor/mongo';
-import { ServerLogService } from '../log-service';
-import { LogLevel } from '../../../models/logLevel';
-import { TemperaturDataPoint } from '../../../models/persistence/temperaturDataPoint';
-import { CountToday } from '../../../models/persistence/todaysCount';
-import { HmIpHeizgruppe } from '../../devices/hmIPDevices/hmIpHeizgruppe';
-import { HmIPDevice } from '../../devices/hmIPDevices/hmIpDevice';
-import { RoomBase } from '../../../models/rooms/RoomBase';
-import { BasicRoomInfo } from '../../../models/persistence/BasicRoomInfo';
-import { RoomDetailInfo } from '../../../models/persistence/RoomDetailInfo';
-import { DailyMovementCount } from '../../../models/persistence/DailyMovementCount';
-import { iTemperaturDataPoint } from "../../../models/iTemperaturDataPoint";
-
-export const TemperatureHistoryCollection = new Mongo.Collection<TemperaturDataPoint>('TemperaturData');
-export const HeatGroupCollection = new Mongo.Collection<TemperaturDataPoint>('HeatGroupCollection');
-export const BasicRoomCollection = new Mongo.Collection<BasicRoomInfo>('BasicRooms');
-export const RoomDetailsCollection = new Mongo.Collection<RoomDetailInfo>('RoomDetailsCollection');
-export const CountTodayCollection = new Mongo.Collection<CountToday>('PresenceToday');
-export const DailyMovementCountTodayCollection = new Mongo.Collection<DailyMovementCount>('DailyMovementCount');
-export class Persist {
-  public static MeteorBound: (callback: any) => void;
-  public static addTemperaturDataPoint(hzGrp: HmIpHeizgruppe): void {
-    const dataPoint: iTemperaturDataPoint = new TemperaturDataPoint(
-      hzGrp.info.customName,
-      hzGrp.iTemperatur,
-      hzGrp.desiredTemperatur,
-      hzGrp.iLevel,
-      hzGrp.humidity,
-      new Date(),
-    );
-    ServerLogService.writeLog(LogLevel.Trace, `Persisting Temperatur Data for ${hzGrp.info.customName}`);
-    this.MeteorBound(() => {
-      TemperatureHistoryCollection.insert(dataPoint);
-    });
-
-    this.MeteorBound(() => {
-      HeatGroupCollection.update({ name: dataPoint.name }, dataPoint, { upsert: true });
-    });
-  }
-
-  public static addRoom(room: RoomBase): void {
-    ServerLogService.writeLog(LogLevel.Trace, `Persisting Room for ${room.roomName}`);
-    this.MeteorBound(() => {
-      BasicRoomCollection.update({ roomName: room.roomName }, new BasicRoomInfo(room.roomName, room.Settings.etage), {
-        upsert: true,
-      });
-    });
-    const detailed = new RoomDetailInfo(room.roomName, room.Settings.etage);
-    for (const h of room.HeatGroup.heaters) {
-      detailed.heaters.push(h.info.customName);
-    }
-    this.MeteorBound(() => {
-      RoomDetailsCollection.update({ roomName: room.roomName }, detailed, { upsert: true });
-    });
-  }
-
-  public static async getCount(device: HmIPDevice): Promise<CountToday> {
-    const result = new Promise<CountToday>((resolve) => {
-      this.MeteorBound(() => {
-        const options = {
-          limit: 1,
-        };
-        const databaseValue: CountToday[] = CountTodayCollection.find(
-          { deviceID: device.info.fullID },
-          options,
-        ).fetch();
-        if (databaseValue.length === 0) {
-          ServerLogService.writeLog(
-            LogLevel.Debug,
-            `Es gibt noch keinen persistierten Counter für ${device.info.fullName}`,
-          );
-          resolve(new CountToday(device.info.fullID, 0));
-        } else {
-          resolve(databaseValue[0]);
-        }
-      });
-    });
-
-    return result;
-  }
-
-  public static persistTodayCount(device: HmIPDevice, count: number, oldCount: number): void {
-    this.MeteorBound(() => {
-      const result = CountTodayCollection.update(
-        { deviceID: device.info.fullID },
-        new CountToday(device.info.fullID, count),
-        { upsert: true },
-      );
-      if (count === 0) {
-        const date = new Date();
-        date.setHours(-24, 0, 0, 0);
-        const result2 = DailyMovementCountTodayCollection.update(
-          { deviceID: device.info.fullID, date: date },
-          new DailyMovementCount(device.info.fullID, oldCount, device.info.room, date),
-          { upsert: true },
-        );
-        ServerLogService.writeLog(
-          LogLevel.Trace,
-          `Persisting Daily Movement Count for ${device.info.customName} to ${oldCount} resolved with "${result2}"`,
-        );
-      }
-      ServerLogService.writeLog(
-        LogLevel.Trace,
-        `Persisting PresenceToday Data for ${device.info.customName} to ${count} resolved with "${result}"`,
-      );
-    });
-  }
-
-  public static async readTemperaturDataPoint(
-    hzGrp: HmIpHeizgruppe,
-    limit: number = -1,
-  ): Promise<TemperaturDataPoint[]> {
-    const result = new Promise<TemperaturDataPoint[]>((resolve) => {
-      this.MeteorBound(() => {
-        const options = {
-          limit: limit > 0 ? limit : undefined,
-          sort: { date: -1 },
-        };
-        resolve(TemperatureHistoryCollection.find({ name: hzGrp.info.customName }, options).fetch());
-      });
-    });
-
-    return result;
-  }
-}
+import { Mongo } from 'meteor/mongo';
+import { ServerLogService } from '../log-service';
+import { LogLevel } from '../../../models/logLevel';
+import { TemperaturDataPoint } from '../../../models/persistence/temperaturDataPoint';
+import { CountToday } from '../../../models/persistence/todaysCount';
+import { HmIpHeizgruppe } from '../../devices/hmIPDevices/hmIpHeizgruppe';
+import { HmIPDevice } from '../../devices/hmIPDevices/hmIpDevice';
+import { RoomBase } from '../../../models/rooms/RoomBase';
+import { BasicRoomInfo } from '../../../models/persistence/BasicRoomInfo';
+import { RoomDetailInfo } from '../../../models/persistence/RoomDetailInfo';
+import { DailyMovementCount } from '../../../models/persistence/DailyMovementCount';
+import { iTemperaturDataPoint } from '../../../models/iTemperaturDataPoint';
+
+export const TemperatureHistoryCollection = new Mongo.Collection<TemperaturDataPoint>('TemperaturData');
+export const HeatGroupCollection = new Mongo.Collection<TemperaturDataPoint>('HeatGroupCollection');
+export const BasicRoomCollection = new Mongo.Collection<BasicRoomInfo>('BasicRooms');
+export const RoomDetailsCollection = new Mongo.Collection<RoomDetailInfo>('RoomDetailsCollection');
+export const CountTodayCollection = new Mongo.Collection<CountToday>('PresenceToday');
+export const DailyMovementCountTodayCollection = new Mongo.Collection<DailyMovementCount>('DailyMovementCount');
+export class Persist {
+  public static MeteorBound: (callback: any) => void;
+  public static addTemperaturDataPoint(hzGrp: HmIpHeizgruppe): void {
+    const dataPoint: iTemperaturDataPoint = new TemperaturDataPoint(
+      hzGrp.info.customName,
+      hzGrp.iTemperatur,
+      hzGrp.desiredTemperatur,
+      hzGrp.iLevel,
+      hzGrp.humidity,
+      new Date(),
+    );
+    ServerLogService.writeLog(LogLevel.Trace, `Persisting Temperatur Data for ${hzGrp.info.customName}`);
+    this.MeteorBound(() => {
+      TemperatureHistoryCollection.insert(dataPoint);
+    });
+
+    this.MeteorBound(() => {
+      HeatGroupCollection.update({ name: dataPoint.name }, dataPoint, { upsert: true });
+    });
+  }
+
+  public static addRoom(room: RoomBase): void {
+    ServerLogService.writeLog(LogLevel.Trace, `Persisting Room for ${room.roomName}`);
+    this.MeteorBound(() => {
+      BasicRoomCollection.update({ roomName: room.roomName }, new BasicRoomInfo(room.roomName, room.Settings.etage), {
+        upsert: true,
+      });
+    });
+    const detailed = new RoomDetailInfo(room.roomName, room.Settings.etage);
+    for (const h of room.HeatGroup.heaters) {
+      detailed.heaters.push(h.info.customName);
+    }
+    this.MeteorBound(() => {
+      RoomDetailsCollection.update({ roomName: room.roomName }, detailed, { upsert: true });
+    });
+  }
+
+  public static async getCount(device: HmIPDevice): Promise<CountToday> {
+    const result = new Promise<CountToday>((resolve) => {
+      this.MeteorBound(() => {
+        const options = {
+          limit: 1,
+        };
+        const databaseValue: CountToday[] = CountTodayCollection.find(
+          { deviceID: device.info.fullID },
+          options,
+        ).fetch();
+        if (databaseValue.length === 0) {
+          ServerLogService.writeLog(
+            LogLevel.Debug,
+            `Es gibt noch keinen persistierten Counter für ${device.info.fullName}`,
+          );
+          resolve(new CountToday(device.info.fullID, 0));
+        } else {
+          resolve(databaseValue[0]);
+        }
+      });
+    });
+
+    return result;
+  }
+
+  public static persistTodayCount(device: HmIPDevice, count: number, oldCount: number): void {
+    this.MeteorBound(() => {
+      const result = CountTodayCollection.update(
+        { deviceID: device.info.fullID },
+        new CountToday(device.info.fullID, count),
+        { upsert: true },
+      );
+      if (count === 0) {
+        const date = new Date();
+        date.setHours(-24, 0, 0, 0);
+        const result2 = DailyMovementCountTodayCollection.update(
+          { deviceID: device.info.fullID, date: date },
+          new DailyMovementCount(device.info.fullID, oldCount, device.info.room, date),
+          { upsert: true },
+        );
+        ServerLogService.writeLog(
+          LogLevel.Trace,
+          `Persisting Daily Movement Count for ${device.info.customName} to ${oldCount} resolved with "${result2}"`,
+        );
+      }
+      ServerLogService.writeLog(
+        LogLevel.Trace,
+        `Persisting PresenceToday Data for ${device.info.customName} to ${count} resolved with "${result}"`,
+      );
+    });
+  }
+
+  public static async readTemperaturDataPoint(
+    hzGrp: HmIpHeizgruppe,
+    limit: number = -1,
+  ): Promise<TemperaturDataPoint[]> {
+    const result = new Promise<TemperaturDataPoint[]>((resolve) => {
+      this.MeteorBound(() => {
+        const options = {
+          limit: limit > 0 ? limit : undefined,
+          sort: { date: -1 },
+        };
+        resolve(TemperatureHistoryCollection.find({ name: hzGrp.info.customName }, options).fetch());
+      });
+    });
+
+    return result;
+  }
+}