From 1646df71366c6190ef834bc162fa02be309e101a Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Thu, 17 Oct 2024 21:10:19 +0800 Subject: [PATCH] feat: added nav for task detail --- core/controllers/task_v2.go | 13 ++++++++++--- core/models/models/v2/task_v2.go | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/core/controllers/task_v2.go b/core/controllers/task_v2.go index 0521bdbd..afb5b17e 100644 --- a/core/controllers/task_v2.go +++ b/core/controllers/task_v2.go @@ -44,20 +44,27 @@ func GetTaskById(c *gin.Context) { return } - // spider - t.Spider, _ = service.NewModelServiceV2[models.SpiderV2]().GetById(t.SpiderId) - // skip if task status is pending if t.Status == constants.TaskStatusPending { HandleSuccessWithData(c, t) return } + // spider + if !t.SpiderId.IsZero() { + t.Spider, _ = service.NewModelServiceV2[models.SpiderV2]().GetById(t.SpiderId) + } + // schedule if !t.ScheduleId.IsZero() { t.Schedule, _ = service.NewModelServiceV2[models.ScheduleV2]().GetById(t.ScheduleId) } + // node + if !t.NodeId.IsZero() { + t.Node, _ = service.NewModelServiceV2[models.NodeV2]().GetById(t.NodeId) + } + // task stat t.Stat, _ = service.NewModelServiceV2[models.TaskStatV2]().GetById(id) diff --git a/core/models/models/v2/task_v2.go b/core/models/models/v2/task_v2.go index 5f6a92b2..849cdf40 100644 --- a/core/models/models/v2/task_v2.go +++ b/core/models/models/v2/task_v2.go @@ -25,5 +25,6 @@ type TaskV2 struct { SubTasks []TaskV2 `json:"sub_tasks,omitempty" bson:"-"` Spider *SpiderV2 `json:"spider,omitempty" bson:"-"` Schedule *ScheduleV2 `json:"schedule,omitempty" bson:"-"` + Node *NodeV2 `json:"node,omitempty" bson:"-"` UserId primitive.ObjectID `json:"-" bson:"-"` }