From 48a6fa411ba9afa86230dcd52e582da3fa69ca5d Mon Sep 17 00:00:00 2001
From: alex <alex@roese.dev>
Date: Fri, 19 May 2023 00:04:17 +0200
Subject: [PATCH] show user avatar in group tasks

---
 grouptasks/grouptasks.go      | 28 +++++++++++-----------
 modules/structs/grouptasks.go | 18 +++++++-------
 socketserver/hub.go           | 44 +++++++++++++++++++----------------
 3 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/grouptasks/grouptasks.go b/grouptasks/grouptasks.go
index 44ec6de..5ce44c8 100644
--- a/grouptasks/grouptasks.go
+++ b/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
diff --git a/modules/structs/grouptasks.go b/modules/structs/grouptasks.go
index 226fa03..a1bb224 100644
--- a/modules/structs/grouptasks.go
+++ b/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
diff --git a/socketserver/hub.go b/socketserver/hub.go
index ba672cc..9188c0f 100644
--- a/socketserver/hub.go
+++ b/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