diff --git a/eai_agentplatform/backend-go/internal/api/action_definition.go b/eai_agentplatform/backend-go/internal/api/action_definition.go index 1f48c74..2ba7a55 100644 --- a/eai_agentplatform/backend-go/internal/api/action_definition.go +++ b/eai_agentplatform/backend-go/internal/api/action_definition.go @@ -7,10 +7,17 @@ import ( "eai_agentplatform/backend/internal/jsonutil" "eai_agentplatform/backend/internal/model" - "eai_agentplatform/backend/internal/store" + "eai_agentplatform/backend/internal/repository" "eai_agentplatform/backend/internal/web" ) +// actionDefinitionRepo 动作定义仓库（便于测试时覆写），包内共享。 +var actionDefinitionRepo repository.ActionDefinitionRepo + +func init() { + actionDefinitionRepo = repository.ActionDefinitionRepo{} +} + type actionDefinitionReq struct { Key string `json:"key"` Label string `json:"label"` @@ -79,18 +86,12 @@ func validateActionDefinitionReq(req *actionDefinitionReq) *web.AppError { } func ListActionDefinitions(c *gin.Context) { - q := store.DB.Model(&model.ActionDefinition{}) - if c.Query("state") == "" { - q = q.Where("state = ?", "active") - } else { - q = q.Where("state = ?", c.Query("state")) + // 不传 state 默认只看 active —— 这是列表接口的契约，放在这里解析。 + state := c.Query("state") + if state == "" { + state = "active" } - var items []model.ActionDefinition - if err := q.Order("sort_order ASC, id ASC").Find(&items).Error; err != nil { - web.Fail(c, web.NewBadRequest("查询 Action 定义失败")) - return - } - web.OK(c, items) + web.OK(c, actionDefinitionRepo.List(state)) } func GetActionDefinitionByKey(c *gin.Context) { @@ -99,8 +100,8 @@ func GetActionDefinitionByKey(c *gin.Context) { web.Fail(c, web.NewBadRequest("action key 不能为空")) return } - var item model.ActionDefinition - if err := store.DB.Where("key = ?", key).First(&item).Error; err != nil { + item, found := actionDefinitionRepo.GetByKey(key) + if !found { web.Fail(c, web.NewNotFoundError("Action 定义不存在")) return } @@ -133,7 +134,7 @@ func CreateActionDefinition(c *gin.Context) { State: req.State, SortOrder: req.SortOrder, } - if err := store.DB.Create(&item).Error; err != nil { + if !actionDefinitionRepo.Insert(&item) { web.Fail(c, web.NewBadRequest("创建 Action 定义失败")) return } @@ -145,8 +146,8 @@ func UpdateActionDefinition(c *gin.Context) { if !ok { return } - var item model.ActionDefinition - if err := store.DB.First(&item, id).Error; err != nil { + item, found := actionDefinitionRepo.GetByID(id) + if !found { web.Fail(c, web.NewNotFoundError("Action 定义不存在")) return } @@ -173,7 +174,7 @@ func UpdateActionDefinition(c *gin.Context) { item.OntologyBindingJSON = req.OntologyBindingJSON item.State = req.State item.SortOrder = req.SortOrder - if err := store.DB.Save(&item).Error; err != nil { + if !actionDefinitionRepo.Update(&item) { web.Fail(c, web.NewBadRequest("更新 Action 定义失败")) return } @@ -185,12 +186,12 @@ func DeleteActionDefinition(c *gin.Context) { if !ok { return } - var item model.ActionDefinition - if err := store.DB.First(&item, id).Error; err != nil { + item, found := actionDefinitionRepo.GetByID(id) + if !found { web.Fail(c, web.NewNotFoundError("Action 定义不存在")) return } - if err := store.DB.Delete(&item).Error; err != nil { + if !actionDefinitionRepo.Delete(&item) { web.Fail(c, web.NewBadRequest("删除 Action 定义失败")) return } diff --git a/eai_agentplatform/backend-go/internal/api/my_task.go b/eai_agentplatform/backend-go/internal/api/my_task.go index 0659a89..23d5703 100644 --- a/eai_agentplatform/backend-go/internal/api/my_task.go +++ b/eai_agentplatform/backend-go/internal/api/my_task.go @@ -9,9 +9,7 @@ import ( "eai_agentplatform/backend/internal/middleware" "eai_agentplatform/backend/internal/model" - specialistmodel "eai_agentplatform/backend/internal/specialists/model" specialistruntime "eai_agentplatform/backend/internal/specialists/runtime" - "eai_agentplatform/backend/internal/store" "eai_agentplatform/backend/internal/web" ) @@ -39,16 +37,8 @@ func ListMyTasks(c *gin.Context) { return } - var items []model.TaskRecord - if err := specialistruntime.MyTaskQuery(user). - // 置顶的排在前面，其余按最近动过的排 —— 置顶只是一个排序偏好。 - Order("pinned DESC, updated_at DESC, id DESC"). - Limit(50). - Find(&items).Error; err != nil { - web.Fail(c, web.NewBadRequest("查询我的任务失败")) - return - } - web.OK(c, items) + // 置顶的排在前面，其余按最近动过的排 —— 置顶只是一个排序偏好。 + web.OK(c, taskRecordRepo.ListByOwners(specialistruntime.MyTaskOwners(user), 50)) } // DeleteMyTask 彻底删掉一条任务。task_record 没有软删字段，删了就是删了 —— @@ -64,12 +54,12 @@ func DeleteMyTask(c *gin.Context) { return } - var task model.TaskRecord - if err := specialistruntime.MyTaskQuery(user).Where("id = ?", id).First(&task).Error; err != nil { + task, found := taskRecordRepo.GetByIDForOwners(id, specialistruntime.MyTaskOwners(user)) + if !found { web.Fail(c, web.NewNotFoundError("任务不存在")) return } - if err := store.DB.Delete(&task).Error; err != nil { + if !taskRecordRepo.Delete(&task) { web.Fail(c, web.NewBadRequest("删除任务失败")) return } @@ -95,8 +85,8 @@ func CreateMyTask(c *gin.Context) { if specialistKey == "" { specialistKey = generalAssistantKey } - var specialist specialistmodel.Specialist - if err := store.DB.Where("key = ?", specialistKey).First(&specialist).Error; err != nil { + specialist, found := specialistRepo.GetByKey(specialistKey) + if !found { web.Fail(c, web.NewNotFoundError("专员不存在")) return } @@ -123,7 +113,7 @@ func CreateMyTask(c *gin.Context) { task.Status = "待处理" } - if err := store.DB.Create(&task).Error; err != nil { + if !taskRecordRepo.Insert(&task) { web.Fail(c, web.NewBadRequest("创建任务失败")) return } @@ -142,8 +132,9 @@ func UpdateMyTask(c *gin.Context) { return } - var task model.TaskRecord - if err := specialistruntime.MyTaskQuery(user).Where("id = ?", id).First(&task).Error; err != nil { + owners := specialistruntime.MyTaskOwners(user) + task, found := taskRecordRepo.GetByIDForOwners(id, owners) + if !found { web.Fail(c, web.NewNotFoundError("任务不存在")) return } @@ -158,8 +149,8 @@ func UpdateMyTask(c *gin.Context) { task.Title = title } if key := strings.TrimSpace(req.SpecialistKey); key != "" && key != task.SpecialistKey { - var specialist specialistmodel.Specialist - if err := store.DB.Where("key = ?", key).First(&specialist).Error; err != nil { + specialist, ok := specialistRepo.GetByKey(key) + if !ok { web.Fail(c, web.NewNotFoundError("目标专员不存在")) return } @@ -173,8 +164,8 @@ func UpdateMyTask(c *gin.Context) { if *req.ProjectID == 0 { task.ProjectID = nil } else { - var project model.Project - if err := specialistruntime.ProjectQuery(user).Where("id = ?", *req.ProjectID).First(&project).Error; err != nil { + project, ok := projectRepo.GetByIDForOwners(*req.ProjectID, owners) + if !ok { web.Fail(c, web.NewNotFoundError("项目不存在")) return } @@ -185,7 +176,7 @@ func UpdateMyTask(c *gin.Context) { task.Pinned = *req.Pinned } - if err := store.DB.Save(&task).Error; err != nil { + if !taskRecordRepo.Update(&task) { web.Fail(c, web.NewBadRequest("更新任务失败")) return } diff --git a/eai_agentplatform/backend-go/internal/api/note.go b/eai_agentplatform/backend-go/internal/api/note.go index bc2cf43..ee0e0cd 100644 --- a/eai_agentplatform/backend-go/internal/api/note.go +++ b/eai_agentplatform/backend-go/internal/api/note.go @@ -8,10 +8,17 @@ import ( "eai_agentplatform/backend/internal/middleware" "eai_agentplatform/backend/internal/model" - "eai_agentplatform/backend/internal/store" + "eai_agentplatform/backend/internal/repository" "eai_agentplatform/backend/internal/web" ) +// noteRepo 学习笔记仓库（便于测试时覆写），包内共享。 +var noteRepo repository.StudyNoteRepo + +func init() { + noteRepo = repository.StudyNoteRepo{} +} + var validNoteItemTypes = map[string]bool{"company": true, "product": true, "course": true} // ListNotes GET /api/notes?item_type=&item_id= —— 我的学习笔记 @@ -21,21 +28,16 @@ func ListNotes(c *gin.Context) { web.Fail(c, web.NewAuthError("未登录")) return } - q := store.DB.Where("user_id = ?", u.ID) - if t := c.Query("item_type"); t != "" { - q = q.Where("item_type = ?", t) - } + // item_id 解析失败（不是数字）就当没传 —— 不给一个错参数回 400， + // 笔记列表本来就是按内容可筛可不筛。 + var itemID *uint if s := c.Query("item_id"); s != "" { if n, err := strconv.ParseUint(s, 10, 64); err == nil { - q = q.Where("item_id = ?", n) + id := uint(n) + itemID = &id } } - var items []model.StudyNote - if err := q.Order("updated_at DESC").Find(&items).Error; err != nil { - web.Fail(c, web.NewBadRequest("查询笔记失败")) - return - } - web.OK(c, items) + web.OK(c, noteRepo.ListByUser(u.ID, c.Query("item_type"), itemID)) } // CreateNote POST /api/notes —— 新增学习笔记 @@ -63,7 +65,7 @@ func CreateNote(c *gin.Context) { return } n := model.StudyNote{UserID: u.ID, ItemType: req.ItemType, ItemID: req.ItemID, Content: strings.TrimSpace(req.Content)} - if err := store.DB.Create(&n).Error; err != nil { + if !noteRepo.Insert(&n) { web.Fail(c, web.NewBadRequest("保存笔记失败")) return } @@ -81,8 +83,8 @@ func UpdateNote(c *gin.Context) { if !ok { return } - var n model.StudyNote - if err := store.DB.First(&n, id).Error; err != nil { + n, found := noteRepo.GetByID(id) + if !found { web.Fail(c, web.NewNotFoundError("笔记不存在")) return } @@ -102,7 +104,7 @@ func UpdateNote(c *gin.Context) { return } n.Content = strings.TrimSpace(req.Content) - if err := store.DB.Save(&n).Error; err != nil { + if !noteRepo.Update(&n) { web.Fail(c, web.NewBadRequest("更新笔记失败")) return } @@ -120,8 +122,8 @@ func DeleteNote(c *gin.Context) { if !ok { return } - var n model.StudyNote - if err := store.DB.First(&n, id).Error; err != nil { + n, found := noteRepo.GetByID(id) + if !found { web.Fail(c, web.NewNotFoundError("笔记不存在")) return } @@ -129,7 +131,7 @@ func DeleteNote(c *gin.Context) { web.Fail(c, web.NewForbiddenError("无权操作他人笔记")) return } - if err := store.DB.Delete(&n).Error; err != nil { + if !noteRepo.Delete(&n) { web.Fail(c, web.NewBadRequest("删除笔记失败")) return } diff --git a/eai_agentplatform/backend-go/internal/api/project.go b/eai_agentplatform/backend-go/internal/api/project.go index c4a139d..87b711a 100644 --- a/eai_agentplatform/backend-go/internal/api/project.go +++ b/eai_agentplatform/backend-go/internal/api/project.go @@ -10,9 +10,7 @@ import ( "eai_agentplatform/backend/internal/middleware" "eai_agentplatform/backend/internal/model" - specialistmodel "eai_agentplatform/backend/internal/specialists/model" specialistruntime "eai_agentplatform/backend/internal/specialists/runtime" - "eai_agentplatform/backend/internal/store" "eai_agentplatform/backend/internal/web" ) @@ -33,8 +31,6 @@ type projectReq struct { Pinned *bool `json:"pinned"` } - - // encodeKeys 把 key 列表存成 JSON 字符串。空列表存空串而不是 "[]"， // 读的时候一眼能看出「没配」和「配了但为空」的区别不大，但空串更省。 func encodeKeys(keys []string) string { @@ -62,15 +58,7 @@ func ListProjects(c *gin.Context) { return } - var items []model.Project - if err := specialistruntime.ProjectQuery(user). - Order("pinned DESC, updated_at DESC, id DESC"). - Limit(50). - Find(&items).Error; err != nil { - web.Fail(c, web.NewBadRequest("查询项目失败")) - return - } - web.OK(c, items) + web.OK(c, projectRepo.ListByOwners(specialistruntime.MyTaskOwners(user), 50)) } // CreateProject 建一个项目。空 body 也收（跟「新建任务」一样，全走默认值）， @@ -117,7 +105,7 @@ func CreateProject(c *gin.Context) { SkillKeys: encodeKeys(req.SkillKeys), ConnectorKeys: encodeKeys(req.ConnectorKeys), } - if err := store.DB.Create(&project).Error; err != nil { + if !projectRepo.Insert(&project) { web.Fail(c, web.NewBadRequest("创建项目失败")) return } @@ -137,8 +125,8 @@ func UpdateProject(c *gin.Context) { return } - var project model.Project - if err := specialistruntime.ProjectQuery(user).Where("id = ?", id).First(&project).Error; err != nil { + project, found := projectRepo.GetByIDForOwners(id, specialistruntime.MyTaskOwners(user)) + if !found { web.Fail(c, web.NewNotFoundError("项目不存在")) return } @@ -181,7 +169,7 @@ func UpdateProject(c *gin.Context) { project.ConnectorKeys = encodeKeys(req.ConnectorKeys) } - if err := store.DB.Save(&project).Error; err != nil { + if !projectRepo.Update(&project) { web.Fail(c, web.NewBadRequest("更新项目失败")) return } @@ -204,18 +192,16 @@ func DeleteProject(c *gin.Context) { return } - var project model.Project - if err := specialistruntime.ProjectQuery(user).Where("id = ?", id).First(&project).Error; err != nil { + project, found := projectRepo.GetByIDForOwners(id, specialistruntime.MyTaskOwners(user)) + if !found { web.Fail(c, web.NewNotFoundError("项目不存在")) return } - if err := store.DB.Model(&model.TaskRecord{}). - Where("project_id = ?", project.ID). - Update("project_id", nil).Error; err != nil { + if !taskRecordRepo.ClearProject(project.ID) { web.Fail(c, web.NewBadRequest("解除任务归属失败")) return } - if err := store.DB.Delete(&project).Error; err != nil { + if !projectRepo.Delete(&project) { web.Fail(c, web.NewBadRequest("删除项目失败")) return } @@ -235,21 +221,13 @@ func ListProjectTasks(c *gin.Context) { return } - var project model.Project - if err := specialistruntime.ProjectQuery(user).Where("id = ?", id).First(&project).Error; err != nil { + project, found := projectRepo.GetByIDForOwners(id, specialistruntime.MyTaskOwners(user)) + if !found { web.Fail(c, web.NewNotFoundError("项目不存在")) return } - var items []model.TaskRecord - if err := store.DB.Where("project_id = ?", project.ID). - Order("updated_at DESC, id DESC"). - Limit(100). - Find(&items).Error; err != nil { - web.Fail(c, web.NewBadRequest("查询项目任务失败")) - return - } - web.OK(c, items) + web.OK(c, taskRecordRepo.ListByProject(project.ID, 100)) } // validateSpecialistKeys 专员 key 得真实存在才让存 —— 项目卡片上要显示专员名， @@ -262,8 +240,7 @@ func validateSpecialistKeys(keys []string) error { if trimmed == "" { continue } - var specialist specialistmodel.Specialist - if err := store.DB.Where("key = ?", trimmed).First(&specialist).Error; err != nil { + if _, found := specialistRepo.GetByKey(trimmed); !found { return errors.New("专员不存在：" + trimmed) } } diff --git a/eai_agentplatform/backend-go/internal/api/specialist_prompt.go b/eai_agentplatform/backend-go/internal/api/specialist_prompt.go index 0bfa17c..7587a32 100644 --- a/eai_agentplatform/backend-go/internal/api/specialist_prompt.go +++ b/eai_agentplatform/backend-go/internal/api/specialist_prompt.go @@ -4,10 +4,8 @@ import ( "fmt" "strings" - "eai_agentplatform/backend/internal/model" skillcore "eai_agentplatform/backend/internal/skills/core" specialistmodel "eai_agentplatform/backend/internal/specialists/model" - "eai_agentplatform/backend/internal/store" ) // 本文件回答一个问题：一次对话/一次动作，到底该以哪个专员的身份说话。 @@ -25,12 +23,10 @@ func loadSpecialistByKey(key string) *specialistmodel.Specialist { if key == "" { return nil } - var s specialistmodel.Specialist - if err := store.DB.Where("key = ?", key).First(&s).Error; err != nil { - return nil - } - // state = inactive 的专员不再接新会话，但 system（通用助手）要能查到。 - if s.State == "inactive" { + // state = inactive 的专员不再接新会话，但 system（通用助手）要能查到 —— + // 「要不要拒绝 inactive」这个口径只在这里，不去污染仓库的取数口径。 + s, found := specialistRepo.GetByKey(key) + if !found || s.State == "inactive" { return nil } return &s @@ -48,8 +44,7 @@ func resolveSpecialist(req ChatMessageRequest) *specialistmodel.Specialist { if req.TaskID > 0 { // 与 task_runtime.go 其余读路径一致，不按 created_by 收窄： // 专员目录本身就是所有登录用户可读的，这里不构成新的信息暴露。 - var task model.TaskRecord - if err := store.DB.First(&task, req.TaskID).Error; err == nil { + if task, found := taskRecordRepo.GetByID(req.TaskID); found { if s := loadSpecialistByKey(task.SpecialistKey); s != nil { return s } diff --git a/eai_agentplatform/backend-go/internal/api/specialist_prompt_test.go b/eai_agentplatform/backend-go/internal/api/specialist_prompt_test.go index 7b02306..1294919 100644 --- a/eai_agentplatform/backend-go/internal/api/specialist_prompt_test.go +++ b/eai_agentplatform/backend-go/internal/api/specialist_prompt_test.go @@ -10,6 +10,7 @@ import ( "gorm.io/gorm/logger" "eai_agentplatform/backend/internal/model" + "eai_agentplatform/backend/internal/repository" specialistmodel "eai_agentplatform/backend/internal/specialists/model" "eai_agentplatform/backend/internal/store" ) @@ -124,6 +125,12 @@ func setupAPITestDB(t *testing.T) { store.DB = db t.Cleanup(func() { store.DB = prev }) + // 取数现在走仓库层，零值仓库（repository.XxxRepo{}）的 base() 会回落到 + // 包级 repository.DB —— 这根线不接，第一个查询就是 nil 解引用。 + prevRepo := repository.DB + repository.SetDB(db) + t.Cleanup(func() { repository.SetDB(prevRepo) }) + for _, s := range []specialistmodel.Specialist{ {Key: "contract-review", Label: "合同审查专员", State: "active", Tier: "industry", ObjectEntryRoute: "/apps/contract-review"}, {Key: "report-generation", Label: "报告生成专员", State: "active", Tier: "generic", ObjectEntryRoute: "/apps/report-generation"}, diff --git a/eai_agentplatform/backend-go/internal/api/task_runtime.go b/eai_agentplatform/backend-go/internal/api/task_runtime.go index 3e6a42e..07d8040 100644 --- a/eai_agentplatform/backend-go/internal/api/task_runtime.go +++ b/eai_agentplatform/backend-go/internal/api/task_runtime.go @@ -7,30 +7,43 @@ import ( "time" "github.com/gin-gonic/gin" - "gorm.io/gorm" "eai_agentplatform/backend/internal/middleware" "eai_agentplatform/backend/internal/model" - specialistmodel "eai_agentplatform/backend/internal/specialists/model" + "eai_agentplatform/backend/internal/repository" wechatofficialaccountapi "eai_agentplatform/backend/internal/specialists/packages/wechat_official_account/api" specialistruntime "eai_agentplatform/backend/internal/specialists/runtime" - "eai_agentplatform/backend/internal/store" "eai_agentplatform/backend/internal/web" ) +// 任务域仓库，包内共享。 +// +// specialistRepo 还被 my_task.go、project.go、specialist_prompt.go 共用， +// projectRepo 还被 my_task.go 共用 —— 同一个仓库只声明一处： +// 两份变量持有同一个仓库时，测试里覆写一份、另一份照旧，行为会静默分叉。 +var ( + specialistRepo repository.SpecialistRepo + taskRecordRepo repository.TaskRecordRepo + taskRunRepo repository.TaskRunRepo + taskArtifactRepo repository.TaskArtifactRepo + projectRepo repository.ProjectRepo +) + +func init() { + specialistRepo = repository.SpecialistRepo{} + taskRecordRepo = repository.TaskRecordRepo{} + taskRunRepo = repository.TaskRunRepo{} + taskArtifactRepo = repository.TaskArtifactRepo{} + projectRepo = repository.ProjectRepo{} +} + func ListTasks(c *gin.Context) { specialistKey := strings.TrimSpace(c.Query("specialist_key")) if specialistKey == "" { web.Fail(c, web.NewBadRequest("specialist_key 不能为空")) return } - - var items []model.TaskRecord - if err := store.DB.Where("specialist_key = ?", specialistKey).Order("updated_at DESC, id DESC").Find(&items).Error; err != nil { - web.Fail(c, web.NewBadRequest("查询事项失败")) - return - } - web.OK(c, items) + web.OK(c, taskRecordRepo.ListBySpecialistKey(specialistKey)) } func GetTaskDetail(c *gin.Context) { @@ -39,23 +52,14 @@ func GetTaskDetail(c *gin.Context) { return } - var task model.TaskRecord - if err := store.DB.First(&task, id).Error; err != nil { + task, found := taskRecordRepo.GetByID(id) + if !found { web.Fail(c, web.NewNotFoundError("事项不存在")) return } - var artifacts []model.TaskArtifact - if err := store.DB.Where("task_id = ?", id).Order("created_at DESC, id DESC").Find(&artifacts).Error; err != nil { - web.Fail(c, web.NewBadRequest("查询交付物失败")) - return - } - - var runs []model.TaskRun - if err := store.DB.Where("task_id = ?", id).Order("started_at DESC, id DESC").Find(&runs).Error; err != nil { - web.Fail(c, web.NewBadRequest("查询运行记录失败")) - return - } + artifacts := taskArtifactRepo.ListByTask(id) + runs := taskRunRepo.ListByTask(id) if task.SpecialistKey == wechatofficialaccountapi.OfficialAccountSpecialistKey { artifacts = wechatofficialaccountapi.CompactOfficialAccountArtifactsForResponse(artifacts) runs = wechatofficialaccountapi.CompactOfficialAccountRunsForResponse(runs) @@ -75,22 +79,21 @@ func GetArtifactDetail(c *gin.Context) { return } - var artifact model.TaskArtifact - if err := store.DB.First(&artifact, id).Error; err != nil { + artifact, found := taskArtifactRepo.GetByID(id) + if !found { web.Fail(c, web.NewNotFoundError("交付物不存在")) return } - var task model.TaskRecord - if err := store.DB.First(&task, artifact.TaskID).Error; err != nil { + task, found := taskRecordRepo.GetByID(artifact.TaskID) + if !found { web.Fail(c, web.NewNotFoundError("事项不存在")) return } - var run model.TaskRun var runData any if artifact.CreatedByRunID != nil { - if err := store.DB.First(&run, *artifact.CreatedByRunID).Error; err == nil { + if run, ok := taskRunRepo.GetByID(*artifact.CreatedByRunID); ok { runData = run } } @@ -113,8 +116,8 @@ func CreateTask(c *gin.Context) { return } - var specialist specialistmodel.Specialist - if err := store.DB.Where("key = ?", strings.TrimSpace(req.SpecialistKey)).First(&specialist).Error; err != nil { + specialist, found := specialistRepo.GetByKey(strings.TrimSpace(req.SpecialistKey)) + if !found { web.Fail(c, web.NewNotFoundError("专员不存在")) return } @@ -132,7 +135,7 @@ func CreateTask(c *gin.Context) { task.Status = "待处理" } - if err := store.DB.Create(&task).Error; err != nil { + if !taskRecordRepo.Insert(&task) { web.Fail(c, web.NewBadRequest("创建事项失败")) return } @@ -145,8 +148,8 @@ func UpdateTask(c *gin.Context) { return } - var task model.TaskRecord - if err := store.DB.First(&task, id).Error; err != nil { + task, found := taskRecordRepo.GetByID(id) + if !found { web.Fail(c, web.NewNotFoundError("事项不存在")) return } @@ -163,9 +166,9 @@ func UpdateTask(c *gin.Context) { return } - if strings.TrimSpace(req.SpecialistKey) != "" && strings.TrimSpace(req.SpecialistKey) != task.SpecialistKey { - var specialist specialistmodel.Specialist - if err := store.DB.Where("key = ?", strings.TrimSpace(req.SpecialistKey)).First(&specialist).Error; err != nil { + if key := strings.TrimSpace(req.SpecialistKey); key != "" && key != task.SpecialistKey { + specialist, ok := specialistRepo.GetByKey(key) + if !ok { web.Fail(c, web.NewNotFoundError("目标专员不存在")) return } @@ -178,7 +181,7 @@ func UpdateTask(c *gin.Context) { task.Status = specialistruntime.NormalizeTaskStatus(updated.Status) task.ContextJSON = updated.ContextJSON task.DueAt = updated.DueAt - if err := store.DB.Save(&task).Error; err != nil { + if !taskRecordRepo.Update(&task) { web.Fail(c, web.NewBadRequest("更新事项失败")) return } @@ -191,8 +194,8 @@ func UpdateTaskStatus(c *gin.Context) { return } - var task model.TaskRecord - if err := store.DB.First(&task, id).Error; err != nil { + task, found := taskRecordRepo.GetByID(id) + if !found { web.Fail(c, web.NewNotFoundError("事项不存在")) return } @@ -208,7 +211,7 @@ func UpdateTaskStatus(c *gin.Context) { return } task.Status = status - if err := store.DB.Save(&task).Error; err != nil { + if !taskRecordRepo.Update(&task) { web.Fail(c, web.NewBadRequest("更新事项状态失败")) return } @@ -221,24 +224,14 @@ func DeleteTask(c *gin.Context) { return } - var task model.TaskRecord - if err := store.DB.First(&task, id).Error; err != nil { + task, found := taskRecordRepo.GetByID(id) + if !found { web.Fail(c, web.NewNotFoundError("事项不存在")) return } - if err := store.DB.Transaction(func(tx *gorm.DB) error { - if err := tx.Where("task_id = ?", task.ID).Delete(&model.TaskArtifact{}).Error; err != nil { - return err - } - if err := tx.Where("task_id = ?", task.ID).Delete(&model.TaskRun{}).Error; err != nil { - return err - } - if err := tx.Delete(&task).Error; err != nil { - return err - } - return nil - }); err != nil { + // 交付物与运行记录跟着任务一起走，三张表在同一个事务里。 + if !taskRecordRepo.DeleteCascade(task.ID) { web.Fail(c, web.NewBadRequest("删除事项失败")) return } @@ -252,13 +245,13 @@ func UpdateArtifactStatus(c *gin.Context) { return } - var artifact model.TaskArtifact - if err := store.DB.First(&artifact, id).Error; err != nil { + artifact, found := taskArtifactRepo.GetByID(id) + if !found { web.Fail(c, web.NewNotFoundError("交付物不存在")) return } - var task model.TaskRecord - if err := store.DB.First(&task, artifact.TaskID).Error; err != nil { + task, found := taskRecordRepo.GetByID(artifact.TaskID) + if !found { web.Fail(c, web.NewNotFoundError("事项不存在")) return } @@ -274,14 +267,14 @@ func UpdateArtifactStatus(c *gin.Context) { return } artifact.Status = nextStatus - if err := store.DB.Save(&artifact).Error; err != nil { + if !taskArtifactRepo.Update(&artifact) { web.Fail(c, web.NewBadRequest("更新交付物状态失败")) return } task.Status = specialistruntime.TaskStatusFromArtifactStatus(nextStatus) task.CurrentResult = specialistruntime.BuildArtifactStatusSummary(artifact, strings.TrimSpace(req.Remark)) - if err := store.DB.Save(&task).Error; err != nil { + if !taskRecordRepo.Update(&task) { web.Fail(c, web.NewBadRequest("更新事项状态失败")) return } @@ -298,13 +291,13 @@ func ExecuteTaskAction(c *gin.Context) { return } - var task model.TaskRecord - if err := store.DB.First(&task, id).Error; err != nil { + task, found := taskRecordRepo.GetByID(id) + if !found { web.Fail(c, web.NewNotFoundError("事项不存在")) return } - var specialist specialistmodel.Specialist - if err := store.DB.Where("key = ?", task.SpecialistKey).First(&specialist).Error; err != nil { + specialist, found := specialistRepo.GetByKey(task.SpecialistKey) + if !found { web.Fail(c, web.NewNotFoundError("专员不存在")) return } @@ -350,7 +343,7 @@ func ExecuteTaskAction(c *gin.Context) { StartedAt: now, FinishedAt: &now, } - if err := store.DB.Create(&run).Error; err != nil { + if !taskRunRepo.Insert(&run) { web.Fail(c, web.NewBadRequest("执行动作失败")) return } @@ -369,7 +362,7 @@ func ExecuteTaskAction(c *gin.Context) { SourceRefsJSON: string(sourceRefsJSON), CreatedByRunID: &run.ID, } - if err := store.DB.Create(artifact).Error; err != nil { + if !taskArtifactRepo.Insert(artifact) { web.Fail(c, web.NewBadRequest("保存交付物失败")) return } @@ -379,7 +372,7 @@ func ExecuteTaskAction(c *gin.Context) { task.CurrentRunID = &run.ID task.CurrentResult = runOutput.Summary task.LastTriggeredAt = &now - if err := store.DB.Save(&task).Error; err != nil { + if !taskRecordRepo.Update(&task) { web.Fail(c, web.NewBadRequest("更新事项状态失败")) return } @@ -391,18 +384,17 @@ func ExecuteTaskAction(c *gin.Context) { }) } +// ensureBootstrapTask 某专员名下一条任务都没有时，铺一条默认任务。 +// +// 注意：目前全仓没有调用方（保留原样迁到仓库层，未删）。 func ensureBootstrapTask(specialistKey string, user *model.User) error { - var count int64 - if err := store.DB.Model(&model.TaskRecord{}).Where("specialist_key = ?", specialistKey).Count(&count).Error; err != nil { - return err - } - if count > 0 { + if taskRecordRepo.CountBySpecialistKey(specialistKey) > 0 { return nil } - var specialist specialistmodel.Specialist - if err := store.DB.Where("key = ?", specialistKey).First(&specialist).Error; err != nil { - return err + specialist, found := specialistRepo.GetByKey(specialistKey) + if !found { + return fmt.Errorf("专员不存在：%s", specialistKey) } now := time.Now() @@ -427,7 +419,10 @@ func ensureBootstrapTask(specialistKey string, user *model.User) error { if user != nil { task.CreatedBy = &user.ID } - return store.DB.Create(&task).Error + if !taskRecordRepo.Insert(&task) { + return fmt.Errorf("创建铺底任务失败") + } + return nil } func buildBottomPanel(runs []model.TaskRun) gin.H { diff --git a/eai_agentplatform/backend-go/internal/repository/action_definition.go b/eai_agentplatform/backend-go/internal/repository/action_definition.go new file mode 100644 index 0000000..80d7a1f --- /dev/null +++ b/eai_agentplatform/backend-go/internal/repository/action_definition.go @@ -0,0 +1,57 @@ +package repository + +import ( + "eai_agentplatform/backend/internal/model" +) + +// ActionDefinition 原子执行动作定义仓库。 +type ActionDefinitionRepo struct{ *QueryBuilder } + +// List 全部动作定义（sort_order ASC, id ASC）。 +// +// 这里不替调用方定 state 默认值：列表接口「不传 state 就只看 active」是接口契约， +// 由 handler 解析 query 参数后把结果传进来。 +func (r ActionDefinitionRepo) List(state string) []model.ActionDefinition { + q := r.Type(&model.ActionDefinition{}) + if state != "" { + q = q.Where("state = ?", state) + } + var items []model.ActionDefinition + if q.Order("sort_order ASC, id ASC").Find(&items) { + return items + } + return nil +} + +// GetByID 按 ID 取。 +func (r ActionDefinitionRepo) GetByID(id uint) (model.ActionDefinition, bool) { + var a model.ActionDefinition + if r.Type(&a).Where("id = ?", id).First(&a) { + return a, true + } + return model.ActionDefinition{}, false +} + +// GetByKey 按 key 取（key 上有唯一索引）。 +func (r ActionDefinitionRepo) GetByKey(key string) (model.ActionDefinition, bool) { + var a model.ActionDefinition + if r.Type(&a).Where("key = ?", key).First(&a) { + return a, true + } + return model.ActionDefinition{}, false +} + +// Insert 新建。 +func (r ActionDefinitionRepo) Insert(a *model.ActionDefinition) bool { + return r.QueryBuilder.Insert(a) +} + +// Update 更新。 +func (r ActionDefinitionRepo) Update(a *model.ActionDefinition) bool { + return r.Save(a) +} + +// Delete 硬删除。 +func (r ActionDefinitionRepo) Delete(a *model.ActionDefinition) bool { + return r.QueryBuilder.Delete(a) +} diff --git a/eai_agentplatform/backend-go/internal/repository/project.go b/eai_agentplatform/backend-go/internal/repository/project.go new file mode 100644 index 0000000..56d002b --- /dev/null +++ b/eai_agentplatform/backend-go/internal/repository/project.go @@ -0,0 +1,52 @@ +package repository + +import ( + "eai_agentplatform/backend/internal/model" +) + +// Project 项目仓库（任务的容器）。 +type ProjectRepo struct{ *QueryBuilder } + +// GetByIDForOwners 按 ID 取项目，且必须归属于 owners 里的一员。 +// +// owners 为空时查不到任何东西（而不是查到全部）——跟任务同一套归属口径， +// 别人的项目和不存在的项目在这里不做区分，调用方一律回 404。 +func (r ProjectRepo) GetByIDForOwners(id uint, owners []string) (model.Project, bool) { + var p model.Project + if ownerScope(r.Type(&p), owners).Where("id = ?", id).First(&p) { + return p, true + } + return model.Project{}, false +} + +// ListByOwners 「我的项目」：置顶的排前面，其余按最近动过的排。 +// limit <= 0 表示不设上限。 +func (r ProjectRepo) ListByOwners(owners []string, limit int) []model.Project { + q := ownerScope(r.Type(&model.Project{}), owners) + if limit > 0 { + q = q.Limit(limit) + } + var items []model.Project + if q.Order("pinned DESC, updated_at DESC, id DESC").Find(&items) { + return items + } + return nil +} + +// Insert 新建项目。 +func (r ProjectRepo) Insert(p *model.Project) bool { + return r.QueryBuilder.Insert(p) +} + +// Update 更新项目。 +func (r ProjectRepo) Update(p *model.Project) bool { + return r.Save(p) +} + +// Delete 删除项目。 +// +// 项目里的任务**不删**——先由调用方把它们的 project_id 置空（见 +// TaskRecordRepo.ClearProject），再删项目本身。 +func (r ProjectRepo) Delete(p *model.Project) bool { + return r.QueryBuilder.Delete(p) +} diff --git a/eai_agentplatform/backend-go/internal/repository/specialist.go b/eai_agentplatform/backend-go/internal/repository/specialist.go new file mode 100644 index 0000000..40a6066 --- /dev/null +++ b/eai_agentplatform/backend-go/internal/repository/specialist.go @@ -0,0 +1,110 @@ +package repository + +import ( + specialistmodel "eai_agentplatform/backend/internal/specialists/model" +) + +// Specialist 数字员工专员目录仓库。 +// +// 模型定义在 specialists 领域包内（internal/specialists/model），取数统一走这里—— +// 「按 key 找专员」原先在 4 个文件里各写了一遍，散着改迟早分叉。 +type SpecialistRepo struct{ *QueryBuilder } + +// GetByKey 按 key 取专员，**不限 state**。 +// +// 不过滤 state 是有意的：调用方对「停用的专员算不算数」口径不同—— +// 建任务时要能查到（任务挂在已下线的专员上仍要能解释）， +// 而对话取 prompt 时要拒绝 inactive。把口径留在调用方，这里只负责取数。 +func (r SpecialistRepo) GetByKey(key string) (specialistmodel.Specialist, bool) { + var s specialistmodel.Specialist + if r.Type(&s).Where("key = ?", key).First(&s) { + return s, true + } + return specialistmodel.Specialist{}, false +} + +// GetByID 按 ID 取专员。 +func (r SpecialistRepo) GetByID(id uint) (specialistmodel.Specialist, bool) { + var s specialistmodel.Specialist + if r.Type(&s).Where("id = ?", id).First(&s) { + return s, true + } + return specialistmodel.Specialist{}, false +} + +// Query 返回专员表的查询构建器（已 Type 好）。 +// +// 给「带自己那套 state 策略」的调用方用——比如按 key 取且非管理员只认 active、 +// 或者按 state 分档计数。这类策略是各接口自己的口径，不在这里替它们定。 +func (r SpecialistRepo) Query() *QueryBuilder { + return r.QueryBuilder.Query().Type(&specialistmodel.Specialist{}) +} + +// List 专员目录列表（sort_order ASC, id ASC）。 +// +// state 的档位是接口契约，调用方直接透传 query 参数： +// - ""（默认）：仅 active —— 员工浏览视角 +// - "all"：管理员看全部状态，非管理员仍只看 active +// - "system"：仅 system（通用助手那条内置记录） +// - 其它：按该状态精确匹配 +// +// 除显式要 system 外，一律排除 system 记录——它是内置的通用助手， +// 不该混进专员目录里让人当成一个可选的专员。 +func (r SpecialistRepo) List(tier, marketTag, state string, isAdmin bool) []specialistmodel.Specialist { + q := r.Type(&specialistmodel.Specialist{}) + if tier != "" { + q = q.Where("tier = ?", tier) + } + if marketTag != "" { + q = q.Where("market_tag = ?", marketTag) + } + switch state { + case "": + q = q.Where("state = ?", "active") + case "all": + if !isAdmin { + q = q.Where("state = ?", "active") + } + case "system": + q = q.Where("state = ?", "system") + default: + q = q.Where("state = ?", state) + } + if state != "system" { + q = q.Where("state <> ?", "system") + } + var items []specialistmodel.Specialist + if q.Order("sort_order ASC, id ASC").Find(&items) { + return items + } + return nil +} + +// CountByKey 按 key 统计（唯一性检查）。excludeID 用于更新时排除自身，nil 表示不排除。 +func (r SpecialistRepo) CountByKey(key string, excludeID *uint) int64 { + q := r.Inner().Model(&specialistmodel.Specialist{}).Where("key = ?", key) + if excludeID != nil { + q = q.Where("id <> ?", *excludeID) + } + var c int64 + q.Count(&c) + return c +} + +// Insert 新建专员。 +func (r SpecialistRepo) Insert(s *specialistmodel.Specialist) bool { + return r.QueryBuilder.Insert(s) +} + +// Update 更新专员。 +func (r SpecialistRepo) Update(s *specialistmodel.Specialist) bool { + return r.Save(s) +} + +// Delete 硬删除专员。 +// +// 表上没有软删字段，删了就是删了——跟「停用」（state=inactive）是两回事： +// 停用还留着记录、还能查到，删除会让挂在它名下的历史任务失去解释依据。 +func (r SpecialistRepo) Delete(id uint) bool { + return r.Type(&specialistmodel.Specialist{}).Where("id = ?", id).Delete(&specialistmodel.Specialist{}) +} diff --git a/eai_agentplatform/backend-go/internal/repository/study_note.go b/eai_agentplatform/backend-go/internal/repository/study_note.go new file mode 100644 index 0000000..c3982c7 --- /dev/null +++ b/eai_agentplatform/backend-go/internal/repository/study_note.go @@ -0,0 +1,52 @@ +package repository + +import ( + "eai_agentplatform/backend/internal/model" +) + +// StudyNote 学习笔记仓库（员工私人笔记，按 user_id 隔离）。 +type StudyNoteRepo struct{ *QueryBuilder } + +// ListByUser 某用户的笔记，最近改过的在前。 +// +// itemType 为空表示不按内容类型过滤；itemID 为 nil 表示不按内容 ID 过滤 +// （指针而非 0 值，是因为 company 类笔记的 item_id 本来就固定是 0）。 +func (r StudyNoteRepo) ListByUser(userID uint, itemType string, itemID *uint) []model.StudyNote { + q := r.Type(&model.StudyNote{}).Where("user_id = ?", userID) + if itemType != "" { + q = q.Where("item_type = ?", itemType) + } + if itemID != nil { + q = q.Where("item_id = ?", *itemID) + } + var items []model.StudyNote + if q.Order("updated_at DESC").Find(&items) { + return items + } + return nil +} + +// GetByID 按 ID 取笔记。**不在这里判归属**——越权检查留在 handler， +// 那里能把「不存在」和「不是你的」分别回成 404 / 403。 +func (r StudyNoteRepo) GetByID(id uint) (model.StudyNote, bool) { + var n model.StudyNote + if r.Type(&n).Where("id = ?", id).First(&n) { + return n, true + } + return model.StudyNote{}, false +} + +// Insert 新建笔记。 +func (r StudyNoteRepo) Insert(n *model.StudyNote) bool { + return r.QueryBuilder.Insert(n) +} + +// Update 更新笔记。 +func (r StudyNoteRepo) Update(n *model.StudyNote) bool { + return r.Save(n) +} + +// Delete 删除笔记（硬删，表上没有软删字段）。 +func (r StudyNoteRepo) Delete(n *model.StudyNote) bool { + return r.QueryBuilder.Delete(n) +} diff --git a/eai_agentplatform/backend-go/internal/repository/task_artifact.go b/eai_agentplatform/backend-go/internal/repository/task_artifact.go new file mode 100644 index 0000000..82886ab --- /dev/null +++ b/eai_agentplatform/backend-go/internal/repository/task_artifact.go @@ -0,0 +1,37 @@ +package repository + +import ( + "eai_agentplatform/backend/internal/model" +) + +// TaskArtifact 专员交付物仓库。 +type TaskArtifactRepo struct{ *QueryBuilder } + +// GetByID 按 ID 取交付物。 +func (r TaskArtifactRepo) GetByID(id uint) (model.TaskArtifact, bool) { + var a model.TaskArtifact + if r.Type(&a).Where("id = ?", id).First(&a) { + return a, true + } + return model.TaskArtifact{}, false +} + +// ListByTask 某任务的全部交付物（最近产出的在前）。 +func (r TaskArtifactRepo) ListByTask(taskID uint) []model.TaskArtifact { + var items []model.TaskArtifact + if r.Type(&items).Where("task_id = ?", taskID). + Order("created_at DESC, id DESC").Find(&items) { + return items + } + return nil +} + +// Insert 新建交付物。 +func (r TaskArtifactRepo) Insert(a *model.TaskArtifact) bool { + return r.QueryBuilder.Insert(a) +} + +// Update 更新交付物（状态流转走这里）。 +func (r TaskArtifactRepo) Update(a *model.TaskArtifact) bool { + return r.Save(a) +} diff --git a/eai_agentplatform/backend-go/internal/repository/task_record.go b/eai_agentplatform/backend-go/internal/repository/task_record.go new file mode 100644 index 0000000..6b7cf9c --- /dev/null +++ b/eai_agentplatform/backend-go/internal/repository/task_record.go @@ -0,0 +1,125 @@ +package repository + +import ( + "gorm.io/gorm" + + "eai_agentplatform/backend/internal/model" +) + +// TaskRecord 专员事项/任务仓库。 +// +// 任务是这个聚合的根：交付物（task_artifact）与运行记录（task_run）都挂在它下面， +// 所以级联删除也放在这里，而不是让 handler 去协调三个仓库。 +type TaskRecordRepo struct{ *QueryBuilder } + +// GetByID 按 ID 取任务。 +func (r TaskRecordRepo) GetByID(id uint) (model.TaskRecord, bool) { + var t model.TaskRecord + if r.Type(&t).Where("id = ?", id).First(&t) { + return t, true + } + return model.TaskRecord{}, false +} + +// GetByIDForOwners 按 ID 取任务，且必须归属于 owners 里的一员。 +// +// owners 为空时查不到任何东西（而不是查到全部）：归属标识缺失时必须退化成 +// 「什么都看不到」，绝不能反过来退化成「看所有人的」。 +func (r TaskRecordRepo) GetByIDForOwners(id uint, owners []string) (model.TaskRecord, bool) { + var t model.TaskRecord + if ownerScope(r.Type(&t), owners).Where("id = ?", id).First(&t) { + return t, true + } + return model.TaskRecord{}, false +} + +// ListBySpecialistKey 某专员名下的全部任务（最近更新的在前）。 +func (r TaskRecordRepo) ListBySpecialistKey(specialistKey string) []model.TaskRecord { + var items []model.TaskRecord + if r.Type(&items).Where("specialist_key = ?", specialistKey). + Order("updated_at DESC, id DESC").Find(&items) { + return items + } + return nil +} + +// ListByOwners 「我的任务」：置顶的排前面，其余按最近动过的排。 +// limit <= 0 表示不设上限。 +func (r TaskRecordRepo) ListByOwners(owners []string, limit int) []model.TaskRecord { + q := ownerScope(r.Type(&model.TaskRecord{}), owners) + if limit > 0 { + q = q.Limit(limit) + } + var items []model.TaskRecord + if q.Order("pinned DESC, updated_at DESC, id DESC").Find(&items) { + return items + } + return nil +} + +// ListByProject 项目下的任务（最近更新的在前）。limit <= 0 表示不设上限。 +func (r TaskRecordRepo) ListByProject(projectID uint, limit int) []model.TaskRecord { + q := r.Type(&model.TaskRecord{}).Where("project_id = ?", projectID) + if limit > 0 { + q = q.Limit(limit) + } + var items []model.TaskRecord + if q.Order("updated_at DESC, id DESC").Find(&items) { + return items + } + return nil +} + +// CountBySpecialistKey 统计某专员名下的任务数（首次进入时判断要不要铺底任务）。 +func (r TaskRecordRepo) CountBySpecialistKey(specialistKey string) int64 { + var c int64 + r.Inner().Model(&model.TaskRecord{}).Where("specialist_key = ?", specialistKey).Count(&c) + return c +} + +// Insert 新建任务。 +func (r TaskRecordRepo) Insert(t *model.TaskRecord) bool { + return r.QueryBuilder.Insert(t) +} + +// Update 更新任务。 +func (r TaskRecordRepo) Update(t *model.TaskRecord) bool { + return r.Save(t) +} + +// Delete 删除单条任务（不动它的交付物与运行记录，级联请用 DeleteCascade）。 +func (r TaskRecordRepo) Delete(t *model.TaskRecord) bool { + return r.QueryBuilder.Delete(t) +} + +// ClearProject 把项目下的任务全部解除归属（project_id 置空）。 +// +// 任务是「做过的事」，删一个分组不该把它一起抹掉，所以只解除归属、不删记录。 +func (r TaskRecordRepo) ClearProject(projectID uint) bool { + return r.Type(&model.TaskRecord{}).Where("project_id = ?", projectID). + UpdateColumn("project_id", nil) +} + +// DeleteCascade 删任务，连同它的交付物与运行记录。 +// +// 三张表必须一起成功或一起失败——留下没有任务的交付物，详情页就再也点不进去了。 +func (r TaskRecordRepo) DeleteCascade(id uint) bool { + err := r.Inner().Transaction(func(tx *gorm.DB) error { + if err := tx.Where("task_id = ?", id).Delete(&model.TaskArtifact{}).Error; err != nil { + return err + } + if err := tx.Where("task_id = ?", id).Delete(&model.TaskRun{}).Error; err != nil { + return err + } + return tx.Delete(&model.TaskRecord{}, id).Error + }) + return err == nil +} + +// ownerScope 给查询套上归属范围。owners 为空时套一个恒假条件（空集，不是全表）。 +func ownerScope(q *QueryBuilder, owners []string) *QueryBuilder { + if len(owners) == 0 { + return q.Where("1 = 0") + } + return q.Where("owner IN ?", owners) +} diff --git a/eai_agentplatform/backend-go/internal/repository/task_run.go b/eai_agentplatform/backend-go/internal/repository/task_run.go new file mode 100644 index 0000000..bf037da --- /dev/null +++ b/eai_agentplatform/backend-go/internal/repository/task_run.go @@ -0,0 +1,34 @@ +package repository + +import ( + "eai_agentplatform/backend/internal/model" +) + +// TaskRun 专员动作运行记录仓库。 +// +// 运行记录只增不改：一次动作一条，是任务详情的「时间线/回放」底稿。 +type TaskRunRepo struct{ *QueryBuilder } + +// GetByID 按 ID 取运行记录。 +func (r TaskRunRepo) GetByID(id uint) (model.TaskRun, bool) { + var run model.TaskRun + if r.Type(&run).Where("id = ?", id).First(&run) { + return run, true + } + return model.TaskRun{}, false +} + +// ListByTask 某任务的全部运行记录（最近开始的在前）。 +func (r TaskRunRepo) ListByTask(taskID uint) []model.TaskRun { + var items []model.TaskRun + if r.Type(&items).Where("task_id = ?", taskID). + Order("started_at DESC, id DESC").Find(&items) { + return items + } + return nil +} + +// Insert 追加一条运行记录。 +func (r TaskRunRepo) Insert(run *model.TaskRun) bool { + return r.QueryBuilder.Insert(run) +} diff --git a/eai_agentplatform/backend-go/internal/skills/api/office_handlers.go b/eai_agentplatform/backend-go/internal/skills/api/office_handlers.go index 1ab3285..e94d697 100644 --- a/eai_agentplatform/backend-go/internal/skills/api/office_handlers.go +++ b/eai_agentplatform/backend-go/internal/skills/api/office_handlers.go @@ -20,10 +20,20 @@ import ( "eai_agentplatform/backend/internal/middleware" "eai_agentplatform/backend/internal/model" + "eai_agentplatform/backend/internal/repository" "eai_agentplatform/backend/internal/store" "eai_agentplatform/backend/internal/web" ) +// taskRecordRepo 任务仓库（便于测试时覆写）。本文件里还有两处 +// store.DB.Transaction —— 运行记录和交付物要在同一个事务里落库， +// QueryBuilder 不带事务，那两处维持原样。 +var taskRecordRepo repository.TaskRecordRepo + +func init() { + taskRecordRepo = repository.TaskRecordRepo{} +} + type officeSkillExecuteReq struct { TaskID uint `json:"task_id"` SkillKey string `json:"skill_key"` @@ -304,18 +314,20 @@ func persistOfficeExecution(task model.TaskRecord, definition officecontracts.Ru } func loadMyOwnedTask(c *gin.Context, user *model.User, taskID uint) (model.TaskRecord, bool) { - var task model.TaskRecord - if err := specialistruntime.MyTaskQuery(user).Where("id = ?", taskID).First(&task).Error; err != nil { + task, found := taskRecordRepo.GetByIDForOwners(taskID, specialistruntime.MyTaskOwners(user)) + if !found { web.Fail(c, web.NewNotFoundError("任务不存在")) - return task, false + return model.TaskRecord{}, false } return task, true } func reloadTask(taskID uint) (model.TaskRecord, error) { - var task model.TaskRecord - err := store.DB.First(&task, taskID).Error - return task, err + task, found := taskRecordRepo.GetByID(taskID) + if !found { + return model.TaskRecord{}, gorm.ErrRecordNotFound + } + return task, nil } func anyToStrings(value any) []string { diff --git a/eai_agentplatform/backend-go/internal/specialists/api/admin_handlers.go b/eai_agentplatform/backend-go/internal/specialists/api/admin_handlers.go index 72ae216..e7b23d3 100644 --- a/eai_agentplatform/backend-go/internal/specialists/api/admin_handlers.go +++ b/eai_agentplatform/backend-go/internal/specialists/api/admin_handlers.go @@ -5,12 +5,20 @@ import ( "github.com/gin-gonic/gin" + "eai_agentplatform/backend/internal/repository" specialistmodel "eai_agentplatform/backend/internal/specialists/model" specialistruntime "eai_agentplatform/backend/internal/specialists/runtime" - "eai_agentplatform/backend/internal/store" "eai_agentplatform/backend/internal/web" ) +// specialistRepo 专员目录仓库（便于测试时覆写）。query_handlers.go 里的读接口共用， +// 声明只此一处。 +var specialistRepo repository.SpecialistRepo + +func init() { + specialistRepo = repository.SpecialistRepo{} +} + // CreateSpecialist POST /api/specialists (admin) func CreateSpecialist(c *gin.Context) { var req specialistReq @@ -23,9 +31,7 @@ func CreateSpecialist(c *gin.Context) { return } - var count int64 - store.DB.Model(&specialistmodel.Specialist{}).Where("key = ?", req.Key).Count(&count) - if count > 0 { + if specialistRepo.CountByKey(req.Key, nil) > 0 { web.Fail(c, web.NewConflictError("专员 key 已存在")) return } @@ -64,7 +70,7 @@ func CreateSpecialist(c *gin.Context) { SortOrder: req.SortOrder, } specialistruntime.EnsureStructuredRecords(&item) - if err := store.DB.Create(&item).Error; err != nil { + if !specialistRepo.Insert(&item) { web.Fail(c, web.NewBadRequest("创建专员失败")) return } @@ -77,8 +83,8 @@ func UpdateSpecialist(c *gin.Context) { if !ok { return } - var item specialistmodel.Specialist - if err := store.DB.First(&item, id).Error; err != nil { + item, found := specialistRepo.GetByID(id) + if !found { web.Fail(c, web.NewNotFoundError("专员不存在")) return } @@ -93,9 +99,7 @@ func UpdateSpecialist(c *gin.Context) { return } - var count int64 - store.DB.Model(&specialistmodel.Specialist{}).Where("key = ? AND id <> ?", req.Key, id).Count(&count) - if count > 0 { + if specialistRepo.CountByKey(req.Key, &id) > 0 { web.Fail(c, web.NewConflictError("专员 key 已存在")) return } @@ -133,7 +137,7 @@ func UpdateSpecialist(c *gin.Context) { item.SortOrder = req.SortOrder specialistruntime.EnsureStructuredRecords(&item) - if err := store.DB.Save(&item).Error; err != nil { + if !specialistRepo.Update(&item) { web.Fail(c, web.NewBadRequest("更新专员失败")) return } @@ -146,12 +150,11 @@ func DeleteSpecialist(c *gin.Context) { if !ok { return } - var item specialistmodel.Specialist - if err := store.DB.First(&item, id).Error; err != nil { + if _, found := specialistRepo.GetByID(id); !found { web.Fail(c, web.NewNotFoundError("专员不存在")) return } - if err := store.DB.Delete(&item).Error; err != nil { + if !specialistRepo.Delete(id) { web.Fail(c, web.NewBadRequest("删除专员失败")) return } diff --git a/eai_agentplatform/backend-go/internal/specialists/api/query_handlers.go b/eai_agentplatform/backend-go/internal/specialists/api/query_handlers.go index 4e3e7dd..e343d57 100644 --- a/eai_agentplatform/backend-go/internal/specialists/api/query_handlers.go +++ b/eai_agentplatform/backend-go/internal/specialists/api/query_handlers.go @@ -8,42 +8,15 @@ import ( "eai_agentplatform/backend/internal/middleware" specialistmodel "eai_agentplatform/backend/internal/specialists/model" specialistruntime "eai_agentplatform/backend/internal/specialists/runtime" - "eai_agentplatform/backend/internal/store" "eai_agentplatform/backend/internal/web" ) // ListSpecialists GET /api/specialists?tier=&state=&market_tag= func ListSpecialists(c *gin.Context) { - q := store.DB.Model(&specialistmodel.Specialist{}) - if tier := c.Query("tier"); tier != "" { - q = q.Where("tier = ?", tier) - } - if marketTag := c.Query("market_tag"); marketTag != "" { - q = q.Where("market_tag = ?", marketTag) - } user := middleware.CurrentUser(c) isAdmin := user != nil && user.Role == "admin" - switch state := c.Query("state"); state { - case "": - q = q.Where("state = ?", "active") - case "all": - if !isAdmin { - q = q.Where("state = ?", "active") - } - case "system": - q = q.Where("state = ?", "system") - default: - q = q.Where("state = ?", state) - } - if c.Query("state") != "system" { - q = q.Where("state <> ?", "system") - } - var items []specialistmodel.Specialist - if err := q.Order("sort_order ASC, id ASC").Find(&items).Error; err != nil { - web.Fail(c, web.NewBadRequest("查询专员目录失败")) - return - } + items := specialistRepo.List(c.Query("tier"), c.Query("market_tag"), c.Query("state"), isAdmin) for i := range items { specialistruntime.EnsureStructuredRecords(&items[i]) } @@ -58,7 +31,7 @@ func GetSpecialistByKey(c *gin.Context) { return } - q := store.DB.Model(&specialistmodel.Specialist{}).Where("key = ?", key) + q := specialistRepo.Query().Where("key = ?", key) user := middleware.CurrentUser(c) isAdmin := user != nil && user.Role == "admin" if !isAdmin { @@ -66,7 +39,7 @@ func GetSpecialistByKey(c *gin.Context) { } var item specialistmodel.Specialist - if err := q.First(&item).Error; err != nil { + if !q.First(&item) { web.Fail(c, web.NewNotFoundError("专员不存在")) return } @@ -87,14 +60,14 @@ func SpecialistSummary(c *gin.Context) { } var resp summary + // column 全是代码里写死的常量（tier / specialist_mode / market_tag）， + // 没有一处来自请求参数。 count := func(column string, value string) int64 { - var total int64 - q := store.DB.Model(&specialistmodel.Specialist{}).Where("state = ?", "active") + q := specialistRepo.Query().Where("state = ?", "active") if column != "" { q = q.Where(column+" = ?", value) } - q.Count(&total) - return total + return q.Count() } resp.Total = count("", "") diff --git a/eai_agentplatform/backend-go/internal/specialists/runtime/task_runtime.go b/eai_agentplatform/backend-go/internal/specialists/runtime/task_runtime.go index 1e42f4d..74a250d 100644 --- a/eai_agentplatform/backend-go/internal/specialists/runtime/task_runtime.go +++ b/eai_agentplatform/backend-go/internal/specialists/runtime/task_runtime.go @@ -7,15 +7,13 @@ import ( "strings" "time" - "gorm.io/gorm" - "eai_agentplatform/backend/internal/ai" "eai_agentplatform/backend/internal/config" connectorcontracts "eai_agentplatform/backend/internal/connectors/core/contracts" connectorregistry "eai_agentplatform/backend/internal/connectors/registry" "eai_agentplatform/backend/internal/model" + "eai_agentplatform/backend/internal/repository" specialistmodel "eai_agentplatform/backend/internal/specialists/model" - "eai_agentplatform/backend/internal/store" ) // Cfg 全局配置，由 internal/api.RegisterRoutes 注入。 @@ -109,27 +107,6 @@ func MyTaskOwners(user *model.User) []string { return owners } -// MyTaskQuery 「我的任务」永远是"我自己的"，管理员也只看自己的。 -func MyTaskQuery(user *model.User) *gorm.DB { - owners := MyTaskOwners(user) - query := store.DB.Model(&model.TaskRecord{}) - if len(owners) == 0 { - // 没有可用的归属标识，返回空集而不是全表 - return query.Where("1 = 0") - } - return query.Where("owner IN ?", owners) -} - -// ProjectQuery 「我的项目」永远只列自己的，归属判定复用 MyTaskOwners。 -func ProjectQuery(user *model.User) *gorm.DB { - owners := MyTaskOwners(user) - query := store.DB.Model(&model.Project{}) - if len(owners) == 0 { - return query.Where("1 = 0") - } - return query.Where("owner IN ?", owners) -} - // BuildTaskFromReq 由请求体构建任务记录。 func BuildTaskFromReq(req TaskReq, user *model.User) (model.TaskRecord, error) { task := model.TaskRecord{ @@ -164,9 +141,10 @@ func BuildTaskFromReq(req TaskReq, user *model.User) (model.TaskRecord, error) { task.DueAt = &parsed } // 挂项目：得确认这个项目是自己的，否则等于给别人的项目里塞任务。 + // 「自己的」判定复用 MyTaskOwners —— 任务和项目的归属是同一套口径。 if req.ProjectID != nil && *req.ProjectID != 0 { - var project model.Project - if err := ProjectQuery(user).Where("id = ?", *req.ProjectID).First(&project).Error; err != nil { + project, found := repository.ProjectRepo{}.GetByIDForOwners(*req.ProjectID, MyTaskOwners(user)) + if !found { return task, fmt.Errorf("项目不存在") } task.ProjectID = &project.ID