From 55f38bfeb506aea023ad909427b637759816dab0 Mon Sep 17 00:00:00 2001
From: alex <alex@roese.dev>
Date: Fri, 21 Apr 2023 14:01:56 +0200
Subject: [PATCH] removed user request and added user connection init to ws

---
 grouptasks/grouptasks.go  | 7 +++++--
 modules/structs/socket.go | 6 ++++++
 socketserver/hub.go       | 8 ++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/grouptasks/grouptasks.go b/grouptasks/grouptasks.go
index 900043a..42e4aed 100644
--- a/grouptasks/grouptasks.go
+++ b/grouptasks/grouptasks.go
@@ -7,10 +7,11 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-var Groups []*Group
+var Groups []Group
 
 type Group struct {
 	Category     string         `json:"category"`
+	Id           string         `json:"id"`
 	Name         string         `json:"name"`
 	GlobalInputs []GlobalInputs `json:"globalInputs"`
 	Tasks        []Task         `json:"tasks"`
@@ -75,7 +76,9 @@ func ReadGroups() {
 
 				json.Unmarshal(content, &group)
 
-				Groups = append(Groups, &group)
+				group.Id = entry.Name()
+
+				Groups = append(Groups, group)
 
 				log.Info().Msgf("Group: %s", group)
 				log.Info().Msgf("Number of groups: %d", len(Groups))
diff --git a/modules/structs/socket.go b/modules/structs/socket.go
index fba6f18..0269e86 100644
--- a/modules/structs/socket.go
+++ b/modules/structs/socket.go
@@ -3,6 +3,7 @@ package structs
 import (
 	"encoding/json"
 	"errors"
+	"janex/admin-dashboard-backend/grouptasks"
 	"sync"
 
 	"github.com/gofiber/websocket/v2"
@@ -78,6 +79,11 @@ func (socketClient *SocketClient) writeMessage(messageType int, message SendSock
 }
 
 type InitUserSocketConnection struct {
+	User       UserData
+	GroupTasks []grouptasks.Group
+}
+
+type UserData struct {
 	Username string
 	Email    string
 }
diff --git a/socketserver/hub.go b/socketserver/hub.go
index 2a15a04..d7fb270 100644
--- a/socketserver/hub.go
+++ b/socketserver/hub.go
@@ -3,6 +3,7 @@ package socketserver
 import (
 	"encoding/json"
 	"fmt"
+	"janex/admin-dashboard-backend/grouptasks"
 	"janex/admin-dashboard-backend/modules/cache"
 	"janex/admin-dashboard-backend/modules/database"
 	"janex/admin-dashboard-backend/modules/structs"
@@ -45,8 +46,11 @@ func RunHub() {
 			newSocketClient.SendMessage(structs.SendSocketMessage{
 				Cmd: utils.SentInitUserSocketConnection,
 				Body: structs.InitUserSocketConnection{
-					Username: user.Username,
-					Email:    user.Email,
+					User: structs.UserData{
+						Username: user.Username,
+						Email:    user.Email,
+					},
+					GroupTasks: grouptasks.Groups,
 				},
 			})