pull/1113/head
akash-sachan 2023-05-11 19:52:17 +05:30
parent 5799f53b6b
commit eb0a632ece
1 changed files with 10 additions and 4 deletions

View File

@ -72,7 +72,7 @@ func getVisibleIncidentsOfService(service *services.Service) []incidents.Inciden
visibleIncidentIds = append(visibleIncidentIds, incident.Id) visibleIncidentIds = append(visibleIncidentIds, incident.Id)
} else if checkResolvedVisibility(incident.Updates) { } else if checkResolvedVisibility(incident.Updates) {
incidentVar := *incident incidentVar := *incident
sortUpdates(incidentVar.Updates) sortUpdates(incidentVar.Updates, "DESC")
visibleIncidents = append(visibleIncidents, incidentVar) visibleIncidents = append(visibleIncidents, incidentVar)
visibleIncidentIds = append(visibleIncidentIds, incident.Id) visibleIncidentIds = append(visibleIncidentIds, incident.Id)
} }
@ -81,9 +81,15 @@ func getVisibleIncidentsOfService(service *services.Service) []incidents.Inciden
return visibleIncidents return visibleIncidents
} }
func sortUpdates(updates []*incidents.IncidentUpdate) { func sortUpdates(updates []*incidents.IncidentUpdate, order string) {
sort.Slice(updates, func(i, j int) bool { sort.Slice(updates, func(i, j int) bool {
switch order {
case "DESC":
return updates[i].CreatedAt.Unix() >= updates[j].CreatedAt.Unix() return updates[i].CreatedAt.Unix() >= updates[j].CreatedAt.Unix()
case "ASC":
return updates[i].CreatedAt.Unix() <= updates[j].CreatedAt.Unix()
}
return false
}) })
} }
@ -113,7 +119,7 @@ func apiIncidentUpdatesHandler(w http.ResponseWriter, r *http.Request) {
sendErrorJson(err, w, r) sendErrorJson(err, w, r)
return return
} }
sortUpdates(incid.Updates) sortUpdates(incid.Updates, "ASC")
returnJson(incid.Updates, w, r) returnJson(incid.Updates, w, r)
} }