feat: pg_trgm search, sort options, populated total count
Backend:
- Migration 0005_search.sql enables pg_trgm and adds GIN indexes
(gin_trgm_ops) on mangas.title and on mangas.author (partial, WHERE
author IS NOT NULL).
- repo::manga::list keeps the existing substring (ILIKE) clause and
adds the `%` operator on title + author so the search tolerates typos
('narto' → 'Naruto'). Both branches share the trgm index. A second
count(*) query (same WHERE clause, indexed) yields the total without
scanning twice in any meaningful sense.
- New ListSort enum (Recent / Title) interpolated into ORDER BY from a
hard-coded match — never from request input, so the format!() is not
a SQL-injection seam. Default stays Recent (created_at DESC).
- api::mangas accepts `?sort=recent|title` (snake_case) via serde and
returns `page.total` as a number instead of null.
- api::pagination::PagedResponse gains a `with_total` constructor.
Backend coverage in tests/api_mangas.rs (4 new cases plus the existing
list_is_empty_initially updated to assert total: 0):
- list_returns_total_count_independent_of_pagination — limit=2 with 3
rows returns 2 items and total=3.
- search_via_trigram_tolerates_typos — `?search=narto` finds Naruto.
- list_sort_title_orders_alphabetically — three out-of-order inserts
come back A→Z.
- search_reflects_filtered_total — search narrows total to 1.
Frontend:
- lib/api/mangas.ts gains a `MangaSort` type and threads `sort` through
listMangas's query-string builder.
- Home page renders a "Sort" select (Recent / Title A→Z) that re-runs
the list query, and shows "Showing N of M" when total is present.
Lockstep version bump to 0.8.0.
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]]
|
||||
name = "mangalord"
|
||||
version = "0.7.0"
|
||||
version = "0.8.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"argon2",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "mangalord"
|
||||
version = "0.7.0"
|
||||
version = "0.8.0"
|
||||
edition = "2021"
|
||||
|
||||
[lib]
|
||||
|
||||
15
backend/migrations/0005_search.sql
Normal file
15
backend/migrations/0005_search.sql
Normal file
@@ -0,0 +1,15 @@
|
||||
-- Trigram-backed fuzzy search on mangas. The `%` operator becomes
|
||||
-- index-supported once gin_trgm_ops is in place, so the search query
|
||||
-- can mix substring matches (ILIKE) with fuzzy matches (similarity >
|
||||
-- pg_trgm.similarity_threshold, default 0.3) without a full scan.
|
||||
|
||||
CREATE EXTENSION IF NOT EXISTS pg_trgm;
|
||||
|
||||
CREATE INDEX mangas_title_trgm_idx
|
||||
ON mangas USING gin (title gin_trgm_ops);
|
||||
|
||||
-- Author is nullable; index only the rows that have one so the index
|
||||
-- stays tight.
|
||||
CREATE INDEX mangas_author_trgm_idx
|
||||
ON mangas USING gin (author gin_trgm_ops)
|
||||
WHERE author IS NOT NULL;
|
||||
@@ -28,6 +28,8 @@ pub struct ListParams {
|
||||
pub limit: i64,
|
||||
#[serde(default)]
|
||||
pub offset: i64,
|
||||
#[serde(default)]
|
||||
pub sort: repo::manga::ListSort,
|
||||
}
|
||||
|
||||
fn default_limit() -> i64 {
|
||||
@@ -44,9 +46,10 @@ async fn list(
|
||||
search: params.search.filter(|s| !s.trim().is_empty()),
|
||||
limit,
|
||||
offset,
|
||||
sort: params.sort,
|
||||
};
|
||||
let items = repo::manga::list(&state.db, &q).await?;
|
||||
Ok(Json(PagedResponse::new(items, limit, offset)))
|
||||
let (items, total) = repo::manga::list(&state.db, &q).await?;
|
||||
Ok(Json(PagedResponse::with_total(items, limit, offset, total)))
|
||||
}
|
||||
|
||||
async fn get_one(
|
||||
|
||||
@@ -27,4 +27,11 @@ impl<T> PagedResponse<T> {
|
||||
page: PageInfo { limit, offset, total: None },
|
||||
}
|
||||
}
|
||||
|
||||
pub fn with_total(items: Vec<T>, limit: i64, offset: i64, total: i64) -> Self {
|
||||
Self {
|
||||
items,
|
||||
page: PageInfo { limit, offset, total: Some(total) },
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,44 +5,90 @@
|
||||
//! handlers depend only on `sqlx::PgPool`, not on a trait object. Swap to
|
||||
//! a trait + impl if a second backend ever becomes necessary.
|
||||
|
||||
use serde::Deserialize;
|
||||
use sqlx::PgPool;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::domain::manga::{Manga, NewManga};
|
||||
use crate::error::{AppError, AppResult};
|
||||
|
||||
#[derive(Debug, Clone, Copy, Default, Deserialize)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum ListSort {
|
||||
/// Newest first (default).
|
||||
#[default]
|
||||
Recent,
|
||||
/// A→Z by title (case-insensitive).
|
||||
Title,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct ListQuery {
|
||||
pub search: Option<String>,
|
||||
pub limit: i64,
|
||||
pub offset: i64,
|
||||
pub sort: ListSort,
|
||||
}
|
||||
|
||||
impl Default for ListQuery {
|
||||
fn default() -> Self {
|
||||
Self { search: None, limit: 50, offset: 0 }
|
||||
Self {
|
||||
search: None,
|
||||
limit: 50,
|
||||
offset: 0,
|
||||
sort: ListSort::Recent,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn list(pool: &PgPool, query: &ListQuery) -> AppResult<Vec<Manga>> {
|
||||
let pattern = query.search.as_deref().map(|s| format!("%{}%", s));
|
||||
let rows = sqlx::query_as::<_, Manga>(
|
||||
/// Returns the page of mangas matching `query` plus the unfiltered total
|
||||
/// count for the same filter. The trigram GIN indexes (see 0005_search.sql)
|
||||
/// keep both queries cheap as the library grows.
|
||||
pub async fn list(pool: &PgPool, query: &ListQuery) -> AppResult<(Vec<Manga>, i64)> {
|
||||
// `order_by` is interpolated from a hard-coded enum, never from request
|
||||
// input, so this is not a SQL injection seam.
|
||||
let order_by = match query.sort {
|
||||
ListSort::Recent => "created_at DESC, id",
|
||||
ListSort::Title => "lower(title) ASC, id",
|
||||
};
|
||||
|
||||
let search = query.search.as_deref();
|
||||
|
||||
let list_sql = format!(
|
||||
r#"
|
||||
SELECT id, title, author, description, cover_image_path, created_at, updated_at
|
||||
FROM mangas
|
||||
WHERE $1::text IS NULL
|
||||
OR title ILIKE $1
|
||||
OR COALESCE(author, '') ILIKE $1
|
||||
ORDER BY created_at DESC
|
||||
OR title ILIKE '%' || $1 || '%'
|
||||
OR COALESCE(author, '') ILIKE '%' || $1 || '%'
|
||||
OR title % $1
|
||||
OR (author IS NOT NULL AND author % $1)
|
||||
ORDER BY {order_by}
|
||||
LIMIT $2 OFFSET $3
|
||||
"#,
|
||||
)
|
||||
.bind(pattern)
|
||||
.bind(query.limit)
|
||||
.bind(query.offset)
|
||||
.fetch_all(pool)
|
||||
.await?;
|
||||
Ok(rows)
|
||||
"#
|
||||
);
|
||||
|
||||
let rows = sqlx::query_as::<_, Manga>(&list_sql)
|
||||
.bind(search)
|
||||
.bind(query.limit)
|
||||
.bind(query.offset)
|
||||
.fetch_all(pool)
|
||||
.await?;
|
||||
|
||||
let count_sql = r#"
|
||||
SELECT count(*) FROM mangas
|
||||
WHERE $1::text IS NULL
|
||||
OR title ILIKE '%' || $1 || '%'
|
||||
OR COALESCE(author, '') ILIKE '%' || $1 || '%'
|
||||
OR title % $1
|
||||
OR (author IS NOT NULL AND author % $1)
|
||||
"#;
|
||||
let (total,): (i64,) = sqlx::query_as(count_sql)
|
||||
.bind(search)
|
||||
.fetch_one(pool)
|
||||
.await?;
|
||||
|
||||
Ok((rows, total))
|
||||
}
|
||||
|
||||
pub async fn get(pool: &PgPool, id: Uuid) -> AppResult<Manga> {
|
||||
|
||||
@@ -20,7 +20,130 @@ async fn list_is_empty_initially(pool: PgPool) {
|
||||
assert_eq!(body["items"], json!([]));
|
||||
assert_eq!(body["page"]["limit"], 50);
|
||||
assert_eq!(body["page"]["offset"], 0);
|
||||
assert!(body["page"]["total"].is_null());
|
||||
assert_eq!(body["page"]["total"], 0);
|
||||
}
|
||||
|
||||
#[sqlx::test(migrations = "./migrations")]
|
||||
async fn list_returns_total_count_independent_of_pagination(pool: PgPool) {
|
||||
let h = common::harness(pool);
|
||||
let (_, cookie) = common::register_user(&h.app).await;
|
||||
|
||||
for title in ["One Piece", "Berserk", "Vinland Saga"] {
|
||||
let _ = h
|
||||
.app
|
||||
.clone()
|
||||
.oneshot(common::post_multipart_with_cookie(
|
||||
"/api/v1/mangas",
|
||||
MultipartBuilder::new().add_json("metadata", json!({ "title": title })),
|
||||
&cookie,
|
||||
))
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
let resp = h
|
||||
.app
|
||||
.oneshot(common::get("/api/v1/mangas?limit=2"))
|
||||
.await
|
||||
.unwrap();
|
||||
let body = common::body_json(resp).await;
|
||||
assert_eq!(body["items"].as_array().unwrap().len(), 2);
|
||||
// Total reflects the unfiltered population, not the page size.
|
||||
assert_eq!(body["page"]["total"], 3);
|
||||
}
|
||||
|
||||
#[sqlx::test(migrations = "./migrations")]
|
||||
async fn search_via_trigram_tolerates_typos(pool: PgPool) {
|
||||
let h = common::harness(pool);
|
||||
let (_, cookie) = common::register_user(&h.app).await;
|
||||
let _ = h
|
||||
.app
|
||||
.clone()
|
||||
.oneshot(common::post_multipart_with_cookie(
|
||||
"/api/v1/mangas",
|
||||
MultipartBuilder::new().add_json("metadata", json!({ "title": "Naruto" })),
|
||||
&cookie,
|
||||
))
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
// 'narto' is one letter off — the % operator on the GIN trgm index
|
||||
// should still match it.
|
||||
let resp = h
|
||||
.app
|
||||
.oneshot(common::get("/api/v1/mangas?search=narto"))
|
||||
.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!["Naruto"]);
|
||||
assert_eq!(body["page"]["total"], 1);
|
||||
}
|
||||
|
||||
#[sqlx::test(migrations = "./migrations")]
|
||||
async fn list_sort_title_orders_alphabetically(pool: PgPool) {
|
||||
let h = common::harness(pool);
|
||||
let (_, cookie) = common::register_user(&h.app).await;
|
||||
|
||||
for title in ["Vinland Saga", "Berserk", "One Piece"] {
|
||||
let _ = h
|
||||
.app
|
||||
.clone()
|
||||
.oneshot(common::post_multipart_with_cookie(
|
||||
"/api/v1/mangas",
|
||||
MultipartBuilder::new().add_json("metadata", json!({ "title": title })),
|
||||
&cookie,
|
||||
))
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
let resp = h
|
||||
.app
|
||||
.oneshot(common::get("/api/v1/mangas?sort=title"))
|
||||
.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", "One Piece", "Vinland Saga"]);
|
||||
}
|
||||
|
||||
#[sqlx::test(migrations = "./migrations")]
|
||||
async fn search_reflects_filtered_total(pool: PgPool) {
|
||||
let h = common::harness(pool);
|
||||
let (_, cookie) = common::register_user(&h.app).await;
|
||||
|
||||
for title in ["One Piece", "Berserk", "Vinland Saga"] {
|
||||
let _ = h
|
||||
.app
|
||||
.clone()
|
||||
.oneshot(common::post_multipart_with_cookie(
|
||||
"/api/v1/mangas",
|
||||
MultipartBuilder::new().add_json("metadata", json!({ "title": title })),
|
||||
&cookie,
|
||||
))
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
let resp = h
|
||||
.app
|
||||
.oneshot(common::get("/api/v1/mangas?search=berserk"))
|
||||
.await
|
||||
.unwrap();
|
||||
let body = common::body_json(resp).await;
|
||||
assert_eq!(body["items"].as_array().unwrap().len(), 1);
|
||||
assert_eq!(body["page"]["total"], 1);
|
||||
}
|
||||
|
||||
#[sqlx::test(migrations = "./migrations")]
|
||||
|
||||
Reference in New Issue
Block a user