dee7f1d160
The bookmarks list was rendering "Manga bookmark <date>" with no indication of which manga the bookmark referred to. The data is already in the DB — the list query just wasn't pulling it. Backend: - BookmarkSummary gains manga_title (String) and manga_cover_image_path (Option<String>). Populated by an INNER JOIN on `mangas` in `repo::bookmark::list_for_user`. The JOIN is INNER because `bookmarks.manga_id` has ON DELETE CASCADE, so a bookmark cannot outlive its manga. Chapter LEFT JOIN unchanged. - The existing list_me_enriches_chapter_bookmarks_with_chapter_number test now also asserts manga_title is populated for both chapter- and manga-level bookmarks, and that manga_cover_image_path is null when no cover was uploaded. Frontend: - Bookmark type carries optional manga_title and manga_cover_image_path (optional because POST /bookmarks returns the bare Bookmark, not the enriched summary). - /bookmarks page redesigned as a grid: cover thumbnail (64×96 with a placeholder when no cover) on the left, then the manga title (as the primary link), then either "Chapter N — page M" linked to the reader, "(chapter removed)" for orphan chapter bookmarks, or "Whole manga" for manga-level bookmarks. Bookmark date moves to a subdued footer. - E2E fixtures track the enriched shape returned by the list endpoint (vs. the bare Bookmark returned by POST). The toggle test now asserts the manga title appears on the bookmarks card after the bookmark is created. Also: tighten .gitignore. `/data` only catches the compose volume root; the dev backend writes to `/backend/data` (default STORAGE_DIR is `./data/storage` relative to backend cwd), so local uploads were showing as untracked. Adding `/backend/data` keeps test uploads out of the index. Lockstep version bump to 0.11.1. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
38 lines
1.3 KiB
Rust
38 lines
1.3 KiB
Rust
use chrono::{DateTime, Utc};
|
|
use serde::{Deserialize, Serialize};
|
|
use sqlx::FromRow;
|
|
use uuid::Uuid;
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, FromRow)]
|
|
pub struct Bookmark {
|
|
pub id: Uuid,
|
|
pub user_id: Uuid,
|
|
pub manga_id: Uuid,
|
|
pub chapter_id: Option<Uuid>,
|
|
pub page: Option<i32>,
|
|
pub created_at: DateTime<Utc>,
|
|
}
|
|
|
|
/// `Bookmark` enriched with the parent manga's title + cover and the
|
|
/// chapter's reader-facing number, so the /bookmarks page can render a
|
|
/// proper card (title, cover, link target) without N+1 round-trips.
|
|
/// Populated by JOINs in `repo::bookmark::list_for_user`:
|
|
/// - `manga_title` / `manga_cover_image_path` come from `mangas` via an
|
|
/// INNER JOIN (safe: `bookmarks.manga_id` is `ON DELETE CASCADE`, so a
|
|
/// bookmark cannot outlive its manga).
|
|
/// - `chapter_number` comes from `chapters` via a LEFT JOIN; `null` for
|
|
/// manga-level bookmarks or for chapter bookmarks whose chapter has
|
|
/// since been deleted (`bookmarks.chapter_id` is `ON DELETE SET NULL`).
|
|
#[derive(Debug, Clone, Serialize, FromRow)]
|
|
pub struct BookmarkSummary {
|
|
pub id: Uuid,
|
|
pub user_id: Uuid,
|
|
pub manga_id: Uuid,
|
|
pub manga_title: String,
|
|
pub manga_cover_image_path: Option<String>,
|
|
pub chapter_id: Option<Uuid>,
|
|
pub chapter_number: Option<i32>,
|
|
pub page: Option<i32>,
|
|
pub created_at: DateTime<Utc>,
|
|
}
|