From 98d9b364699c52419230c88d2a394bcb488cd4e5 Mon Sep 17 00:00:00 2001 From: alex Date: Sat, 1 Jul 2023 20:21:26 +0200 Subject: [PATCH] logging requests for category group changes --- grouptasks_lang_log_messages.json | 13 +++++++++++++ modules/grouptasks/grouptasks.go | 24 +++++++++++++++++++++++- socketserver/hub.go | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/grouptasks_lang_log_messages.json b/grouptasks_lang_log_messages.json index 6caeffe..df06f6b 100644 --- a/grouptasks_lang_log_messages.json +++ b/grouptasks_lang_log_messages.json @@ -89,5 +89,18 @@ "message": "--------- SERVER gestartet ---------" } ] + }, + { + "id": 7, + "languages": [ + { + "lang": "en", + "message": "%userId% has requested checking for changes in the category groups. Result: %result%" + }, + { + "lang": "de", + "message": "%userId% hat die Prüfung auf Änderungen in den Kategoriengruppen angefordert. Ergebnis: %result%" + } + ] } ] \ No newline at end of file diff --git a/modules/grouptasks/grouptasks.go b/modules/grouptasks/grouptasks.go index c03597b..7bca653 100644 --- a/modules/grouptasks/grouptasks.go +++ b/modules/grouptasks/grouptasks.go @@ -138,7 +138,7 @@ func ReloadCategoryGroups(category string) { } } -func LookingForCategoryGroupChanges() { +func LookingForCategoryGroupChanges(userId string) { entries, err := os.ReadDir(config.Cfg.FolderPaths.GroupTasksGroups) if err != nil { @@ -197,11 +197,16 @@ func LookingForCategoryGroupChanges() { } } + var logResultAddedCategoryGroups []string + var logResultRemovedCategoryGroups []string + for _, newCategory := range newCategories { addedGroupTasksPermissions = append(addedGroupTasksPermissions, systempermissions.AddDynamicGroupTasksPermissionsByCategory(newCategory)...) cGroup := cache.GetCategoryGroupByCategory(newCategory) addedCategoryGroups = append(addedCategoryGroups, cGroup) + + logResultAddedCategoryGroups = append(logResultAddedCategoryGroups, newCategory) } var removedCategoryGroups []string @@ -213,6 +218,8 @@ func LookingForCategoryGroupChanges() { cache.RemoveAllCategoryGroupsByCategory(cachedCategoryGroup.Category) removedGroupTasksPermissions = append(removedGroupTasksPermissions, systempermissions.RemoveDynamicGroupTasksPermissionsByCategory(cachedCategoryGroup.Category)...) + + logResultRemovedCategoryGroups = append(logResultRemovedCategoryGroups, cachedCategoryGroup.Category) } } @@ -239,6 +246,21 @@ func LookingForCategoryGroupChanges() { Cmd: utils.SentCmdGroupTasksCategoryGroupChanges, Body: result, }) + + logger.AddGroupTasksLog(structs.LogMessage{ + Id: 7, + Type: utils.LogTypeInfo, + Messages: []structs.LogData{ + {Type: "userId", Value: userId}, + {Type: "result", Value: utils.MarshalJson(struct { + AddedCategoryGroups []string + RemovedCategoryGroups []string + }{ + AddedCategoryGroups: logResultAddedCategoryGroups, + RemovedCategoryGroups: logResultRemovedCategoryGroups, + })}, + }, + }) } func isInList(value string, list []string) bool { diff --git a/socketserver/hub.go b/socketserver/hub.go index 2a6b3ca..06d149c 100644 --- a/socketserver/hub.go +++ b/socketserver/hub.go @@ -367,7 +367,7 @@ func RunHub() { break } - grouptasks.LookingForCategoryGroupChanges() + grouptasks.LookingForCategoryGroupChanges(data.Conn.Locals("userId").(string)) break default: