neoris/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix assembling return value for filtered report history

Browse Source
This commit is contained in:
Ingo Oppermann 2023-04-05 13:58:41 +02:00
parent 7372b3210d
commit 51cbb8e74e
No known key found for this signature in database
GPG Key ID: 2AB32426E9DD229E
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
http/handler/api/restream.go
View File

@ -366,6 +366,7 @@ func (h *RestreamHandler) GetReport(c echo.Context) error {
filteredReport := api.ProcessReport{}
// Add the current report as a fake history entry
report.History = append(report.History, api.ProcessReportEntry{
CreatedAt: report.CreatedAt,
Prelude: report.Prelude,
@ -395,7 +396,7 @@ func (h *RestreamHandler) GetReport(c echo.Context) error {
}
sort.SliceStable(entries, func(i, j int) bool {
return entries[i].CreatedAt < entries[j].CreatedAt
return entries[i].CreatedAt > entries[j].CreatedAt
})
if entries[0].ExitState == "" {
@ -403,9 +404,11 @@ func (h *RestreamHandler) GetReport(c echo.Context) error {
filteredReport.CreatedAt = entries[0].CreatedAt
filteredReport.Prelude = entries[0].Prelude
filteredReport.Log = entries[0].Log
}
filteredReport.History = entries[1:]
filteredReport.History = entries[1:]
} else {
filteredReport.History = entries
}
return c.JSON(http.StatusOK, filteredReport)
}

2
http/handler/api/restream_test.go
View File

@ -368,7 +368,7 @@ func TestProcessReportAt(t *testing.T) {
err = json.Unmarshal(response.Raw, &x)
require.NoError(t, err)
require.Equal(t, 1, len(x.History))
require.Equal(t, 2, len(x.History))
}
func TestSearchReportHistory(t *testing.T) {