修复: status→enum + type alias(SMELL-P1-6)

crates/df-storage/src/crud/task_repo.rs

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 use tokio::sync::Mutex;
 
 use df_types::error::Result;
+use df_types::types::TaskStatus;
 
 use crate::db::Database;
 use crate::models::TaskRecord;
@@ -24,7 +25,10 @@ fn task_from_row(row: &Row<'_>) -> std::result::Result<TaskRecord, rusqlite::Err
         project_id: row.get("project_id")?,
         title: row.get("title")?,
         description: row.get("description")?,
-        status: row.get("status")?,
+        status: {
+            let s: String = row.get("status")?;
+            TaskStatus::from_db_str(&s).unwrap_or_default()
+        },
         priority: row.get("priority")?,
         branch_name: row.get("branch_name")?,
         assignee: row.get("assignee")?,
@@ -122,7 +126,7 @@ impl_repo!(
             "INSERT INTO tasks (id, project_id, title, description, status, priority, branch_name, assignee, workflow_def_id, base_branch, review_rounds, output_json, idea_id, queue, parent_id, content_json, created_at, updated_at)
              VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17, ?18)",
             params![
-                rec.id, rec.project_id, rec.title, rec.description, rec.status, rec.priority,
+                rec.id, rec.project_id, rec.title, rec.description, rec.status.as_str(), rec.priority,
                 rec.branch_name, rec.assignee, rec.workflow_def_id, rec.base_branch,
                 rec.review_rounds, rec.output_json, rec.idea_id,
                 rec.queue, rec.parent_id, rec.content_json,
@@ -134,7 +138,7 @@ impl_repo!(
         conn.execute(
             "UPDATE tasks SET project_id = ?1, title = ?2, description = ?3, status = ?4, priority = ?5, branch_name = ?6, assignee = ?7, workflow_def_id = ?8, base_branch = ?9, review_rounds = ?10, output_json = ?11, idea_id = ?12, queue = ?13, parent_id = ?14, content_json = ?15, updated_at = ?16 WHERE id = ?17",
             params![
-                rec.project_id, rec.title, rec.description, rec.status, rec.priority,
+                rec.project_id, rec.title, rec.description, rec.status.as_str(), rec.priority,
                 rec.branch_name, rec.assignee, rec.workflow_def_id, rec.base_branch,
                 rec.review_rounds, rec.output_json, rec.idea_id,
                 rec.queue, rec.parent_id, rec.content_json,
@@ -566,20 +570,21 @@ mod tests {
     use super::*;
     use crate::crud::ProjectRepo;
     use crate::models::ProjectRecord;
+    use df_types::types::{ProjectStatus, TaskStatus};
 
     /// 构造一条 TaskRecord fixture(queue/parent_id/status 可定制,V29 新维度 + 聚合测试用 status)。
     fn trec(id: &str, queue: &str, parent_id: Option<&str>) -> TaskRecord {
-        trec_full(id, queue, parent_id, "todo")
+        trec_full(id, queue, parent_id, TaskStatus::Todo)
     }
 
     /// 全参 fixture(聚合测试需自定义 status 时用)。
-    fn trec_full(id: &str, queue: &str, parent_id: Option<&str>, status: &str) -> TaskRecord {
+    fn trec_full(id: &str, queue: &str, parent_id: Option<&str>, status: TaskStatus) -> TaskRecord {
         TaskRecord {
             id: id.to_string(),
             project_id: "proj-1".to_string(),
             title: format!("task-{id}"),
             description: String::new(),
-            status: status.to_string(),
+            status,
             priority: 1,
             branch_name: None,
             assignee: None,
@@ -605,7 +610,7 @@ mod tests {
                 id: "proj-1".to_string(),
                 name: "proj-1".to_string(),
                 description: String::new(),
-                status: "active".to_string(),
+                status: ProjectStatus::Planning,
                 idea_id: None,
                 path: None,
                 stack: None,
@@ -778,13 +783,13 @@ mod tests {
     async fn set_status_for_aggregation_writes_status() {
         let repo = setup().await;
         // 父任务初始 todo(queue=todo, parent_id=None 容器模型)
-        repo.insert(trec_full("parent", "todo", None, "todo"))
+        repo.insert(trec_full("parent", "todo", None, TaskStatus::Todo))
             .await
             .unwrap();
-        let ok = repo.set_status_for_aggregation("parent", "in_progress").await.unwrap();
+        let ok = repo.set_status_for_aggregation("parent", "in_progress");
         assert!(ok, "应命中写入");
         let after = repo.get_by_id("parent").await.unwrap().unwrap();
-        assert_eq!(after.status, "in_progress", "status 应被聚合写入更新");
+        assert_eq!(after.status.as_str(), "in_progress", "status 应被聚合写入更新");
         assert_eq!(after.review_rounds, 0, "父聚合写入不动 review_rounds");
     }
 
@@ -792,7 +797,7 @@ mod tests {
     async fn set_status_for_aggregation_skips_soft_deleted() {
         // 软删任务(回收站)不进聚合写入(WHERE deleted_at IS NULL),返回 false
         let repo = setup().await;
-        repo.insert(trec_full("parent", "todo", None, "todo"))
+        repo.insert(trec_full("parent", "todo", None, TaskStatus::Todo))
             .await
             .unwrap();
         repo.soft_delete("parent").await.unwrap();