fix(tasks): fill username

Author: fiftin

api/integration.go

@@ -246,8 +246,8 @@ func RunIntegration(integration db.Integration, project db.Project, r *http.Requ
 
 	log.Info(fmt.Sprintf("Running integration %d", integration.ID))
 
-	var envValues  = make([]db.IntegrationExtractValue, 0)
-	var taskValues  = make([]db.IntegrationExtractValue, 0)
+	var envValues = make([]db.IntegrationExtractValue, 0)
+	var taskValues = make([]db.IntegrationExtractValue, 0)
 
 	extractValuesForExtractor, err := helpers.Store(r).GetIntegrationExtractValues(project.ID, db.RetrieveQueryParams{}, integration.ID)
 	if err != nil {
@@ -257,7 +257,7 @@ func RunIntegration(integration db.Integration, project db.Project, r *http.Requ
 
 	for _, val := range extractValuesForExtractor {
 		switch val.VariableType {
-	    case "", db.IntegrationVariableEnvironment: // "" handles null/empty for backward compatibility
+		case "", db.IntegrationVariableEnvironment: // "" handles null/empty for backward compatibility
 			envValues = append(envValues, val)
 		case db.IntegrationVariableTaskParam:
 			taskValues = append(taskValues, val)
@@ -281,7 +281,7 @@ func RunIntegration(integration db.Integration, project db.Project, r *http.Requ
 		Environment:   environmentJSONString,
 		IntegrationID: &integration.ID,
 	}
-	
+
 	// Only assign extractedTaskResults to Params if it's not empty
 	if len(extractedTaskResults) > 0 {
 		taskDefinition.Params = extractedTaskResults
@@ -293,7 +293,7 @@ func RunIntegration(integration db.Integration, project db.Project, r *http.Requ
 		return
 	}
 
-	_, err = helpers.TaskPool(r).AddTask(taskDefinition, nil, integration.ProjectID, tpl.App.NeedTaskAlias())
+	_, err = helpers.TaskPool(r).AddTask(taskDefinition, nil, "", integration.ProjectID, tpl.App.NeedTaskAlias())
 	if err != nil {
 		log.Error(err)
 		return
@@ -321,27 +321,27 @@ func Extract(extractValues []db.IntegrationExtractValue, r *http.Request, payloa
 }
 
 func ExtractAsAnyForTaskParams(extractValues []db.IntegrationExtractValue, r *http.Request, payload []byte) db.MapStringAnyField {
-    // Create a result map that accepts any type
-    result := make(db.MapStringAnyField)
-
-    for _, extractValue := range extractValues {
-        switch extractValue.ValueSource {
-        case db.IntegrationExtractHeaderValue:
-            // Extract the header value
-            result[extractValue.Variable] = r.Header.Get(extractValue.Key)
-
-        case db.IntegrationExtractBodyValue:
-            switch extractValue.BodyDataType {
-            case db.IntegrationBodyDataJSON:
-                // Query the JSON payload for the key using gojsonq
-                rawValue := gojsonq.New().JSONString(string(payload)).Find(extractValue.Key)
-                result[extractValue.Variable] = rawValue
-
-            case db.IntegrationBodyDataString:
-                // Simply use the entire payload as a string
-                result[extractValue.Variable] = string(payload)
-            }
-        }
-    }
-    return result
-}
+	// Create a result map that accepts any type
+	result := make(db.MapStringAnyField)
+
+	for _, extractValue := range extractValues {
+		switch extractValue.ValueSource {
+		case db.IntegrationExtractHeaderValue:
+			// Extract the header value
+			result[extractValue.Variable] = r.Header.Get(extractValue.Key)
+
+		case db.IntegrationExtractBodyValue:
+			switch extractValue.BodyDataType {
+			case db.IntegrationBodyDataJSON:
+				// Query the JSON payload for the key using gojsonq
+				rawValue := gojsonq.New().JSONString(string(payload)).Find(extractValue.Key)
+				result[extractValue.Variable] = rawValue
+
+			case db.IntegrationBodyDataString:
+				// Simply use the entire payload as a string
+				result[extractValue.Variable] = string(payload)
+			}
+		}
+	}
+	return result
+}

api/projects/tasks.go

@@ -32,7 +32,13 @@ func AddTask(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	newTask, err := helpers.TaskPool(r).AddTask(taskObj, &user.ID, project.ID, tpl.App.NeedTaskAlias())
+	newTask, err := helpers.TaskPool(r).AddTask(
+		taskObj,
+		&user.ID,
+		user.Username,
+		project.ID,
+		tpl.App.NeedTaskAlias(),
+	)
 
 	if errors.Is(err, tasks.ErrInvalidSubscription) {
 		helpers.WriteErrorStatus(w, "No active subscription available.", http.StatusForbidden)

services/schedules/SchedulePool.go

@@ -83,10 +83,18 @@ func (r ScheduleRunner) Run() {
 		return
 	}
 
-	_, err = r.pool.taskPool.AddTask(db.Task{
+	task := db.Task{
 		TemplateID: schedule.TemplateID,
 		ProjectID:  schedule.ProjectID,
-	}, nil, schedule.ProjectID, tpl.App.NeedTaskAlias())
+	}
+
+	_, err = r.pool.taskPool.AddTask(
+		task,
+		nil,
+		"",
+		schedule.ProjectID,
+		tpl.App.NeedTaskAlias(),
+	)
 
 	if err != nil {
 		log.Error(err)

services/tasks/TaskPool.go

@@ -341,7 +341,13 @@ func getNextBuildVersion(startVersion string, currentVersion string) string {
 	return prefix + strconv.Itoa(newVer) + suffix
 }
 
-func (p *TaskPool) AddTask(taskObj db.Task, userID *int, projectID int, needAlias bool) (newTask db.Task, err error) {
+func (p *TaskPool) AddTask(
+	taskObj db.Task,
+	userID *int,
+	username string,
+	projectID int,
+	needAlias bool,
+) (newTask db.Task, err error) {
 	taskObj.Created = time.Now().UTC()
 	taskObj.Status = task_logger.TaskWaitingStatus
 	taskObj.UserID = userID
@@ -379,8 +385,9 @@ func (p *TaskPool) AddTask(taskObj db.Task, userID *int, projectID int, needAlia
 	}
 
 	taskRunner := TaskRunner{
-		Task: newTask,
-		pool: p,
+		Task:     newTask,
+		pool:     p,
+		Username: username,
 	}
 
 	if needAlias {
@@ -425,7 +432,7 @@ func (p *TaskPool) AddTask(taskObj db.Task, userID *int, projectID int, needAlia
 	taskRunner.job = job
 
 	p.register <- &taskRunner
-	
+
 	taskRunner.createTaskEvent()
 
 	return

services/tasks/TaskRunner.go

@@ -197,11 +197,18 @@ func (t *TaskRunner) run() {
 	}
 
 	for _, tpl := range tpls {
-		_, err = t.pool.AddTask(db.Task{
+		task := db.Task{
 			TemplateID:  tpl.ID,
 			ProjectID:   tpl.ProjectID,
 			BuildTaskID: &t.Task.ID,
-		}, nil, tpl.ProjectID, tpl.App.NeedTaskAlias())
+		}
+		_, err = t.pool.AddTask(
+			task,
+			nil,
+			"",
+			tpl.ProjectID,
+			tpl.App.NeedTaskAlias(),
+		)
 		if err != nil {
 			t.Log("Running app failed: " + err.Error())
 			continue