mirror of https://github.com/statping/statping
formating
parent
945beb79e5
commit
d1a2af6f1a
|
@ -24,25 +24,25 @@ func findDowntime(r *http.Request) (*downtimes.Downtime, error) {
|
||||||
|
|
||||||
func convertToMap(query url.Values) map[string]string{
|
func convertToMap(query url.Values) map[string]string{
|
||||||
vars := make(map[string]string)
|
vars := make(map[string]string)
|
||||||
if query.Get("start")!= "" {
|
if query.Get("start") != "" {
|
||||||
vars["start"] = query.Get("start")
|
vars["start"] = query.Get("start")
|
||||||
}
|
}
|
||||||
if query.Get("end")!= "" {
|
if query.Get("end") != "" {
|
||||||
vars["end"] = query.Get("end")
|
vars["end"] = query.Get("end")
|
||||||
}
|
}
|
||||||
if query.Get("sub_status")!= "" {
|
if query.Get("sub_status") != "" {
|
||||||
vars["sub_status"] = query.Get("sub_status")
|
vars["sub_status"] = query.Get("sub_status")
|
||||||
}
|
}
|
||||||
if query.Get("service_id")!= "" {
|
if query.Get("service_id") != "" {
|
||||||
vars["service_id"] = query.Get("service_id")
|
vars["service_id"] = query.Get("service_id")
|
||||||
}
|
}
|
||||||
if query.Get("type")!= "" {
|
if query.Get("type") != "" {
|
||||||
vars["type"] = query.Get("type")
|
vars["type"] = query.Get("type")
|
||||||
}
|
}
|
||||||
if query.Get("skip")!= "" {
|
if query.Get("skip")!= "" {
|
||||||
vars["skip"] = query.Get("skip")
|
vars["skip"] = query.Get("skip")
|
||||||
}
|
}
|
||||||
if query.Get("count")!= "" {
|
if query.Get("count") != "" {
|
||||||
vars["count"] = query.Get("count")
|
vars["count"] = query.Get("count")
|
||||||
}
|
}
|
||||||
return vars
|
return vars
|
||||||
|
|
|
@ -73,18 +73,17 @@ func FindAll(vars map[string]string ) (*[]Downtime, error) {
|
||||||
var downtime []Downtime
|
var downtime []Downtime
|
||||||
var start time.Time
|
var start time.Time
|
||||||
var end time.Time
|
var end time.Time
|
||||||
var err error
|
|
||||||
var count int64
|
|
||||||
var skip int64
|
|
||||||
st,err1 := vars["start"]
|
st,err1 := vars["start"]
|
||||||
en,err2 := vars["end"]
|
en,err2 := vars["end"]
|
||||||
if err1 && err2 && (en > st){
|
startInt,err := strconv.ParseInt(st,10,64)
|
||||||
|
endInt,err := strconv.ParseInt(en,10,64)
|
||||||
|
if err1 && err2 && (endInt > startInt){
|
||||||
start,err = ConvertToUnixTime(vars["start"])
|
start,err = ConvertToUnixTime(vars["start"])
|
||||||
if err!=nil {
|
if err != nil {
|
||||||
return &downtime,err
|
return &downtime,err
|
||||||
}
|
}
|
||||||
end,err = ConvertToUnixTime(vars["end"])
|
end,err = ConvertToUnixTime(vars["end"])
|
||||||
if err!=nil {
|
if err != nil {
|
||||||
return &downtime,err
|
return &downtime,err
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
|
@ -92,35 +91,32 @@ func FindAll(vars map[string]string ) (*[]Downtime, error) {
|
||||||
start = ninetyDaysAgo
|
start = ninetyDaysAgo
|
||||||
end = time.Now()
|
end = time.Now()
|
||||||
}
|
}
|
||||||
q := db.Where("start BETWEEN ? AND ? ", start, end)
|
q := db.Where("start BETWEEN ? AND ?", start, end)
|
||||||
subStatus,err3 := vars["sub_status"]
|
if subStatusVar,subStatusErr := vars["sub_status"]; subStatusErr{
|
||||||
if err3{
|
q = q.Where("sub_status = ?", subStatusVar)
|
||||||
q = q.Where(" sub_status = ?", subStatus)
|
|
||||||
}
|
}
|
||||||
serviceId,err4 := vars["service_id"]
|
if serviceIdVar,serviceIdErr := vars["service_id"]; serviceIdErr{
|
||||||
if err4{
|
q = q.Where("service = ?", serviceIdVar)
|
||||||
q = q.Where(" service = ?", serviceId)
|
|
||||||
}
|
}
|
||||||
ty,err5 := vars["type"]
|
if typeVar,typeErr := vars["type"]; typeErr{
|
||||||
if err5{
|
q = q.Where("type = ?", typeVar)
|
||||||
q = q.Where(" type = ?", ty)
|
|
||||||
}
|
}
|
||||||
cnt,err5 := vars["count"]
|
var count int64
|
||||||
if err5{
|
if countVar,countErr := vars["count"]; countErr{
|
||||||
count,err = strconv.ParseInt(cnt,10,64)
|
count,err = strconv.ParseInt(countVar,10,64)
|
||||||
if count > 100 {
|
if count > 100 {
|
||||||
count = 100
|
count = 100
|
||||||
}
|
}
|
||||||
}else {
|
}else {
|
||||||
count = 20
|
count = 20
|
||||||
}
|
}
|
||||||
skp,err6:=vars["skip"]
|
var skip int64
|
||||||
if err6{
|
if skipVar,err6 := vars["skip"]; err6{
|
||||||
skip,err = strconv.ParseInt(skp,10,64)
|
skip,err = strconv.ParseInt(skipVar,10,64)
|
||||||
}else {
|
}else {
|
||||||
skip = 0
|
skip = 0
|
||||||
}
|
}
|
||||||
q = q.Order("id ASC ")
|
q = q.Order("id ASC")
|
||||||
q = q.Limit((int)(count)).Offset((int)(skip)).Find(&downtime)
|
q = q.Limit((int)(count)).Offset((int)(skip)).Find(&downtime)
|
||||||
return &downtime, q.Error()
|
return &downtime, q.Error()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue