From 2187f2951ec09163fe94bfdfa40c580b2786919d Mon Sep 17 00:00:00 2001
From: alex <alex@roese.dev>
Date: Mon, 26 Jun 2023 23:46:29 +0200
Subject: [PATCH] send log data

---
 grouptasks_lang_log_messages.json | 11 ++++++++-
 modules/logger/logger.go          |  9 ++-----
 modules/structs/log.go            |  1 +
 socketserver/hub.go               | 41 ++++++++++++++++++++++++++-----
 4 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/grouptasks_lang_log_messages.json b/grouptasks_lang_log_messages.json
index 01c00e7..cd19210 100644
--- a/grouptasks_lang_log_messages.json
+++ b/grouptasks_lang_log_messages.json
@@ -4,7 +4,16 @@
         "languages": [
             {
                 "lang": "en",
-                "message": "%userId% has started group tasks"
+                "message": "%userId% has started group task %groupTaskId% %groupTaskName%"
+            }
+        ]
+    },
+    {
+        "id": 1,
+        "languages": [
+            {
+                "lang": "en",
+                "message": "%userId% has reloaded group tasks config of category %category%"
             }
         ]
     }
diff --git a/modules/logger/logger.go b/modules/logger/logger.go
index 8206f32..cfb734c 100644
--- a/modules/logger/logger.go
+++ b/modules/logger/logger.go
@@ -114,16 +114,11 @@ func ReadLogs(date string, systemLogs bool) []structs.LogMessageResponse {
 
 		for _, systemLanguageLogMessage := range languageLogMessages {
 			if logMessage.Id == systemLanguageLogMessage.Id {
-				replacedLogMessage := systemLanguageLogMessage.Languages[0].Message
-
-				for _, message := range logMessage.Messages {
-					replacedLogMessage = strings.ReplaceAll(replacedLogMessage, "%"+message.Type+"%", message.Value)
-				}
-
 				logMessages = append(logMessages, structs.LogMessageResponse{
 					Time:    logMessage.Time,
 					Type:    logMessage.Type,
-					Message: replacedLogMessage,
+					Message: systemLanguageLogMessage.Languages[0].Message,
+					LogData: logMessage.Messages,
 				})
 				break
 			}
diff --git a/modules/structs/log.go b/modules/structs/log.go
index 5f895e8..7b26aa8 100644
--- a/modules/structs/log.go
+++ b/modules/structs/log.go
@@ -30,4 +30,5 @@ type LogMessageResponse struct {
 	Time    time.Time
 	Type    uint8
 	Message string
+	LogData []LogData
 }
diff --git a/socketserver/hub.go b/socketserver/hub.go
index 0f1d4a6..9e7ded4 100644
--- a/socketserver/hub.go
+++ b/socketserver/hub.go
@@ -93,12 +93,6 @@ func RunHub() {
 				Messages: []structs.LogData{
 					{Type: "userId", Value: user.Id}}})
 
-			logger.AddGroupTasksLog(structs.LogMessage{
-				Id:   0,
-				Type: utils.LogTypeInfo,
-				Messages: []structs.LogData{
-					{Type: "userId", Value: user.Id}}})
-
 		case data := <-broadcast:
 			var receivedMessage structs.ReceivedMessage
 
@@ -156,6 +150,26 @@ func RunHub() {
 					TaskStepId:    "",
 					GlobalInputs:  globalInputsJsonString,
 				})
+
+				logger.AddGroupTasksLog(structs.LogMessage{
+					Id:   0,
+					Type: utils.LogTypeInfo,
+					Messages: []structs.LogData{
+						{
+							Type:  "userId",
+							Value: data.Conn.Locals("userId").(string),
+						},
+						{
+							Type:  "groupTaskId",
+							Value: groupTaskId,
+						},
+						{
+							Type:  "groupTaskName",
+							Value: groupTasks.GroupName,
+						},
+					},
+				})
+
 				break
 			case utils.ReceivedCmdTaskFailedTryAgainRunTaskStep:
 				go grouptasks.RunGroupTask(grouptasks.RunGroupTaskArgs{
@@ -194,6 +208,21 @@ func RunHub() {
 				})
 
 				grouptasks.LoadGroups(category)
+
+				logger.AddGroupTasksLog(structs.LogMessage{
+					Id:   1,
+					Type: utils.LogTypeInfo,
+					Messages: []structs.LogData{
+						{
+							Type:  "userId",
+							Value: data.Conn.Locals("userId").(string),
+						},
+						{
+							Type:  "category",
+							Value: category,
+						},
+					},
+				})
 				break
 			case utils.ReceivedCmdTaskLocking:
 				cache.AddLockedGroupTaskStep(structs.LockedGroupTaskSteps{