feat: manga metadata with status, authors, genres, tags, and search filters (0.15.0)
Adds first-class manga metadata across the stack: - **Status** (ongoing / completed), **alternative titles**, normalized **multi-author** support, **curated genres** (13 seeded), and **free-form user tags** (case-insensitive, globally shared). Each is modelled as its own table joined to mangas; `mangas.author` is backfilled into `authors` + `manga_authors` and dropped. - New endpoints: `PATCH /v1/mangas/:id` (three-state `description`), `POST/DELETE /v1/mangas/:id/tags[/:tag_id]`, `GET /v1/genres`, `GET /v1/tags?search=`. - `GET /v1/mangas` now returns `MangaCard` (with authors + genres batched in) and supports `?status=`, `?author_id=`, `?genre_id=`, `?tag_id=` filters — AND across facets, with empty-array no-op semantics for the unnest primitive. - `GET /v1/mangas/:id` returns the enriched `MangaDetail` with tags. - Frontend: reusable `Chip` component; manga detail page renders authors as chips linking to `/authors/:id` (Phase 2), a status badge, alt titles, genres, and tags with inline add/remove (only the attacher sees remove); upload form supports multi-author / multi-genre / alt titles / status; search page gets a collapsible URL-synced filter panel with keyboard-navigable tag autocomplete. - 126 backend tests (incl. AND-across-facets primitive, case-insens author/tag de-dup, transactional create rollback, PATCH semantics for missing / null / set on description); 72 frontend tests + svelte-check clean. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
2
backend/Cargo.lock
generated
2
backend/Cargo.lock
generated
@@ -1033,7 +1033,7 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mangalord"
|
name = "mangalord"
|
||||||
version = "0.14.0"
|
version = "0.15.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"argon2",
|
"argon2",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "mangalord"
|
name = "mangalord"
|
||||||
version = "0.14.0"
|
version = "0.15.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
|
|||||||
102
backend/migrations/0009_manga_metadata.sql
Normal file
102
backend/migrations/0009_manga_metadata.sql
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
-- Manga metadata: status, alternative titles, normalized authors,
|
||||||
|
-- curated genres, and user-extensible tags. Each new concept gets its
|
||||||
|
-- own table joined to mangas rather than being jammed onto the mangas
|
||||||
|
-- row, in line with the extension philosophy in 0001_init.sql.
|
||||||
|
|
||||||
|
-- 1. Inline columns: status (curated enum-like) and alt_titles (array).
|
||||||
|
ALTER TABLE mangas
|
||||||
|
ADD COLUMN status text NOT NULL DEFAULT 'ongoing'
|
||||||
|
CHECK (status IN ('ongoing', 'completed')),
|
||||||
|
ADD COLUMN alt_titles text[] NOT NULL DEFAULT '{}';
|
||||||
|
|
||||||
|
-- 2. Authors: normalized so an author page can list works.
|
||||||
|
-- Display name preserves casing; lookups go through lower(name) for
|
||||||
|
-- case-insensitive de-dup. Trigram index supports autocomplete.
|
||||||
|
CREATE TABLE authors (
|
||||||
|
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
name text NOT NULL,
|
||||||
|
created_at timestamptz NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE UNIQUE INDEX authors_name_lower_uniq ON authors (lower(name));
|
||||||
|
CREATE INDEX authors_name_trgm_idx ON authors USING gin (name gin_trgm_ops);
|
||||||
|
|
||||||
|
CREATE TABLE manga_authors (
|
||||||
|
manga_id uuid NOT NULL REFERENCES mangas(id) ON DELETE CASCADE,
|
||||||
|
author_id uuid NOT NULL REFERENCES authors(id) ON DELETE CASCADE,
|
||||||
|
position integer NOT NULL DEFAULT 0,
|
||||||
|
PRIMARY KEY (manga_id, author_id)
|
||||||
|
);
|
||||||
|
CREATE INDEX manga_authors_author_idx ON manga_authors (author_id);
|
||||||
|
|
||||||
|
-- 3. Genres: curated controlled vocabulary, seeded below. Uploaders
|
||||||
|
-- pick from this list; users do not add new genres (that's what
|
||||||
|
-- tags are for).
|
||||||
|
CREATE TABLE genres (
|
||||||
|
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
name text NOT NULL UNIQUE
|
||||||
|
);
|
||||||
|
|
||||||
|
INSERT INTO genres (name) VALUES
|
||||||
|
('Action'),
|
||||||
|
('Adventure'),
|
||||||
|
('Comedy'),
|
||||||
|
('Drama'),
|
||||||
|
('Fantasy'),
|
||||||
|
('Horror'),
|
||||||
|
('Mystery'),
|
||||||
|
('Romance'),
|
||||||
|
('Sci-Fi'),
|
||||||
|
('Slice of Life'),
|
||||||
|
('Sports'),
|
||||||
|
('Supernatural'),
|
||||||
|
('Thriller')
|
||||||
|
ON CONFLICT DO NOTHING;
|
||||||
|
|
||||||
|
CREATE TABLE manga_genres (
|
||||||
|
manga_id uuid NOT NULL REFERENCES mangas(id) ON DELETE CASCADE,
|
||||||
|
genre_id uuid NOT NULL REFERENCES genres(id) ON DELETE CASCADE,
|
||||||
|
PRIMARY KEY (manga_id, genre_id)
|
||||||
|
);
|
||||||
|
CREATE INDEX manga_genres_genre_idx ON manga_genres (genre_id);
|
||||||
|
|
||||||
|
-- 4. Tags: free-form but globally shared. Any signed-in user can
|
||||||
|
-- attach a tag to a manga — creating the tag if new. `added_by`
|
||||||
|
-- records the attacher so the UI can show a remove button only to
|
||||||
|
-- them. ON DELETE SET NULL keeps the tag intact if the user leaves.
|
||||||
|
CREATE TABLE tags (
|
||||||
|
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
name text NOT NULL,
|
||||||
|
created_at timestamptz NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE UNIQUE INDEX tags_name_lower_uniq ON tags (lower(name));
|
||||||
|
CREATE INDEX tags_name_trgm_idx ON tags USING gin (name gin_trgm_ops);
|
||||||
|
|
||||||
|
CREATE TABLE manga_tags (
|
||||||
|
manga_id uuid NOT NULL REFERENCES mangas(id) ON DELETE CASCADE,
|
||||||
|
tag_id uuid NOT NULL REFERENCES tags(id) ON DELETE CASCADE,
|
||||||
|
added_by uuid REFERENCES users(id) ON DELETE SET NULL,
|
||||||
|
created_at timestamptz NOT NULL DEFAULT now(),
|
||||||
|
PRIMARY KEY (manga_id, tag_id)
|
||||||
|
);
|
||||||
|
CREATE INDEX manga_tags_tag_idx ON manga_tags (tag_id);
|
||||||
|
|
||||||
|
-- 5. Backfill the existing single `author` column into the normalized
|
||||||
|
-- tables. Trim whitespace; skip blanks. After backfill, drop the
|
||||||
|
-- trigram index on the old column and then drop the column itself.
|
||||||
|
INSERT INTO authors (name)
|
||||||
|
SELECT DISTINCT trim(author)
|
||||||
|
FROM mangas
|
||||||
|
WHERE author IS NOT NULL
|
||||||
|
AND trim(author) <> ''
|
||||||
|
ON CONFLICT (lower(name)) DO NOTHING;
|
||||||
|
|
||||||
|
INSERT INTO manga_authors (manga_id, author_id, position)
|
||||||
|
SELECT m.id, a.id, 0
|
||||||
|
FROM mangas m
|
||||||
|
JOIN authors a ON lower(a.name) = lower(trim(m.author))
|
||||||
|
WHERE m.author IS NOT NULL
|
||||||
|
AND trim(m.author) <> ''
|
||||||
|
ON CONFLICT DO NOTHING;
|
||||||
|
|
||||||
|
DROP INDEX IF EXISTS mangas_author_trgm_idx;
|
||||||
|
ALTER TABLE mangas DROP COLUMN author;
|
||||||
16
backend/src/api/genres.rs
Normal file
16
backend/src/api/genres.rs
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
use axum::extract::State;
|
||||||
|
use axum::routing::get;
|
||||||
|
use axum::{Json, Router};
|
||||||
|
|
||||||
|
use crate::app::AppState;
|
||||||
|
use crate::domain::genre::Genre;
|
||||||
|
use crate::error::AppResult;
|
||||||
|
use crate::repo;
|
||||||
|
|
||||||
|
pub fn routes() -> Router<AppState> {
|
||||||
|
Router::new().route("/genres", get(list))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn list(State(state): State<AppState>) -> AppResult<Json<Vec<Genre>>> {
|
||||||
|
Ok(Json(repo::genre::list_all(&state.db).await?))
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
use axum::extract::{Multipart, Path, Query, State};
|
use axum::extract::{Multipart, Path, Query, State};
|
||||||
use axum::http::StatusCode;
|
use axum::http::StatusCode;
|
||||||
use axum::routing::get;
|
use axum::routing::{delete, get, post};
|
||||||
use axum::{Json, Router};
|
use axum::{Json, Router};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use serde_json::json;
|
use serde_json::json;
|
||||||
@@ -9,7 +9,8 @@ use uuid::Uuid;
|
|||||||
use crate::api::pagination::PagedResponse;
|
use crate::api::pagination::PagedResponse;
|
||||||
use crate::app::AppState;
|
use crate::app::AppState;
|
||||||
use crate::auth::extractor::CurrentUser;
|
use crate::auth::extractor::CurrentUser;
|
||||||
use crate::domain::manga::{Manga, NewManga};
|
use crate::domain::manga::{MangaCard, MangaDetail, MangaPatch, NewManga, Patch};
|
||||||
|
use crate::domain::tag::TagRef;
|
||||||
use crate::error::{AppError, AppResult};
|
use crate::error::{AppError, AppResult};
|
||||||
use crate::repo;
|
use crate::repo;
|
||||||
use crate::upload::{parse_image, UploadedImage};
|
use crate::upload::{parse_image, UploadedImage};
|
||||||
@@ -17,13 +18,25 @@ use crate::upload::{parse_image, UploadedImage};
|
|||||||
pub fn routes() -> Router<AppState> {
|
pub fn routes() -> Router<AppState> {
|
||||||
Router::new()
|
Router::new()
|
||||||
.route("/mangas", get(list).post(create))
|
.route("/mangas", get(list).post(create))
|
||||||
.route("/mangas/:id", get(get_one))
|
.route("/mangas/:id", get(get_one).patch(update))
|
||||||
|
.route("/mangas/:id/tags", post(attach_tag))
|
||||||
|
.route("/mangas/:id/tags/:tag_id", delete(detach_tag))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize, Default)]
|
||||||
pub struct ListParams {
|
pub struct ListParams {
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub search: Option<String>,
|
pub search: Option<String>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub status: Option<String>,
|
||||||
|
/// Comma-separated UUIDs. AND across the list — every id must be
|
||||||
|
/// attached to the manga for it to match.
|
||||||
|
#[serde(default)]
|
||||||
|
pub author_id: Option<String>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub genre_id: Option<String>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub tag_id: Option<String>,
|
||||||
#[serde(default = "default_limit")]
|
#[serde(default = "default_limit")]
|
||||||
pub limit: i64,
|
pub limit: i64,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@@ -36,41 +49,78 @@ fn default_limit() -> i64 {
|
|||||||
50
|
50
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn parse_uuid_csv(field: &str, raw: Option<&str>) -> AppResult<Vec<Uuid>> {
|
||||||
|
let Some(raw) = raw else { return Ok(Vec::new()) };
|
||||||
|
let mut out = Vec::new();
|
||||||
|
for piece in raw.split(',') {
|
||||||
|
let s = piece.trim();
|
||||||
|
if s.is_empty() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let id = Uuid::parse_str(s).map_err(|_| AppError::ValidationFailed {
|
||||||
|
message: format!("{field} contained an invalid UUID"),
|
||||||
|
details: json!({ field: "comma-separated UUIDs" }),
|
||||||
|
})?;
|
||||||
|
out.push(id);
|
||||||
|
}
|
||||||
|
Ok(out)
|
||||||
|
}
|
||||||
|
|
||||||
async fn list(
|
async fn list(
|
||||||
State(state): State<AppState>,
|
State(state): State<AppState>,
|
||||||
Query(params): Query<ListParams>,
|
Query(params): Query<ListParams>,
|
||||||
) -> AppResult<Json<PagedResponse<Manga>>> {
|
) -> AppResult<Json<PagedResponse<MangaCard>>> {
|
||||||
let limit = params.limit.clamp(1, 200);
|
let limit = params.limit.clamp(1, 200);
|
||||||
let offset = params.offset.max(0);
|
let offset = params.offset.max(0);
|
||||||
|
let status = match params.status.as_deref().map(str::trim) {
|
||||||
|
None | Some("") => None,
|
||||||
|
Some(s) => {
|
||||||
|
if !repo::manga::STATUSES.contains(&s) {
|
||||||
|
return Err(AppError::ValidationFailed {
|
||||||
|
message: "invalid status filter".into(),
|
||||||
|
details: json!({ "status": format!("must be one of {:?}", repo::manga::STATUSES) }),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Some(s.to_string())
|
||||||
|
}
|
||||||
|
};
|
||||||
let q = repo::manga::ListQuery {
|
let q = repo::manga::ListQuery {
|
||||||
search: params.search.filter(|s| !s.trim().is_empty()),
|
search: params.search.filter(|s| !s.trim().is_empty()),
|
||||||
|
status,
|
||||||
|
author_ids: parse_uuid_csv("author_id", params.author_id.as_deref())?,
|
||||||
|
genre_ids: parse_uuid_csv("genre_id", params.genre_id.as_deref())?,
|
||||||
|
tag_ids: parse_uuid_csv("tag_id", params.tag_id.as_deref())?,
|
||||||
limit,
|
limit,
|
||||||
offset,
|
offset,
|
||||||
sort: params.sort,
|
sort: params.sort,
|
||||||
};
|
};
|
||||||
let (items, total) = repo::manga::list(&state.db, &q).await?;
|
let (items, total) = repo::manga::list_cards(&state.db, &q).await?;
|
||||||
Ok(Json(PagedResponse::with_total(items, limit, offset, total)))
|
Ok(Json(PagedResponse::with_total(items, limit, offset, total)))
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn get_one(
|
async fn get_one(
|
||||||
State(state): State<AppState>,
|
State(state): State<AppState>,
|
||||||
Path(id): Path<Uuid>,
|
Path(id): Path<Uuid>,
|
||||||
) -> AppResult<Json<Manga>> {
|
) -> AppResult<Json<MangaDetail>> {
|
||||||
Ok(Json(repo::manga::get(&state.db, id).await?))
|
Ok(Json(repo::manga::get_detail(&state.db, id).await?))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// `POST /api/v1/mangas` is multipart/form-data. Parts:
|
/// `POST /api/v1/mangas` is multipart/form-data. Parts:
|
||||||
///
|
///
|
||||||
/// - `metadata` (required): JSON body matching `NewManga`.
|
/// - `metadata` (required): JSON body matching `NewManga` — title, optional
|
||||||
|
/// status, optional authors (array of names), optional alt_titles
|
||||||
|
/// (array), optional description, optional genre_ids (array of UUIDs).
|
||||||
/// - `cover` (optional): image bytes. MIME is sniffed from magic bytes
|
/// - `cover` (optional): image bytes. MIME is sniffed from magic bytes
|
||||||
/// (jpeg/png/webp/gif/avif); size capped at `upload.max_file_bytes`.
|
/// (jpeg/png/webp/gif/avif); size capped at `upload.max_file_bytes`.
|
||||||
///
|
///
|
||||||
/// Anything else is ignored.
|
/// Anything else is ignored. Authors are upserted into the global
|
||||||
|
/// authors table (case-insensitive de-dup); genre_ids are validated
|
||||||
|
/// against the curated genres list.
|
||||||
async fn create(
|
async fn create(
|
||||||
State(state): State<AppState>,
|
State(state): State<AppState>,
|
||||||
CurrentUser(_user): CurrentUser,
|
CurrentUser(_user): CurrentUser,
|
||||||
mut multipart: Multipart,
|
mut multipart: Multipart,
|
||||||
) -> AppResult<(StatusCode, Json<Manga>)> {
|
) -> AppResult<(StatusCode, Json<MangaDetail>)> {
|
||||||
let mut metadata: Option<NewManga> = None;
|
let mut metadata: Option<NewManga> = None;
|
||||||
let mut cover: Option<UploadedImage> = None;
|
let mut cover: Option<UploadedImage> = None;
|
||||||
|
|
||||||
@@ -93,15 +143,36 @@ async fn create(
|
|||||||
details: json!({ "metadata": "required" }),
|
details: json!({ "metadata": "required" }),
|
||||||
})?;
|
})?;
|
||||||
validate_new_manga(&metadata)?;
|
validate_new_manga(&metadata)?;
|
||||||
|
validate_genre_ids(&state, &metadata.genre_ids).await?;
|
||||||
|
|
||||||
// Transactional create. If the cover put or the cover_image_path
|
let status = metadata
|
||||||
// UPDATE fails, the manga row is rolled back so a half-uploaded
|
.status
|
||||||
// cover doesn't leave a manga without one stuck pointing at it.
|
.as_deref()
|
||||||
// Bytes already written to storage on a rolled-back transaction
|
.map(str::trim)
|
||||||
// become orphans on disk — a future reaper can sweep them; we
|
.filter(|s| !s.is_empty())
|
||||||
// prioritise DB consistency over storage tidiness here.
|
.unwrap_or(repo::manga::DEFAULT_STATUS)
|
||||||
|
.to_string();
|
||||||
|
let alt_titles = normalize_alt_titles(metadata.alt_titles);
|
||||||
|
let authors = normalize_string_list(metadata.authors);
|
||||||
|
|
||||||
|
// Transactional create. If the cover put or any relation write
|
||||||
|
// fails, the manga row and its relations are rolled back so a
|
||||||
|
// half-uploaded cover doesn't leave a manga without one stuck
|
||||||
|
// pointing at it. Bytes already written to storage on a rolled-back
|
||||||
|
// transaction become orphans on disk — a future reaper can sweep
|
||||||
|
// them; we prioritise DB consistency over storage tidiness here.
|
||||||
let mut tx = state.db.begin().await?;
|
let mut tx = state.db.begin().await?;
|
||||||
let mut manga = repo::manga::create(&mut *tx, metadata).await?;
|
let mut manga = repo::manga::create(
|
||||||
|
&mut *tx,
|
||||||
|
metadata.title.trim(),
|
||||||
|
&status,
|
||||||
|
metadata.description.as_deref(),
|
||||||
|
&alt_titles,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let author_refs = repo::author::set_for_manga(&mut *tx, manga.id, &authors).await?;
|
||||||
|
repo::genre::set_for_manga(&mut *tx, manga.id, &metadata.genre_ids).await?;
|
||||||
|
|
||||||
if let Some(img) = cover {
|
if let Some(img) = cover {
|
||||||
let key = format!("mangas/{}/cover.{}", manga.id, img.ext);
|
let key = format!("mangas/{}/cover.{}", manga.id, img.ext);
|
||||||
@@ -112,7 +183,135 @@ async fn create(
|
|||||||
|
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
|
|
||||||
Ok((StatusCode::CREATED, Json(manga)))
|
// Re-read so the genres list reflects the canonical sort order
|
||||||
|
// and any future trigger-driven defaults.
|
||||||
|
let detail = repo::manga::get_detail(&state.db, manga.id).await?;
|
||||||
|
let _ = author_refs; // returned for free via detail
|
||||||
|
Ok((StatusCode::CREATED, Json(detail)))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn update(
|
||||||
|
State(state): State<AppState>,
|
||||||
|
CurrentUser(_user): CurrentUser,
|
||||||
|
Path(id): Path<Uuid>,
|
||||||
|
Json(patch): Json<MangaPatch>,
|
||||||
|
) -> AppResult<Json<MangaDetail>> {
|
||||||
|
// TODO(auth): until uploaders are tracked (Phase 5), any signed-in
|
||||||
|
// user can edit any manga. Restrict to uploader + admin once that
|
||||||
|
// column lands.
|
||||||
|
if !repo::manga::exists(&state.db, id).await? {
|
||||||
|
return Err(AppError::NotFound);
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(ref status) = patch.status {
|
||||||
|
let trimmed = status.trim();
|
||||||
|
if !repo::manga::STATUSES.contains(&trimmed) {
|
||||||
|
return Err(AppError::ValidationFailed {
|
||||||
|
message: "invalid status".into(),
|
||||||
|
details: json!({ "status": format!("must be one of {:?}", repo::manga::STATUSES) }),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Some(ref title) = patch.title {
|
||||||
|
if title.trim().is_empty() {
|
||||||
|
return Err(AppError::ValidationFailed {
|
||||||
|
message: "title cannot be blank".into(),
|
||||||
|
details: json!({ "title": "non-empty" }),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Some(ref ids) = patch.genre_ids {
|
||||||
|
validate_genre_ids(&state, ids).await?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let alt_titles_owned: Option<Vec<String>> =
|
||||||
|
patch.alt_titles.map(normalize_alt_titles);
|
||||||
|
let authors_owned: Option<Vec<String>> =
|
||||||
|
patch.authors.map(normalize_string_list);
|
||||||
|
|
||||||
|
let description_provided = patch.description.is_provided();
|
||||||
|
let description_value: Option<&str> = match &patch.description {
|
||||||
|
Patch::Set(s) => Some(s.as_str()),
|
||||||
|
Patch::Clear | Patch::Unchanged => None,
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
let _updated = repo::manga::update_basics(
|
||||||
|
&mut *tx,
|
||||||
|
id,
|
||||||
|
patch.title.as_deref().map(str::trim),
|
||||||
|
patch.status.as_deref().map(str::trim),
|
||||||
|
description_provided,
|
||||||
|
description_value,
|
||||||
|
alt_titles_owned.as_deref(),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
if let Some(ref names) = authors_owned {
|
||||||
|
repo::author::set_for_manga(&mut *tx, id, names).await?;
|
||||||
|
}
|
||||||
|
if let Some(ref ids) = patch.genre_ids {
|
||||||
|
repo::genre::set_for_manga(&mut *tx, id, ids).await?;
|
||||||
|
}
|
||||||
|
tx.commit().await?;
|
||||||
|
|
||||||
|
Ok(Json(repo::manga::get_detail(&state.db, id).await?))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
pub struct AttachTagBody {
|
||||||
|
pub name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn attach_tag(
|
||||||
|
State(state): State<AppState>,
|
||||||
|
CurrentUser(user): CurrentUser,
|
||||||
|
Path(id): Path<Uuid>,
|
||||||
|
Json(body): Json<AttachTagBody>,
|
||||||
|
) -> AppResult<(StatusCode, Json<TagRef>)> {
|
||||||
|
if !repo::manga::exists(&state.db, id).await? {
|
||||||
|
return Err(AppError::NotFound);
|
||||||
|
}
|
||||||
|
let outcome = repo::tag::attach_to_manga(&state.db, id, &body.name, user.id).await?;
|
||||||
|
let status = if outcome.created_attachment {
|
||||||
|
StatusCode::CREATED
|
||||||
|
} else {
|
||||||
|
StatusCode::OK
|
||||||
|
};
|
||||||
|
// `added_by` reflects who currently owns the attachment — which is
|
||||||
|
// the first attacher, not the caller. Look it up so the response
|
||||||
|
// matches what subsequent list_for_manga reads will show.
|
||||||
|
let added_by = repo::tag::find_attacher(&state.db, id, outcome.tag.id)
|
||||||
|
.await?
|
||||||
|
.flatten();
|
||||||
|
Ok((
|
||||||
|
status,
|
||||||
|
Json(TagRef {
|
||||||
|
id: outcome.tag.id,
|
||||||
|
name: outcome.tag.name,
|
||||||
|
added_by,
|
||||||
|
}),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn detach_tag(
|
||||||
|
State(state): State<AppState>,
|
||||||
|
CurrentUser(user): CurrentUser,
|
||||||
|
Path((manga_id, tag_id)): Path<(Uuid, Uuid)>,
|
||||||
|
) -> AppResult<StatusCode> {
|
||||||
|
match repo::tag::find_attacher(&state.db, manga_id, tag_id).await? {
|
||||||
|
None => Err(AppError::NotFound),
|
||||||
|
Some(added_by) => {
|
||||||
|
// `added_by` is None if the attaching user was deleted; in
|
||||||
|
// that case nobody owns it, so we refuse rather than let
|
||||||
|
// any user clear orphan tags (an admin role can do that
|
||||||
|
// later).
|
||||||
|
if added_by != Some(user.id) {
|
||||||
|
return Err(AppError::Forbidden);
|
||||||
|
}
|
||||||
|
repo::tag::detach(&state.db, manga_id, tag_id).await?;
|
||||||
|
Ok(StatusCode::NO_CONTENT)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn validate_new_manga(input: &NewManga) -> AppResult<()> {
|
fn validate_new_manga(input: &NewManga) -> AppResult<()> {
|
||||||
@@ -122,9 +321,75 @@ fn validate_new_manga(input: &NewManga) -> AppResult<()> {
|
|||||||
details: json!({ "title": "required" }),
|
details: json!({ "title": "required" }),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
if let Some(ref status) = input.status {
|
||||||
|
let trimmed = status.trim();
|
||||||
|
if !trimmed.is_empty() && !repo::manga::STATUSES.contains(&trimmed) {
|
||||||
|
return Err(AppError::ValidationFailed {
|
||||||
|
message: "invalid status".into(),
|
||||||
|
details: json!({ "status": format!("must be one of {:?}", repo::manga::STATUSES) }),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn validate_genre_ids(state: &AppState, ids: &[Uuid]) -> AppResult<()> {
|
||||||
|
if ids.is_empty() {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
// Dedup before counting — Postgres' `id = ANY(...)` is set-based,
|
||||||
|
// so a request with `[g1, g1]` would match one row and trip the
|
||||||
|
// "unknown id" branch even though the only id is real. The DB-side
|
||||||
|
// insert path also dedupes via `ON CONFLICT DO NOTHING`, so we
|
||||||
|
// simply silently accept duplicates from the client.
|
||||||
|
let unique: std::collections::HashSet<Uuid> = ids.iter().copied().collect();
|
||||||
|
let (matched,): (i64,) =
|
||||||
|
sqlx::query_as("SELECT count(*) FROM genres WHERE id = ANY($1)")
|
||||||
|
.bind(ids)
|
||||||
|
.fetch_one(&state.db)
|
||||||
|
.await?;
|
||||||
|
if (matched as usize) != unique.len() {
|
||||||
|
return Err(AppError::ValidationFailed {
|
||||||
|
message: "unknown genre id".into(),
|
||||||
|
details: json!({ "genre_ids": "all ids must reference an existing genre" }),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn normalize_alt_titles(raw: Vec<String>) -> Vec<String> {
|
||||||
|
let mut out = Vec::with_capacity(raw.len());
|
||||||
|
for t in raw {
|
||||||
|
let trimmed = t.trim();
|
||||||
|
if trimmed.is_empty() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let s = trimmed.to_string();
|
||||||
|
if !out.contains(&s) {
|
||||||
|
out.push(s);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
fn normalize_string_list(raw: Vec<String>) -> Vec<String> {
|
||||||
|
let mut out = Vec::with_capacity(raw.len());
|
||||||
|
for s in raw {
|
||||||
|
let trimmed = s.trim();
|
||||||
|
if trimmed.is_empty() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// Case-insensitive de-dup so ["Miura", "miura"] becomes one entry.
|
||||||
|
if !out
|
||||||
|
.iter()
|
||||||
|
.any(|existing: &String| existing.eq_ignore_ascii_case(trimmed))
|
||||||
|
{
|
||||||
|
out.push(trimmed.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
fn parse_metadata_json(bytes: &[u8]) -> AppResult<NewManga> {
|
fn parse_metadata_json(bytes: &[u8]) -> AppResult<NewManga> {
|
||||||
serde_json::from_slice(bytes).map_err(|e| AppError::ValidationFailed {
|
serde_json::from_slice(bytes).map_err(|e| AppError::ValidationFailed {
|
||||||
message: "metadata is not valid JSON".into(),
|
message: "metadata is not valid JSON".into(),
|
||||||
|
|||||||
@@ -2,9 +2,11 @@ pub mod auth;
|
|||||||
pub mod bookmarks;
|
pub mod bookmarks;
|
||||||
pub mod chapters;
|
pub mod chapters;
|
||||||
pub mod files;
|
pub mod files;
|
||||||
|
pub mod genres;
|
||||||
pub mod health;
|
pub mod health;
|
||||||
pub mod mangas;
|
pub mod mangas;
|
||||||
pub mod pagination;
|
pub mod pagination;
|
||||||
|
pub mod tags;
|
||||||
|
|
||||||
use axum::Router;
|
use axum::Router;
|
||||||
|
|
||||||
@@ -18,4 +20,6 @@ pub fn routes() -> Router<AppState> {
|
|||||||
.merge(files::routes())
|
.merge(files::routes())
|
||||||
.merge(auth::routes())
|
.merge(auth::routes())
|
||||||
.merge(bookmarks::routes())
|
.merge(bookmarks::routes())
|
||||||
|
.merge(genres::routes())
|
||||||
|
.merge(tags::routes())
|
||||||
}
|
}
|
||||||
|
|||||||
37
backend/src/api/tags.rs
Normal file
37
backend/src/api/tags.rs
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
use axum::extract::{Query, State};
|
||||||
|
use axum::routing::get;
|
||||||
|
use axum::{Json, Router};
|
||||||
|
use serde::Deserialize;
|
||||||
|
|
||||||
|
use crate::app::AppState;
|
||||||
|
use crate::domain::tag::Tag;
|
||||||
|
use crate::error::AppResult;
|
||||||
|
use crate::repo;
|
||||||
|
|
||||||
|
pub fn routes() -> Router<AppState> {
|
||||||
|
Router::new().route("/tags", get(list))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
pub struct ListParams {
|
||||||
|
#[serde(default)]
|
||||||
|
pub search: Option<String>,
|
||||||
|
#[serde(default = "default_limit")]
|
||||||
|
pub limit: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn default_limit() -> i64 {
|
||||||
|
10
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn list(
|
||||||
|
State(state): State<AppState>,
|
||||||
|
Query(params): Query<ListParams>,
|
||||||
|
) -> AppResult<Json<Vec<Tag>>> {
|
||||||
|
let limit = params.limit.clamp(1, 50);
|
||||||
|
let search = params.search.as_deref().and_then(|s| {
|
||||||
|
let t = s.trim();
|
||||||
|
if t.is_empty() { None } else { Some(t) }
|
||||||
|
});
|
||||||
|
Ok(Json(repo::tag::list(&state.db, search, limit).await?))
|
||||||
|
}
|
||||||
30
backend/src/domain/author.rs
Normal file
30
backend/src/domain/author.rs
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use sqlx::FromRow;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, FromRow)]
|
||||||
|
pub struct Author {
|
||||||
|
pub id: Uuid,
|
||||||
|
pub name: String,
|
||||||
|
pub created_at: DateTime<Utc>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Slimmer shape embedded in manga responses — id + name is all a chip
|
||||||
|
/// needs to render and link to the author page.
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, FromRow)]
|
||||||
|
pub struct AuthorRef {
|
||||||
|
pub id: Uuid,
|
||||||
|
pub name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returned by `GET /authors/:id`. `manga_count` is denormalized from
|
||||||
|
/// `manga_authors` so the author page can show it without an extra
|
||||||
|
/// round-trip.
|
||||||
|
#[derive(Debug, Clone, Serialize, FromRow)]
|
||||||
|
pub struct AuthorWithCount {
|
||||||
|
pub id: Uuid,
|
||||||
|
pub name: String,
|
||||||
|
pub created_at: DateTime<Utc>,
|
||||||
|
pub manga_count: i64,
|
||||||
|
}
|
||||||
14
backend/src/domain/genre.rs
Normal file
14
backend/src/domain/genre.rs
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use sqlx::FromRow;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, FromRow)]
|
||||||
|
pub struct Genre {
|
||||||
|
pub id: Uuid,
|
||||||
|
pub name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Same shape as `Genre` today, but kept distinct from the canonical
|
||||||
|
/// type so future fields on `Genre` (description, slug…) don't bloat
|
||||||
|
/// every manga payload.
|
||||||
|
pub type GenreRef = Genre;
|
||||||
@@ -3,20 +3,152 @@ use serde::{Deserialize, Serialize};
|
|||||||
use sqlx::FromRow;
|
use sqlx::FromRow;
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use super::author::AuthorRef;
|
||||||
|
use super::genre::GenreRef;
|
||||||
|
use super::tag::TagRef;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, FromRow)]
|
#[derive(Debug, Clone, Serialize, Deserialize, FromRow)]
|
||||||
pub struct Manga {
|
pub struct Manga {
|
||||||
pub id: Uuid,
|
pub id: Uuid,
|
||||||
pub title: String,
|
pub title: String,
|
||||||
pub author: Option<String>,
|
pub status: String,
|
||||||
|
pub alt_titles: Vec<String>,
|
||||||
pub description: Option<String>,
|
pub description: Option<String>,
|
||||||
pub cover_image_path: Option<String>,
|
pub cover_image_path: Option<String>,
|
||||||
pub created_at: DateTime<Utc>,
|
pub created_at: DateTime<Utc>,
|
||||||
pub updated_at: DateTime<Utc>,
|
pub updated_at: DateTime<Utc>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize)]
|
/// Shape returned by list endpoints. Cards show the title, authors and
|
||||||
|
/// genres; tags are intentionally elided here to keep the response
|
||||||
|
/// proportional to what a card actually renders.
|
||||||
|
#[derive(Debug, Clone, Serialize)]
|
||||||
|
pub struct MangaCard {
|
||||||
|
#[serde(flatten)]
|
||||||
|
pub manga: Manga,
|
||||||
|
pub authors: Vec<AuthorRef>,
|
||||||
|
pub genres: Vec<GenreRef>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Shape returned by `GET /mangas/:id`. Adds user-added tags on top of
|
||||||
|
/// the card fields.
|
||||||
|
#[derive(Debug, Clone, Serialize)]
|
||||||
|
pub struct MangaDetail {
|
||||||
|
#[serde(flatten)]
|
||||||
|
pub manga: Manga,
|
||||||
|
pub authors: Vec<AuthorRef>,
|
||||||
|
pub genres: Vec<GenreRef>,
|
||||||
|
pub tags: Vec<TagRef>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Deserialize, Default)]
|
||||||
pub struct NewManga {
|
pub struct NewManga {
|
||||||
pub title: String,
|
pub title: String,
|
||||||
pub author: Option<String>,
|
#[serde(default)]
|
||||||
|
pub status: Option<String>,
|
||||||
|
/// Author display names. Looked up case-insensitively; created on
|
||||||
|
/// the fly when unseen.
|
||||||
|
#[serde(default)]
|
||||||
|
pub authors: Vec<String>,
|
||||||
|
#[serde(default)]
|
||||||
pub description: Option<String>,
|
pub description: Option<String>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub alt_titles: Vec<String>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub genre_ids: Vec<Uuid>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Deserialize, Default)]
|
||||||
|
pub struct MangaPatch {
|
||||||
|
pub title: Option<String>,
|
||||||
|
pub status: Option<String>,
|
||||||
|
/// Three-state: missing key leaves the description alone; explicit
|
||||||
|
/// `null` clears it; a string sets it. See `Patch` for details.
|
||||||
|
#[serde(default)]
|
||||||
|
pub description: Patch<String>,
|
||||||
|
pub alt_titles: Option<Vec<String>>,
|
||||||
|
/// When provided, replaces the manga's authors atomically.
|
||||||
|
pub authors: Option<Vec<String>>,
|
||||||
|
/// When provided, replaces the manga's genres atomically.
|
||||||
|
pub genre_ids: Option<Vec<Uuid>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Three-state container for nullable PATCH fields.
|
||||||
|
///
|
||||||
|
/// `serde`'s default behaviour collapses both "field missing" and
|
||||||
|
/// "field is `null`" to `Option::None`, which means an `Option<T>`
|
||||||
|
/// patch field can't distinguish "leave alone" from "set to NULL".
|
||||||
|
/// `Patch<T>` carries that distinction by deserializing JSON `null`
|
||||||
|
/// into `Clear` and any value into `Set`; with `#[serde(default)]` on
|
||||||
|
/// the field, a missing key falls through to `Unchanged`.
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq)]
|
||||||
|
pub enum Patch<T> {
|
||||||
|
/// Field absent from the request — leave the column untouched.
|
||||||
|
#[default]
|
||||||
|
Unchanged,
|
||||||
|
/// Field present and explicitly `null` — set the column to NULL.
|
||||||
|
Clear,
|
||||||
|
/// Field present with a value — set the column to that value.
|
||||||
|
Set(T),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> Patch<T> {
|
||||||
|
/// Whether the request indicated this field should be written
|
||||||
|
/// (either to a new value or to NULL).
|
||||||
|
pub fn is_provided(&self) -> bool {
|
||||||
|
!matches!(self, Patch::Unchanged)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The value to bind when writing, or `None` for `Unchanged`/`Clear`.
|
||||||
|
pub fn set_value(&self) -> Option<&T> {
|
||||||
|
match self {
|
||||||
|
Patch::Set(v) => Some(v),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'de, T> serde::Deserialize<'de> for Patch<T>
|
||||||
|
where
|
||||||
|
T: serde::Deserialize<'de>,
|
||||||
|
{
|
||||||
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
||||||
|
where
|
||||||
|
D: serde::Deserializer<'de>,
|
||||||
|
{
|
||||||
|
Option::<T>::deserialize(deserializer).map(|opt| match opt {
|
||||||
|
Some(v) => Patch::Set(v),
|
||||||
|
None => Patch::Clear,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use serde_json::json;
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct Holder {
|
||||||
|
#[serde(default)]
|
||||||
|
desc: Patch<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn missing_key_is_unchanged() {
|
||||||
|
let h: Holder = serde_json::from_value(json!({})).unwrap();
|
||||||
|
assert_eq!(h.desc, Patch::Unchanged);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn explicit_null_is_clear() {
|
||||||
|
let h: Holder = serde_json::from_value(json!({ "desc": null })).unwrap();
|
||||||
|
assert_eq!(h.desc, Patch::Clear);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn value_is_set() {
|
||||||
|
let h: Holder = serde_json::from_value(json!({ "desc": "x" })).unwrap();
|
||||||
|
assert_eq!(h.desc, Patch::Set("x".into()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,23 @@
|
|||||||
pub mod api_token;
|
pub mod api_token;
|
||||||
|
pub mod author;
|
||||||
pub mod bookmark;
|
pub mod bookmark;
|
||||||
pub mod chapter;
|
pub mod chapter;
|
||||||
|
pub mod genre;
|
||||||
pub mod manga;
|
pub mod manga;
|
||||||
pub mod page;
|
pub mod page;
|
||||||
pub mod session;
|
pub mod session;
|
||||||
|
pub mod tag;
|
||||||
pub mod user;
|
pub mod user;
|
||||||
pub mod user_preferences;
|
pub mod user_preferences;
|
||||||
|
|
||||||
pub use api_token::ApiToken;
|
pub use api_token::ApiToken;
|
||||||
|
pub use author::{Author, AuthorRef, AuthorWithCount};
|
||||||
pub use bookmark::{Bookmark, BookmarkSummary};
|
pub use bookmark::{Bookmark, BookmarkSummary};
|
||||||
pub use chapter::Chapter;
|
pub use chapter::Chapter;
|
||||||
pub use manga::Manga;
|
pub use genre::{Genre, GenreRef};
|
||||||
|
pub use manga::{Manga, MangaCard, MangaDetail};
|
||||||
pub use page::Page;
|
pub use page::Page;
|
||||||
pub use session::Session;
|
pub use session::Session;
|
||||||
|
pub use tag::{Tag, TagRef};
|
||||||
pub use user::User;
|
pub use user::User;
|
||||||
pub use user_preferences::UserPreferences;
|
pub use user_preferences::UserPreferences;
|
||||||
|
|||||||
20
backend/src/domain/tag.rs
Normal file
20
backend/src/domain/tag.rs
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use sqlx::FromRow;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, FromRow)]
|
||||||
|
pub struct Tag {
|
||||||
|
pub id: Uuid,
|
||||||
|
pub name: String,
|
||||||
|
pub created_at: DateTime<Utc>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Tag embedded on a manga payload, including the user who attached it
|
||||||
|
/// so the UI can render a remove button only to them.
|
||||||
|
#[derive(Debug, Clone, Serialize, FromRow)]
|
||||||
|
pub struct TagRef {
|
||||||
|
pub id: Uuid,
|
||||||
|
pub name: String,
|
||||||
|
pub added_by: Option<Uuid>,
|
||||||
|
}
|
||||||
205
backend/src/repo/author.rs
Normal file
205
backend/src/repo/author.rs
Normal file
@@ -0,0 +1,205 @@
|
|||||||
|
//! Author persistence. Same plain-function style as the other repos.
|
||||||
|
//!
|
||||||
|
//! Names are stored with the casing of the first submission; lookups go
|
||||||
|
//! through the case-insensitive unique index on `lower(name)` so
|
||||||
|
//! "Kentaro Miura" and "kentaro miura" share one row.
|
||||||
|
|
||||||
|
use std::collections::BTreeMap;
|
||||||
|
|
||||||
|
use sqlx::{PgConnection, PgExecutor, PgPool};
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use crate::domain::author::{Author, AuthorRef, AuthorWithCount};
|
||||||
|
use crate::domain::manga::Manga;
|
||||||
|
use crate::error::{AppError, AppResult};
|
||||||
|
|
||||||
|
/// Insert-or-find by name. Returns the canonical row whether or not
|
||||||
|
/// this call created it. The `ON CONFLICT … DO UPDATE` no-op is what
|
||||||
|
/// makes `RETURNING` come back even on the existing-row path.
|
||||||
|
pub async fn upsert_by_name<'e, E: PgExecutor<'e>>(
|
||||||
|
executor: E,
|
||||||
|
name: &str,
|
||||||
|
) -> AppResult<Author> {
|
||||||
|
let trimmed = name.trim();
|
||||||
|
if trimmed.is_empty() {
|
||||||
|
return Err(AppError::ValidationFailed {
|
||||||
|
message: "author name cannot be empty".into(),
|
||||||
|
details: serde_json::json!({ "authors": "non-empty names required" }),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
let row = sqlx::query_as::<_, Author>(
|
||||||
|
r#"
|
||||||
|
INSERT INTO authors (name)
|
||||||
|
VALUES ($1)
|
||||||
|
ON CONFLICT (lower(name)) DO UPDATE SET name = authors.name
|
||||||
|
RETURNING id, name, created_at
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.bind(trimmed)
|
||||||
|
.fetch_one(executor)
|
||||||
|
.await?;
|
||||||
|
Ok(row)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn find_by_id(pool: &PgPool, id: Uuid) -> AppResult<Author> {
|
||||||
|
sqlx::query_as::<_, Author>(
|
||||||
|
"SELECT id, name, created_at FROM authors WHERE id = $1",
|
||||||
|
)
|
||||||
|
.bind(id)
|
||||||
|
.fetch_optional(pool)
|
||||||
|
.await?
|
||||||
|
.ok_or(AppError::NotFound)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn find_with_count(pool: &PgPool, id: Uuid) -> AppResult<AuthorWithCount> {
|
||||||
|
sqlx::query_as::<_, AuthorWithCount>(
|
||||||
|
r#"
|
||||||
|
SELECT a.id,
|
||||||
|
a.name,
|
||||||
|
a.created_at,
|
||||||
|
(SELECT count(*) FROM manga_authors ma WHERE ma.author_id = a.id) AS manga_count
|
||||||
|
FROM authors a
|
||||||
|
WHERE a.id = $1
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.bind(id)
|
||||||
|
.fetch_optional(pool)
|
||||||
|
.await?
|
||||||
|
.ok_or(AppError::NotFound)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Autocomplete-friendly: substring + trigram match on `name`, ordered
|
||||||
|
/// most-similar first when a search term is present.
|
||||||
|
pub async fn list(
|
||||||
|
pool: &PgPool,
|
||||||
|
search: Option<&str>,
|
||||||
|
limit: i64,
|
||||||
|
offset: i64,
|
||||||
|
) -> AppResult<Vec<Author>> {
|
||||||
|
let rows = sqlx::query_as::<_, Author>(
|
||||||
|
r#"
|
||||||
|
SELECT id, name, created_at
|
||||||
|
FROM authors
|
||||||
|
WHERE $1::text IS NULL
|
||||||
|
OR name ILIKE '%' || $1 || '%'
|
||||||
|
OR name % $1
|
||||||
|
ORDER BY CASE WHEN $1::text IS NULL THEN 0 ELSE similarity(name, $1) END DESC,
|
||||||
|
lower(name) ASC
|
||||||
|
LIMIT $2 OFFSET $3
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.bind(search)
|
||||||
|
.bind(limit)
|
||||||
|
.bind(offset)
|
||||||
|
.fetch_all(pool)
|
||||||
|
.await?;
|
||||||
|
Ok(rows)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Atomically replace the set of authors on a manga. Caller passes a
|
||||||
|
/// `&mut PgConnection` (`&mut *tx` works) so the delete+upserts run in
|
||||||
|
/// one transaction with whatever called us.
|
||||||
|
pub async fn set_for_manga(
|
||||||
|
conn: &mut PgConnection,
|
||||||
|
manga_id: Uuid,
|
||||||
|
names: &[String],
|
||||||
|
) -> AppResult<Vec<AuthorRef>> {
|
||||||
|
sqlx::query("DELETE FROM manga_authors WHERE manga_id = $1")
|
||||||
|
.bind(manga_id)
|
||||||
|
.execute(&mut *conn)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let mut refs = Vec::with_capacity(names.len());
|
||||||
|
for (position, name) in names.iter().enumerate() {
|
||||||
|
let author = upsert_by_name(&mut *conn, name).await?;
|
||||||
|
sqlx::query(
|
||||||
|
"INSERT INTO manga_authors (manga_id, author_id, position) VALUES ($1, $2, $3)
|
||||||
|
ON CONFLICT (manga_id, author_id) DO NOTHING",
|
||||||
|
)
|
||||||
|
.bind(manga_id)
|
||||||
|
.bind(author.id)
|
||||||
|
.bind(position as i32)
|
||||||
|
.execute(&mut *conn)
|
||||||
|
.await?;
|
||||||
|
refs.push(AuthorRef { id: author.id, name: author.name });
|
||||||
|
}
|
||||||
|
Ok(refs)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn list_for_manga(pool: &PgPool, manga_id: Uuid) -> AppResult<Vec<AuthorRef>> {
|
||||||
|
let rows = sqlx::query_as::<_, AuthorRef>(
|
||||||
|
r#"
|
||||||
|
SELECT a.id, a.name
|
||||||
|
FROM manga_authors ma
|
||||||
|
JOIN authors a ON a.id = ma.author_id
|
||||||
|
WHERE ma.manga_id = $1
|
||||||
|
ORDER BY ma.position, lower(a.name)
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.bind(manga_id)
|
||||||
|
.fetch_all(pool)
|
||||||
|
.await?;
|
||||||
|
Ok(rows)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Batch-load authors for a list of manga ids and group by manga. Used
|
||||||
|
/// by the list endpoint to avoid N+1 round-trips.
|
||||||
|
pub async fn load_for_mangas(
|
||||||
|
pool: &PgPool,
|
||||||
|
manga_ids: &[Uuid],
|
||||||
|
) -> AppResult<BTreeMap<Uuid, Vec<AuthorRef>>> {
|
||||||
|
if manga_ids.is_empty() {
|
||||||
|
return Ok(BTreeMap::new());
|
||||||
|
}
|
||||||
|
let rows: Vec<(Uuid, Uuid, String)> = sqlx::query_as(
|
||||||
|
r#"
|
||||||
|
SELECT ma.manga_id, a.id, a.name
|
||||||
|
FROM manga_authors ma
|
||||||
|
JOIN authors a ON a.id = ma.author_id
|
||||||
|
WHERE ma.manga_id = ANY($1)
|
||||||
|
ORDER BY ma.manga_id, ma.position, lower(a.name)
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.bind(manga_ids)
|
||||||
|
.fetch_all(pool)
|
||||||
|
.await?;
|
||||||
|
let mut grouped: BTreeMap<Uuid, Vec<AuthorRef>> = BTreeMap::new();
|
||||||
|
for (manga_id, author_id, name) in rows {
|
||||||
|
grouped
|
||||||
|
.entry(manga_id)
|
||||||
|
.or_default()
|
||||||
|
.push(AuthorRef { id: author_id, name });
|
||||||
|
}
|
||||||
|
Ok(grouped)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn list_mangas_for_author(
|
||||||
|
pool: &PgPool,
|
||||||
|
author_id: Uuid,
|
||||||
|
limit: i64,
|
||||||
|
offset: i64,
|
||||||
|
) -> AppResult<(Vec<Manga>, i64)> {
|
||||||
|
let rows = sqlx::query_as::<_, Manga>(
|
||||||
|
r#"
|
||||||
|
SELECT m.id, m.title, m.status, m.alt_titles, m.description,
|
||||||
|
m.cover_image_path, m.created_at, m.updated_at
|
||||||
|
FROM manga_authors ma
|
||||||
|
JOIN mangas m ON m.id = ma.manga_id
|
||||||
|
WHERE ma.author_id = $1
|
||||||
|
ORDER BY m.created_at DESC, m.id
|
||||||
|
LIMIT $2 OFFSET $3
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.bind(author_id)
|
||||||
|
.bind(limit)
|
||||||
|
.bind(offset)
|
||||||
|
.fetch_all(pool)
|
||||||
|
.await?;
|
||||||
|
let (total,): (i64,) = sqlx::query_as(
|
||||||
|
"SELECT count(*) FROM manga_authors WHERE author_id = $1",
|
||||||
|
)
|
||||||
|
.bind(author_id)
|
||||||
|
.fetch_one(pool)
|
||||||
|
.await?;
|
||||||
|
Ok((rows, total))
|
||||||
|
}
|
||||||
88
backend/src/repo/genre.rs
Normal file
88
backend/src/repo/genre.rs
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
use std::collections::BTreeMap;
|
||||||
|
|
||||||
|
use sqlx::{PgConnection, PgPool};
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use crate::domain::genre::{Genre, GenreRef};
|
||||||
|
use crate::error::AppResult;
|
||||||
|
|
||||||
|
pub async fn list_all(pool: &PgPool) -> AppResult<Vec<Genre>> {
|
||||||
|
let rows = sqlx::query_as::<_, Genre>(
|
||||||
|
"SELECT id, name FROM genres ORDER BY lower(name)",
|
||||||
|
)
|
||||||
|
.fetch_all(pool)
|
||||||
|
.await?;
|
||||||
|
Ok(rows)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn list_for_manga(pool: &PgPool, manga_id: Uuid) -> AppResult<Vec<GenreRef>> {
|
||||||
|
let rows = sqlx::query_as::<_, GenreRef>(
|
||||||
|
r#"
|
||||||
|
SELECT g.id, g.name
|
||||||
|
FROM manga_genres mg
|
||||||
|
JOIN genres g ON g.id = mg.genre_id
|
||||||
|
WHERE mg.manga_id = $1
|
||||||
|
ORDER BY lower(g.name)
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.bind(manga_id)
|
||||||
|
.fetch_all(pool)
|
||||||
|
.await?;
|
||||||
|
Ok(rows)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn load_for_mangas(
|
||||||
|
pool: &PgPool,
|
||||||
|
manga_ids: &[Uuid],
|
||||||
|
) -> AppResult<BTreeMap<Uuid, Vec<GenreRef>>> {
|
||||||
|
if manga_ids.is_empty() {
|
||||||
|
return Ok(BTreeMap::new());
|
||||||
|
}
|
||||||
|
let rows: Vec<(Uuid, Uuid, String)> = sqlx::query_as(
|
||||||
|
r#"
|
||||||
|
SELECT mg.manga_id, g.id, g.name
|
||||||
|
FROM manga_genres mg
|
||||||
|
JOIN genres g ON g.id = mg.genre_id
|
||||||
|
WHERE mg.manga_id = ANY($1)
|
||||||
|
ORDER BY mg.manga_id, lower(g.name)
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.bind(manga_ids)
|
||||||
|
.fetch_all(pool)
|
||||||
|
.await?;
|
||||||
|
let mut grouped: BTreeMap<Uuid, Vec<GenreRef>> = BTreeMap::new();
|
||||||
|
for (manga_id, id, name) in rows {
|
||||||
|
grouped.entry(manga_id).or_default().push(GenreRef { id, name });
|
||||||
|
}
|
||||||
|
Ok(grouped)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Replace the manga's genres. Unknown ids are silently ignored: the
|
||||||
|
/// FK constraint would reject them, so we filter upstream rather than
|
||||||
|
/// surface a 500 here. (The API layer validates the set against
|
||||||
|
/// `list_all` first.)
|
||||||
|
pub async fn set_for_manga(
|
||||||
|
conn: &mut PgConnection,
|
||||||
|
manga_id: Uuid,
|
||||||
|
genre_ids: &[Uuid],
|
||||||
|
) -> AppResult<()> {
|
||||||
|
sqlx::query("DELETE FROM manga_genres WHERE manga_id = $1")
|
||||||
|
.bind(manga_id)
|
||||||
|
.execute(&mut *conn)
|
||||||
|
.await?;
|
||||||
|
if genre_ids.is_empty() {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
sqlx::query(
|
||||||
|
r#"
|
||||||
|
INSERT INTO manga_genres (manga_id, genre_id)
|
||||||
|
SELECT $1, unnest($2::uuid[])
|
||||||
|
ON CONFLICT DO NOTHING
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.bind(manga_id)
|
||||||
|
.bind(genre_ids)
|
||||||
|
.execute(&mut *conn)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -6,11 +6,17 @@
|
|||||||
//! a trait + impl if a second backend ever becomes necessary.
|
//! a trait + impl if a second backend ever becomes necessary.
|
||||||
|
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use sqlx::{PgExecutor, PgPool};
|
use sqlx::{PgConnection, PgExecutor, PgPool};
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
use crate::domain::manga::{Manga, NewManga};
|
use crate::domain::manga::{Manga, MangaCard, MangaDetail};
|
||||||
use crate::error::{AppError, AppResult};
|
use crate::error::{AppError, AppResult};
|
||||||
|
use crate::repo;
|
||||||
|
|
||||||
|
/// Status values mirror the CHECK constraint in 0009. Centralized so
|
||||||
|
/// the API layer can validate uploads against the same vocabulary.
|
||||||
|
pub const STATUSES: &[&str] = &["ongoing", "completed"];
|
||||||
|
pub const DEFAULT_STATUS: &str = "ongoing";
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, Default, Deserialize)]
|
#[derive(Debug, Clone, Copy, Default, Deserialize)]
|
||||||
#[serde(rename_all = "snake_case")]
|
#[serde(rename_all = "snake_case")]
|
||||||
@@ -22,28 +28,65 @@ pub enum ListSort {
|
|||||||
Title,
|
Title,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone, Default)]
|
||||||
pub struct ListQuery {
|
pub struct ListQuery {
|
||||||
pub search: Option<String>,
|
pub search: Option<String>,
|
||||||
|
pub status: Option<String>,
|
||||||
|
pub author_ids: Vec<Uuid>,
|
||||||
|
pub genre_ids: Vec<Uuid>,
|
||||||
|
pub tag_ids: Vec<Uuid>,
|
||||||
pub limit: i64,
|
pub limit: i64,
|
||||||
pub offset: i64,
|
pub offset: i64,
|
||||||
pub sort: ListSort,
|
pub sort: ListSort,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for ListQuery {
|
const SELECT_COLS: &str =
|
||||||
fn default() -> Self {
|
"id, title, status, alt_titles, description, cover_image_path, created_at, updated_at";
|
||||||
Self {
|
|
||||||
search: None,
|
/// Shared WHERE used by both the rows and the count queries. Filters
|
||||||
limit: 50,
|
/// are AND across facets: every supplied author_id (or genre, or tag)
|
||||||
offset: 0,
|
/// must be attached to the manga for it to match. Empty arrays mean
|
||||||
sort: ListSort::Recent,
|
/// "no filter" because `NOT EXISTS` over an empty unnest is vacuously
|
||||||
}
|
/// true.
|
||||||
}
|
const FILTER_WHERE: &str = r#"
|
||||||
}
|
($1::text IS NULL
|
||||||
|
OR title ILIKE '%' || $1 || '%'
|
||||||
|
OR title % $1
|
||||||
|
OR EXISTS (
|
||||||
|
SELECT 1 FROM manga_authors ma
|
||||||
|
JOIN authors a ON a.id = ma.author_id
|
||||||
|
WHERE ma.manga_id = mangas.id
|
||||||
|
AND (a.name ILIKE '%' || $1 || '%' OR a.name % $1)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
AND ($2::text IS NULL OR status = $2)
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM unnest($3::uuid[]) AS req(id)
|
||||||
|
WHERE NOT EXISTS (
|
||||||
|
SELECT 1 FROM manga_authors ma
|
||||||
|
WHERE ma.manga_id = mangas.id AND ma.author_id = req.id
|
||||||
|
)
|
||||||
|
)
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM unnest($4::uuid[]) AS req(id)
|
||||||
|
WHERE NOT EXISTS (
|
||||||
|
SELECT 1 FROM manga_genres mg
|
||||||
|
WHERE mg.manga_id = mangas.id AND mg.genre_id = req.id
|
||||||
|
)
|
||||||
|
)
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM unnest($5::uuid[]) AS req(id)
|
||||||
|
WHERE NOT EXISTS (
|
||||||
|
SELECT 1 FROM manga_tags mt
|
||||||
|
WHERE mt.manga_id = mangas.id AND mt.tag_id = req.id
|
||||||
|
)
|
||||||
|
)
|
||||||
|
"#;
|
||||||
|
|
||||||
/// Returns the page of mangas matching `query` plus the unfiltered total
|
/// Returns the page of mangas matching `query` plus the unfiltered total
|
||||||
/// count for the same filter. The trigram GIN indexes (see 0005_search.sql)
|
/// count for the same filter. The trigram GIN indexes (see 0005_search.sql
|
||||||
/// keep both queries cheap as the library grows.
|
/// and 0009_manga_metadata.sql) keep both queries cheap as the library
|
||||||
|
/// grows.
|
||||||
pub async fn list(pool: &PgPool, query: &ListQuery) -> AppResult<(Vec<Manga>, i64)> {
|
pub async fn list(pool: &PgPool, query: &ListQuery) -> AppResult<(Vec<Manga>, i64)> {
|
||||||
// `order_by` is interpolated from a hard-coded enum, never from request
|
// `order_by` is interpolated from a hard-coded enum, never from request
|
||||||
// input, so this is not a SQL injection seam.
|
// input, so this is not a SQL injection seam.
|
||||||
@@ -53,80 +96,152 @@ pub async fn list(pool: &PgPool, query: &ListQuery) -> AppResult<(Vec<Manga>, i6
|
|||||||
};
|
};
|
||||||
|
|
||||||
let search = query.search.as_deref();
|
let search = query.search.as_deref();
|
||||||
|
let status = query.status.as_deref();
|
||||||
|
|
||||||
let list_sql = format!(
|
let list_sql = format!(
|
||||||
r#"
|
r#"
|
||||||
SELECT id, title, author, description, cover_image_path, created_at, updated_at
|
SELECT {SELECT_COLS}
|
||||||
FROM mangas
|
FROM mangas
|
||||||
WHERE $1::text IS NULL
|
WHERE {FILTER_WHERE}
|
||||||
OR title ILIKE '%' || $1 || '%'
|
|
||||||
OR COALESCE(author, '') ILIKE '%' || $1 || '%'
|
|
||||||
OR title % $1
|
|
||||||
OR (author IS NOT NULL AND author % $1)
|
|
||||||
ORDER BY {order_by}
|
ORDER BY {order_by}
|
||||||
LIMIT $2 OFFSET $3
|
LIMIT $6 OFFSET $7
|
||||||
"#
|
"#
|
||||||
);
|
);
|
||||||
|
|
||||||
let rows = sqlx::query_as::<_, Manga>(&list_sql)
|
let rows = sqlx::query_as::<_, Manga>(&list_sql)
|
||||||
.bind(search)
|
.bind(search)
|
||||||
|
.bind(status)
|
||||||
|
.bind(&query.author_ids)
|
||||||
|
.bind(&query.genre_ids)
|
||||||
|
.bind(&query.tag_ids)
|
||||||
.bind(query.limit)
|
.bind(query.limit)
|
||||||
.bind(query.offset)
|
.bind(query.offset)
|
||||||
.fetch_all(pool)
|
.fetch_all(pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
let count_sql = r#"
|
let count_sql = format!(
|
||||||
|
r#"
|
||||||
SELECT count(*) FROM mangas
|
SELECT count(*) FROM mangas
|
||||||
WHERE $1::text IS NULL
|
WHERE {FILTER_WHERE}
|
||||||
OR title ILIKE '%' || $1 || '%'
|
"#
|
||||||
OR COALESCE(author, '') ILIKE '%' || $1 || '%'
|
);
|
||||||
OR title % $1
|
let (total,): (i64,) = sqlx::query_as(&count_sql)
|
||||||
OR (author IS NOT NULL AND author % $1)
|
|
||||||
"#;
|
|
||||||
let (total,): (i64,) = sqlx::query_as(count_sql)
|
|
||||||
.bind(search)
|
.bind(search)
|
||||||
|
.bind(status)
|
||||||
|
.bind(&query.author_ids)
|
||||||
|
.bind(&query.genre_ids)
|
||||||
|
.bind(&query.tag_ids)
|
||||||
.fetch_one(pool)
|
.fetch_one(pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
Ok((rows, total))
|
Ok((rows, total))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Same filter as `list`, but wraps each row with its authors + genres
|
||||||
|
/// in a single batched round-trip. Tags are intentionally not loaded
|
||||||
|
/// here — see `MangaCard` in the domain layer.
|
||||||
|
pub async fn list_cards(
|
||||||
|
pool: &PgPool,
|
||||||
|
query: &ListQuery,
|
||||||
|
) -> AppResult<(Vec<MangaCard>, i64)> {
|
||||||
|
let (rows, total) = list(pool, query).await?;
|
||||||
|
let ids: Vec<Uuid> = rows.iter().map(|m| m.id).collect();
|
||||||
|
let mut authors = repo::author::load_for_mangas(pool, &ids).await?;
|
||||||
|
let mut genres = repo::genre::load_for_mangas(pool, &ids).await?;
|
||||||
|
let cards = rows
|
||||||
|
.into_iter()
|
||||||
|
.map(|manga| MangaCard {
|
||||||
|
authors: authors.remove(&manga.id).unwrap_or_default(),
|
||||||
|
genres: genres.remove(&manga.id).unwrap_or_default(),
|
||||||
|
manga,
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
Ok((cards, total))
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn get(pool: &PgPool, id: Uuid) -> AppResult<Manga> {
|
pub async fn get(pool: &PgPool, id: Uuid) -> AppResult<Manga> {
|
||||||
sqlx::query_as::<_, Manga>(
|
sqlx::query_as::<_, Manga>(&format!(
|
||||||
r#"
|
"SELECT {SELECT_COLS} FROM mangas WHERE id = $1"
|
||||||
SELECT id, title, author, description, cover_image_path, created_at, updated_at
|
))
|
||||||
FROM mangas
|
|
||||||
WHERE id = $1
|
|
||||||
"#,
|
|
||||||
)
|
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.fetch_optional(pool)
|
.fetch_optional(pool)
|
||||||
.await?
|
.await?
|
||||||
.ok_or(AppError::NotFound)
|
.ok_or(AppError::NotFound)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Accepts any `PgExecutor` so callers can pass `&PgPool` for simple
|
pub async fn get_detail(pool: &PgPool, id: Uuid) -> AppResult<MangaDetail> {
|
||||||
/// inserts or `&mut *tx` to run inside a transaction. Same applies to
|
let manga = get(pool, id).await?;
|
||||||
/// `set_cover_image_path` below.
|
let authors = repo::author::list_for_manga(pool, id).await?;
|
||||||
|
let genres = repo::genre::list_for_manga(pool, id).await?;
|
||||||
|
let tags = repo::tag::list_for_manga(pool, id).await?;
|
||||||
|
Ok(MangaDetail { manga, authors, genres, tags })
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Insert just the manga row. Relations (authors, genres) are written
|
||||||
|
/// by the caller via `repo::author::set_for_manga` etc. in the same
|
||||||
|
/// transaction. `status` is taken as a validated string — the handler
|
||||||
|
/// is responsible for defaulting/validating it.
|
||||||
pub async fn create<'e, E: PgExecutor<'e>>(
|
pub async fn create<'e, E: PgExecutor<'e>>(
|
||||||
executor: E,
|
executor: E,
|
||||||
input: NewManga,
|
title: &str,
|
||||||
|
status: &str,
|
||||||
|
description: Option<&str>,
|
||||||
|
alt_titles: &[String],
|
||||||
) -> AppResult<Manga> {
|
) -> AppResult<Manga> {
|
||||||
let row = sqlx::query_as::<_, Manga>(
|
let row = sqlx::query_as::<_, Manga>(&format!(
|
||||||
r#"
|
r#"
|
||||||
INSERT INTO mangas (title, author, description)
|
INSERT INTO mangas (title, status, description, alt_titles)
|
||||||
VALUES ($1, $2, $3)
|
VALUES ($1, $2, $3, $4)
|
||||||
RETURNING id, title, author, description, cover_image_path, created_at, updated_at
|
RETURNING {SELECT_COLS}
|
||||||
"#,
|
"#
|
||||||
)
|
))
|
||||||
.bind(&input.title)
|
.bind(title)
|
||||||
.bind(&input.author)
|
.bind(status)
|
||||||
.bind(&input.description)
|
.bind(description)
|
||||||
|
.bind(alt_titles)
|
||||||
.fetch_one(executor)
|
.fetch_one(executor)
|
||||||
.await?;
|
.await?;
|
||||||
Ok(row)
|
Ok(row)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Patch the inline columns. Each `Option` argument leaves the field
|
||||||
|
/// untouched when `None`. `description` uses two binds — a `provided`
|
||||||
|
/// boolean and the new value — so callers can distinguish "leave
|
||||||
|
/// alone" from "set to NULL" (both look the same in a plain
|
||||||
|
/// `Option<&str>` because serde collapses missing and explicit-null).
|
||||||
|
pub async fn update_basics(
|
||||||
|
conn: &mut PgConnection,
|
||||||
|
id: Uuid,
|
||||||
|
title: Option<&str>,
|
||||||
|
status: Option<&str>,
|
||||||
|
description_provided: bool,
|
||||||
|
description: Option<&str>,
|
||||||
|
alt_titles: Option<&[String]>,
|
||||||
|
) -> AppResult<Manga> {
|
||||||
|
let row = sqlx::query_as::<_, Manga>(&format!(
|
||||||
|
r#"
|
||||||
|
UPDATE mangas
|
||||||
|
SET title = COALESCE($2, title),
|
||||||
|
status = COALESCE($3, status),
|
||||||
|
description = CASE WHEN $4::boolean THEN $5 ELSE description END,
|
||||||
|
alt_titles = COALESCE($6, alt_titles),
|
||||||
|
updated_at = now()
|
||||||
|
WHERE id = $1
|
||||||
|
RETURNING {SELECT_COLS}
|
||||||
|
"#
|
||||||
|
))
|
||||||
|
.bind(id)
|
||||||
|
.bind(title)
|
||||||
|
.bind(status)
|
||||||
|
.bind(description_provided)
|
||||||
|
.bind(description)
|
||||||
|
.bind(alt_titles)
|
||||||
|
.fetch_optional(&mut *conn)
|
||||||
|
.await?
|
||||||
|
.ok_or(AppError::NotFound)?;
|
||||||
|
Ok(row)
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn set_cover_image_path<'e, E: PgExecutor<'e>>(
|
pub async fn set_cover_image_path<'e, E: PgExecutor<'e>>(
|
||||||
executor: E,
|
executor: E,
|
||||||
id: Uuid,
|
id: Uuid,
|
||||||
@@ -139,3 +254,12 @@ pub async fn set_cover_image_path<'e, E: PgExecutor<'e>>(
|
|||||||
.await?;
|
.await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn exists(pool: &PgPool, id: Uuid) -> AppResult<bool> {
|
||||||
|
let (exists,): (bool,) =
|
||||||
|
sqlx::query_as("SELECT EXISTS(SELECT 1 FROM mangas WHERE id = $1)")
|
||||||
|
.bind(id)
|
||||||
|
.fetch_one(pool)
|
||||||
|
.await?;
|
||||||
|
Ok(exists)
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
pub mod api_token;
|
pub mod api_token;
|
||||||
|
pub mod author;
|
||||||
pub mod bookmark;
|
pub mod bookmark;
|
||||||
pub mod chapter;
|
pub mod chapter;
|
||||||
|
pub mod genre;
|
||||||
pub mod manga;
|
pub mod manga;
|
||||||
pub mod page;
|
pub mod page;
|
||||||
pub mod session;
|
pub mod session;
|
||||||
|
pub mod tag;
|
||||||
pub mod user;
|
pub mod user;
|
||||||
pub mod user_preferences;
|
pub mod user_preferences;
|
||||||
|
|||||||
149
backend/src/repo/tag.rs
Normal file
149
backend/src/repo/tag.rs
Normal file
@@ -0,0 +1,149 @@
|
|||||||
|
use sqlx::{PgExecutor, PgPool};
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use crate::domain::tag::{Tag, TagRef};
|
||||||
|
use crate::error::{AppError, AppResult};
|
||||||
|
|
||||||
|
/// True when this manga-tag attachment is new (so the API can return
|
||||||
|
/// 201 vs 200), plus the canonical tag row.
|
||||||
|
pub struct AttachOutcome {
|
||||||
|
pub tag: Tag,
|
||||||
|
pub created_attachment: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn upsert_by_name<'e, E: PgExecutor<'e>>(
|
||||||
|
executor: E,
|
||||||
|
name: &str,
|
||||||
|
) -> AppResult<Tag> {
|
||||||
|
let trimmed = name.trim();
|
||||||
|
if trimmed.is_empty() {
|
||||||
|
return Err(AppError::ValidationFailed {
|
||||||
|
message: "tag name cannot be empty".into(),
|
||||||
|
details: serde_json::json!({ "name": "required" }),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if trimmed.chars().count() > 64 {
|
||||||
|
return Err(AppError::ValidationFailed {
|
||||||
|
message: "tag name too long".into(),
|
||||||
|
details: serde_json::json!({ "name": "max 64 characters" }),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
let row = sqlx::query_as::<_, Tag>(
|
||||||
|
r#"
|
||||||
|
INSERT INTO tags (name)
|
||||||
|
VALUES ($1)
|
||||||
|
ON CONFLICT (lower(name)) DO UPDATE SET name = tags.name
|
||||||
|
RETURNING id, name, created_at
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.bind(trimmed)
|
||||||
|
.fetch_one(executor)
|
||||||
|
.await?;
|
||||||
|
Ok(row)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Attach a tag to a manga, idempotently. Returns whether a new
|
||||||
|
/// attachment row was created so the API can pick 201 vs 200.
|
||||||
|
pub async fn attach_to_manga(
|
||||||
|
pool: &PgPool,
|
||||||
|
manga_id: Uuid,
|
||||||
|
name: &str,
|
||||||
|
added_by: Uuid,
|
||||||
|
) -> AppResult<AttachOutcome> {
|
||||||
|
let mut tx = pool.begin().await?;
|
||||||
|
let tag = upsert_by_name(&mut *tx, name).await?;
|
||||||
|
let rows_affected = sqlx::query(
|
||||||
|
r#"
|
||||||
|
INSERT INTO manga_tags (manga_id, tag_id, added_by)
|
||||||
|
VALUES ($1, $2, $3)
|
||||||
|
ON CONFLICT (manga_id, tag_id) DO NOTHING
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.bind(manga_id)
|
||||||
|
.bind(tag.id)
|
||||||
|
.bind(added_by)
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?
|
||||||
|
.rows_affected();
|
||||||
|
tx.commit().await?;
|
||||||
|
Ok(AttachOutcome { tag, created_attachment: rows_affected > 0 })
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Look up who attached a given (manga, tag) pair, if any. Returns
|
||||||
|
/// `None` if the attachment doesn't exist. The outer `AppResult` only
|
||||||
|
/// surfaces DB errors.
|
||||||
|
pub async fn find_attacher(
|
||||||
|
pool: &PgPool,
|
||||||
|
manga_id: Uuid,
|
||||||
|
tag_id: Uuid,
|
||||||
|
) -> AppResult<Option<Option<Uuid>>> {
|
||||||
|
let row: Option<(Option<Uuid>,)> = sqlx::query_as(
|
||||||
|
"SELECT added_by FROM manga_tags WHERE manga_id = $1 AND tag_id = $2",
|
||||||
|
)
|
||||||
|
.bind(manga_id)
|
||||||
|
.bind(tag_id)
|
||||||
|
.fetch_optional(pool)
|
||||||
|
.await?;
|
||||||
|
Ok(row.map(|(added_by,)| added_by))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn detach(pool: &PgPool, manga_id: Uuid, tag_id: Uuid) -> AppResult<()> {
|
||||||
|
sqlx::query("DELETE FROM manga_tags WHERE manga_id = $1 AND tag_id = $2")
|
||||||
|
.bind(manga_id)
|
||||||
|
.bind(tag_id)
|
||||||
|
.execute(pool)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn list_for_manga(pool: &PgPool, manga_id: Uuid) -> AppResult<Vec<TagRef>> {
|
||||||
|
let rows = sqlx::query_as::<_, TagRef>(
|
||||||
|
r#"
|
||||||
|
SELECT t.id, t.name, mt.added_by
|
||||||
|
FROM manga_tags mt
|
||||||
|
JOIN tags t ON t.id = mt.tag_id
|
||||||
|
WHERE mt.manga_id = $1
|
||||||
|
ORDER BY lower(t.name)
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.bind(manga_id)
|
||||||
|
.fetch_all(pool)
|
||||||
|
.await?;
|
||||||
|
Ok(rows)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Tag autocomplete. Substring + trigram, no `added_by` (tags are
|
||||||
|
/// global), capped at the caller's limit.
|
||||||
|
pub async fn list(
|
||||||
|
pool: &PgPool,
|
||||||
|
search: Option<&str>,
|
||||||
|
limit: i64,
|
||||||
|
) -> AppResult<Vec<Tag>> {
|
||||||
|
let rows = sqlx::query_as::<_, Tag>(
|
||||||
|
r#"
|
||||||
|
SELECT id, name, created_at
|
||||||
|
FROM tags
|
||||||
|
WHERE $1::text IS NULL
|
||||||
|
OR name ILIKE '%' || $1 || '%'
|
||||||
|
OR name % $1
|
||||||
|
ORDER BY CASE WHEN $1::text IS NULL THEN 0 ELSE similarity(name, $1) END DESC,
|
||||||
|
lower(name) ASC
|
||||||
|
LIMIT $2
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.bind(search)
|
||||||
|
.bind(limit)
|
||||||
|
.fetch_all(pool)
|
||||||
|
.await?;
|
||||||
|
Ok(rows)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn find_by_id(pool: &PgPool, id: Uuid) -> AppResult<Tag> {
|
||||||
|
sqlx::query_as::<_, Tag>(
|
||||||
|
"SELECT id, name, created_at FROM tags WHERE id = $1",
|
||||||
|
)
|
||||||
|
.bind(id)
|
||||||
|
.fetch_optional(pool)
|
||||||
|
.await?
|
||||||
|
.ok_or(AppError::NotFound)
|
||||||
|
}
|
||||||
35
backend/tests/api_genres.rs
Normal file
35
backend/tests/api_genres.rs
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
mod common;
|
||||||
|
|
||||||
|
use axum::http::StatusCode;
|
||||||
|
use sqlx::PgPool;
|
||||||
|
use tower::ServiceExt;
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn lists_seeded_genres(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::get("/api/v1/genres"))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::OK);
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
let items = body.as_array().expect("genres returned as a flat array");
|
||||||
|
let names: Vec<&str> = items
|
||||||
|
.iter()
|
||||||
|
.map(|g| g["name"].as_str().unwrap())
|
||||||
|
.collect();
|
||||||
|
// The migration seeds a curated vocabulary; spot-check a few
|
||||||
|
// common ones so accidental removals fail loudly.
|
||||||
|
for expected in ["Action", "Comedy", "Romance", "Sci-Fi"] {
|
||||||
|
assert!(
|
||||||
|
names.contains(&expected),
|
||||||
|
"expected seeded genre {expected:?} in {names:?}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// Every genre must carry an id so the create/patch endpoints have
|
||||||
|
// something to reference.
|
||||||
|
for g in items {
|
||||||
|
assert!(g["id"].as_str().is_some());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -158,7 +158,11 @@ async fn create_then_list_roundtrip(pool: PgPool) {
|
|||||||
"/api/v1/mangas",
|
"/api/v1/mangas",
|
||||||
MultipartBuilder::new().add_json(
|
MultipartBuilder::new().add_json(
|
||||||
"metadata",
|
"metadata",
|
||||||
json!({ "title": "Berserk", "author": "Kentaro Miura", "description": null }),
|
json!({
|
||||||
|
"title": "Berserk",
|
||||||
|
"authors": ["Kentaro Miura"],
|
||||||
|
"description": null,
|
||||||
|
}),
|
||||||
),
|
),
|
||||||
&cookie,
|
&cookie,
|
||||||
))
|
))
|
||||||
@@ -167,14 +171,23 @@ async fn create_then_list_roundtrip(pool: PgPool) {
|
|||||||
assert_eq!(created.status(), StatusCode::CREATED);
|
assert_eq!(created.status(), StatusCode::CREATED);
|
||||||
let body = common::body_json(created).await;
|
let body = common::body_json(created).await;
|
||||||
assert_eq!(body["title"], "Berserk");
|
assert_eq!(body["title"], "Berserk");
|
||||||
assert_eq!(body["author"], "Kentaro Miura");
|
let authors = body["authors"].as_array().unwrap();
|
||||||
|
assert_eq!(authors.len(), 1);
|
||||||
|
assert_eq!(authors[0]["name"], "Kentaro Miura");
|
||||||
assert!(body["id"].as_str().is_some());
|
assert!(body["id"].as_str().is_some());
|
||||||
|
// Status defaults to ongoing; tags and genres start empty.
|
||||||
|
assert_eq!(body["status"], "ongoing");
|
||||||
|
assert_eq!(body["genres"], json!([]));
|
||||||
|
assert_eq!(body["tags"], json!([]));
|
||||||
|
|
||||||
let listed = h.app.oneshot(common::get("/api/v1/mangas")).await.unwrap();
|
let listed = h.app.oneshot(common::get("/api/v1/mangas")).await.unwrap();
|
||||||
let listed_body = common::body_json(listed).await;
|
let listed_body = common::body_json(listed).await;
|
||||||
let items = listed_body["items"].as_array().unwrap();
|
let items = listed_body["items"].as_array().unwrap();
|
||||||
assert_eq!(items.len(), 1);
|
assert_eq!(items.len(), 1);
|
||||||
assert_eq!(items[0]["title"], "Berserk");
|
assert_eq!(items[0]["title"], "Berserk");
|
||||||
|
// List endpoint returns the card shape: authors + genres included.
|
||||||
|
let authors = items[0]["authors"].as_array().unwrap();
|
||||||
|
assert_eq!(authors[0]["name"], "Kentaro Miura");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[sqlx::test(migrations = "./migrations")]
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
@@ -193,13 +206,15 @@ async fn search_filters_by_title_and_author(pool: PgPool) {
|
|||||||
.oneshot(common::post_multipart_with_cookie(
|
.oneshot(common::post_multipart_with_cookie(
|
||||||
"/api/v1/mangas",
|
"/api/v1/mangas",
|
||||||
MultipartBuilder::new()
|
MultipartBuilder::new()
|
||||||
.add_json("metadata", json!({ "title": title, "author": author })),
|
.add_json("metadata", json!({ "title": title, "authors": [author] })),
|
||||||
&cookie,
|
&cookie,
|
||||||
))
|
))
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Searching by author name still works — the list query joins
|
||||||
|
// authors so 'miura' resolves through the manga_authors table.
|
||||||
let resp = h
|
let resp = h
|
||||||
.app
|
.app
|
||||||
.clone()
|
.clone()
|
||||||
|
|||||||
568
backend/tests/api_mangas_metadata.rs
Normal file
568
backend/tests/api_mangas_metadata.rs
Normal file
@@ -0,0 +1,568 @@
|
|||||||
|
mod common;
|
||||||
|
|
||||||
|
use axum::http::StatusCode;
|
||||||
|
use serde_json::{json, Value};
|
||||||
|
use sqlx::PgPool;
|
||||||
|
use tower::ServiceExt;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use common::MultipartBuilder;
|
||||||
|
|
||||||
|
async fn genre_id_named(app: &axum::Router, name: &str) -> String {
|
||||||
|
let resp = app
|
||||||
|
.clone()
|
||||||
|
.oneshot(common::get("/api/v1/genres"))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::OK);
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
body.as_array()
|
||||||
|
.unwrap()
|
||||||
|
.iter()
|
||||||
|
.find(|g| g["name"].as_str() == Some(name))
|
||||||
|
.and_then(|g| g["id"].as_str().map(str::to_string))
|
||||||
|
.unwrap_or_else(|| panic!("expected seeded genre {name}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn create_manga(
|
||||||
|
app: &axum::Router,
|
||||||
|
cookie: &str,
|
||||||
|
metadata: Value,
|
||||||
|
) -> Value {
|
||||||
|
let resp = app
|
||||||
|
.clone()
|
||||||
|
.oneshot(common::post_multipart_with_cookie(
|
||||||
|
"/api/v1/mangas",
|
||||||
|
MultipartBuilder::new().add_json("metadata", metadata),
|
||||||
|
cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
resp.status(),
|
||||||
|
StatusCode::CREATED,
|
||||||
|
"create_manga failed: {:?}",
|
||||||
|
resp.status()
|
||||||
|
);
|
||||||
|
common::body_json(resp).await
|
||||||
|
}
|
||||||
|
|
||||||
|
fn id_of(body: &Value) -> Uuid {
|
||||||
|
Uuid::parse_str(body["id"].as_str().unwrap()).unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn create_returns_enriched_detail_with_defaults(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
|
||||||
|
let body = create_manga(&h.app, &cookie, json!({ "title": "Solo Manga" })).await;
|
||||||
|
assert_eq!(body["title"], "Solo Manga");
|
||||||
|
assert_eq!(body["status"], "ongoing");
|
||||||
|
assert_eq!(body["alt_titles"], json!([]));
|
||||||
|
assert_eq!(body["authors"], json!([]));
|
||||||
|
assert_eq!(body["genres"], json!([]));
|
||||||
|
assert_eq!(body["tags"], json!([]));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn create_with_full_metadata_roundtrips(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let action_id = genre_id_named(&h.app, "Action").await;
|
||||||
|
let fantasy_id = genre_id_named(&h.app, "Fantasy").await;
|
||||||
|
|
||||||
|
let body = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({
|
||||||
|
"title": "Berserk",
|
||||||
|
"status": "completed",
|
||||||
|
"authors": ["Kentaro Miura", "Studio Gaga"],
|
||||||
|
"alt_titles": ["ベルセルク"],
|
||||||
|
"genre_ids": [action_id, fantasy_id],
|
||||||
|
"description": "Guts wields a big sword."
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
assert_eq!(body["status"], "completed");
|
||||||
|
assert_eq!(body["alt_titles"], json!(["ベルセルク"]));
|
||||||
|
let authors: Vec<&str> = body["authors"]
|
||||||
|
.as_array()
|
||||||
|
.unwrap()
|
||||||
|
.iter()
|
||||||
|
.map(|a| a["name"].as_str().unwrap())
|
||||||
|
.collect();
|
||||||
|
assert_eq!(authors, vec!["Kentaro Miura", "Studio Gaga"]);
|
||||||
|
let genres: Vec<&str> = body["genres"]
|
||||||
|
.as_array()
|
||||||
|
.unwrap()
|
||||||
|
.iter()
|
||||||
|
.map(|g| g["name"].as_str().unwrap())
|
||||||
|
.collect();
|
||||||
|
assert_eq!(genres, vec!["Action", "Fantasy"]);
|
||||||
|
|
||||||
|
// GET /mangas/:id returns the same shape.
|
||||||
|
let id = id_of(&body);
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::get(&format!("/api/v1/mangas/{id}")))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let detail = common::body_json(resp).await;
|
||||||
|
assert_eq!(detail["status"], "completed");
|
||||||
|
assert_eq!(detail["authors"].as_array().unwrap().len(), 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn invalid_status_rejected_with_422(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::post_multipart_with_cookie(
|
||||||
|
"/api/v1/mangas",
|
||||||
|
MultipartBuilder::new()
|
||||||
|
.add_json("metadata", json!({ "title": "Foo", "status": "hiatus" })),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::UNPROCESSABLE_ENTITY);
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
assert_eq!(body["error"]["code"], "validation_failed");
|
||||||
|
assert!(body["error"]["details"]["status"].is_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn unknown_genre_id_rejected_with_422(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let unknown = Uuid::new_v4();
|
||||||
|
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::post_multipart_with_cookie(
|
||||||
|
"/api/v1/mangas",
|
||||||
|
MultipartBuilder::new().add_json(
|
||||||
|
"metadata",
|
||||||
|
json!({ "title": "Foo", "genre_ids": [unknown.to_string()] }),
|
||||||
|
),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::UNPROCESSABLE_ENTITY);
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
assert_eq!(body["error"]["code"], "validation_failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn author_dedups_case_insensitively(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
|
||||||
|
let a = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({ "title": "Berserk", "authors": ["Kentaro Miura"] }),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let b = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({ "title": "Berserk Prelude", "authors": ["kentaro miura"] }),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
// Both mangas resolve the same author id even though the casing differed.
|
||||||
|
let id_a = a["authors"][0]["id"].as_str().unwrap();
|
||||||
|
let id_b = b["authors"][0]["id"].as_str().unwrap();
|
||||||
|
assert_eq!(id_a, id_b);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn filter_by_status_returns_only_matches(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
|
||||||
|
let _ongoing = create_manga(&h.app, &cookie, json!({ "title": "Ongoing One" })).await;
|
||||||
|
let _done = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({ "title": "Wrapped Up", "status": "completed" }),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::get("/api/v1/mangas?status=completed"))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
let titles: Vec<&str> = body["items"]
|
||||||
|
.as_array()
|
||||||
|
.unwrap()
|
||||||
|
.iter()
|
||||||
|
.map(|m| m["title"].as_str().unwrap())
|
||||||
|
.collect();
|
||||||
|
assert_eq!(titles, vec!["Wrapped Up"]);
|
||||||
|
assert_eq!(body["page"]["total"], 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn filter_by_multiple_genres_is_and(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let action = genre_id_named(&h.app, "Action").await;
|
||||||
|
let fantasy = genre_id_named(&h.app, "Fantasy").await;
|
||||||
|
let comedy = genre_id_named(&h.app, "Comedy").await;
|
||||||
|
|
||||||
|
let _both = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({ "title": "Action+Fantasy", "genre_ids": [action.clone(), fantasy.clone()] }),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let _action_only = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({ "title": "Action Only", "genre_ids": [action.clone()] }),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let _other = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({ "title": "Comedy Only", "genre_ids": [comedy] }),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
let url = format!("/api/v1/mangas?genre_id={action},{fantasy}");
|
||||||
|
let resp = h.app.oneshot(common::get(&url)).await.unwrap();
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
let titles: Vec<&str> = body["items"]
|
||||||
|
.as_array()
|
||||||
|
.unwrap()
|
||||||
|
.iter()
|
||||||
|
.map(|m| m["title"].as_str().unwrap())
|
||||||
|
.collect();
|
||||||
|
// Only the manga tagged with BOTH genres matches — pure AND.
|
||||||
|
assert_eq!(titles, vec!["Action+Fantasy"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn filter_by_author_id_matches_only_works_by_that_author(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
|
||||||
|
let miura_manga = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({ "title": "Berserk", "authors": ["Kentaro Miura"] }),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let miura_id = miura_manga["authors"][0]["id"].as_str().unwrap();
|
||||||
|
let _oda = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({ "title": "One Piece", "authors": ["Eiichiro Oda"] }),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::get(&format!("/api/v1/mangas?author_id={miura_id}")))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
let titles: Vec<&str> = body["items"]
|
||||||
|
.as_array()
|
||||||
|
.unwrap()
|
||||||
|
.iter()
|
||||||
|
.map(|m| m["title"].as_str().unwrap())
|
||||||
|
.collect();
|
||||||
|
assert_eq!(titles, vec!["Berserk"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn patch_updates_status_authors_and_genres(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let drama = genre_id_named(&h.app, "Drama").await;
|
||||||
|
|
||||||
|
let created = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({ "title": "WIP", "authors": ["Old Name"] }),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let id = id_of(&created);
|
||||||
|
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::patch_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{id}"),
|
||||||
|
json!({
|
||||||
|
"status": "completed",
|
||||||
|
"authors": ["Old Name", "New Coauthor"],
|
||||||
|
"genre_ids": [drama]
|
||||||
|
}),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::OK);
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
assert_eq!(body["status"], "completed");
|
||||||
|
let names: Vec<&str> = body["authors"]
|
||||||
|
.as_array()
|
||||||
|
.unwrap()
|
||||||
|
.iter()
|
||||||
|
.map(|a| a["name"].as_str().unwrap())
|
||||||
|
.collect();
|
||||||
|
assert_eq!(names, vec!["Old Name", "New Coauthor"]);
|
||||||
|
assert_eq!(body["genres"][0]["name"], "Drama");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn patch_404_on_unknown_id(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::patch_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{}", Uuid::new_v4()),
|
||||||
|
json!({ "status": "completed" }),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn filter_by_unknown_uuid_returns_empty_not_error(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let _ = create_manga(&h.app, &cookie, json!({ "title": "Anything" })).await;
|
||||||
|
|
||||||
|
let unknown = Uuid::new_v4();
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::get(&format!("/api/v1/mangas?genre_id={unknown}")))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::OK);
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
assert_eq!(body["items"], json!([]));
|
||||||
|
assert_eq!(body["page"]["total"], 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn filter_combining_status_author_genre_and_tag_is_and(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let action = genre_id_named(&h.app, "Action").await;
|
||||||
|
|
||||||
|
// The "winner" matches every facet; the other rows each miss at
|
||||||
|
// least one so the combined filter must reject them.
|
||||||
|
let winner = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({
|
||||||
|
"title": "Winner",
|
||||||
|
"status": "completed",
|
||||||
|
"authors": ["Solo Author"],
|
||||||
|
"genre_ids": [action.clone()],
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let solo_author_id = winner["authors"][0]["id"].as_str().unwrap().to_string();
|
||||||
|
let winner_id = id_of(&winner);
|
||||||
|
|
||||||
|
let _missing_status = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({
|
||||||
|
"title": "Wrong Status",
|
||||||
|
"authors": ["Solo Author"],
|
||||||
|
"genre_ids": [action.clone()],
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let _missing_author = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({
|
||||||
|
"title": "Wrong Author",
|
||||||
|
"status": "completed",
|
||||||
|
"authors": ["Other"],
|
||||||
|
"genre_ids": [action.clone()],
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let _missing_genre = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({
|
||||||
|
"title": "Missing Genre",
|
||||||
|
"status": "completed",
|
||||||
|
"authors": ["Solo Author"],
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
// Attach a tag to the winner so we can hit all four facets at once.
|
||||||
|
let tag_attach = h
|
||||||
|
.app
|
||||||
|
.clone()
|
||||||
|
.oneshot(common::post_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{winner_id}/tags"),
|
||||||
|
json!({ "name": "Pinned" }),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let tag_id = common::body_json(tag_attach).await["id"].as_str().unwrap().to_string();
|
||||||
|
|
||||||
|
let url = format!(
|
||||||
|
"/api/v1/mangas?status=completed&author_id={solo_author_id}&genre_id={action}&tag_id={tag_id}"
|
||||||
|
);
|
||||||
|
let resp = h.app.oneshot(common::get(&url)).await.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::OK);
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
let titles: Vec<&str> = body["items"]
|
||||||
|
.as_array()
|
||||||
|
.unwrap()
|
||||||
|
.iter()
|
||||||
|
.map(|m| m["title"].as_str().unwrap())
|
||||||
|
.collect();
|
||||||
|
assert_eq!(titles, vec!["Winner"]);
|
||||||
|
assert_eq!(body["page"]["total"], 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn duplicate_genre_ids_accepted_not_treated_as_unknown(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let action = genre_id_named(&h.app, "Action").await;
|
||||||
|
|
||||||
|
let body = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({
|
||||||
|
"title": "Dup Genres",
|
||||||
|
"genre_ids": [action.clone(), action]
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
// The repeated id resolves to a single attachment (the join table
|
||||||
|
// de-dupes via the composite PK + `ON CONFLICT DO NOTHING`), so
|
||||||
|
// the response carries one genre, not two.
|
||||||
|
let names: Vec<&str> = body["genres"]
|
||||||
|
.as_array()
|
||||||
|
.unwrap()
|
||||||
|
.iter()
|
||||||
|
.map(|g| g["name"].as_str().unwrap())
|
||||||
|
.collect();
|
||||||
|
assert_eq!(names, vec!["Action"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn patch_explicit_null_description_clears_it(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let created = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({ "title": "With desc", "description": "Original" }),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let id = id_of(&created);
|
||||||
|
assert_eq!(created["description"], "Original");
|
||||||
|
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::patch_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{id}"),
|
||||||
|
json!({ "description": null }),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::OK);
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
assert!(body["description"].is_null(), "expected description cleared");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn patch_omitting_description_leaves_it_alone(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let created = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({ "title": "With desc", "description": "Keep me" }),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let id = id_of(&created);
|
||||||
|
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::patch_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{id}"),
|
||||||
|
json!({ "status": "completed" }),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::OK);
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
assert_eq!(body["description"], "Keep me");
|
||||||
|
assert_eq!(body["status"], "completed");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn patch_empty_alt_titles_clears_them(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let created = create_manga(
|
||||||
|
&h.app,
|
||||||
|
&cookie,
|
||||||
|
json!({ "title": "Has alts", "alt_titles": ["a", "b"] }),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let id = id_of(&created);
|
||||||
|
assert_eq!(created["alt_titles"], json!(["a", "b"]));
|
||||||
|
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::patch_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{id}"),
|
||||||
|
json!({ "alt_titles": [] }),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
assert_eq!(body["alt_titles"], json!([]));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn patch_requires_authentication(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let created = create_manga(&h.app, &cookie, json!({ "title": "Auth Check" })).await;
|
||||||
|
let id = id_of(&created);
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::patch_json(
|
||||||
|
&format!("/api/v1/mangas/{id}"),
|
||||||
|
json!({ "status": "completed" }),
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::UNAUTHORIZED);
|
||||||
|
}
|
||||||
260
backend/tests/api_tags.rs
Normal file
260
backend/tests/api_tags.rs
Normal file
@@ -0,0 +1,260 @@
|
|||||||
|
mod common;
|
||||||
|
|
||||||
|
use axum::http::StatusCode;
|
||||||
|
use serde_json::json;
|
||||||
|
use sqlx::PgPool;
|
||||||
|
use tower::ServiceExt;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn attach_creates_tag_and_links_to_manga(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let manga_id = common::seed_manga_via_api(&h.app, &cookie, "Berserk").await;
|
||||||
|
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.clone()
|
||||||
|
.oneshot(common::post_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{manga_id}/tags"),
|
||||||
|
json!({ "name": "Dark Fantasy" }),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::CREATED);
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
assert_eq!(body["name"], "Dark Fantasy");
|
||||||
|
assert!(body["id"].as_str().is_some());
|
||||||
|
assert!(body["added_by"].as_str().is_some());
|
||||||
|
|
||||||
|
// The tag is now visible on the manga detail response.
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::get(&format!("/api/v1/mangas/{manga_id}")))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let detail = common::body_json(resp).await;
|
||||||
|
let tags = detail["tags"].as_array().unwrap();
|
||||||
|
assert_eq!(tags.len(), 1);
|
||||||
|
assert_eq!(tags[0]["name"], "Dark Fantasy");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn reattach_same_tag_is_idempotent_and_returns_200(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let manga_id = common::seed_manga_via_api(&h.app, &cookie, "Berserk").await;
|
||||||
|
|
||||||
|
let make = || {
|
||||||
|
common::post_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{manga_id}/tags"),
|
||||||
|
json!({ "name": "Gritty" }),
|
||||||
|
&cookie,
|
||||||
|
)
|
||||||
|
};
|
||||||
|
let first = h.app.clone().oneshot(make()).await.unwrap();
|
||||||
|
assert_eq!(first.status(), StatusCode::CREATED);
|
||||||
|
let second = h.app.oneshot(make()).await.unwrap();
|
||||||
|
assert_eq!(second.status(), StatusCode::OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn tag_names_dedup_case_insensitively(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let manga_id = common::seed_manga_via_api(&h.app, &cookie, "Berserk").await;
|
||||||
|
|
||||||
|
let first = h
|
||||||
|
.app
|
||||||
|
.clone()
|
||||||
|
.oneshot(common::post_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{manga_id}/tags"),
|
||||||
|
json!({ "name": "Seinen" }),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(first.status(), StatusCode::CREATED);
|
||||||
|
let first_body = common::body_json(first).await;
|
||||||
|
let first_id = first_body["id"].as_str().unwrap().to_string();
|
||||||
|
|
||||||
|
// Different casing on a second manga should resolve to the same tag id.
|
||||||
|
let other_manga = common::seed_manga_via_api(&h.app, &cookie, "Other").await;
|
||||||
|
let second = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::post_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{other_manga}/tags"),
|
||||||
|
json!({ "name": "seinen" }),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let second_body = common::body_json(second).await;
|
||||||
|
assert_eq!(second_body["id"].as_str().unwrap(), first_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn detach_only_by_attacher(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie_a) = common::register_user(&h.app).await;
|
||||||
|
let (_, cookie_b) = common::register_user(&h.app).await;
|
||||||
|
let manga_id = common::seed_manga_via_api(&h.app, &cookie_a, "Berserk").await;
|
||||||
|
|
||||||
|
let attach = h
|
||||||
|
.app
|
||||||
|
.clone()
|
||||||
|
.oneshot(common::post_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{manga_id}/tags"),
|
||||||
|
json!({ "name": "Classic" }),
|
||||||
|
&cookie_a,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let attach_body = common::body_json(attach).await;
|
||||||
|
let tag_id = attach_body["id"].as_str().unwrap();
|
||||||
|
|
||||||
|
// User B cannot remove user A's tag attachment.
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.clone()
|
||||||
|
.oneshot(common::delete_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{manga_id}/tags/{tag_id}"),
|
||||||
|
&cookie_b,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::FORBIDDEN);
|
||||||
|
|
||||||
|
// User A can.
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::delete_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{manga_id}/tags/{tag_id}"),
|
||||||
|
&cookie_a,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::NO_CONTENT);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn detach_404_when_not_attached(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let manga_id = common::seed_manga_via_api(&h.app, &cookie, "Berserk").await;
|
||||||
|
let unknown_tag = Uuid::new_v4();
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::delete_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{manga_id}/tags/{unknown_tag}"),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn attach_requires_authentication(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let manga_id = common::seed_manga_via_api(&h.app, &cookie, "Berserk").await;
|
||||||
|
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::post_json(
|
||||||
|
&format!("/api/v1/mangas/{manga_id}/tags"),
|
||||||
|
json!({ "name": "Anon" }),
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::UNAUTHORIZED);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn attach_404_on_unknown_manga(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::post_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{}/tags", Uuid::new_v4()),
|
||||||
|
json!({ "name": "Anything" }),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn filter_by_tag_id_matches_only_tagged_mangas(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let tagged = common::seed_manga_via_api(&h.app, &cookie, "Tagged").await;
|
||||||
|
let _untagged = common::seed_manga_via_api(&h.app, &cookie, "Untagged").await;
|
||||||
|
|
||||||
|
let attach = h
|
||||||
|
.app
|
||||||
|
.clone()
|
||||||
|
.oneshot(common::post_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{tagged}/tags"),
|
||||||
|
json!({ "name": "Recommendation" }),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let tag_id = common::body_json(attach).await["id"].as_str().unwrap().to_string();
|
||||||
|
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::get(&format!("/api/v1/mangas?tag_id={tag_id}")))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
let titles: Vec<&str> = body["items"]
|
||||||
|
.as_array()
|
||||||
|
.unwrap()
|
||||||
|
.iter()
|
||||||
|
.map(|m| m["title"].as_str().unwrap())
|
||||||
|
.collect();
|
||||||
|
assert_eq!(titles, vec!["Tagged"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrations = "./migrations")]
|
||||||
|
async fn tag_autocomplete_returns_matches_ordered_by_similarity(pool: PgPool) {
|
||||||
|
let h = common::harness(pool);
|
||||||
|
let (_, cookie) = common::register_user(&h.app).await;
|
||||||
|
let manga_id = common::seed_manga_via_api(&h.app, &cookie, "Berserk").await;
|
||||||
|
|
||||||
|
for name in ["Mystery", "Murder Mystery", "Comedy"] {
|
||||||
|
let _ = h
|
||||||
|
.app
|
||||||
|
.clone()
|
||||||
|
.oneshot(common::post_json_with_cookie(
|
||||||
|
&format!("/api/v1/mangas/{manga_id}/tags"),
|
||||||
|
json!({ "name": name }),
|
||||||
|
&cookie,
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
let resp = h
|
||||||
|
.app
|
||||||
|
.oneshot(common::get("/api/v1/tags?search=myst"))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), StatusCode::OK);
|
||||||
|
let body = common::body_json(resp).await;
|
||||||
|
let names: Vec<&str> = body
|
||||||
|
.as_array()
|
||||||
|
.unwrap()
|
||||||
|
.iter()
|
||||||
|
.map(|t| t["name"].as_str().unwrap())
|
||||||
|
.collect();
|
||||||
|
assert!(names.iter().any(|n| *n == "Mystery"));
|
||||||
|
assert!(names.iter().any(|n| *n == "Murder Mystery"));
|
||||||
|
assert!(!names.iter().any(|n| *n == "Comedy"));
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "mangalord-frontend",
|
"name": "mangalord-frontend",
|
||||||
"version": "0.14.0",
|
"version": "0.15.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -65,13 +65,16 @@ export async function request<T>(path: string, init?: RequestInit): Promise<T> {
|
|||||||
export type Manga = {
|
export type Manga = {
|
||||||
id: string;
|
id: string;
|
||||||
title: string;
|
title: string;
|
||||||
author: string | null;
|
status: MangaStatus;
|
||||||
|
alt_titles: string[];
|
||||||
description: string | null;
|
description: string | null;
|
||||||
cover_image_path: string | null;
|
cover_image_path: string | null;
|
||||||
created_at: string;
|
created_at: string;
|
||||||
updated_at: string;
|
updated_at: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type MangaStatus = 'ongoing' | 'completed';
|
||||||
|
|
||||||
export type Page = {
|
export type Page = {
|
||||||
limit: number;
|
limit: number;
|
||||||
offset: number;
|
offset: number;
|
||||||
|
|||||||
33
frontend/src/lib/api/genres.test.ts
Normal file
33
frontend/src/lib/api/genres.test.ts
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
import { describe, it, expect, vi, beforeEach, afterEach, type MockInstance } from 'vitest';
|
||||||
|
import { listGenres } from './genres';
|
||||||
|
|
||||||
|
function ok(body: unknown): Response {
|
||||||
|
return new Response(JSON.stringify(body), {
|
||||||
|
status: 200,
|
||||||
|
headers: { 'content-type': 'application/json' }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('genres api client', () => {
|
||||||
|
let fetchSpy: MockInstance<typeof globalThis.fetch>;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fetchSpy = vi.spyOn(globalThis, 'fetch');
|
||||||
|
});
|
||||||
|
afterEach(() => {
|
||||||
|
vi.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('listGenres GETs /v1/genres and returns a flat array', async () => {
|
||||||
|
fetchSpy.mockResolvedValueOnce(
|
||||||
|
ok([
|
||||||
|
{ id: 'g1', name: 'Action' },
|
||||||
|
{ id: 'g2', name: 'Comedy' }
|
||||||
|
])
|
||||||
|
);
|
||||||
|
const genres = await listGenres();
|
||||||
|
expect(genres.map((g) => g.name)).toEqual(['Action', 'Comedy']);
|
||||||
|
const url = fetchSpy.mock.calls[0][0] as string;
|
||||||
|
expect(url).toMatch(/\/v1\/genres$/);
|
||||||
|
});
|
||||||
|
});
|
||||||
9
frontend/src/lib/api/genres.ts
Normal file
9
frontend/src/lib/api/genres.ts
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
import { request } from './client';
|
||||||
|
import type { GenreRef } from './mangas';
|
||||||
|
|
||||||
|
export type Genre = GenreRef;
|
||||||
|
|
||||||
|
/** Returns the full curated genre vocabulary. The list is short, so no pagination. */
|
||||||
|
export async function listGenres(): Promise<Genre[]> {
|
||||||
|
return request<Genre[]>('/v1/genres');
|
||||||
|
}
|
||||||
@@ -1,13 +1,24 @@
|
|||||||
import { describe, it, expect, vi, beforeEach, afterEach, type MockInstance } from 'vitest';
|
import { describe, it, expect, vi, beforeEach, afterEach, type MockInstance } from 'vitest';
|
||||||
import { listMangas, createManga, getManga } from './mangas';
|
import {
|
||||||
|
listMangas,
|
||||||
|
createManga,
|
||||||
|
getManga,
|
||||||
|
updateManga,
|
||||||
|
attachTag,
|
||||||
|
detachTag
|
||||||
|
} from './mangas';
|
||||||
|
|
||||||
function ok(body: unknown): Response {
|
function ok(body: unknown, status = 200): Response {
|
||||||
return new Response(JSON.stringify(body), {
|
return new Response(JSON.stringify(body), {
|
||||||
status: 200,
|
status,
|
||||||
headers: { 'content-type': 'application/json' }
|
headers: { 'content-type': 'application/json' }
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function noContent(): Response {
|
||||||
|
return new Response(null, { status: 204 });
|
||||||
|
}
|
||||||
|
|
||||||
function envelope(status: number, code: string, message: string): Response {
|
function envelope(status: number, code: string, message: string): Response {
|
||||||
return new Response(JSON.stringify({ error: { code, message } }), {
|
return new Response(JSON.stringify({ error: { code, message } }), {
|
||||||
status,
|
status,
|
||||||
@@ -19,6 +30,30 @@ function emptyPage() {
|
|||||||
return { items: [], page: { limit: 50, offset: 0, total: null } };
|
return { items: [], page: { limit: 50, offset: 0, total: null } };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function cardFixture(extra: Record<string, unknown> = {}) {
|
||||||
|
return {
|
||||||
|
id: 'b1',
|
||||||
|
title: 'Berserk',
|
||||||
|
status: 'ongoing',
|
||||||
|
alt_titles: [],
|
||||||
|
description: null,
|
||||||
|
cover_image_path: null,
|
||||||
|
created_at: '2026-01-01T00:00:00Z',
|
||||||
|
updated_at: '2026-01-01T00:00:00Z',
|
||||||
|
authors: [{ id: 'a1', name: 'Kentaro Miura' }],
|
||||||
|
genres: [],
|
||||||
|
...extra
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function detailFixture(extra: Record<string, unknown> = {}) {
|
||||||
|
return {
|
||||||
|
...cardFixture(),
|
||||||
|
tags: [],
|
||||||
|
...extra
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
describe('mangas api client', () => {
|
describe('mangas api client', () => {
|
||||||
let fetchSpy: MockInstance<typeof globalThis.fetch>;
|
let fetchSpy: MockInstance<typeof globalThis.fetch>;
|
||||||
|
|
||||||
@@ -37,54 +72,65 @@ describe('mangas api client', () => {
|
|||||||
expect(url).toMatch(/\/v1\/mangas$/);
|
expect(url).toMatch(/\/v1\/mangas$/);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('listMangas returns the paged envelope', async () => {
|
it('listMangas returns the paged envelope with cards', async () => {
|
||||||
fetchSpy.mockResolvedValueOnce(
|
fetchSpy.mockResolvedValueOnce(
|
||||||
ok({
|
ok({
|
||||||
items: [
|
items: [cardFixture()],
|
||||||
{
|
page: { limit: 50, offset: 0, total: 1 }
|
||||||
id: 'b1',
|
|
||||||
title: 'Berserk',
|
|
||||||
author: 'Miura',
|
|
||||||
description: null,
|
|
||||||
cover_image_path: null,
|
|
||||||
created_at: '2026-01-01T00:00:00Z',
|
|
||||||
updated_at: '2026-01-01T00:00:00Z'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
page: { limit: 50, offset: 0, total: null }
|
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
const result = await listMangas();
|
const result = await listMangas();
|
||||||
expect(result.items).toHaveLength(1);
|
expect(result.items).toHaveLength(1);
|
||||||
expect(result.items[0].title).toBe('Berserk');
|
expect(result.items[0].title).toBe('Berserk');
|
||||||
expect(result.page).toEqual({ limit: 50, offset: 0, total: null });
|
expect(result.items[0].authors[0].name).toBe('Kentaro Miura');
|
||||||
|
expect(result.page).toEqual({ limit: 50, offset: 0, total: 1 });
|
||||||
});
|
});
|
||||||
|
|
||||||
it('listMangas encodes search, limit, offset, sort', async () => {
|
it('listMangas encodes search, status, ids (csv), limit, offset, sort', async () => {
|
||||||
fetchSpy.mockResolvedValueOnce(ok(emptyPage()));
|
fetchSpy.mockResolvedValueOnce(ok(emptyPage()));
|
||||||
await listMangas({ search: 'one piece', limit: 10, offset: 20, sort: 'title' });
|
await listMangas({
|
||||||
|
search: 'one piece',
|
||||||
|
status: 'completed',
|
||||||
|
authorIds: ['a1', 'a2'],
|
||||||
|
genreIds: ['g1'],
|
||||||
|
tagIds: ['t1', 't2'],
|
||||||
|
limit: 10,
|
||||||
|
offset: 20,
|
||||||
|
sort: 'title'
|
||||||
|
});
|
||||||
const url = fetchSpy.mock.calls[0][0] as string;
|
const url = fetchSpy.mock.calls[0][0] as string;
|
||||||
expect(url).toMatch(/\/v1\/mangas\?/);
|
expect(url).toMatch(/\/v1\/mangas\?/);
|
||||||
expect(url).toContain('search=one+piece');
|
expect(url).toContain('search=one+piece');
|
||||||
|
expect(url).toContain('status=completed');
|
||||||
|
// Multi-value facets land as a single comma-separated param so the
|
||||||
|
// backend can apply pure AND semantics across the list.
|
||||||
|
expect(url).toContain('author_id=a1%2Ca2');
|
||||||
|
expect(url).toContain('genre_id=g1');
|
||||||
|
expect(url).toContain('tag_id=t1%2Ct2');
|
||||||
expect(url).toContain('limit=10');
|
expect(url).toContain('limit=10');
|
||||||
expect(url).toContain('offset=20');
|
expect(url).toContain('offset=20');
|
||||||
expect(url).toContain('sort=title');
|
expect(url).toContain('sort=title');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('createManga POSTs multipart with metadata to /v1/mangas', async () => {
|
it('getManga returns the enriched detail shape', async () => {
|
||||||
fetchSpy.mockResolvedValueOnce(
|
fetchSpy.mockResolvedValueOnce(
|
||||||
ok({
|
ok(detailFixture({ tags: [{ id: 't1', name: 'Seinen', added_by: 'u1' }] }))
|
||||||
id: 'abc',
|
|
||||||
title: 'Berserk',
|
|
||||||
author: 'Miura',
|
|
||||||
description: null,
|
|
||||||
cover_image_path: null,
|
|
||||||
created_at: '2026-01-01T00:00:00Z',
|
|
||||||
updated_at: '2026-01-01T00:00:00Z'
|
|
||||||
})
|
|
||||||
);
|
);
|
||||||
const m = await createManga({ title: 'Berserk', author: 'Miura' });
|
const m = await getManga('b1');
|
||||||
expect(m.title).toBe('Berserk');
|
expect(m.tags).toHaveLength(1);
|
||||||
|
expect(m.tags[0].name).toBe('Seinen');
|
||||||
|
expect(m.authors[0].name).toBe('Kentaro Miura');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('createManga POSTs multipart with the new metadata shape', async () => {
|
||||||
|
fetchSpy.mockResolvedValueOnce(ok(detailFixture()));
|
||||||
|
await createManga({
|
||||||
|
title: 'Berserk',
|
||||||
|
authors: ['Kentaro Miura'],
|
||||||
|
status: 'completed',
|
||||||
|
alt_titles: ['ベルセルク'],
|
||||||
|
genre_ids: ['g1']
|
||||||
|
});
|
||||||
const url = fetchSpy.mock.calls[0][0] as string;
|
const url = fetchSpy.mock.calls[0][0] as string;
|
||||||
expect(url).toMatch(/\/v1\/mangas$/);
|
expect(url).toMatch(/\/v1\/mangas$/);
|
||||||
const init = fetchSpy.mock.calls[0][1] as RequestInit;
|
const init = fetchSpy.mock.calls[0][1] as RequestInit;
|
||||||
@@ -94,13 +140,17 @@ describe('mangas api client', () => {
|
|||||||
const metadata = form.get('metadata') as Blob;
|
const metadata = form.get('metadata') as Blob;
|
||||||
expect(metadata).toBeInstanceOf(Blob);
|
expect(metadata).toBeInstanceOf(Blob);
|
||||||
expect(metadata.type).toBe('application/json');
|
expect(metadata.type).toBe('application/json');
|
||||||
// jsdom doesn't implement Blob.text(); read the bytes via FileReader.
|
|
||||||
const text = await new Promise<string>((resolve) => {
|
const text = await new Promise<string>((resolve) => {
|
||||||
const reader = new FileReader();
|
const reader = new FileReader();
|
||||||
reader.onload = () => resolve(reader.result as string);
|
reader.onload = () => resolve(reader.result as string);
|
||||||
reader.readAsText(metadata);
|
reader.readAsText(metadata);
|
||||||
});
|
});
|
||||||
expect(text).toBe(JSON.stringify({ title: 'Berserk', author: 'Miura' }));
|
const parsed = JSON.parse(text);
|
||||||
|
expect(parsed.title).toBe('Berserk');
|
||||||
|
expect(parsed.authors).toEqual(['Kentaro Miura']);
|
||||||
|
expect(parsed.status).toBe('completed');
|
||||||
|
expect(parsed.alt_titles).toEqual(['ベルセルク']);
|
||||||
|
expect(parsed.genre_ids).toEqual(['g1']);
|
||||||
expect(form.get('cover')).toBeNull();
|
expect(form.get('cover')).toBeNull();
|
||||||
// The browser sets Content-Type with boundary automatically when body
|
// The browser sets Content-Type with boundary automatically when body
|
||||||
// is a FormData — we must NOT set it ourselves.
|
// is a FormData — we must NOT set it ourselves.
|
||||||
@@ -108,17 +158,7 @@ describe('mangas api client', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('createManga attaches the cover Blob when supplied', async () => {
|
it('createManga attaches the cover Blob when supplied', async () => {
|
||||||
fetchSpy.mockResolvedValueOnce(
|
fetchSpy.mockResolvedValueOnce(ok(detailFixture()));
|
||||||
ok({
|
|
||||||
id: 'abc',
|
|
||||||
title: 'Berserk',
|
|
||||||
author: null,
|
|
||||||
description: null,
|
|
||||||
cover_image_path: 'mangas/abc/cover.png',
|
|
||||||
created_at: '2026-01-01T00:00:00Z',
|
|
||||||
updated_at: '2026-01-01T00:00:00Z'
|
|
||||||
})
|
|
||||||
);
|
|
||||||
const cover = new Blob([new Uint8Array([0x89, 0x50, 0x4e, 0x47])], { type: 'image/png' });
|
const cover = new Blob([new Uint8Array([0x89, 0x50, 0x4e, 0x47])], { type: 'image/png' });
|
||||||
await createManga({ title: 'Berserk' }, cover);
|
await createManga({ title: 'Berserk' }, cover);
|
||||||
const init = fetchSpy.mock.calls[0][1] as RequestInit;
|
const init = fetchSpy.mock.calls[0][1] as RequestInit;
|
||||||
@@ -127,6 +167,45 @@ describe('mangas api client', () => {
|
|||||||
expect(got).toBeInstanceOf(Blob);
|
expect(got).toBeInstanceOf(Blob);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('updateManga PATCHes with the provided patch body', async () => {
|
||||||
|
fetchSpy.mockResolvedValueOnce(ok(detailFixture({ status: 'completed' })));
|
||||||
|
const updated = await updateManga('b1', {
|
||||||
|
status: 'completed',
|
||||||
|
authors: ['Kentaro Miura', 'Studio Gaga']
|
||||||
|
});
|
||||||
|
expect(updated.status).toBe('completed');
|
||||||
|
const url = fetchSpy.mock.calls[0][0] as string;
|
||||||
|
expect(url).toMatch(/\/v1\/mangas\/b1$/);
|
||||||
|
const init = fetchSpy.mock.calls[0][1] as RequestInit;
|
||||||
|
expect(init.method).toBe('PATCH');
|
||||||
|
expect(JSON.parse(init.body as string)).toEqual({
|
||||||
|
status: 'completed',
|
||||||
|
authors: ['Kentaro Miura', 'Studio Gaga']
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('attachTag POSTs the name and returns the TagRef', async () => {
|
||||||
|
fetchSpy.mockResolvedValueOnce(
|
||||||
|
ok({ id: 't9', name: 'Dark Fantasy', added_by: 'u1' }, 201)
|
||||||
|
);
|
||||||
|
const tag = await attachTag('b1', 'Dark Fantasy');
|
||||||
|
expect(tag.name).toBe('Dark Fantasy');
|
||||||
|
const url = fetchSpy.mock.calls[0][0] as string;
|
||||||
|
expect(url).toMatch(/\/v1\/mangas\/b1\/tags$/);
|
||||||
|
const init = fetchSpy.mock.calls[0][1] as RequestInit;
|
||||||
|
expect(init.method).toBe('POST');
|
||||||
|
expect(JSON.parse(init.body as string)).toEqual({ name: 'Dark Fantasy' });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('detachTag DELETEs the (manga, tag) pair', async () => {
|
||||||
|
fetchSpy.mockResolvedValueOnce(noContent());
|
||||||
|
await detachTag('b1', 't9');
|
||||||
|
const url = fetchSpy.mock.calls[0][0] as string;
|
||||||
|
expect(url).toMatch(/\/v1\/mangas\/b1\/tags\/t9$/);
|
||||||
|
const init = fetchSpy.mock.calls[0][1] as RequestInit;
|
||||||
|
expect(init.method).toBe('DELETE');
|
||||||
|
});
|
||||||
|
|
||||||
it('getManga throws ApiError carrying the envelope code on non-2xx', async () => {
|
it('getManga throws ApiError carrying the envelope code on non-2xx', async () => {
|
||||||
fetchSpy.mockResolvedValue(envelope(404, 'not_found', 'manga not found'));
|
fetchSpy.mockResolvedValue(envelope(404, 'not_found', 'manga not found'));
|
||||||
await expect(getManga('missing')).rejects.toMatchObject({
|
await expect(getManga('missing')).rejects.toMatchObject({
|
||||||
|
|||||||
@@ -1,22 +1,54 @@
|
|||||||
import { request, type Manga, type Page } from './client';
|
import { request, type Manga, type MangaStatus, type Page } from './client';
|
||||||
|
|
||||||
export type MangaSort = 'recent' | 'title';
|
export type MangaSort = 'recent' | 'title';
|
||||||
|
|
||||||
|
export type AuthorRef = { id: string; name: string };
|
||||||
|
export type GenreRef = { id: string; name: string };
|
||||||
|
export type TagRef = { id: string; name: string; added_by: string | null };
|
||||||
|
|
||||||
|
/** Card shape returned by `GET /v1/mangas` — authors + genres, no tags. */
|
||||||
|
export type MangaCard = Manga & {
|
||||||
|
authors: AuthorRef[];
|
||||||
|
genres: GenreRef[];
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Detail shape returned by `GET /v1/mangas/:id`. Includes user tags. */
|
||||||
|
export type MangaDetail = Manga & {
|
||||||
|
authors: AuthorRef[];
|
||||||
|
genres: GenreRef[];
|
||||||
|
tags: TagRef[];
|
||||||
|
};
|
||||||
|
|
||||||
export type ListOptions = {
|
export type ListOptions = {
|
||||||
search?: string;
|
search?: string;
|
||||||
|
status?: MangaStatus;
|
||||||
|
/** AND across the list — every id must be attached to the manga. */
|
||||||
|
authorIds?: string[];
|
||||||
|
genreIds?: string[];
|
||||||
|
tagIds?: string[];
|
||||||
limit?: number;
|
limit?: number;
|
||||||
offset?: number;
|
offset?: number;
|
||||||
sort?: MangaSort;
|
sort?: MangaSort;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type MangasPage = {
|
export type MangasPage = {
|
||||||
items: Manga[];
|
items: MangaCard[];
|
||||||
page: Page;
|
page: Page;
|
||||||
};
|
};
|
||||||
|
|
||||||
export async function listMangas(opts: ListOptions = {}): Promise<MangasPage> {
|
export async function listMangas(opts: ListOptions = {}): Promise<MangasPage> {
|
||||||
const params = new URLSearchParams();
|
const params = new URLSearchParams();
|
||||||
if (opts.search) params.set('search', opts.search);
|
if (opts.search) params.set('search', opts.search);
|
||||||
|
if (opts.status) params.set('status', opts.status);
|
||||||
|
if (opts.authorIds && opts.authorIds.length) {
|
||||||
|
params.set('author_id', opts.authorIds.join(','));
|
||||||
|
}
|
||||||
|
if (opts.genreIds && opts.genreIds.length) {
|
||||||
|
params.set('genre_id', opts.genreIds.join(','));
|
||||||
|
}
|
||||||
|
if (opts.tagIds && opts.tagIds.length) {
|
||||||
|
params.set('tag_id', opts.tagIds.join(','));
|
||||||
|
}
|
||||||
if (opts.limit != null) params.set('limit', String(opts.limit));
|
if (opts.limit != null) params.set('limit', String(opts.limit));
|
||||||
if (opts.offset != null) params.set('offset', String(opts.offset));
|
if (opts.offset != null) params.set('offset', String(opts.offset));
|
||||||
if (opts.sort) params.set('sort', opts.sort);
|
if (opts.sort) params.set('sort', opts.sort);
|
||||||
@@ -24,14 +56,18 @@ export async function listMangas(opts: ListOptions = {}): Promise<MangasPage> {
|
|||||||
return request<MangasPage>(`/v1/mangas${qs ? `?${qs}` : ''}`);
|
return request<MangasPage>(`/v1/mangas${qs ? `?${qs}` : ''}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getManga(id: string): Promise<Manga> {
|
export async function getManga(id: string): Promise<MangaDetail> {
|
||||||
return request<Manga>(`/v1/mangas/${encodeURIComponent(id)}`);
|
return request<MangaDetail>(`/v1/mangas/${encodeURIComponent(id)}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
export type NewManga = {
|
export type NewManga = {
|
||||||
title: string;
|
title: string;
|
||||||
author?: string | null;
|
status?: MangaStatus;
|
||||||
|
/** Author display names; resolved server-side, case-insensitive. */
|
||||||
|
authors?: string[];
|
||||||
description?: string | null;
|
description?: string | null;
|
||||||
|
alt_titles?: string[];
|
||||||
|
genre_ids?: string[];
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -40,14 +76,55 @@ export type NewManga = {
|
|||||||
* automatically when `body` is a FormData, so we deliberately do not set
|
* automatically when `body` is a FormData, so we deliberately do not set
|
||||||
* Content-Type ourselves.
|
* Content-Type ourselves.
|
||||||
*/
|
*/
|
||||||
export async function createManga(input: NewManga, cover?: Blob): Promise<Manga> {
|
export async function createManga(
|
||||||
|
input: NewManga,
|
||||||
|
cover?: Blob
|
||||||
|
): Promise<MangaDetail> {
|
||||||
const form = new FormData();
|
const form = new FormData();
|
||||||
form.append(
|
form.append(
|
||||||
'metadata',
|
'metadata',
|
||||||
new Blob([JSON.stringify(input)], { type: 'application/json' })
|
new Blob([JSON.stringify(input)], { type: 'application/json' })
|
||||||
);
|
);
|
||||||
if (cover) form.append('cover', cover);
|
if (cover) form.append('cover', cover);
|
||||||
return request<Manga>('/v1/mangas', { method: 'POST', body: form });
|
return request<MangaDetail>('/v1/mangas', { method: 'POST', body: form });
|
||||||
}
|
}
|
||||||
|
|
||||||
export type { Manga, Page };
|
export type MangaPatch = {
|
||||||
|
title?: string;
|
||||||
|
status?: MangaStatus;
|
||||||
|
description?: string | null;
|
||||||
|
alt_titles?: string[];
|
||||||
|
authors?: string[];
|
||||||
|
genre_ids?: string[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export async function updateManga(
|
||||||
|
id: string,
|
||||||
|
patch: MangaPatch
|
||||||
|
): Promise<MangaDetail> {
|
||||||
|
return request<MangaDetail>(`/v1/mangas/${encodeURIComponent(id)}`, {
|
||||||
|
method: 'PATCH',
|
||||||
|
headers: { 'content-type': 'application/json' },
|
||||||
|
body: JSON.stringify(patch)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function attachTag(
|
||||||
|
mangaId: string,
|
||||||
|
name: string
|
||||||
|
): Promise<TagRef> {
|
||||||
|
return request<TagRef>(`/v1/mangas/${encodeURIComponent(mangaId)}/tags`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'content-type': 'application/json' },
|
||||||
|
body: JSON.stringify({ name })
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function detachTag(mangaId: string, tagId: string): Promise<void> {
|
||||||
|
await request<void>(
|
||||||
|
`/v1/mangas/${encodeURIComponent(mangaId)}/tags/${encodeURIComponent(tagId)}`,
|
||||||
|
{ method: 'DELETE' }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export type { Manga, MangaStatus, Page };
|
||||||
|
|||||||
38
frontend/src/lib/api/tags.test.ts
Normal file
38
frontend/src/lib/api/tags.test.ts
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
import { describe, it, expect, vi, beforeEach, afterEach, type MockInstance } from 'vitest';
|
||||||
|
import { listTags } from './tags';
|
||||||
|
|
||||||
|
function ok(body: unknown): Response {
|
||||||
|
return new Response(JSON.stringify(body), {
|
||||||
|
status: 200,
|
||||||
|
headers: { 'content-type': 'application/json' }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('tags api client', () => {
|
||||||
|
let fetchSpy: MockInstance<typeof globalThis.fetch>;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fetchSpy = vi.spyOn(globalThis, 'fetch');
|
||||||
|
});
|
||||||
|
afterEach(() => {
|
||||||
|
vi.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('listTags GETs /v1/tags with no query when no opts', async () => {
|
||||||
|
fetchSpy.mockResolvedValueOnce(ok([]));
|
||||||
|
await listTags();
|
||||||
|
const url = fetchSpy.mock.calls[0][0] as string;
|
||||||
|
expect(url).toMatch(/\/v1\/tags$/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('listTags encodes search + limit', async () => {
|
||||||
|
fetchSpy.mockResolvedValueOnce(
|
||||||
|
ok([{ id: 't1', name: 'Mystery', created_at: '2026-01-01T00:00:00Z' }])
|
||||||
|
);
|
||||||
|
const tags = await listTags({ search: 'myst', limit: 5 });
|
||||||
|
expect(tags[0].name).toBe('Mystery');
|
||||||
|
const url = fetchSpy.mock.calls[0][0] as string;
|
||||||
|
expect(url).toContain('search=myst');
|
||||||
|
expect(url).toContain('limit=5');
|
||||||
|
});
|
||||||
|
});
|
||||||
21
frontend/src/lib/api/tags.ts
Normal file
21
frontend/src/lib/api/tags.ts
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
import { request } from './client';
|
||||||
|
|
||||||
|
export type Tag = {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
created_at: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type ListTagsOptions = {
|
||||||
|
search?: string;
|
||||||
|
limit?: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Autocomplete for the tag input. Server sorts by trigram similarity. */
|
||||||
|
export async function listTags(opts: ListTagsOptions = {}): Promise<Tag[]> {
|
||||||
|
const params = new URLSearchParams();
|
||||||
|
if (opts.search) params.set('search', opts.search);
|
||||||
|
if (opts.limit != null) params.set('limit', String(opts.limit));
|
||||||
|
const qs = params.toString();
|
||||||
|
return request<Tag[]>(`/v1/tags${qs ? `?${qs}` : ''}`);
|
||||||
|
}
|
||||||
118
frontend/src/lib/components/Chip.svelte
Normal file
118
frontend/src/lib/components/Chip.svelte
Normal file
@@ -0,0 +1,118 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import X from '@lucide/svelte/icons/x';
|
||||||
|
|
||||||
|
type Variant = 'neutral' | 'primary' | 'soft';
|
||||||
|
|
||||||
|
let {
|
||||||
|
label,
|
||||||
|
href,
|
||||||
|
variant = 'neutral',
|
||||||
|
onRemove,
|
||||||
|
removeLabel = 'Remove',
|
||||||
|
testid
|
||||||
|
}: {
|
||||||
|
label: string;
|
||||||
|
href?: string;
|
||||||
|
variant?: Variant;
|
||||||
|
onRemove?: () => void;
|
||||||
|
removeLabel?: string;
|
||||||
|
testid?: string;
|
||||||
|
} = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#if href}
|
||||||
|
<a class="chip {variant}" {href} data-testid={testid}>
|
||||||
|
<span class="chip-label">{label}</span>
|
||||||
|
{#if onRemove}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="chip-remove"
|
||||||
|
aria-label={removeLabel}
|
||||||
|
title={removeLabel}
|
||||||
|
onclick={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
onRemove?.();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<X size={12} aria-hidden="true" />
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
</a>
|
||||||
|
{:else}
|
||||||
|
<span class="chip {variant}" data-testid={testid}>
|
||||||
|
<span class="chip-label">{label}</span>
|
||||||
|
{#if onRemove}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="chip-remove"
|
||||||
|
aria-label={removeLabel}
|
||||||
|
title={removeLabel}
|
||||||
|
onclick={() => onRemove?.()}
|
||||||
|
>
|
||||||
|
<X size={12} aria-hidden="true" />
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
</span>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.chip {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-1);
|
||||||
|
padding: 2px var(--space-2);
|
||||||
|
border-radius: var(--radius-pill);
|
||||||
|
font-size: var(--font-xs);
|
||||||
|
font-weight: var(--weight-medium);
|
||||||
|
line-height: var(--leading-tight);
|
||||||
|
background: var(--surface-elevated);
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
color: var(--text);
|
||||||
|
text-decoration: none;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
a.chip:hover {
|
||||||
|
background: var(--primary-soft-bg);
|
||||||
|
border-color: var(--primary);
|
||||||
|
color: var(--text);
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chip.primary {
|
||||||
|
background: var(--primary-soft-bg);
|
||||||
|
border-color: var(--primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.chip.soft {
|
||||||
|
background: transparent;
|
||||||
|
border-color: var(--border-strong);
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.chip-label {
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chip-remove {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
padding: 0;
|
||||||
|
background: transparent;
|
||||||
|
border: 0;
|
||||||
|
color: inherit;
|
||||||
|
opacity: 0.6;
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: var(--radius-pill);
|
||||||
|
}
|
||||||
|
|
||||||
|
.chip-remove:hover {
|
||||||
|
opacity: 1;
|
||||||
|
background: var(--danger-soft-bg);
|
||||||
|
color: var(--danger);
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -1,23 +1,56 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
import { listMangas, type Manga, type MangaSort } from '$lib/api/mangas';
|
import { browser } from '$app/environment';
|
||||||
|
import { goto } from '$app/navigation';
|
||||||
|
import { page } from '$app/stores';
|
||||||
|
import {
|
||||||
|
listMangas,
|
||||||
|
type MangaCard,
|
||||||
|
type MangaSort,
|
||||||
|
type MangaStatus
|
||||||
|
} from '$lib/api/mangas';
|
||||||
|
import { listGenres, type Genre } from '$lib/api/genres';
|
||||||
|
import { listTags, type Tag } from '$lib/api/tags';
|
||||||
import { fileUrl } from '$lib/api/client';
|
import { fileUrl } from '$lib/api/client';
|
||||||
|
import Chip from '$lib/components/Chip.svelte';
|
||||||
import Search from '@lucide/svelte/icons/search';
|
import Search from '@lucide/svelte/icons/search';
|
||||||
import BookImage from '@lucide/svelte/icons/book-image';
|
import BookImage from '@lucide/svelte/icons/book-image';
|
||||||
|
import SlidersHorizontal from '@lucide/svelte/icons/sliders-horizontal';
|
||||||
|
import Plus from '@lucide/svelte/icons/plus';
|
||||||
|
|
||||||
let mangas: Manga[] = $state([]);
|
let mangas: MangaCard[] = $state([]);
|
||||||
let search = $state('');
|
let search = $state('');
|
||||||
let sort: MangaSort = $state('recent');
|
let sort: MangaSort = $state('recent');
|
||||||
|
let statusFilter = $state<'' | MangaStatus>('');
|
||||||
|
let selectedGenres = $state<Genre[]>([]);
|
||||||
|
let selectedTags = $state<Tag[]>([]);
|
||||||
|
let allGenres = $state<Genre[]>([]);
|
||||||
|
let tagDraft = $state('');
|
||||||
|
let tagSuggestions = $state<Tag[]>([]);
|
||||||
|
let tagSuggestHighlight = $state(-1);
|
||||||
|
let suggestTimer: ReturnType<typeof setTimeout> | null = null;
|
||||||
|
// Monotonic counter — discards stale fetch results so a fast typist
|
||||||
|
// can't see an earlier query's results overwrite the current one.
|
||||||
|
let suggestSeq = 0;
|
||||||
|
const tagSuggestListId = 'tag-filter-suggest-list';
|
||||||
|
let filtersOpen = $state(false);
|
||||||
let total: number | null = $state(null);
|
let total: number | null = $state(null);
|
||||||
let loading = $state(true);
|
let loading = $state(true);
|
||||||
let error: string | null = $state(null);
|
let error: string | null = $state(null);
|
||||||
|
|
||||||
|
const activeFilterCount = $derived(
|
||||||
|
(statusFilter ? 1 : 0) + selectedGenres.length + selectedTags.length
|
||||||
|
);
|
||||||
|
|
||||||
async function load() {
|
async function load() {
|
||||||
loading = true;
|
loading = true;
|
||||||
error = null;
|
error = null;
|
||||||
try {
|
try {
|
||||||
const result = await listMangas({
|
const result = await listMangas({
|
||||||
search: search.trim() || undefined,
|
search: search.trim() || undefined,
|
||||||
|
status: statusFilter || undefined,
|
||||||
|
genreIds: selectedGenres.map((g) => g.id),
|
||||||
|
tagIds: selectedTags.map((t) => t.id),
|
||||||
sort
|
sort
|
||||||
});
|
});
|
||||||
mangas = result.items;
|
mangas = result.items;
|
||||||
@@ -29,20 +62,156 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function syncUrl() {
|
||||||
|
if (!browser) return;
|
||||||
|
const params = new URLSearchParams();
|
||||||
|
if (search.trim()) params.set('q', search.trim());
|
||||||
|
if (sort !== 'recent') params.set('sort', sort);
|
||||||
|
if (statusFilter) params.set('status', statusFilter);
|
||||||
|
if (selectedGenres.length)
|
||||||
|
params.set('genres', selectedGenres.map((g) => g.id).join(','));
|
||||||
|
if (selectedTags.length)
|
||||||
|
params.set('tags', selectedTags.map((t) => t.id).join(','));
|
||||||
|
const qs = params.toString();
|
||||||
|
const url = qs ? `/?${qs}` : '/';
|
||||||
|
goto(url, { replaceState: true, keepFocus: true, noScroll: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
async function hydrateFromUrl() {
|
||||||
|
// Parse the query and resolve the supplied ids back to full Tag /
|
||||||
|
// Genre objects so the chip rows render real labels.
|
||||||
|
const url = new URL($page.url);
|
||||||
|
search = url.searchParams.get('q') ?? '';
|
||||||
|
const s = url.searchParams.get('sort');
|
||||||
|
if (s === 'title' || s === 'recent') sort = s;
|
||||||
|
const st = url.searchParams.get('status');
|
||||||
|
statusFilter = st === 'ongoing' || st === 'completed' ? st : '';
|
||||||
|
const genreIds = (url.searchParams.get('genres') ?? '')
|
||||||
|
.split(',')
|
||||||
|
.filter(Boolean);
|
||||||
|
if (genreIds.length) {
|
||||||
|
selectedGenres = allGenres.filter((g) => genreIds.includes(g.id));
|
||||||
|
}
|
||||||
|
const tagIds = (url.searchParams.get('tags') ?? '')
|
||||||
|
.split(',')
|
||||||
|
.filter(Boolean);
|
||||||
|
if (tagIds.length) {
|
||||||
|
// listTags doesn't take ids; fetch a generous page and filter.
|
||||||
|
// Tag count is small in the near term, so this is fine.
|
||||||
|
const tags = await listTags({ limit: 50 });
|
||||||
|
selectedTags = tags.filter((t) => tagIds.includes(t.id));
|
||||||
|
}
|
||||||
|
// Open the filters panel if anything is active so the user can see why.
|
||||||
|
if (statusFilter || selectedGenres.length || selectedTags.length) {
|
||||||
|
filtersOpen = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onSubmit(e: SubmitEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
syncUrl();
|
||||||
|
await load();
|
||||||
|
}
|
||||||
|
|
||||||
function onSortChange() {
|
function onSortChange() {
|
||||||
|
syncUrl();
|
||||||
load();
|
load();
|
||||||
}
|
}
|
||||||
|
|
||||||
onMount(load);
|
function onStatusChange() {
|
||||||
|
syncUrl();
|
||||||
|
load();
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleGenre(g: Genre) {
|
||||||
|
selectedGenres = selectedGenres.some((x) => x.id === g.id)
|
||||||
|
? selectedGenres.filter((x) => x.id !== g.id)
|
||||||
|
: [...selectedGenres, g];
|
||||||
|
syncUrl();
|
||||||
|
load();
|
||||||
|
}
|
||||||
|
|
||||||
|
function removeTag(t: Tag) {
|
||||||
|
selectedTags = selectedTags.filter((x) => x.id !== t.id);
|
||||||
|
syncUrl();
|
||||||
|
load();
|
||||||
|
}
|
||||||
|
|
||||||
|
function pickTag(t: Tag) {
|
||||||
|
if (!selectedTags.some((x) => x.id === t.id)) {
|
||||||
|
selectedTags = [...selectedTags, t];
|
||||||
|
}
|
||||||
|
tagDraft = '';
|
||||||
|
tagSuggestions = [];
|
||||||
|
tagSuggestHighlight = -1;
|
||||||
|
syncUrl();
|
||||||
|
load();
|
||||||
|
}
|
||||||
|
|
||||||
|
function onTagDraftInput() {
|
||||||
|
tagSuggestHighlight = -1;
|
||||||
|
if (suggestTimer) clearTimeout(suggestTimer);
|
||||||
|
const q = tagDraft.trim();
|
||||||
|
if (q.length === 0) {
|
||||||
|
tagSuggestions = [];
|
||||||
|
suggestSeq++;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const seq = ++suggestSeq;
|
||||||
|
suggestTimer = setTimeout(async () => {
|
||||||
|
try {
|
||||||
|
const matched = await listTags({ search: q, limit: 6 });
|
||||||
|
if (seq !== suggestSeq) return;
|
||||||
|
const chosen = new Set(selectedTags.map((t) => t.id));
|
||||||
|
tagSuggestions = matched.filter((m) => !chosen.has(m.id));
|
||||||
|
} catch {
|
||||||
|
if (seq === suggestSeq) tagSuggestions = [];
|
||||||
|
}
|
||||||
|
}, 180);
|
||||||
|
}
|
||||||
|
|
||||||
|
function onTagFilterKeydown(e: KeyboardEvent) {
|
||||||
|
if (e.key === 'ArrowDown' && tagSuggestions.length > 0) {
|
||||||
|
e.preventDefault();
|
||||||
|
tagSuggestHighlight = (tagSuggestHighlight + 1) % tagSuggestions.length;
|
||||||
|
} else if (e.key === 'ArrowUp' && tagSuggestions.length > 0) {
|
||||||
|
e.preventDefault();
|
||||||
|
tagSuggestHighlight =
|
||||||
|
tagSuggestHighlight <= 0
|
||||||
|
? tagSuggestions.length - 1
|
||||||
|
: tagSuggestHighlight - 1;
|
||||||
|
} else if (e.key === 'Enter' && tagSuggestHighlight >= 0) {
|
||||||
|
e.preventDefault();
|
||||||
|
pickTag(tagSuggestions[tagSuggestHighlight]);
|
||||||
|
} else if (e.key === 'Escape') {
|
||||||
|
tagSuggestions = [];
|
||||||
|
tagSuggestHighlight = -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearFilters() {
|
||||||
|
statusFilter = '';
|
||||||
|
selectedGenres = [];
|
||||||
|
selectedTags = [];
|
||||||
|
syncUrl();
|
||||||
|
load();
|
||||||
|
}
|
||||||
|
|
||||||
|
onMount(async () => {
|
||||||
|
try {
|
||||||
|
allGenres = await listGenres();
|
||||||
|
} catch {
|
||||||
|
// Filter UI still loads with an empty genre list rather than blocking.
|
||||||
|
}
|
||||||
|
await hydrateFromUrl();
|
||||||
|
await load();
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<h1>Mangas</h1>
|
<h1>Mangas</h1>
|
||||||
|
|
||||||
<form
|
<form
|
||||||
onsubmit={(e) => {
|
onsubmit={onSubmit}
|
||||||
e.preventDefault();
|
|
||||||
load();
|
|
||||||
}}
|
|
||||||
action="javascript:void(0)"
|
action="javascript:void(0)"
|
||||||
class="controls"
|
class="controls"
|
||||||
>
|
>
|
||||||
@@ -54,10 +223,147 @@
|
|||||||
placeholder="Search by title or author"
|
placeholder="Search by title or author"
|
||||||
data-testid="search-input"
|
data-testid="search-input"
|
||||||
/>
|
/>
|
||||||
<button class="icon-btn" type="submit" aria-label="Search" title="Search">
|
<button class="icon-btn primary" type="submit" aria-label="Search" title="Search">
|
||||||
<Search size={18} aria-hidden="true" />
|
<Search size={18} aria-hidden="true" />
|
||||||
</button>
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="filters-toggle"
|
||||||
|
class:active={filtersOpen}
|
||||||
|
onclick={() => (filtersOpen = !filtersOpen)}
|
||||||
|
aria-expanded={filtersOpen}
|
||||||
|
aria-controls="filters-panel"
|
||||||
|
data-testid="filters-toggle"
|
||||||
|
>
|
||||||
|
<SlidersHorizontal size={16} aria-hidden="true" />
|
||||||
|
<span>Filters</span>
|
||||||
|
{#if activeFilterCount > 0}
|
||||||
|
<span class="filter-count">{activeFilterCount}</span>
|
||||||
|
{/if}
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
{#if filtersOpen}
|
||||||
|
<div class="filters-panel" id="filters-panel" data-testid="filters-panel">
|
||||||
|
<div class="filter-group">
|
||||||
|
<span class="filter-label">Status</span>
|
||||||
|
<div class="status-row">
|
||||||
|
<label>
|
||||||
|
<input
|
||||||
|
type="radio"
|
||||||
|
name="status"
|
||||||
|
value=""
|
||||||
|
bind:group={statusFilter}
|
||||||
|
onchange={onStatusChange}
|
||||||
|
/>
|
||||||
|
<span>Any</span>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
<input
|
||||||
|
type="radio"
|
||||||
|
name="status"
|
||||||
|
value="ongoing"
|
||||||
|
bind:group={statusFilter}
|
||||||
|
onchange={onStatusChange}
|
||||||
|
/>
|
||||||
|
<span>Ongoing</span>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
<input
|
||||||
|
type="radio"
|
||||||
|
name="status"
|
||||||
|
value="completed"
|
||||||
|
bind:group={statusFilter}
|
||||||
|
onchange={onStatusChange}
|
||||||
|
/>
|
||||||
|
<span>Completed</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="filter-group">
|
||||||
|
<span class="filter-label">Genres (all must match)</span>
|
||||||
|
<div class="filter-chip-row">
|
||||||
|
{#each allGenres as g (g.id)}
|
||||||
|
{@const on = selectedGenres.some((x) => x.id === g.id)}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="genre-pill"
|
||||||
|
class:active={on}
|
||||||
|
onclick={() => toggleGenre(g)}
|
||||||
|
data-testid={`genre-filter-${g.name}`}
|
||||||
|
>
|
||||||
|
{g.name}
|
||||||
|
</button>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="filter-group">
|
||||||
|
<span class="filter-label">Tags (all must match)</span>
|
||||||
|
{#if selectedTags.length > 0}
|
||||||
|
<div class="filter-chip-row">
|
||||||
|
{#each selectedTags as t (t.id)}
|
||||||
|
<Chip
|
||||||
|
label={t.name}
|
||||||
|
variant="primary"
|
||||||
|
onRemove={() => removeTag(t)}
|
||||||
|
removeLabel={`Remove tag ${t.name}`}
|
||||||
|
testid={`tag-filter-chip-${t.name}`}
|
||||||
|
/>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
<div class="tag-search">
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
role="combobox"
|
||||||
|
bind:value={tagDraft}
|
||||||
|
oninput={onTagDraftInput}
|
||||||
|
onkeydown={onTagFilterKeydown}
|
||||||
|
placeholder="Type to find a tag"
|
||||||
|
maxlength="64"
|
||||||
|
aria-label="Find a tag"
|
||||||
|
aria-controls={tagSuggestListId}
|
||||||
|
aria-expanded={tagSuggestions.length > 0}
|
||||||
|
aria-autocomplete="list"
|
||||||
|
aria-activedescendant={tagSuggestHighlight >= 0
|
||||||
|
? `${tagSuggestListId}-opt-${tagSuggestHighlight}`
|
||||||
|
: undefined}
|
||||||
|
data-testid="tag-filter-input"
|
||||||
|
/>
|
||||||
|
{#if tagSuggestions.length > 0}
|
||||||
|
<ul class="tag-suggestions" role="listbox" id={tagSuggestListId}>
|
||||||
|
{#each tagSuggestions as s, i (s.id)}
|
||||||
|
<li
|
||||||
|
id={`${tagSuggestListId}-opt-${i}`}
|
||||||
|
role="option"
|
||||||
|
aria-selected={i === tagSuggestHighlight}
|
||||||
|
class:active={i === tagSuggestHighlight}
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
tabindex="-1"
|
||||||
|
onmouseenter={() => (tagSuggestHighlight = i)}
|
||||||
|
onclick={() => pickTag(s)}
|
||||||
|
data-testid={`tag-filter-suggestion-${s.name}`}
|
||||||
|
>
|
||||||
|
<Plus size={12} aria-hidden="true" />
|
||||||
|
{s.name}
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
{/each}
|
||||||
|
</ul>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if activeFilterCount > 0}
|
||||||
|
<button type="button" class="clear" onclick={clearFilters}>
|
||||||
|
Clear filters
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
<div class="config-row">
|
<div class="config-row">
|
||||||
<label class="sort">
|
<label class="sort">
|
||||||
<span>Sort</span>
|
<span>Sort</span>
|
||||||
@@ -100,7 +406,16 @@
|
|||||||
</a>
|
</a>
|
||||||
<div class="meta">
|
<div class="meta">
|
||||||
<a href="/manga/{m.id}" class="title">{m.title}</a>
|
<a href="/manga/{m.id}" class="title">{m.title}</a>
|
||||||
{#if m.author}<span class="author">{m.author}</span>{/if}
|
{#if m.authors.length > 0}
|
||||||
|
<span class="author">
|
||||||
|
{m.authors.map((a) => a.name).join(', ')}
|
||||||
|
</span>
|
||||||
|
{/if}
|
||||||
|
{#if m.genres.length > 0}
|
||||||
|
<span class="genres">
|
||||||
|
{m.genres.map((g) => g.name).join(' · ')}
|
||||||
|
</span>
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
{/each}
|
{/each}
|
||||||
@@ -119,6 +434,7 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
gap: var(--space-2);
|
gap: var(--space-2);
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.search {
|
.search {
|
||||||
@@ -127,6 +443,150 @@
|
|||||||
max-width: 28rem;
|
max-width: 28rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.filters-toggle {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
padding: 0 var(--space-3);
|
||||||
|
height: 36px;
|
||||||
|
background: var(--surface);
|
||||||
|
border: 1px solid var(--border-strong);
|
||||||
|
color: var(--text);
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filters-toggle:hover,
|
||||||
|
.filters-toggle.active {
|
||||||
|
background: var(--surface-elevated);
|
||||||
|
border-color: var(--primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-count {
|
||||||
|
background: var(--primary);
|
||||||
|
color: var(--primary-contrast);
|
||||||
|
border-radius: var(--radius-pill);
|
||||||
|
font-size: var(--font-xs);
|
||||||
|
padding: 0 6px;
|
||||||
|
min-width: 18px;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filters-panel {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: var(--space-3);
|
||||||
|
padding: var(--space-3);
|
||||||
|
background: var(--surface);
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-group {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-label {
|
||||||
|
color: var(--text-muted);
|
||||||
|
font-size: var(--font-sm);
|
||||||
|
font-weight: var(--weight-medium);
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-row {
|
||||||
|
display: flex;
|
||||||
|
gap: var(--space-3);
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-row label {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-1);
|
||||||
|
color: var(--text);
|
||||||
|
font-size: var(--font-sm);
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-chip-row {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.genre-pill {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
padding: 4px var(--space-2);
|
||||||
|
background: var(--surface-elevated);
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
color: var(--text);
|
||||||
|
border-radius: var(--radius-pill);
|
||||||
|
font-size: var(--font-xs);
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.genre-pill:hover {
|
||||||
|
border-color: var(--primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.genre-pill.active {
|
||||||
|
background: var(--primary-soft-bg);
|
||||||
|
border-color: var(--primary);
|
||||||
|
color: var(--primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-search {
|
||||||
|
position: relative;
|
||||||
|
max-width: 20rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-search input {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-suggestions {
|
||||||
|
position: absolute;
|
||||||
|
top: 100%;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
margin: var(--space-1) 0 0;
|
||||||
|
padding: var(--space-1) 0;
|
||||||
|
list-style: none;
|
||||||
|
background: var(--surface);
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
|
||||||
|
z-index: var(--z-dropdown);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-suggestions button {
|
||||||
|
width: 100%;
|
||||||
|
background: transparent;
|
||||||
|
border: 0;
|
||||||
|
text-align: left;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
padding: var(--space-1) var(--space-3);
|
||||||
|
color: var(--text);
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: var(--font-sm);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-suggestions li.active button,
|
||||||
|
.tag-suggestions button:hover {
|
||||||
|
background: var(--primary-soft-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.clear {
|
||||||
|
align-self: flex-start;
|
||||||
|
background: transparent;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
color: var(--text-muted);
|
||||||
|
font-size: var(--font-sm);
|
||||||
|
}
|
||||||
|
|
||||||
.config-row {
|
.config-row {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
@@ -153,12 +613,15 @@
|
|||||||
width: 36px;
|
width: 36px;
|
||||||
height: 36px;
|
height: 36px;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-btn.primary {
|
||||||
background: var(--primary);
|
background: var(--primary);
|
||||||
color: var(--primary-contrast);
|
color: var(--primary-contrast);
|
||||||
border: 1px solid var(--primary);
|
border: 1px solid var(--primary);
|
||||||
}
|
}
|
||||||
|
|
||||||
.icon-btn:hover:not(:disabled) {
|
.icon-btn.primary:hover:not(:disabled) {
|
||||||
background: var(--primary-hover);
|
background: var(--primary-hover);
|
||||||
border-color: var(--primary-hover);
|
border-color: var(--primary-hover);
|
||||||
}
|
}
|
||||||
@@ -237,7 +700,8 @@
|
|||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.author {
|
.author,
|
||||||
|
.genres {
|
||||||
color: var(--text-muted);
|
color: var(--text-muted);
|
||||||
font-size: var(--font-xs);
|
font-size: var(--font-xs);
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
|||||||
@@ -1,16 +1,27 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { fileUrl } from '$lib/api/client';
|
import { fileUrl } from '$lib/api/client';
|
||||||
import { createBookmark, deleteBookmark, type Bookmark } from '$lib/api/bookmarks';
|
import { createBookmark, deleteBookmark, type Bookmark } from '$lib/api/bookmarks';
|
||||||
|
import {
|
||||||
|
attachTag,
|
||||||
|
detachTag,
|
||||||
|
type AuthorRef,
|
||||||
|
type GenreRef,
|
||||||
|
type TagRef
|
||||||
|
} from '$lib/api/mangas';
|
||||||
|
import { listTags, type Tag } from '$lib/api/tags';
|
||||||
import { session } from '$lib/session.svelte';
|
import { session } from '$lib/session.svelte';
|
||||||
|
import Chip from '$lib/components/Chip.svelte';
|
||||||
|
import Plus from '@lucide/svelte/icons/plus';
|
||||||
|
|
||||||
let { data } = $props();
|
let { data } = $props();
|
||||||
const manga = $derived(data.manga);
|
const manga = $derived(data.manga);
|
||||||
const chapters = $derived(data.chapters);
|
const chapters = $derived(data.chapters);
|
||||||
|
|
||||||
// Local working copy of the bookmark list — mutated optimistically
|
const authors = $derived<AuthorRef[]>(manga.authors);
|
||||||
// when the user toggles, instead of re-fetching from the server.
|
const genres = $derived<GenreRef[]>(manga.genres);
|
||||||
// The route re-mounts on /manga/{id} → /manga/{other} navigation,
|
|
||||||
// so capturing the initial value here is the desired behaviour.
|
// svelte-ignore state_referenced_locally
|
||||||
|
let tags = $state<TagRef[]>([...manga.tags]);
|
||||||
// svelte-ignore state_referenced_locally
|
// svelte-ignore state_referenced_locally
|
||||||
let bookmarks = $state<Bookmark[]>([...data.bookmarks]);
|
let bookmarks = $state<Bookmark[]>([...data.bookmarks]);
|
||||||
|
|
||||||
@@ -19,6 +30,7 @@
|
|||||||
);
|
);
|
||||||
|
|
||||||
let busy = $state(false);
|
let busy = $state(false);
|
||||||
|
let altTitlesOpen = $state(false);
|
||||||
|
|
||||||
async function toggleBookmark() {
|
async function toggleBookmark() {
|
||||||
if (!session.user) return;
|
if (!session.user) return;
|
||||||
@@ -36,6 +48,106 @@
|
|||||||
busy = false;
|
busy = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---- Tag UI ----
|
||||||
|
let tagDraft = $state('');
|
||||||
|
let tagAddBusy = $state(false);
|
||||||
|
let tagError = $state<string | null>(null);
|
||||||
|
let suggestions = $state<Tag[]>([]);
|
||||||
|
let suggestHighlight = $state(-1);
|
||||||
|
let suggestTimer: ReturnType<typeof setTimeout> | null = null;
|
||||||
|
// Monotonic counter — late-returning fetches with a stale seq are
|
||||||
|
// discarded so a fast typist can't see results from a previous
|
||||||
|
// query overwrite the current one.
|
||||||
|
let suggestSeq = 0;
|
||||||
|
const suggestListId = 'tag-suggest-list';
|
||||||
|
|
||||||
|
function onTagDraftInput() {
|
||||||
|
tagError = null;
|
||||||
|
suggestHighlight = -1;
|
||||||
|
if (suggestTimer) clearTimeout(suggestTimer);
|
||||||
|
const q = tagDraft.trim();
|
||||||
|
if (q.length === 0) {
|
||||||
|
suggestions = [];
|
||||||
|
suggestSeq++;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const seq = ++suggestSeq;
|
||||||
|
suggestTimer = setTimeout(async () => {
|
||||||
|
try {
|
||||||
|
const matched = await listTags({ search: q, limit: 6 });
|
||||||
|
if (seq !== suggestSeq) return;
|
||||||
|
// Hide tags already attached so the menu only suggests new picks.
|
||||||
|
const attached = new Set(tags.map((t) => t.id));
|
||||||
|
suggestions = matched.filter((m) => !attached.has(m.id));
|
||||||
|
} catch {
|
||||||
|
if (seq === suggestSeq) suggestions = [];
|
||||||
|
}
|
||||||
|
}, 180);
|
||||||
|
}
|
||||||
|
|
||||||
|
function onTagKeydown(e: KeyboardEvent) {
|
||||||
|
if (e.key === 'ArrowDown' && suggestions.length > 0) {
|
||||||
|
e.preventDefault();
|
||||||
|
suggestHighlight = (suggestHighlight + 1) % suggestions.length;
|
||||||
|
} else if (e.key === 'ArrowUp' && suggestions.length > 0) {
|
||||||
|
e.preventDefault();
|
||||||
|
suggestHighlight =
|
||||||
|
suggestHighlight <= 0 ? suggestions.length - 1 : suggestHighlight - 1;
|
||||||
|
} else if (e.key === 'Escape') {
|
||||||
|
suggestions = [];
|
||||||
|
suggestHighlight = -1;
|
||||||
|
}
|
||||||
|
// Enter is handled by the form's onsubmit — if a suggestion is
|
||||||
|
// highlighted we submit that name, otherwise we submit the
|
||||||
|
// raw draft so a brand-new tag can still be created inline.
|
||||||
|
}
|
||||||
|
|
||||||
|
async function submitTag(name: string) {
|
||||||
|
const trimmed = name.trim();
|
||||||
|
if (!trimmed || !session.user || tagAddBusy) return;
|
||||||
|
tagAddBusy = true;
|
||||||
|
tagError = null;
|
||||||
|
try {
|
||||||
|
const attached = await attachTag(manga.id, trimmed);
|
||||||
|
// If the tag was already attached by someone else, the
|
||||||
|
// server returns 200 + the existing ref — replace any
|
||||||
|
// matching entry to keep local state coherent.
|
||||||
|
tags = [...tags.filter((t) => t.id !== attached.id), attached];
|
||||||
|
tagDraft = '';
|
||||||
|
suggestions = [];
|
||||||
|
suggestHighlight = -1;
|
||||||
|
} catch (e) {
|
||||||
|
tagError = (e as Error).message;
|
||||||
|
} finally {
|
||||||
|
tagAddBusy = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function removeTag(tag: TagRef) {
|
||||||
|
if (!session.user || tag.added_by !== session.user.id) return;
|
||||||
|
const snapshot = tags;
|
||||||
|
tags = tags.filter((t) => t.id !== tag.id);
|
||||||
|
try {
|
||||||
|
await detachTag(manga.id, tag.id);
|
||||||
|
} catch (e) {
|
||||||
|
tags = snapshot;
|
||||||
|
tagError = (e as Error).message;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onTagFormSubmit(e: SubmitEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
// If the user arrowed down to a suggestion, pick it; otherwise
|
||||||
|
// submit whatever's in the input (allows creating a new tag).
|
||||||
|
const target =
|
||||||
|
suggestHighlight >= 0 && suggestions[suggestHighlight]
|
||||||
|
? suggestions[suggestHighlight].name
|
||||||
|
: tagDraft;
|
||||||
|
submitTag(target);
|
||||||
|
}
|
||||||
|
|
||||||
|
const statusLabel = $derived(manga.status === 'completed' ? 'Completed' : 'Ongoing');
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<svelte:head>
|
<svelte:head>
|
||||||
@@ -54,10 +166,119 @@
|
|||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
<div class="meta">
|
<div class="meta">
|
||||||
|
<div class="title-row">
|
||||||
<h1 data-testid="manga-title">{manga.title}</h1>
|
<h1 data-testid="manga-title">{manga.title}</h1>
|
||||||
{#if manga.author}
|
<span
|
||||||
<p class="author" data-testid="manga-author">by {manga.author}</p>
|
class="status-badge status-{manga.status}"
|
||||||
|
data-testid="manga-status"
|
||||||
|
>
|
||||||
|
{statusLabel}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if authors.length > 0}
|
||||||
|
<div class="chip-row" data-testid="manga-authors">
|
||||||
|
<span class="chip-row-label">by</span>
|
||||||
|
{#each authors as a (a.id)}
|
||||||
|
<Chip label={a.name} href={`/authors/${a.id}`} variant="primary" />
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
{#if manga.alt_titles.length > 0}
|
||||||
|
<details
|
||||||
|
class="alt-titles"
|
||||||
|
bind:open={altTitlesOpen}
|
||||||
|
data-testid="manga-alt-titles"
|
||||||
|
>
|
||||||
|
<summary>Also known as ({manga.alt_titles.length})</summary>
|
||||||
|
<ul>
|
||||||
|
{#each manga.alt_titles as alt}
|
||||||
|
<li>{alt}</li>
|
||||||
|
{/each}
|
||||||
|
</ul>
|
||||||
|
</details>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if genres.length > 0}
|
||||||
|
<div class="chip-row" data-testid="manga-genres">
|
||||||
|
<span class="chip-row-label">Genres</span>
|
||||||
|
{#each genres as g (g.id)}
|
||||||
|
<Chip label={g.name} />
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<div class="chip-row tag-row" data-testid="manga-tags">
|
||||||
|
<span class="chip-row-label">Tags</span>
|
||||||
|
{#each tags as t (t.id)}
|
||||||
|
<Chip
|
||||||
|
label={t.name}
|
||||||
|
variant="soft"
|
||||||
|
onRemove={session.user && t.added_by === session.user.id
|
||||||
|
? () => removeTag(t)
|
||||||
|
: undefined}
|
||||||
|
removeLabel="Remove tag"
|
||||||
|
/>
|
||||||
|
{/each}
|
||||||
|
{#if session.user}
|
||||||
|
<form class="tag-form" onsubmit={onTagFormSubmit}>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
role="combobox"
|
||||||
|
bind:value={tagDraft}
|
||||||
|
oninput={onTagDraftInput}
|
||||||
|
onkeydown={onTagKeydown}
|
||||||
|
placeholder="Add tag"
|
||||||
|
maxlength="64"
|
||||||
|
aria-label="Add tag"
|
||||||
|
aria-controls={suggestListId}
|
||||||
|
aria-expanded={suggestions.length > 0}
|
||||||
|
aria-autocomplete="list"
|
||||||
|
aria-activedescendant={suggestHighlight >= 0
|
||||||
|
? `${suggestListId}-opt-${suggestHighlight}`
|
||||||
|
: undefined}
|
||||||
|
class="tag-input"
|
||||||
|
data-testid="tag-input"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
class="tag-add-btn"
|
||||||
|
disabled={!tagDraft.trim() || tagAddBusy}
|
||||||
|
aria-label="Add tag"
|
||||||
|
title="Add tag"
|
||||||
|
>
|
||||||
|
<Plus size={14} aria-hidden="true" />
|
||||||
|
</button>
|
||||||
|
{#if suggestions.length > 0}
|
||||||
|
<ul class="tag-suggestions" role="listbox" id={suggestListId}>
|
||||||
|
{#each suggestions as s, i (s.id)}
|
||||||
|
<li
|
||||||
|
id={`${suggestListId}-opt-${i}`}
|
||||||
|
role="option"
|
||||||
|
aria-selected={i === suggestHighlight}
|
||||||
|
class:active={i === suggestHighlight}
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
tabindex="-1"
|
||||||
|
onmouseenter={() => (suggestHighlight = i)}
|
||||||
|
onclick={() => submitTag(s.name)}
|
||||||
|
data-testid="tag-suggestion"
|
||||||
|
>
|
||||||
|
{s.name}
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
{/each}
|
||||||
|
</ul>
|
||||||
|
{/if}
|
||||||
|
</form>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{#if tagError}
|
||||||
|
<p class="tag-error" role="alert">{tagError}</p>
|
||||||
|
{/if}
|
||||||
|
|
||||||
{#if manga.description}
|
{#if manga.description}
|
||||||
<p class="description" data-testid="manga-description">{manga.description}</p>
|
<p class="description" data-testid="manga-description">{manga.description}</p>
|
||||||
{/if}
|
{/if}
|
||||||
@@ -123,15 +344,135 @@
|
|||||||
background: var(--surface);
|
background: var(--surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
.author {
|
.title-row {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-3);
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.title-row h1 {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-badge {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
padding: 2px var(--space-2);
|
||||||
|
border-radius: var(--radius-pill);
|
||||||
|
font-size: var(--font-xs);
|
||||||
|
font-weight: var(--weight-semibold);
|
||||||
|
background: var(--surface-elevated);
|
||||||
|
border: 1px solid var(--border-strong);
|
||||||
color: var(--text-muted);
|
color: var(--text-muted);
|
||||||
margin: 0 0 var(--space-3);
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.04em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-badge.status-completed {
|
||||||
|
background: var(--success-soft-bg, var(--surface-elevated));
|
||||||
|
color: var(--success);
|
||||||
|
border-color: var(--success);
|
||||||
|
}
|
||||||
|
|
||||||
|
.chip-row {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
margin: var(--space-2) 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chip-row-label {
|
||||||
|
color: var(--text-muted);
|
||||||
|
font-size: var(--font-sm);
|
||||||
|
}
|
||||||
|
|
||||||
|
.alt-titles {
|
||||||
|
margin: var(--space-2) 0;
|
||||||
|
color: var(--text-muted);
|
||||||
|
font-size: var(--font-sm);
|
||||||
|
}
|
||||||
|
|
||||||
|
.alt-titles ul {
|
||||||
|
margin: var(--space-1) 0 0;
|
||||||
|
padding-left: var(--space-5);
|
||||||
}
|
}
|
||||||
|
|
||||||
.description {
|
.description {
|
||||||
white-space: pre-wrap;
|
white-space: pre-wrap;
|
||||||
color: var(--text);
|
color: var(--text);
|
||||||
margin-bottom: var(--space-3);
|
margin: var(--space-3) 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-row {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-form {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-1);
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-input {
|
||||||
|
height: 28px;
|
||||||
|
padding: 0 var(--space-2);
|
||||||
|
font-size: var(--font-xs);
|
||||||
|
width: 8rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-add-btn {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 28px;
|
||||||
|
height: 28px;
|
||||||
|
padding: 0;
|
||||||
|
background: var(--primary);
|
||||||
|
color: var(--primary-contrast);
|
||||||
|
border: 1px solid var(--primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-add-btn:hover:not(:disabled) {
|
||||||
|
background: var(--primary-hover);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-suggestions {
|
||||||
|
position: absolute;
|
||||||
|
top: 100%;
|
||||||
|
left: 0;
|
||||||
|
margin: var(--space-1) 0 0;
|
||||||
|
padding: var(--space-1) 0;
|
||||||
|
list-style: none;
|
||||||
|
background: var(--surface);
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
|
||||||
|
z-index: var(--z-dropdown);
|
||||||
|
min-width: 10rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-suggestions button {
|
||||||
|
width: 100%;
|
||||||
|
background: transparent;
|
||||||
|
border: 0;
|
||||||
|
text-align: left;
|
||||||
|
padding: var(--space-1) var(--space-3);
|
||||||
|
color: var(--text);
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: var(--font-sm);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-suggestions li.active button,
|
||||||
|
.tag-suggestions button:hover {
|
||||||
|
background: var(--primary-soft-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-error {
|
||||||
|
color: var(--danger);
|
||||||
|
font-size: var(--font-sm);
|
||||||
}
|
}
|
||||||
|
|
||||||
.bookmark {
|
.bookmark {
|
||||||
|
|||||||
@@ -1,24 +1,32 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { goto } from '$app/navigation';
|
import { goto } from '$app/navigation';
|
||||||
import { ApiError, fileUrl } from '$lib/api/client';
|
import { ApiError, fileUrl } from '$lib/api/client';
|
||||||
import { createManga } from '$lib/api/mangas';
|
import { createManga, type MangaStatus } from '$lib/api/mangas';
|
||||||
import { request } from '$lib/api/client';
|
import { request } from '$lib/api/client';
|
||||||
import { session } from '$lib/session.svelte';
|
import { session } from '$lib/session.svelte';
|
||||||
import { formatBytes, validateImageFile } from '$lib/upload-validation';
|
import { formatBytes, validateImageFile } from '$lib/upload-validation';
|
||||||
|
import Chip from '$lib/components/Chip.svelte';
|
||||||
import ArrowUp from '@lucide/svelte/icons/arrow-up';
|
import ArrowUp from '@lucide/svelte/icons/arrow-up';
|
||||||
import ArrowDown from '@lucide/svelte/icons/arrow-down';
|
import ArrowDown from '@lucide/svelte/icons/arrow-down';
|
||||||
import Trash2 from '@lucide/svelte/icons/trash-2';
|
import Trash2 from '@lucide/svelte/icons/trash-2';
|
||||||
import UploadCloud from '@lucide/svelte/icons/upload-cloud';
|
import UploadCloud from '@lucide/svelte/icons/upload-cloud';
|
||||||
import BookImage from '@lucide/svelte/icons/book-image';
|
import BookImage from '@lucide/svelte/icons/book-image';
|
||||||
|
import Plus from '@lucide/svelte/icons/plus';
|
||||||
|
|
||||||
let { data } = $props();
|
let { data } = $props();
|
||||||
const mangas = $derived(data.mangas);
|
const mangas = $derived(data.mangas);
|
||||||
|
const genres = $derived(data.genres);
|
||||||
|
|
||||||
// -------- Manga form state --------
|
// -------- Manga form state --------
|
||||||
|
|
||||||
let mangaTitle = $state('');
|
let mangaTitle = $state('');
|
||||||
let mangaAuthor = $state('');
|
let mangaStatus = $state<MangaStatus>('ongoing');
|
||||||
let mangaDescription = $state('');
|
let mangaDescription = $state('');
|
||||||
|
let mangaAuthors = $state<string[]>([]);
|
||||||
|
let authorDraft = $state('');
|
||||||
|
let mangaAltTitles = $state<string[]>([]);
|
||||||
|
let altTitleDraft = $state('');
|
||||||
|
let mangaGenreIds = $state<string[]>([]);
|
||||||
let coverFile = $state<File | null>(null);
|
let coverFile = $state<File | null>(null);
|
||||||
let coverError = $state<string | null>(null);
|
let coverError = $state<string | null>(null);
|
||||||
let mangaSubmitting = $state(false);
|
let mangaSubmitting = $state(false);
|
||||||
@@ -30,6 +38,38 @@
|
|||||||
mangaTitle.trim().length > 0 && !coverError && !mangaSubmitting
|
mangaTitle.trim().length > 0 && !coverError && !mangaSubmitting
|
||||||
);
|
);
|
||||||
|
|
||||||
|
function addAuthor() {
|
||||||
|
const name = authorDraft.trim();
|
||||||
|
if (!name) return;
|
||||||
|
if (!mangaAuthors.some((a) => a.toLowerCase() === name.toLowerCase())) {
|
||||||
|
mangaAuthors = [...mangaAuthors, name];
|
||||||
|
}
|
||||||
|
authorDraft = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function removeAuthor(name: string) {
|
||||||
|
mangaAuthors = mangaAuthors.filter((a) => a !== name);
|
||||||
|
}
|
||||||
|
|
||||||
|
function addAltTitle() {
|
||||||
|
const t = altTitleDraft.trim();
|
||||||
|
if (!t) return;
|
||||||
|
if (!mangaAltTitles.includes(t)) {
|
||||||
|
mangaAltTitles = [...mangaAltTitles, t];
|
||||||
|
}
|
||||||
|
altTitleDraft = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function removeAltTitle(t: string) {
|
||||||
|
mangaAltTitles = mangaAltTitles.filter((x) => x !== t);
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleGenre(id: string) {
|
||||||
|
mangaGenreIds = mangaGenreIds.includes(id)
|
||||||
|
? mangaGenreIds.filter((g) => g !== id)
|
||||||
|
: [...mangaGenreIds, id];
|
||||||
|
}
|
||||||
|
|
||||||
function onCoverChange(e: Event) {
|
function onCoverChange(e: Event) {
|
||||||
const input = e.target as HTMLInputElement;
|
const input = e.target as HTMLInputElement;
|
||||||
const file = input.files?.[0] ?? null;
|
const file = input.files?.[0] ?? null;
|
||||||
@@ -40,6 +80,10 @@
|
|||||||
async function submitManga(e: SubmitEvent) {
|
async function submitManga(e: SubmitEvent) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if (!canSubmitManga) return;
|
if (!canSubmitManga) return;
|
||||||
|
// Pick up an unsubmitted token if the user hit Submit without
|
||||||
|
// pressing Add — otherwise the typed name silently disappears.
|
||||||
|
if (authorDraft.trim()) addAuthor();
|
||||||
|
if (altTitleDraft.trim()) addAltTitle();
|
||||||
mangaSubmitting = true;
|
mangaSubmitting = true;
|
||||||
mangaError = null;
|
mangaError = null;
|
||||||
mangaFieldErrors = {};
|
mangaFieldErrors = {};
|
||||||
@@ -48,14 +92,20 @@
|
|||||||
const manga = await createManga(
|
const manga = await createManga(
|
||||||
{
|
{
|
||||||
title: mangaTitle.trim(),
|
title: mangaTitle.trim(),
|
||||||
author: mangaAuthor.trim() || null,
|
status: mangaStatus,
|
||||||
|
authors: mangaAuthors,
|
||||||
|
alt_titles: mangaAltTitles,
|
||||||
|
genre_ids: mangaGenreIds,
|
||||||
description: mangaDescription.trim() || null
|
description: mangaDescription.trim() || null
|
||||||
},
|
},
|
||||||
coverFile ?? undefined
|
coverFile ?? undefined
|
||||||
);
|
);
|
||||||
mangaSuccess = `Created "${manga.title}".`;
|
mangaSuccess = `Created "${manga.title}".`;
|
||||||
mangaTitle = '';
|
mangaTitle = '';
|
||||||
mangaAuthor = '';
|
mangaStatus = 'ongoing';
|
||||||
|
mangaAuthors = [];
|
||||||
|
mangaAltTitles = [];
|
||||||
|
mangaGenreIds = [];
|
||||||
mangaDescription = '';
|
mangaDescription = '';
|
||||||
coverFile = null;
|
coverFile = null;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
@@ -80,6 +130,9 @@
|
|||||||
let isDragOver = $state(false);
|
let isDragOver = $state(false);
|
||||||
|
|
||||||
const selectedManga = $derived(mangas.find((m) => m.id === chapterMangaId) ?? null);
|
const selectedManga = $derived(mangas.find((m) => m.id === chapterMangaId) ?? null);
|
||||||
|
const selectedMangaAuthors = $derived(
|
||||||
|
selectedManga ? selectedManga.authors.map((a) => a.name).join(', ') : ''
|
||||||
|
);
|
||||||
const allChapterPagesValid = $derived(chapterPages.every((p) => !p.error));
|
const allChapterPagesValid = $derived(chapterPages.every((p) => !p.error));
|
||||||
const canSubmitChapter = $derived(
|
const canSubmitChapter = $derived(
|
||||||
Boolean(chapterMangaId) &&
|
Boolean(chapterMangaId) &&
|
||||||
@@ -181,9 +234,6 @@
|
|||||||
}
|
}
|
||||||
const message = e instanceof Error ? e.message : String(e);
|
const message = e instanceof Error ? e.message : String(e);
|
||||||
setMessage(message);
|
setMessage(message);
|
||||||
// ApiError doesn't carry the details object yet; the API surfaces
|
|
||||||
// the most actionable field in the message itself, so we keep
|
|
||||||
// setFields available for a future refinement and clear it now.
|
|
||||||
setFields({});
|
setFields({});
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@@ -217,15 +267,99 @@
|
|||||||
<span class="field-error" role="alert">{mangaFieldErrors.title}</span>
|
<span class="field-error" role="alert">{mangaFieldErrors.title}</span>
|
||||||
{/if}
|
{/if}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label class="form-field">
|
<label class="form-field">
|
||||||
<span>Author</span>
|
<span>Status</span>
|
||||||
|
<select bind:value={mangaStatus} data-testid="manga-status">
|
||||||
|
<option value="ongoing">Ongoing</option>
|
||||||
|
<option value="completed">Completed</option>
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div class="form-field">
|
||||||
|
<span>Authors</span>
|
||||||
|
<div class="token-row">
|
||||||
|
{#each mangaAuthors as a (a)}
|
||||||
|
<Chip label={a} variant="primary" onRemove={() => removeAuthor(a)} />
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
<div class="token-input-row">
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
bind:value={mangaAuthor}
|
bind:value={authorDraft}
|
||||||
|
onkeydown={(e) => {
|
||||||
|
if (e.key === 'Enter') {
|
||||||
|
e.preventDefault();
|
||||||
|
addAuthor();
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
placeholder="Add author"
|
||||||
maxlength="200"
|
maxlength="200"
|
||||||
data-testid="manga-author"
|
data-testid="manga-author-input"
|
||||||
/>
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="icon-btn primary"
|
||||||
|
onclick={addAuthor}
|
||||||
|
disabled={!authorDraft.trim()}
|
||||||
|
aria-label="Add author"
|
||||||
|
title="Add author"
|
||||||
|
>
|
||||||
|
<Plus size={16} aria-hidden="true" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-field">
|
||||||
|
<span>Genres</span>
|
||||||
|
<div class="genre-grid" data-testid="manga-genres">
|
||||||
|
{#each genres as g (g.id)}
|
||||||
|
<label class="genre-toggle">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={mangaGenreIds.includes(g.id)}
|
||||||
|
onchange={() => toggleGenre(g.id)}
|
||||||
|
/>
|
||||||
|
<span>{g.name}</span>
|
||||||
</label>
|
</label>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-field">
|
||||||
|
<span>Alternative titles</span>
|
||||||
|
<div class="token-row">
|
||||||
|
{#each mangaAltTitles as t (t)}
|
||||||
|
<Chip label={t} onRemove={() => removeAltTitle(t)} />
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
<div class="token-input-row">
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
bind:value={altTitleDraft}
|
||||||
|
onkeydown={(e) => {
|
||||||
|
if (e.key === 'Enter') {
|
||||||
|
e.preventDefault();
|
||||||
|
addAltTitle();
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
placeholder="Add alternative title"
|
||||||
|
maxlength="200"
|
||||||
|
data-testid="manga-alt-input"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="icon-btn primary"
|
||||||
|
onclick={addAltTitle}
|
||||||
|
disabled={!altTitleDraft.trim()}
|
||||||
|
aria-label="Add alternative title"
|
||||||
|
title="Add alternative title"
|
||||||
|
>
|
||||||
|
<Plus size={16} aria-hidden="true" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<label class="form-field">
|
<label class="form-field">
|
||||||
<span>Description</span>
|
<span>Description</span>
|
||||||
<textarea
|
<textarea
|
||||||
@@ -283,7 +417,9 @@
|
|||||||
<option value="">Choose…</option>
|
<option value="">Choose…</option>
|
||||||
{#each mangas as m (m.id)}
|
{#each mangas as m (m.id)}
|
||||||
<option value={m.id}>
|
<option value={m.id}>
|
||||||
{m.title}{#if m.author} — {m.author}{/if}
|
{m.title}{#if m.authors.length > 0} — {m.authors
|
||||||
|
.map((a) => a.name)
|
||||||
|
.join(', ')}{/if}
|
||||||
</option>
|
</option>
|
||||||
{/each}
|
{/each}
|
||||||
</select>
|
</select>
|
||||||
@@ -304,8 +440,8 @@
|
|||||||
{/if}
|
{/if}
|
||||||
<div class="preview-meta">
|
<div class="preview-meta">
|
||||||
<span class="preview-title">{selectedManga.title}</span>
|
<span class="preview-title">{selectedManga.title}</span>
|
||||||
{#if selectedManga.author}
|
{#if selectedMangaAuthors}
|
||||||
<span class="preview-author">{selectedManga.author}</span>
|
<span class="preview-author">{selectedMangaAuthors}</span>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -472,6 +608,38 @@
|
|||||||
color: var(--success);
|
color: var(--success);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.token-row {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: var(--space-2);
|
||||||
|
margin-bottom: var(--space-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.token-input-row {
|
||||||
|
display: flex;
|
||||||
|
gap: var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.token-input-row input {
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.genre-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
|
||||||
|
gap: var(--space-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.genre-toggle {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
color: var(--text);
|
||||||
|
font-size: var(--font-sm);
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
.manga-preview {
|
.manga-preview {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -598,6 +766,17 @@
|
|||||||
color: var(--text);
|
color: var(--text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.icon-btn.primary {
|
||||||
|
background: var(--primary);
|
||||||
|
color: var(--primary-contrast);
|
||||||
|
border-color: var(--primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-btn.primary:hover:not(:disabled) {
|
||||||
|
background: var(--primary-hover);
|
||||||
|
border-color: var(--primary-hover);
|
||||||
|
}
|
||||||
|
|
||||||
.icon-btn.danger:hover:not(:disabled) {
|
.icon-btn.danger:hover:not(:disabled) {
|
||||||
color: var(--danger);
|
color: var(--danger);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { listMangas, type Manga } from '$lib/api/mangas';
|
import { listMangas, type MangaCard } from '$lib/api/mangas';
|
||||||
|
import { listGenres, type Genre } from '$lib/api/genres';
|
||||||
import type { PageLoad } from './$types';
|
import type { PageLoad } from './$types';
|
||||||
|
|
||||||
export const ssr = false;
|
export const ssr = false;
|
||||||
@@ -6,7 +7,11 @@ export const ssr = false;
|
|||||||
export const load: PageLoad = async () => {
|
export const load: PageLoad = async () => {
|
||||||
// The chapter form needs a list of mangas to attach the new chapter
|
// The chapter form needs a list of mangas to attach the new chapter
|
||||||
// to. There's no ownership concept yet, so any authenticated user can
|
// to. There's no ownership concept yet, so any authenticated user can
|
||||||
// see and add to any manga.
|
// see and add to any manga. Genres are needed for the create-manga
|
||||||
const { items } = await listMangas({ limit: 200, sort: 'title' });
|
// form's picker.
|
||||||
return { mangas: items as Manga[] };
|
const [{ items }, genres] = await Promise.all([
|
||||||
|
listMangas({ limit: 200, sort: 'title' }),
|
||||||
|
listGenres()
|
||||||
|
]);
|
||||||
|
return { mangas: items as MangaCard[], genres: genres as Genre[] };
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user