show user avatar in group tasks

grouptasks/grouptasks.go

@@ -84,14 +84,15 @@ const (
 )
 
 type RunGroupTaskArgs struct {
-	StartType    uint8
-	GroupTaskId  string
-	Category     string
-	GroupId      string
-	Step         uint8
-	TaskStepId   string
-	GlobalInputs string
-	TaskInputs   string
+	CreatorUserId string
+	StartType     uint8
+	GroupTaskId   string
+	Category      string
+	GroupId       string
+	Step          uint8
+	TaskStepId    string
+	GlobalInputs  string
+	TaskInputs    string
 }
 
 type InputParameters struct {
@@ -103,11 +104,12 @@ func RunGroupTask(args RunGroupTaskArgs) {
 	categoryGroup := GetCategoryGroupTaskByCategoryAndGroupId(args.Category, args.GroupId)
 
 	groupTaskStep := structs.GroupTaskSteps{
-		GroupTasksId: args.GroupTaskId,
-		Step:         args.Step,
-		Status:       structs.GroupTasksStatusRunning,
-		Inputs:       args.TaskInputs,
-		StartedAt:    time.Now(),
+		CreatorUserId: args.CreatorUserId,
+		GroupTasksId:  args.GroupTaskId,
+		Step:          args.Step,
+		Status:        structs.GroupTasksStatusRunning,
+		Inputs:        args.TaskInputs,
+		StartedAt:     time.Now(),
 	}
 
 	// task type

modules/structs/grouptasks.go

@@ -16,6 +16,7 @@ const (
 
 type GroupTasks struct {
 	Id               string
+	CreatorUserId    string
 	Category         string
 	GroupId          string
 	GroupName        string
@@ -29,14 +30,15 @@ type GroupTasks struct {
 }
 
 type GroupTaskSteps struct {
-	Id           string
-	GroupTasksId string
-	Step         uint8
-	Status       uint8
-	Log          string `gorm:"type:text"`
-	Inputs       string `gorm:"type:json"`
-	StartedAt    time.Time
-	EndedAt      time.Time
+	Id            string
+	GroupTasksId  string
+	CreatorUserId string
+	Step          uint8
+	Status        uint8
+	Log           string `gorm:"type:text"`
+	Inputs        string `gorm:"type:json"`
+	StartedAt     time.Time
+	EndedAt       time.Time
 }
 
 // read from file structure

socketserver/hub.go

@@ -87,6 +87,7 @@ func RunHub() {
 
 				groupTasks := &structs.GroupTasks{
 					Id:               groupTaskId,
+					CreatorUserId:    data.Conn.Locals("userId").(string),
 					Category:         category,
 					GroupId:          groupId,
 					GroupName:        receivedMessage.Body["groupName"].(string),
@@ -106,34 +107,37 @@ func RunHub() {
 				})
 
 				go grouptasks.RunGroupTask(grouptasks.RunGroupTaskArgs{
-					StartType:    grouptasks.RunGroupTaskStartTypeNormal,
-					GroupTaskId:  groupTaskId,
-					Category:     category,
-					GroupId:      groupId,
-					Step:         1,
-					TaskStepId:   "",
-					GlobalInputs: globalInputsJsonString,
+					CreatorUserId: data.Conn.Locals("userId").(string),
+					StartType:     grouptasks.RunGroupTaskStartTypeNormal,
+					GroupTaskId:   groupTaskId,
+					Category:      category,
+					GroupId:       groupId,
+					Step:          1,
+					TaskStepId:    "",
+					GlobalInputs:  globalInputsJsonString,
 				})
 				break
 			case utils.ReceivedCmdTaskFailedTryAgainRunTaskStep:
 				go grouptasks.RunGroupTask(grouptasks.RunGroupTaskArgs{
-					StartType:   grouptasks.RunGroupTaskStartTypeTryAgain,
-					GroupTaskId: receivedMessage.Body["groupTaskId"].(string),
-					Category:    receivedMessage.Body["category"].(string),
-					GroupId:     receivedMessage.Body["groupId"].(string),
-					Step:        uint8(receivedMessage.Body["step"].(float64)),
-					TaskStepId:  receivedMessage.Body["taskStepId"].(string),
+					CreatorUserId: data.Conn.Locals("userId").(string),
+					StartType:     grouptasks.RunGroupTaskStartTypeTryAgain,
+					GroupTaskId:   receivedMessage.Body["groupTaskId"].(string),
+					Category:      receivedMessage.Body["category"].(string),
+					GroupId:       receivedMessage.Body["groupId"].(string),
+					Step:          uint8(receivedMessage.Body["step"].(float64)),
+					TaskStepId:    receivedMessage.Body["taskStepId"].(string),
 				})
 				break
 			case utils.ReceivedCmdTaskContinueTaskStep:
 				go grouptasks.RunGroupTask(grouptasks.RunGroupTaskArgs{
-					StartType:   grouptasks.RunGroupTaskStartTypeTryAgain,
-					GroupTaskId: receivedMessage.Body["groupTaskId"].(string),
-					Category:    receivedMessage.Body["category"].(string),
-					GroupId:     receivedMessage.Body["groupId"].(string),
-					Step:        uint8(receivedMessage.Body["step"].(float64)),
-					TaskStepId:  receivedMessage.Body["taskStepId"].(string),
-					TaskInputs:  utils.MarshalJson(receivedMessage.Body["taskInputs"]),
+					CreatorUserId: data.Conn.Locals("userId").(string),
+					StartType:     grouptasks.RunGroupTaskStartTypeTryAgain,
+					GroupTaskId:   receivedMessage.Body["groupTaskId"].(string),
+					Category:      receivedMessage.Body["category"].(string),
+					GroupId:       receivedMessage.Body["groupId"].(string),
+					Step:          uint8(receivedMessage.Body["step"].(float64)),
+					TaskStepId:    receivedMessage.Body["taskStepId"].(string),
+					TaskInputs:    utils.MarshalJson(receivedMessage.Body["taskInputs"]),
 				})
 
 				break