From dcb58bbbdba29189251321ca5bd884268049de55 Mon Sep 17 00:00:00 2001 From: Akhil Gupta Date: Tue, 26 Apr 2022 11:54:55 +0530 Subject: [PATCH] some alerting code --- server/service/alertSevice.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/server/service/alertSevice.go b/server/service/alertSevice.go index 2dac650..9e7462c 100644 --- a/server/service/alertSevice.go +++ b/server/service/alertSevice.go @@ -38,11 +38,15 @@ func CreateAlertInstance(alertId string) error { return err } existingOccurence, err := db.GetAlertOccurenceByAlertId(alertId) + if err != nil { + return err + } var lastOccurance db.AlertOccurance + useOccurance := false if len(*existingOccurence) > 0 { lastOccurance = (*existingOccurence)[0] - + useOccurance = true if alert.AlertFrequency == db.ONETIME { return errors.New("Only single occurance is possible for this kind of alert") } @@ -68,13 +72,13 @@ func CreateAlertInstance(alertId string) error { if alert.AlertType == db.DISTANCE || alert.AlertType == db.BOTH { model.OdoReading = alert.StartOdoReading + alert.OdoFrequency - if &lastOccurance != nil { + if useOccurance { model.OdoReading = lastOccurance.OdoReading + alert.OdoFrequency } } if alert.AlertType == db.TIME || alert.AlertType == db.BOTH { date := alert.StartDate.Add(time.Duration(alert.DayFrequency) * 24 * time.Hour) - if &lastOccurance != nil { + if useOccurance { date = lastOccurance.Date.Add(time.Duration(alert.DayFrequency) * 24 * time.Hour) } model.Date = &date @@ -162,3 +166,7 @@ func FindAlertOccurancesToProcess(today time.Time) ([]db.AlertOccurance, error) } return toReturn, nil } + +func MarkAlertOccuranceAsCompleted() { + +}