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

2
grouptasks/grouptasks.go
View File

@ -84,6 +84,7 @@ const (
) )
type RunGroupTaskArgs struct { type RunGroupTaskArgs struct {
CreatorUserId string
StartType uint8 StartType uint8
GroupTaskId string GroupTaskId string
Category string Category string
@ -103,6 +104,7 @@ func RunGroupTask(args RunGroupTaskArgs) {
categoryGroup := GetCategoryGroupTaskByCategoryAndGroupId(args.Category, args.GroupId) categoryGroup := GetCategoryGroupTaskByCategoryAndGroupId(args.Category, args.GroupId)
groupTaskStep := structs.GroupTaskSteps{ groupTaskStep := structs.GroupTaskSteps{
CreatorUserId: args.CreatorUserId,
GroupTasksId: args.GroupTaskId, GroupTasksId: args.GroupTaskId,
Step: args.Step, Step: args.Step,
Status: structs.GroupTasksStatusRunning, Status: structs.GroupTasksStatusRunning,

2
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
@ -31,6 +32,7 @@ type GroupTasks struct {
type GroupTaskSteps struct { type GroupTaskSteps struct {
Id string Id string
GroupTasksId string GroupTasksId string
CreatorUserId string
Step uint8 Step uint8
Status uint8 Status uint8
Log string `gorm:"type:text"` Log string `gorm:"type:text"`

4
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,6 +107,7 @@ func RunHub() {
}) })
go grouptasks.RunGroupTask(grouptasks.RunGroupTaskArgs{ go grouptasks.RunGroupTask(grouptasks.RunGroupTaskArgs{
CreatorUserId: data.Conn.Locals("userId").(string),
StartType: grouptasks.RunGroupTaskStartTypeNormal, StartType: grouptasks.RunGroupTaskStartTypeNormal,
GroupTaskId: groupTaskId, GroupTaskId: groupTaskId,
Category: category, Category: category,
@ -117,6 +119,7 @@ func RunHub() {
break break
case utils.ReceivedCmdTaskFailedTryAgainRunTaskStep: case utils.ReceivedCmdTaskFailedTryAgainRunTaskStep:
go grouptasks.RunGroupTask(grouptasks.RunGroupTaskArgs{ go grouptasks.RunGroupTask(grouptasks.RunGroupTaskArgs{
CreatorUserId: data.Conn.Locals("userId").(string),
StartType: grouptasks.RunGroupTaskStartTypeTryAgain, StartType: grouptasks.RunGroupTaskStartTypeTryAgain,
GroupTaskId: receivedMessage.Body["groupTaskId"].(string), GroupTaskId: receivedMessage.Body["groupTaskId"].(string),
Category: receivedMessage.Body["category"].(string), Category: receivedMessage.Body["category"].(string),
@ -127,6 +130,7 @@ func RunHub() {
break break
case utils.ReceivedCmdTaskContinueTaskStep: case utils.ReceivedCmdTaskContinueTaskStep:
go grouptasks.RunGroupTask(grouptasks.RunGroupTaskArgs{ go grouptasks.RunGroupTask(grouptasks.RunGroupTaskArgs{
CreatorUserId: data.Conn.Locals("userId").(string),
StartType: grouptasks.RunGroupTaskStartTypeTryAgain, StartType: grouptasks.RunGroupTaskStartTypeTryAgain,
GroupTaskId: receivedMessage.Body["groupTaskId"].(string), GroupTaskId: receivedMessage.Body["groupTaskId"].(string),
Category: receivedMessage.Body["category"].(string), Category: receivedMessage.Body["category"].(string),