feat(admin): 后台新增条目与分组 CRUD
- POST /api/items + DELETE /api/items/{key}：新增应用/海报/图文，按分区/分组挂载；PATCH 支持 nodeKey 移动
- 分组 CRUD：POST /api/categories/{id}/groups、PATCH/DELETE /api/groups/{id}（删除级联组内条目）
- PATCH /api/categories/{id} 增加 blockNodeKey，首页卡片可选择预览分组
- /admin 新增「内容」Tab（新增/删除条目），「分区」Tab 内联分组管理与卡片预览
- 测试 59 passed（条目创建/移动/删除、分组增删改）
This commit is contained in:
+240
-1
@@ -30,6 +30,23 @@ pub struct UpdateCategory {
|
||||
pub kind: Option<String>,
|
||||
pub preview_limit: Option<i64>,
|
||||
pub empty_text: Option<String>,
|
||||
/// 首页卡片预览哪个节点（分区自己或它下面的分组）
|
||||
pub block_node_key: Option<String>,
|
||||
}
|
||||
|
||||
/// 新建分组（子分类）
|
||||
#[derive(Debug, Clone, Deserialize)]
|
||||
pub struct NewGroup {
|
||||
pub id: String,
|
||||
pub title: String,
|
||||
}
|
||||
|
||||
/// 修改分组：改名 / 侧栏显隐
|
||||
#[derive(Debug, Clone, Default, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct UpdateGroup {
|
||||
pub title: Option<String>,
|
||||
pub show_in_sidebar: Option<bool>,
|
||||
}
|
||||
|
||||
fn valid_id(id: &str) -> bool {
|
||||
@@ -280,11 +297,172 @@ pub fn update(conn: &mut Connection, id: &str, patch: UpdateCategory) -> Result<
|
||||
)
|
||||
.map_err(map_error)?;
|
||||
|
||||
// 首页卡片预览哪个节点：分区自己或它下面的分组
|
||||
if let Some(block_node_key) = patch.block_node_key {
|
||||
let block_node_key = block_node_key.trim().to_string();
|
||||
let valid: i64 = tx
|
||||
.query_row(
|
||||
"SELECT COUNT(*) FROM node n LEFT JOIN node p ON p.key = n.parent_key
|
||||
WHERE n.key = ?1 AND (n.key = ?2 OR p.key = ?2)",
|
||||
params![block_node_key, id],
|
||||
|row| row.get(0),
|
||||
)
|
||||
.map_err(map_error)?;
|
||||
if valid == 0 {
|
||||
return Err(StashError::InvalidDirectory(
|
||||
"首页卡片只能预览本分区或它的分组".into(),
|
||||
));
|
||||
}
|
||||
|
||||
let updated = tx
|
||||
.execute(
|
||||
"UPDATE section_block SET node_key = ?1, title = NULL
|
||||
WHERE id IN (
|
||||
SELECT b.id FROM section_block b
|
||||
JOIN node n ON n.key = b.node_key
|
||||
LEFT JOIN node p ON p.key = n.parent_key
|
||||
WHERE COALESCE(p.key, n.key) = ?2
|
||||
)",
|
||||
params![block_node_key, id],
|
||||
)
|
||||
.map_err(map_error)?;
|
||||
|
||||
if updated == 0 {
|
||||
let sort: i64 = tx
|
||||
.query_row("SELECT COALESCE(MAX(sort), 0) + 1 FROM section_block", [], |row| {
|
||||
row.get(0)
|
||||
})
|
||||
.map_err(map_error)?;
|
||||
tx.execute(
|
||||
"INSERT INTO section_block (node_key, title, preview_limit, sort)
|
||||
VALUES (?1, NULL, NULL, ?2)",
|
||||
params![block_node_key, sort],
|
||||
)
|
||||
.map_err(map_error)?;
|
||||
}
|
||||
}
|
||||
|
||||
entries::audit(&tx, "category.update", id, &title)?;
|
||||
tx.commit().map_err(map_error)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 在应用类分区下新建分组（子分类）。
|
||||
pub fn create_group(conn: &mut Connection, section_id: &str, new: NewGroup) -> Result<(), StashError> {
|
||||
let id = new.id.trim();
|
||||
let title = new.title.trim();
|
||||
|
||||
if !valid_id(id) {
|
||||
return Err(StashError::InvalidDirectory(
|
||||
"分组标识只能用小写字母、数字与连字符（≤32）".into(),
|
||||
));
|
||||
}
|
||||
if title.is_empty() || title.chars().count() > 40 {
|
||||
return Err(StashError::InvalidDirectory("分组标题需为 1–40 个字".into()));
|
||||
}
|
||||
|
||||
let view_mode: Option<String> = conn
|
||||
.query_row(
|
||||
"SELECT view_mode FROM node WHERE key = ?1 AND kind = 'section'",
|
||||
[section_id],
|
||||
|row| row.get(0),
|
||||
)
|
||||
.optional()
|
||||
.map_err(map_error)?;
|
||||
|
||||
let Some(view_mode) = view_mode else {
|
||||
return Err(StashError::NotFound(format!("分区不存在: {section_id}")));
|
||||
};
|
||||
if view_mode != "apps" {
|
||||
return Err(StashError::InvalidDirectory(
|
||||
"只有应用类分区可以添加分组".into(),
|
||||
));
|
||||
}
|
||||
|
||||
let exists: i64 = conn
|
||||
.query_row("SELECT COUNT(*) FROM node WHERE key = ?1", [id], |row| {
|
||||
row.get(0)
|
||||
})
|
||||
.map_err(map_error)?;
|
||||
if exists > 0 {
|
||||
return Err(StashError::Conflict(format!("分组已存在: {id}")));
|
||||
}
|
||||
|
||||
let sort: i64 = conn
|
||||
.query_row(
|
||||
"SELECT COALESCE(MAX(sort), 0) + 1 FROM node WHERE parent_key = ?1",
|
||||
[section_id],
|
||||
|row| row.get(0),
|
||||
)
|
||||
.map_err(map_error)?;
|
||||
|
||||
conn.execute(
|
||||
"INSERT INTO node (key, parent_key, title, kind, view_mode, sort, show_in_sidebar)
|
||||
VALUES (?1, ?2, ?3, 'group', NULL, ?4, 1)",
|
||||
params![id, section_id, title, sort],
|
||||
)
|
||||
.map_err(map_error)?;
|
||||
|
||||
entries::audit(conn, "group.create", id, title)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 修改分组：改名 / 侧栏显隐。
|
||||
pub fn update_group(conn: &Connection, id: &str, patch: UpdateGroup) -> Result<(), StashError> {
|
||||
let current: Option<String> = conn
|
||||
.query_row(
|
||||
"SELECT title FROM node WHERE key = ?1 AND kind = 'group'",
|
||||
[id],
|
||||
|row| row.get(0),
|
||||
)
|
||||
.optional()
|
||||
.map_err(map_error)?;
|
||||
|
||||
let Some(current) = current else {
|
||||
return Err(StashError::NotFound(format!("分组不存在: {id}")));
|
||||
};
|
||||
|
||||
let title = match patch.title {
|
||||
Some(title) => {
|
||||
let title = title.trim().to_string();
|
||||
if title.is_empty() || title.chars().count() > 40 {
|
||||
return Err(StashError::InvalidDirectory("分组标题需为 1–40 个字".into()));
|
||||
}
|
||||
title
|
||||
}
|
||||
None => current,
|
||||
};
|
||||
|
||||
match patch.show_in_sidebar {
|
||||
Some(show) => conn.execute(
|
||||
"UPDATE node SET title = ?1, show_in_sidebar = ?2 WHERE key = ?3",
|
||||
params![title, show, id],
|
||||
),
|
||||
None => conn.execute(
|
||||
"UPDATE node SET title = ?1 WHERE key = ?2",
|
||||
params![title, id],
|
||||
),
|
||||
}
|
||||
.map_err(map_error)?;
|
||||
|
||||
entries::audit(conn, "group.update", id, &title)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 删除分组：组内条目会一起删除（前端需二次确认）。
|
||||
pub fn remove_group(conn: &Connection, id: &str) -> Result<(), StashError> {
|
||||
let removed = conn
|
||||
.execute("DELETE FROM node WHERE key = ?1 AND kind = 'group'", [id])
|
||||
.map_err(map_error)?;
|
||||
|
||||
if removed == 0 {
|
||||
return Err(StashError::NotFound(format!("分组不存在: {id}")));
|
||||
}
|
||||
|
||||
entries::audit(conn, "group.delete", id, "")?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn remove(conn: &mut Connection, id: &str) -> Result<(), StashError> {
|
||||
if id == "local" {
|
||||
return Err(StashError::InvalidDirectory("本地服务不能删除".into()));
|
||||
@@ -490,8 +668,69 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn switching_posters_to_apps_creates_group_and_moves_entries() {
|
||||
fn creates_updates_and_removes_group() {
|
||||
let mut conn = db();
|
||||
create(&mut conn, section("apps1", "应用", "apps")).expect("应能创建");
|
||||
|
||||
create_group(
|
||||
&mut conn,
|
||||
"apps1",
|
||||
NewGroup {
|
||||
id: "g1".into(),
|
||||
title: "常用".into(),
|
||||
},
|
||||
)
|
||||
.expect("应能建分组");
|
||||
|
||||
update_group(
|
||||
&conn,
|
||||
"g1",
|
||||
UpdateGroup {
|
||||
title: Some("改名".into()),
|
||||
show_in_sidebar: Some(false),
|
||||
},
|
||||
)
|
||||
.expect("应能改分组");
|
||||
|
||||
let (title, show): (String, i64) = conn
|
||||
.query_row(
|
||||
"SELECT title, show_in_sidebar FROM node WHERE key='g1'",
|
||||
[],
|
||||
|row| Ok((row.get(0)?, row.get(1)?)),
|
||||
)
|
||||
.expect("应能查");
|
||||
assert_eq!(title, "改名");
|
||||
assert_eq!(show, 0);
|
||||
|
||||
remove_group(&conn, "g1").expect("应能删分组");
|
||||
let left: i64 = conn
|
||||
.query_row("SELECT COUNT(*) FROM node WHERE key='g1'", [], |row| {
|
||||
row.get(0)
|
||||
})
|
||||
.expect("应能查");
|
||||
assert_eq!(left, 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn groups_only_under_apps_sections() {
|
||||
let mut conn = db();
|
||||
create(&mut conn, section("films", "电影", "posters")).expect("应能创建");
|
||||
assert!(
|
||||
create_group(
|
||||
&mut conn,
|
||||
"films",
|
||||
NewGroup {
|
||||
id: "g1".into(),
|
||||
title: "分组".into()
|
||||
}
|
||||
)
|
||||
.is_err(),
|
||||
"海报分区不能建分组"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn switching_posters_to_apps_creates_group_and_moves_entries() { let mut conn = db();
|
||||
create(&mut conn, section("films", "电影", "posters")).expect("应能创建");
|
||||
conn.execute("INSERT INTO entry (key, node_key) VALUES ('f1', 'films')", [])
|
||||
.expect("应能建条目");
|
||||
|
||||
Reference in New Issue
Block a user