add sort by advertised_start_time

.gitignore

@@ -4,4 +4,4 @@ racing/racing
 *.out
 .idea
 .vscode
-
+*.exe

api/proto/racing/racing.proto

@@ -6,6 +6,13 @@ option go_package = "/racing";
 import "google/protobuf/timestamp.proto";
 import "google/api/annotations.proto";
 
+// SortDirection lets a caller influence ordering of list results.
+enum SortDirection {
+  SORT_DIRECTION_UNSPECIFIED = 0; // Defaults to ascending.
+  SORT_DIRECTION_ASC = 1;         // Ascending advertised_start_time.
+  SORT_DIRECTION_DESC = 2;        // Descending advertised_start_time.
+}
+
 service Racing {
   // ListRaces returns a list of all races.
   rpc ListRaces(ListRacesRequest) returns (ListRacesResponse) {
@@ -31,6 +38,9 @@ message ListRacesRequestFilter {
   // visible_only, when true, restricts results to only races marked visible.
   // When omitted or false, all races (visible or not) are returned.
   optional bool visible_only = 2;
+  // sort_direction chooses ascending or descending order by advertised_start_time.
+  // If omitted or UNSPECIFIED the results are returned ascending (earliest first).
+  optional SortDirection sort_direction = 3;
 }
 
 /* Resources */

racing/db/races.go

@@ -68,27 +68,37 @@ func (r *racesRepo) applyFilter(query string, filter *racing.ListRacesRequestFil
 		args    []interface{}
 	)
 
-	if filter == nil {
-		return query, args
-	}
-
-	if len(filter.MeetingIds) > 0 {
-		clauses = append(clauses, "meeting_id IN ("+strings.Repeat("?,", len(filter.MeetingIds)-1)+"?)")
+	if filter != nil {
+		if len(filter.MeetingIds) > 0 {
+			clauses = append(clauses, "meeting_id IN ("+strings.Repeat("?,", len(filter.MeetingIds)-1)+"?)")
 
-		for _, meetingID := range filter.MeetingIds {
-			args = append(args, meetingID)
+			for _, meetingID := range filter.MeetingIds {
+				args = append(args, meetingID)
+			}
 		}
-	}
 
-	// visible_only filter: only return rows where visible = 1 when explicitly true.
-	if filter.VisibleOnly != nil && *filter.VisibleOnly {
-		clauses = append(clauses, "visible = 1")
+		// visible_only filter: only return rows where visible = 1 when explicitly true.
+		if filter.VisibleOnly != nil && *filter.VisibleOnly {
+			clauses = append(clauses, "visible = 1")
+		}
 	}
 
 	if len(clauses) != 0 {
 		query += " WHERE " + strings.Join(clauses, " AND ")
 	}
 
+	// Always order by advertised_start_time (ascending by default).
+	order := " ORDER BY advertised_start_time ASC"
+	if filter != nil && filter.SortDirection != nil {
+		switch *filter.SortDirection {
+		case racing.SortDirection_SORT_DIRECTION_DESC:
+			order = " ORDER BY advertised_start_time DESC"
+		case racing.SortDirection_SORT_DIRECTION_ASC, racing.SortDirection_SORT_DIRECTION_UNSPECIFIED:
+			order = " ORDER BY advertised_start_time ASC"
+		}
+	}
+	query += order
+
 	return query, args
 }
 

racing/db/races_test.go

@@ -0,0 +1,101 @@
+package db
+
+import (
+	"regexp"
+	"testing"
+	"time"
+
+	"git.neds.sh/matty/entain/racing/proto/racing"
+	"github.com/DATA-DOG/go-sqlmock"
+	"google.golang.org/protobuf/types/known/timestamppb"
+)
+
+// helper to build timestamp
+func mustTS(t *testing.T, tm time.Time) *racing.Race {
+	ts := timestamppb.New(tm)
+	return &racing.Race{AdvertisedStartTime: ts}
+}
+
+func TestList_DefaultAscending(t *testing.T) {
+	db, mock, err := sqlmock.New()
+	if err != nil {
+		t.Fatalf("mock: %v", err)
+	}
+	defer db.Close()
+
+	r := NewRacesRepo(db)
+
+	rows := sqlmock.NewRows([]string{"id", "meeting_id", "name", "number", "visible", "advertised_start_time"}).
+		AddRow(1, 1, "A", 1, 1, time.Now().Add(1*time.Hour)).
+		AddRow(2, 1, "B", 2, 1, time.Now().Add(2*time.Hour))
+
+	mock.ExpectQuery(regexp.QuoteMeta("SELECT \n\t\t\tid, \n\t\t\tmeeting_id, \n\t\t\tname, \n\t\t\tnumber, \n\t\t\tvisible, \n\t\t\tadvertised_start_time \n\t\tFROM races ORDER BY advertised_start_time ASC")).
+		WillReturnRows(rows)
+
+	out, err := r.List(nil)
+	if err != nil {
+		t.Fatalf("list: %v", err)
+	}
+	if len(out) != 2 {
+		t.Fatalf("expected 2 rows got %d", len(out))
+	}
+}
+
+func TestList_Descending(t *testing.T) {
+	db, mock, err := sqlmock.New()
+	if err != nil {
+		t.Fatalf("mock: %v", err)
+	}
+	defer db.Close()
+	r := NewRacesRepo(db)
+
+	dir := racing.SortDirection_SORT_DIRECTION_DESC
+	filter := &racing.ListRacesRequestFilter{SortDirection: &dir}
+
+	rows := sqlmock.NewRows([]string{"id", "meeting_id", "name", "number", "visible", "advertised_start_time"}).
+		AddRow(2, 1, "B", 2, 1, time.Now().Add(2*time.Hour)).
+		AddRow(1, 1, "A", 1, 1, time.Now().Add(1*time.Hour))
+
+	mock.ExpectQuery("ORDER BY advertised_start_time DESC").
+		WillReturnRows(rows)
+
+	out, err := r.List(filter)
+	if err != nil {
+		t.Fatalf("list: %v", err)
+	}
+	if len(out) != 2 {
+		t.Fatalf("expected 2 rows got %d", len(out))
+	}
+	if out[0].Id != 2 {
+		t.Fatalf("expected first id 2 got %d", out[0].Id)
+	}
+}
+
+func TestList_VisibleOnly(t *testing.T) {
+	db, mock, err := sqlmock.New()
+	if err != nil {
+		t.Fatalf("mock: %v", err)
+	}
+	defer db.Close()
+	r := NewRacesRepo(db)
+
+	vo := true
+	filter := &racing.ListRacesRequestFilter{VisibleOnly: &vo}
+
+	rows := sqlmock.NewRows([]string{"id", "meeting_id", "name", "number", "visible", "advertised_start_time"}).
+		AddRow(1, 1, "A", 1, 1, time.Now().Add(1*time.Hour))
+
+	mock.ExpectQuery("WHERE visible = 1 ORDER BY advertised_start_time ASC").
+		WillReturnRows(rows)
+
+	out, err := r.List(filter)
+	if err != nil {
+		t.Fatalf("list: %v", err)
+	}
+	if len(out) != 1 {
+		t.Fatalf("expected 1 row got %d", len(out))
+	}
+	if !out[0].Visible {
+		t.Fatalf("expected visible race")
+	}
+}