db: Allow empty service name in query

master
Luther Wen Xu 2020-04-23 15:41:57 +07:00
parent f6a8187f4e
commit 5f14a5b943
Signed by: chanbakjsd
GPG Key ID: B7D77E3E9D102B70
1 changed files with 11 additions and 10 deletions

@ -3,18 +3,15 @@ package db
import (
"time"
"github.com/jinzhu/gorm"
"status/check"
)
//PingEntry represents an entry of Ping that is persisted in the DB.
type PingEntry struct {
gorm.Model
ServiceName string
Time time.Time
Ping int64
Status check.Result
ServiceName string `json:"service_name"`
Time time.Time `json:"query_time"`
Ping int64 `json:"ping"`
Status check.Result `json:"status"`
}
func (p PingEntry) AddToDB() {
@ -24,8 +21,12 @@ func (p PingEntry) AddToDB() {
db.Create(&p)
}
func GetFromDB(serviceName string, from, to time.Time) []*PingEntry {
entries := make([]*PingEntry, 0)
func GetFromDB(serviceName string, from, to time.Time) []PingEntry {
entries := make([]PingEntry, 0)
if serviceName == "" {
db.Where("time BETWEEN ? AND ?", from, to).Find(&entries)
} else {
db.Where("service_name = ? AND time BETWEEN ? AND ?", serviceName, from, to).Find(&entries)
}
return entries
}