Jannex
/
admin-dashboard-backend
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

show user avatar in group tasks

main
alex 2023-05-19 00:04:17 +02:00
parent 6e8faf9c5a
commit 48a6fa411b
3 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
grouptasks/grouptasks.go
View File

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

18
modules/structs/grouptasks.go
View File

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

44
socketserver/hub.go
View File

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