Skip to content

Commit 3d81e92

Browse files
committed
Sort execution asc by default
1 parent ce1eeb3 commit 3d81e92

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -890,14 +890,14 @@ By default, returns the full job (definition, execution tasks, context, etc.). P
890890
### Get job execution
891891

892892
```shell
893-
GET /jobs/<JOB_ID>/execution?page=1&size=25&sort=desc
893+
GET /jobs/<JOB_ID>/execution?page=1&size=25
894894
```
895895

896896
Returns a paginated list of execution tasks as `TaskSummary` objects. Query params:
897897

898898
- `page` – page number (default: `1`)
899899
- `size` – page size (default: `25`, max: `100`)
900-
- `sort` – `desc` (default, most recently started first) or `asc` (matches full job execution order)
900+
- `sort` – `asc` (default, matches full job execution order) or `desc` (most recently started first)
901901

902902
### Submit a job
903903

datastore/postgres/postgres_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -679,21 +679,21 @@ func TestPostgresGetJobExecution(t *testing.T) {
679679
assert.NoError(t, err)
680680
}
681681

682-
page, err := ds.GetJobExecution(ctx, j1.ID, 1, 2, "desc")
682+
page, err := ds.GetJobExecution(ctx, j1.ID, 1, 2, "asc")
683683
assert.NoError(t, err)
684684
assert.Equal(t, 1, page.Number)
685685
assert.Equal(t, 2, len(page.Items))
686686
assert.Equal(t, 5, page.TotalItems)
687687
assert.Equal(t, 3, page.TotalPages)
688-
assert.Equal(t, "task-5", page.Items[0].Name)
689-
assert.Equal(t, "task-4", page.Items[1].Name)
690-
691-
page, err = ds.GetJobExecution(ctx, j1.ID, 1, 2, "asc")
692-
assert.NoError(t, err)
693688
assert.Equal(t, "task-1", page.Items[0].Name)
694689
assert.Equal(t, "task-2", page.Items[1].Name)
695690

696-
_, err = ds.GetJobExecution(ctx, "not-a-job", 1, 10, "desc")
691+
page, err = ds.GetJobExecution(ctx, j1.ID, 1, 2, "desc")
692+
assert.NoError(t, err)
693+
assert.Equal(t, "task-5", page.Items[0].Name)
694+
assert.Equal(t, "task-4", page.Items[1].Name)
695+
696+
_, err = ds.GetJobExecution(ctx, "not-a-job", 1, 10, "asc")
697697
assert.ErrorIs(t, err, datastore.ErrJobNotFound)
698698
}
699699

internal/coordinator/api/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,12 +464,12 @@ func (s *API) getJob(c echo.Context) error {
464464
// @Param id path string true "Job ID"
465465
// @Param page query int false "page number"
466466
// @Param size query int false "page size"
467-
// @Param sort query string false "sort order (desc or asc, default: desc)"
467+
// @Param sort query string false "sort order (asc or desc, default: asc)"
468468
func (s *API) getJobExecution(c echo.Context) error {
469469
id := c.Param("id")
470470
sort := c.QueryParam("sort")
471471
if sort == "" {
472-
sort = "desc"
472+
sort = "asc"
473473
}
474474
if sort != "desc" && sort != "asc" {
475475
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("invalid sort: %s", sort))

internal/coordinator/api/api_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -490,10 +490,10 @@ func Test_getJobExecution(t *testing.T) {
490490
assert.Equal(t, 2, len(page.Items))
491491
assert.Equal(t, 5, page.TotalItems)
492492
assert.Equal(t, 3, page.TotalPages)
493-
assert.Equal(t, "task-5", page.Items[0].Name)
494-
assert.Equal(t, "task-4", page.Items[1].Name)
493+
assert.Equal(t, "task-1", page.Items[0].Name)
494+
assert.Equal(t, "task-2", page.Items[1].Name)
495495

496-
req, err = http.NewRequest("GET", fmt.Sprintf("/jobs/%s/execution?page=1&size=2&sort=asc", j1.ID), nil)
496+
req, err = http.NewRequest("GET", fmt.Sprintf("/jobs/%s/execution?page=1&size=2&sort=desc", j1.ID), nil)
497497
assert.NoError(t, err)
498498
w = httptest.NewRecorder()
499499
api.server.Handler.ServeHTTP(w, req)
@@ -502,8 +502,8 @@ func Test_getJobExecution(t *testing.T) {
502502
assert.NoError(t, err)
503503
err = json.Unmarshal(body, &page)
504504
assert.NoError(t, err)
505-
assert.Equal(t, "task-1", page.Items[0].Name)
506-
assert.Equal(t, "task-2", page.Items[1].Name)
505+
assert.Equal(t, "task-5", page.Items[0].Name)
506+
assert.Equal(t, "task-4", page.Items[1].Name)
507507
assert.NoError(t, ds.Close())
508508
}
509509

0 commit comments

Comments
 (0)