fix(tasks): fill tasks for sql

semaphoreui · Jul 20, 2024 · 21ba6c6 · 21ba6c6 · masterwishx · Jul 21, 2024
1 parent 7ea8d89
commit 21ba6c6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/db/bolt/template.go b/db/bolt/template.go
@@ -79,7 +79,11 @@ func (d *BoltDb) GetTemplates(projectID int, filter db.TemplateFilter, params db
 		}
 
 		tpl.LastTask = &db.TaskWithTpl{
-			Task: task,
+			Task:             task,
+			TemplatePlaybook: tpl.Playbook,
+			TemplateAlias:    tpl.Name,
+			TemplateType:     tpl.Type,
+			TemplateApp:      tpl.App,
 		}
 
 		unfilledTemplateCount--

diff --git a/db/sql/task.go b/db/sql/task.go
@@ -111,7 +111,7 @@ func (d *SqlDb) CreateTaskOutput(output db.TaskOutput) (db.TaskOutput, error) {
 	return output, err
 }
 
-func (d *SqlDb) getTasks(projectID int, templateID *int, params db.RetrieveQueryParams, tasks *[]db.TaskWithTpl) (err error) {
+func (d *SqlDb) getTasks(projectID int, templateID *int, taskIDs []int, params db.RetrieveQueryParams, tasks *[]db.TaskWithTpl) (err error) {
 	fields := "task.*"
 	fields += ", tpl.playbook as tpl_playbook" +
 		", `user`.name as user_name" +
@@ -131,6 +131,10 @@ func (d *SqlDb) getTasks(projectID int, templateID *int, params db.RetrieveQuery
 		q = q.Where("tpl.project_id=? AND task.template_id=?", projectID, templateID)
 	}
 
+	if len(taskIDs) > 0 {
+		q = q.Where(squirrel.Eq{"task.id": taskIDs})
+	}
+
 	if params.Count > 0 {
 		q = q.Limit(uint64(params.Count))
 	}
@@ -176,13 +180,13 @@ func (d *SqlDb) GetTask(projectID int, taskID int) (task db.Task, err error) {
 }
 
 func (d *SqlDb) GetTemplateTasks(projectID int, templateID int, params db.RetrieveQueryParams) (tasks []db.TaskWithTpl, err error) {
-	err = d.getTasks(projectID, &templateID, params, &tasks)
+	err = d.getTasks(projectID, &templateID, nil, params, &tasks)
 	return
 }
 
 func (d *SqlDb) GetProjectTasks(projectID int, params db.RetrieveQueryParams) (tasks []db.TaskWithTpl, err error) {
 	tasks = make([]db.TaskWithTpl, 0)
-	err = d.getTasks(projectID, nil, params, &tasks)
+	err = d.getTasks(projectID, nil, nil, params, &tasks)
 	return
 }
 

diff --git a/db/sql/template.go b/db/sql/template.go
@@ -104,14 +104,6 @@ func (d *SqlDb) UpdateTemplate(template db.Template) error {
 	return err
 }
 
-func (d *SqlDb) getProjectTasksByIDs(projectID int, taskIDs []int) (tasks []db.Task, err error) {
-	err = d.getObjects(projectID, db.TaskProps, db.RetrieveQueryParams{}, func(builder squirrel.SelectBuilder) squirrel.SelectBuilder {
-		return builder.Where(squirrel.Eq{"id": taskIDs})
-	}, &tasks)
-
-	return
-}
-
 func (d *SqlDb) GetTemplates(projectID int, filter db.TemplateFilter, params db.RetrieveQueryParams) (templates []db.Template, err error) {
 
 	templates = []db.Template{}
@@ -201,7 +193,8 @@ func (d *SqlDb) GetTemplates(projectID int, filter db.TemplateFilter, params db.
 		}
 	}
 
-	tasks, err := d.getProjectTasksByIDs(projectID, taskIDs)
+	var tasks []db.TaskWithTpl
+	err = d.getTasks(projectID, nil, taskIDs, db.RetrieveQueryParams{}, &tasks)
 
 	if err != nil {
 		return
@@ -218,9 +211,11 @@ func (d *SqlDb) GetTemplates(projectID int, filter db.TemplateFilter, params db.
 				continue
 			}
 
-			template.LastTask = &db.TaskWithTpl{
-				Task: tsk,
+			err = tsk.Fill(d)
+			if err != nil {
+				return
 			}
+			template.LastTask = &tsk
 			break
 		}
 		templates = append(templates, template)