Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,61 @@ func (c *ReleasePlanColl) ListByOptions(opt *ListReleasePlanOption) ([]*models.R
return resp, count, nil
}

func (c *ReleasePlanColl) FindReleasePlanRefsByWorkflowAndTaskIDs(workflowName string, taskIDs []int64) (map[int64]*models.ReleasePlanRef, error) {
result := make(map[int64]*models.ReleasePlanRef)
if workflowName == "" || len(taskIDs) == 0 {
return result, nil
}

pipeline := mongo.Pipeline{
{{Key: "$match", Value: bson.M{
"jobs.type": config.JobWorkflow,
"jobs.spec.workflow.name": workflowName,
}}},
{{Key: "$unwind", Value: "$jobs"}},
{{Key: "$match", Value: bson.M{
"jobs.type": config.JobWorkflow,
"jobs.spec.workflow.name": workflowName,
"jobs.spec.task_id": bson.M{"$in": taskIDs},
}}},
{{Key: "$project", Value: bson.M{
"task_id": "$jobs.spec.task_id",
"id": bson.M{"$toString": "$_id"},
"name": "$name",
"index": "$index",
}}},
}

type releasePlanTaskRefResult struct {
TaskID int64 `bson:"task_id"`
ID string `bson:"id"`
Name string `bson:"name"`
Index int64 `bson:"index"`
}

cursor, err := c.Collection.Aggregate(context.Background(), pipeline)
if err != nil {
return nil, err
}

resp := make([]*releasePlanTaskRefResult, 0)
if err := cursor.All(context.Background(), &resp); err != nil {
return nil, err
}

for _, item := range resp {
if item == nil {
continue
}
result[item.TaskID] = &models.ReleasePlanRef{
ID: item.ID,
Name: item.Name,
Index: item.Index,
}
}
return result, nil
}

// ListFinishedReleasePlan list all finished release plans in the given time period
func (c *ReleasePlanColl) ListFinishedReleasePlan(startTime, endTime int64) ([]*models.ReleasePlan, error) {
query := bson.M{}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2148,6 +2148,39 @@ type TaskHistoryFilter struct {
JobName string `json:"jobName" form:"jobName"`
}

func fillWorkflowTaskReleasePlans(workflowName string, tasks []*commonmodels.WorkflowTask) map[int64]*commonmodels.ReleasePlanRef {
result := make(map[int64]*commonmodels.ReleasePlanRef)
if workflowName == "" || len(tasks) == 0 {
return result
}

taskIDs := make([]int64, 0)
for _, task := range tasks {
if task == nil {
continue
}
if task.ReleasePlan != nil {
result[task.TaskID] = task.ReleasePlan
continue
}
taskIDs = append(taskIDs, task.TaskID)
}

if len(taskIDs) == 0 {
return result
}

planMap, err := commonrepo.NewReleasePlanColl().FindReleasePlanRefsByWorkflowAndTaskIDs(workflowName, taskIDs)
if err != nil {
log.Errorf("find workflow task release plan refs error: %v", err)
return result
}
for taskID, releasePlan := range planMap {
result[taskID] = releasePlan
}
return result
}

func ListWorkflowTaskV4ByFilter(filter *TaskHistoryFilter, filterList []string, logger *zap.SugaredLogger) ([]*commonmodels.WorkflowTaskPreview, int64, error) {
var listTaskOpt *mongodb.WorkFlowTaskFilter
switch filter.QueryType {
Expand Down Expand Up @@ -2189,6 +2222,7 @@ func ListWorkflowTaskV4ByFilter(filter *TaskHistoryFilter, filterList []string,
return nil, total, err
}

releasePlanMap := fillWorkflowTaskReleasePlans(filter.WorkflowName, tasks)
envMap := make(map[string]*commonmodels.Product)
taskPreviews := make([]*commonmodels.WorkflowTaskPreview, 0)
for _, task := range tasks {
Expand All @@ -2208,7 +2242,7 @@ func ListWorkflowTaskV4ByFilter(filter *TaskHistoryFilter, filterList []string,
LarkWorkItemAPIName: task.LarkWorkItemAPIName,
LarkWorkItemID: task.LarkWorkItemID,
Hash: task.Hash,
ReleasePlan: task.ReleasePlan,
ReleasePlan: releasePlanMap[task.TaskID],
}

stagePreviews := make([]*commonmodels.StagePreview, 0)
Expand Down Expand Up @@ -2389,6 +2423,7 @@ func GetWorkflowTaskV4(workflowName string, taskID int64, logger *zap.SugaredLog
logger.Errorf("find workflowTaskV4 error: %s", err)
return nil, err
}
releasePlanMap := fillWorkflowTaskReleasePlans(workflowName, []*commonmodels.WorkflowTask{task})
resp := &WorkflowTaskPreview{
TaskID: task.TaskID,
WorkflowName: task.WorkflowName,
Expand All @@ -2408,7 +2443,7 @@ func GetWorkflowTaskV4(workflowName string, taskID int64, logger *zap.SugaredLog
Debug: task.IsDebug,
ApprovalTicketID: task.ApprovalTicketID,
ApprovalID: task.ApprovalID,
ReleasePlan: task.ReleasePlan,
ReleasePlan: releasePlanMap[task.TaskID],
}
timeNow := time.Now().Unix()
for _, stage := range task.Stages {
Expand Down
Loading