nemunaire/reveil
1
0
Fork 0
Code Issues 1 Pull Requests 2 Releases 27 Activity

Fix alarm update in db

Browse Source
This commit is contained in:
nemunaire 2022-12-15 18:40:09 +01:00
parent f8be28744c
commit 51a52fcb8e
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
model/alarm.go
View File

@ -239,16 +239,19 @@ func GetAlarmsRepeated(db *LevelDBStorage) (alarms []*AlarmRepeated, err error)
func PutAlarmRepeated(db *LevelDBStorage, alarm *AlarmRepeated) (err error) { func PutAlarmRepeated(db *LevelDBStorage, alarm *AlarmRepeated) (err error) {
var key string var key string
var id Identifier
if alarm.Id.IsEmpty() { if alarm.Id.IsEmpty() {
var id Identifier
key, id, err = db.findBytesKey("alarm-repeated-", IDENTIFIER_LEN) key, id, err = db.findBytesKey("alarm-repeated-", IDENTIFIER_LEN)
if err != nil { if err != nil {
return err return err
} }
alarm.Id = id
} else {
key = fmt.Sprintf("alarm-repeated-%s", alarm.Id.ToString())
} }
alarm.Id = id
// Don't store this, this is autocalculated // Don't store this, this is autocalculated
alarm.Excepts = nil alarm.Excepts = nil
alarm.NextTime = nil alarm.NextTime = nil
@ -293,16 +296,18 @@ func GetAlarmsSingle(db *LevelDBStorage) (alarms []*AlarmSingle, err error) {
func PutAlarmSingle(db *LevelDBStorage, alarm *AlarmSingle) (err error) { func PutAlarmSingle(db *LevelDBStorage, alarm *AlarmSingle) (err error) {
var key string var key string
var id Identifier
if alarm.Id.IsEmpty() { if alarm.Id.IsEmpty() {
var id Identifier
key, id, err = db.findBytesKey("alarm-single-", IDENTIFIER_LEN) key, id, err = db.findBytesKey("alarm-single-", IDENTIFIER_LEN)
if err != nil { if err != nil {
return err return err
} }
}
alarm.Id = id alarm.Id = id
} else {
key = fmt.Sprintf("alarm-single-%s", alarm.Id.ToString())
}
return db.put(key, alarm) return db.put(key, alarm)
} }
@ -363,16 +368,18 @@ func GetAlarmExceptions(db *LevelDBStorage) (alarms []*AlarmException, err error
func PutAlarmException(db *LevelDBStorage, alarm *AlarmException) (err error) { func PutAlarmException(db *LevelDBStorage, alarm *AlarmException) (err error) {
var key string var key string
var id Identifier
if alarm.Id.IsEmpty() { if alarm.Id.IsEmpty() {
var id Identifier
key, id, err = db.findBytesKey("alarm-exception-", IDENTIFIER_LEN) key, id, err = db.findBytesKey("alarm-exception-", IDENTIFIER_LEN)
if err != nil { if err != nil {
return err return err
} }
}
alarm.Id = id alarm.Id = id
} else {
key = fmt.Sprintf("alarm-exception-%s", alarm.Id.ToString())
}
return db.put(key, alarm) return db.put(key, alarm)
} }