feat(backend): add Store.Get and bookmark view helpers
This commit is contained in:
@@ -2,6 +2,7 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@@ -28,6 +29,22 @@ type Bookmark struct {
|
|||||||
UpdatedAt int64 `json:"updated_at"` // unix ms; see Upsert
|
UpdatedAt int64 `json:"updated_at"` // unix ms; see Upsert
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// HasNewChapter reports whether the site has published past the read point.
|
||||||
|
// A nil LatestChapterNum means nothing has been captured yet, which is not the
|
||||||
|
// same as "nothing new".
|
||||||
|
func (b Bookmark) HasNewChapter() bool {
|
||||||
|
return b.LatestChapterNum != nil && *b.LatestChapterNum > b.LastChapterNum
|
||||||
|
}
|
||||||
|
|
||||||
|
// ContinueURL is where the Continue button points: the chapter last read, or
|
||||||
|
// the series page when no chapter URL was ever captured.
|
||||||
|
func (b Bookmark) ContinueURL() string {
|
||||||
|
if b.LastChapterURL != "" {
|
||||||
|
return b.LastChapterURL
|
||||||
|
}
|
||||||
|
return b.SeriesURL
|
||||||
|
}
|
||||||
|
|
||||||
const schema = `
|
const schema = `
|
||||||
CREATE TABLE IF NOT EXISTS bookmarks (
|
CREATE TABLE IF NOT EXISTS bookmarks (
|
||||||
key TEXT PRIMARY KEY,
|
key TEXT PRIMARY KEY,
|
||||||
@@ -182,6 +199,21 @@ func (s *Store) List() ([]Bookmark, error) {
|
|||||||
return out, rows.Err()
|
return out, rows.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Get returns one bookmark by key. A missing key is not an error: ok is false
|
||||||
|
// and err is nil. UI mutations read-modify-write through this so they preserve
|
||||||
|
// the fields they do not touch.
|
||||||
|
func (s *Store) Get(key string) (Bookmark, bool, error) {
|
||||||
|
b, err := scanBookmark(s.db.QueryRow(
|
||||||
|
`SELECT `+bookmarkColumns+` FROM bookmarks WHERE key = ?`, key).Scan)
|
||||||
|
if errors.Is(err, sql.ErrNoRows) {
|
||||||
|
return Bookmark{}, false, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return Bookmark{}, false, fmt.Errorf("get %q: %w", key, err)
|
||||||
|
}
|
||||||
|
return b, true, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Upsert inserts or replaces a bookmark by key (last-write-wins) and returns
|
// Upsert inserts or replaces a bookmark by key (last-write-wins) and returns
|
||||||
// the row as actually stored.
|
// the row as actually stored.
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -34,6 +34,16 @@ func newTestServer(t *testing.T) http.Handler {
|
|||||||
return newRouter(store, testConfig())
|
return newRouter(store, testConfig())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func newTestStore(t *testing.T) *Store {
|
||||||
|
t.Helper()
|
||||||
|
store, err := OpenStore(filepath.Join(t.TempDir(), "test.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("OpenStore: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { store.Close() })
|
||||||
|
return store
|
||||||
|
}
|
||||||
|
|
||||||
func auth(req *http.Request) *http.Request {
|
func auth(req *http.Request) *http.Request {
|
||||||
req.Header.Set("Authorization", "Bearer "+testToken)
|
req.Header.Set("Authorization", "Bearer "+testToken)
|
||||||
return req
|
return req
|
||||||
@@ -433,3 +443,75 @@ func TestOpenStoreMigratesLegacySchema(t *testing.T) {
|
|||||||
}
|
}
|
||||||
store2.Close()
|
store2.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestStoreGet(t *testing.T) {
|
||||||
|
store := newTestStore(t)
|
||||||
|
if _, err := store.Upsert(Bookmark{
|
||||||
|
Key: "asura:solo", Site: "asura", SeriesID: "solo",
|
||||||
|
Title: "Solo Leveling", LastChapterNum: 45, UpdatedAt: 1000,
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatalf("Upsert: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
got, ok, err := store.Get("asura:solo")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Get: %v", err)
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("Get ok = false, want true")
|
||||||
|
}
|
||||||
|
if got.Title != "Solo Leveling" || got.LastChapterNum != 45 {
|
||||||
|
t.Fatalf("Get = %+v, want title/chapter preserved", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStoreGetMissing(t *testing.T) {
|
||||||
|
store := newTestStore(t)
|
||||||
|
_, ok, err := store.Get("asura:nope")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Get missing returned error %v, want nil", err)
|
||||||
|
}
|
||||||
|
if ok {
|
||||||
|
t.Fatal("Get ok = true for missing key, want false")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBookmarkHasNewChapter(t *testing.T) {
|
||||||
|
num := func(f float64) *float64 { return &f }
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
b Bookmark
|
||||||
|
want bool
|
||||||
|
}{
|
||||||
|
{"latest ahead", Bookmark{LastChapterNum: 45, LatestChapterNum: num(47)}, true},
|
||||||
|
{"latest equal", Bookmark{LastChapterNum: 45, LatestChapterNum: num(45)}, false},
|
||||||
|
{"latest behind", Bookmark{LastChapterNum: 45, LatestChapterNum: num(44)}, false},
|
||||||
|
{"latest unknown", Bookmark{LastChapterNum: 45}, false},
|
||||||
|
}
|
||||||
|
for _, tc := range cases {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
if got := tc.b.HasNewChapter(); got != tc.want {
|
||||||
|
t.Fatalf("HasNewChapter() = %v, want %v", got, tc.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBookmarkContinueURL(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
b Bookmark
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{"chapter url present", Bookmark{LastChapterURL: "/ch/45", SeriesURL: "/series"}, "/ch/45"},
|
||||||
|
{"falls back to series", Bookmark{SeriesURL: "/series"}, "/series"},
|
||||||
|
{"both empty", Bookmark{}, ""},
|
||||||
|
}
|
||||||
|
for _, tc := range cases {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
if got := tc.b.ContinueURL(); got != tc.want {
|
||||||
|
t.Fatalf("ContinueURL() = %q, want %q", got, tc.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user