update code level
This commit is contained in:
@@ -79,10 +79,26 @@ pub async fn get_random_album(cache: web::Data<Arc<RwLock<AlbumsCache>>>) -> imp
|
||||
HttpResponse::Ok().json(&c.albums[idx])
|
||||
}
|
||||
|
||||
pub async fn get_album_detail(db: web::Data<Arc<Database>>, path: web::Path<String>) -> impl Responder {
|
||||
pub async fn get_album_detail(
|
||||
db: web::Data<Arc<Database>>,
|
||||
search_db: web::Data<Arc<SearchDb>>,
|
||||
path: web::Path<String>,
|
||||
) -> impl Responder {
|
||||
let id = match Uuid::parse_str(&path.into_inner()) { Ok(id) => id, Err(_) => return HttpResponse::BadRequest().json(serde_json::json!({"error": "无效ID"})) };
|
||||
let id_str = id.to_string();
|
||||
match db.get_album_with_images(id).await {
|
||||
Ok(Some(album)) => HttpResponse::Ok().json(album),
|
||||
Ok(Some(mut album)) => {
|
||||
// 从 search.db 查询该相册的 tags 和 persons
|
||||
let tag_rows: Vec<String> = sqlx::query_scalar(
|
||||
r#"SELECT t.name FROM album_tags at JOIN tags t ON at.tag_id = t.id WHERE at.album_id = ?"#
|
||||
).bind(&id_str).fetch_all(&search_db.pool).await.unwrap_or_default();
|
||||
let person_rows: Vec<String> = sqlx::query_scalar(
|
||||
r#"SELECT p.name FROM album_persons ap JOIN persons p ON ap.person_id = p.id WHERE ap.album_id = ?"#
|
||||
).bind(&id_str).fetch_all(&search_db.pool).await.unwrap_or_default();
|
||||
album.tags = tag_rows;
|
||||
album.persons = person_rows;
|
||||
HttpResponse::Ok().json(album)
|
||||
}
|
||||
Ok(None) => HttpResponse::NotFound().json(serde_json::json!({"error": "相册不存在"})),
|
||||
Err(e) => HttpResponse::InternalServerError().json(serde_json::json!({"error": format!("{}", e)})),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user