change user db structure for workspaces

handlers/login.go

@@ -122,11 +122,12 @@ func (aH *AccessHandler) Login(c *gin.Context) {
 	aH.logger.Info("Login", "user "+user.Name+" logged in successfully")
 
 	c.JSON(http.StatusOK, gin.H{
-		"message":  "login successful",
+		"message":   "login successful",
-		"id":       user.Id,
+		"id":        user.Id,
-		"user":     user.Name,
+		"user":      user.Name,
-		"role":     user.Role.Role,
+		"role":      user.Role.Role,
-		"settings": user.Settings,
+		"settings":  user.Settings,
+		"workspace": user.WorkspaceID,
 	})
 }
 
@@ -223,9 +224,10 @@ func (aH *AccessHandler) Me(c *gin.Context) {
 	}
 
 	c.JSON(http.StatusOK, gin.H{
-		"id":   claims["id"],
+		"id":        claims["id"],
-		"user": claims["username"],
+		"user":      claims["username"],
-		"role": claims["role"],
+		"role":      claims["role"],
+		"workspace": claims["workspace"],
 	})
 }
 

handlers/workspace.go

@@ -35,6 +35,7 @@ func (aH *AccessHandler) AddWorkspace(c *gin.Context) {
 	}
 
 	uid, err := uuid.NewUUID()
+
 	if err != nil {
 		aH.logger.Error("AddWorkspace", err)
 		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
@@ -53,7 +54,7 @@ func (aH *AccessHandler) AddWorkspace(c *gin.Context) {
 	aH.dbHandler.AddNewColum(&models.Workspace{
 		Name:        workspace.Name,
 		Description: workspace.Description,
-		Uuid:        uid,
+		Uuid:        &uid,
 	})
 
 	c.JSON(http.StatusOK, gin.H{
@@ -155,15 +156,22 @@ func (aH *AccessHandler) DeleteWorkspace(c *gin.Context) {
 		}
 
 		for _, u := range users {
-			if u.Workspaces == nil {
+			if u.WorkspaceID == nil {
 				continue
-			} else if u.Settings.Workspace.Name == workspace.Name {
+			} else if *u.WorkspaceID == workspace.Id {
-				u.Settings.Workspace = nil
+				u.WorkspaceID = nil
 			}
 
 			u.Workspaces = slices.DeleteFunc(u.Workspaces, func(w *models.Workspace) bool {
 				return w != nil && w.Name == workspace.Name
 			})
+
+			if err := aH.dbHandler.UpdateValuesById(&u, u.Id); err != nil {
+				aH.logger.Error("DeleteWorkspace", err)
+				c.JSON(http.StatusInternalServerError, nil)
+				return
+			}
+
 		}
 
 		// remove folder
@@ -192,13 +200,15 @@ func (aH *AccessHandler) ReadWorkspaceData(c *gin.Context) {
 		return
 	}
 
-	if workspace.Uuid == uuid.Nil {
+	if workspace.Uuid == nil {
 		aH.logger.Error("ReadWorkspaceData", "uuid nil")
 		c.JSON(http.StatusBadRequest, nil)
 		return
 	}
-
+	fmt.Println(123, workspace)
 	files, err := os.ReadDir(workspace.Uuid.String())
+	fmt.Println(124, err)
+
 	if err != nil {
 		aH.logger.Error("ReadWorkspaceData", err)
 		c.JSON(http.StatusBadRequest, nil)

models/settings.go

@@ -7,15 +7,14 @@ import (
 )
 
 type Settings struct {
-	PrimaryColor       string     `json:"primaryColor,omitempty"`
+	PrimaryColor       string `json:"primaryColor,omitempty"`
-	PrimaryColorText   string     `json:"primaryColorText,omitempty"`
+	PrimaryColorText   string `json:"primaryColorText,omitempty"`
-	SecondaryColor     string     `json:"secondaryColor,omitempty"`
+	SecondaryColor     string `json:"secondaryColor,omitempty"`
-	SecondaryColorText string     `json:"secondaryColorText,omitempty"`
+	SecondaryColorText string `json:"secondaryColorText,omitempty"`
-	Icon               string     `json:"icon,omitempty"`
+	Icon               string `json:"icon,omitempty"`
-	AppName            string     `json:"appName,omitempty"`
+	AppName            string `json:"appName,omitempty"`
-	DatabaseName       string     `json:"databaseName,omitempty"`
+	DatabaseName       string `json:"databaseName,omitempty"`
-	DatabaseToken      string     `json:"databaseToken,omitempty"`
+	DatabaseToken      string `json:"databaseToken,omitempty"`
-	Workspace          *Workspace `json:"workspace,omitempty"`
 }
 
 func (s *Settings) DefaultQuasarSettings() {

models/user.go

@@ -15,6 +15,7 @@ type User struct {
 	Expiration  string       `gorm:"column:expiration" json:"expiration,omitempty"`
 	Settings    Settings     `gorm:"type:json" json:"settings"`
 	Workspaces  []*Workspace `gorm:"many2many:users_workspaces;" json:"workspaces"`
+	WorkspaceID *uint        `gorm:"column:workspaceId" json:"workspaceId,omitempty"`
 }
 
 func (u *User) IsValid() bool {

models/workspace.go

@@ -3,9 +3,9 @@ package models
 import "github.com/google/uuid"
 
 type Workspace struct {
-	Id          uint      `gorm:"primaryKey" json:"id"`
+	Id          uint       `gorm:"primaryKey" json:"id"`
-	Name        string    `gorm:"column:name" json:"name"`
+	Name        string     `gorm:"column:name" json:"name"`
-	Description string    `gorm:"type:json" json:"description"`
+	Description string     `gorm:"type:json" json:"description"`
-	Uuid        uuid.UUID `gorm:"type:text" json:"uuid"`
+	Uuid        *uuid.UUID `gorm:"type:text" json:"uuid,omitempty"`
-	Users       []*User   `gorm:"many2many:users_workspaces;" `
+	Users       []*User    `gorm:"many2many:users_workspaces;" json:"-"`
 }