feat: host ordering

TODO.org

@@ -1,4 +1,3 @@
 This is a running list of things that need to taken care of at some point:
 
- - [ ] Ordering in the native messaging host
  - [ ] Long subtract function too complex

cmd/host/internal/messaging/handlers.go

@@ -304,6 +304,12 @@ func updateBookHandler(in NativeMessage) (NativeMessage, error) {
 	if payload.URL.Valid {
 		options.WithURL(payload.URL.String)
 	}
+	if payload.NextBook.Valid {
+		options.WithOrderBefore(payload.NextBook.String)
+	}
+	if payload.PreviousBook.Valid {
+		options.WithOrderAfter(payload.PreviousBook.String)
+	}
 
 	book, err := armariaapi.UpdateBook(payload.ID, options)
 	if err != nil {
@@ -340,6 +346,12 @@ func updateFolderHandler(in NativeMessage) (NativeMessage, error) {
 	if payload.Name.Valid {
 		options.WithName(payload.Name.String)
 	}
+	if payload.NextBook.Valid {
+		options.WithOrderBefore(payload.NextBook.String)
+	}
+	if payload.PreviousBook.Valid {
+		options.WithOrderAfter(payload.PreviousBook.String)
+	}
 
 	book, err := armariaapi.UpdateFolder(payload.ID, options)
 	if err != nil {

cmd/host/internal/messaging/payload.go

@@ -92,6 +92,8 @@ type UpdateBookPayload struct {
 	ParentID          null.NullString `json:"parentId"`
 	RemoveDescription bool            `json:"removeDescription"`
 	RemoveParentID    bool            `json:"removeParentID"`
+	PreviousBook      null.NullString `json:"previousBook"`
+	NextBook          null.NullString `json:"nextBook"`
 }
 
 // UpdateBookPayload is a payload for a request to update a folder.
@@ -101,6 +103,8 @@ type UpdateFolderPayload struct {
 	Name           null.NullString `json:"name"`
 	ParentID       null.NullString `json:"parentId"`
 	RemoveParentID bool            `json:"removeParentID"`
+	PreviousBook   null.NullString `json:"previousBook"`
+	NextBook       null.NullString `json:"nextBook"`
 }
 
 // ErrorPayload is a payload for a response with an error in it.

cmd/host/internal/test/update_book_test.go

@@ -10,6 +10,8 @@ import (
 	"github.com/jonathanhope/armaria/cmd/host/internal/messaging"
 	"github.com/jonathanhope/armaria/internal/null"
 	"github.com/jonathanhope/armaria/pkg/api"
+	"github.com/jonathanhope/armaria/pkg/model"
+	"github.com/samber/lo"
 )
 
 func TestUpdateBookURL(t *testing.T) {
@@ -258,3 +260,166 @@ func TestUpdateBookRemoveParentID(t *testing.T) {
 		t.Errorf("Expected and actual message different:\n%s", diff)
 	}
 }
+
+func TestUpdateBookOrderStart(t *testing.T) {
+	db := fmt.Sprintf("%s.db", uuid.New().String())
+	defer func() { os.Remove(db) }()
+
+	addOptions := armariaapi.DefaultAddBookOptions()
+	addOptions.WithDB(db)
+	book1, err := armariaapi.AddBook("https://one.com", addOptions)
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	book2, err := armariaapi.AddBook("https://two.com", addOptions)
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	book3, err := armariaapi.AddBook("https://three.com", addOptions)
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	_, err = nativeMessageLoop(messaging.MessageKindUpdateBook, messaging.UpdateBookPayload{
+		DB:       null.NullStringFrom(db),
+		ID:       book2.ID,
+		NextBook: null.NullStringFrom(book1.ID),
+	})
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	listOptions := armariaapi.DefaultListBooksOptions()
+	listOptions.WithBooks(true)
+	listOptions.WithDB(db)
+	books, err := armariaapi.ListBooks(listOptions)
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	got := lo.Map(books, func(x armaria.Book, _ int) string {
+		return x.ID
+	})
+
+	want := []string{
+		book2.ID,
+		book1.ID,
+		book3.ID,
+	}
+
+	diff := cmp.Diff(got, want)
+	if diff != "" {
+		t.Errorf("Expected and actual orders different:\n%s", diff)
+	}
+}
+
+func TestUpdateBookOrderEnd(t *testing.T) {
+	db := fmt.Sprintf("%s.db", uuid.New().String())
+	defer func() { os.Remove(db) }()
+
+	addOptions := armariaapi.DefaultAddBookOptions()
+	addOptions.WithDB(db)
+	book1, err := armariaapi.AddBook("https://one.com", addOptions)
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	book2, err := armariaapi.AddBook("https://two.com", addOptions)
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	book3, err := armariaapi.AddBook("https://three.com", addOptions)
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	_, err = nativeMessageLoop(messaging.MessageKindUpdateBook, messaging.UpdateBookPayload{
+		DB:           null.NullStringFrom(db),
+		ID:           book2.ID,
+		PreviousBook: null.NullStringFrom(book3.ID),
+	})
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	listOptions := armariaapi.DefaultListBooksOptions()
+	listOptions.WithBooks(true)
+	listOptions.WithDB(db)
+	books, err := armariaapi.ListBooks(listOptions)
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	got := lo.Map(books, func(x armaria.Book, _ int) string {
+		return x.ID
+	})
+
+	want := []string{
+		book1.ID,
+		book3.ID,
+		book2.ID,
+	}
+
+	diff := cmp.Diff(got, want)
+	if diff != "" {
+		t.Errorf("Expected and actual orders different:\n%s", diff)
+	}
+}
+
+func TestUpdateBookOrderBetween(t *testing.T) {
+	db := fmt.Sprintf("%s.db", uuid.New().String())
+	defer func() { os.Remove(db) }()
+
+	addOptions := armariaapi.DefaultAddBookOptions()
+	addOptions.WithDB(db)
+	book1, err := armariaapi.AddBook("https://one.com", addOptions)
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	book2, err := armariaapi.AddBook("https://two.com", addOptions)
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	book3, err := armariaapi.AddBook("https://three.com", addOptions)
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	_, err = nativeMessageLoop(messaging.MessageKindUpdateBook, messaging.UpdateBookPayload{
+		DB:           null.NullStringFrom(db),
+		ID:           book3.ID,
+		PreviousBook: null.NullStringFrom(book1.ID),
+		NextBook:     null.NullStringFrom(book2.ID),
+	})
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	listOptions := armariaapi.DefaultListBooksOptions()
+	listOptions.WithBooks(true)
+	listOptions.WithDB(db)
+	books, err := armariaapi.ListBooks(listOptions)
+	if err != nil {
+		t.Errorf("unexpected error: %s", err)
+	}
+
+	got := lo.Map(books, func(x armaria.Book, _ int) string {
+		return x.ID
+	})
+
+	want := []string{
+		book1.ID,
+		book3.ID,
+		book2.ID,
+	}
+
+	diff := cmp.Diff(got, want)
+	if diff != "" {
+		t.Errorf("Expected and actual orders different:\n%s", diff)
+	}
+}