change user db structure for workspaces

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/gin-gonic/gin v1.11.0
 	github.com/go-playground/assert/v2 v2.2.0
 	github.com/golang-jwt/jwt/v5 v5.3.0
+	github.com/google/uuid v1.3.0
 	golang.org/x/crypto v0.43.0
 )
 
@@ -25,7 +26,6 @@ require (
 	github.com/go-playground/validator/v10 v10.27.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/goccy/go-yaml v1.18.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect

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",
-		"id":       user.Id,
-		"user":     user.Name,
-		"role":     user.Role.Role,
-		"settings": user.Settings,
+		"message":   "login successful",
+		"id":        user.Id,
+		"user":      user.Name,
+		"role":      user.Role.Role,
+		"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"],
-		"user": claims["username"],
-		"role": claims["role"],
+		"id":        claims["id"],
+		"user":      claims["username"],
+		"role":      claims["role"],
+		"workspace": claims["workspace"],
 	})
 }
 

handlers/user.go

@@ -207,7 +207,7 @@ func (aH *AccessHandler) UpdateUser(c *gin.Context) {
 	}
 
 	var currentUser models.User
-	err := aH.dbHandler.GetById(&currentUser, user.Id, "Role", "Workspace")
+	err := aH.dbHandler.GetById(&currentUser, user.Id, "Role", "Workspaces")
 	if err != nil {
 		aH.logger.Error("UpdateUser", err)
 		c.JSON(http.StatusInternalServerError, nil)

handlers/workspace.go

@@ -3,11 +3,15 @@ package handlers
 import (
 	"fmt"
 	"net/http"
+	"os"
+	"path/filepath"
 	"slices"
 	"strconv"
+	"strings"
 
 	"gitea.tecamino.com/paadi/access-handler/models"
 	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
 )
 
 func (aH *AccessHandler) AddWorkspaceTable() error {
@@ -24,16 +28,33 @@ func (aH *AccessHandler) AddWorkspace(c *gin.Context) {
 	}
 
 	// Check if a workspace with this name already exists
-	if aH.dbHandler.Exists(&models.Workspace{}, "workspace", workspace.Name, false) {
+	if aH.dbHandler.Exists(&models.Workspace{}, "name", workspace.Name, false) {
 		aH.logger.Error("AddWorkspace", fmt.Sprintf("workspace with name %s already exists", workspace.Name))
 		c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse(fmt.Sprintf("workspace with name %s already exists", workspace.Name)))
 		return
 	}
 
+	uid, err := uuid.NewUUID()
+
+	if err != nil {
+		aH.logger.Error("AddWorkspace", err)
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
+		return
+	}
+
+	// create new folder
+	err = os.MkdirAll(uid.String(), 0644)
+	if err != nil {
+		aH.logger.Error("AddWorkspace", err)
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
+		return
+	}
+
 	// Insert new workspace with provided permissions
 	aH.dbHandler.AddNewColum(&models.Workspace{
 		Name:        workspace.Name,
 		Description: workspace.Description,
+		Uuid:        &uid,
 	})
 
 	c.JSON(http.StatusOK, gin.H{
@@ -120,7 +141,7 @@ func (aH *AccessHandler) DeleteWorkspace(c *gin.Context) {
 	}
 
 	for _, workspace := range request.Workspaces {
-		err = aH.dbHandler.DeleteByKey(&models.Workspace{}, "id", workspace, false)
+		err = aH.dbHandler.DeleteByKey(&models.Workspace{}, "id", workspace.Id, false)
 		if err != nil {
 			aH.logger.Error("DeleteWorkspace", err)
 			c.JSON(http.StatusInternalServerError, nil)
@@ -133,18 +154,76 @@ func (aH *AccessHandler) DeleteWorkspace(c *gin.Context) {
 			c.JSON(http.StatusInternalServerError, nil)
 			return
 		}
+
 		for _, u := range users {
-			if u.Settings.Workspace == workspace.Name {
-				u.Settings.Workspace = ""
+			if u.WorkspaceID == nil {
+				continue
+			} else if *u.WorkspaceID == workspace.Id {
+				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
+		err = os.RemoveAll(workspace.Uuid.String())
+		if err != nil {
+			aH.logger.Error("DeleteWorkspace", err)
+			c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
+			return
+		}
+
 	}
 
 	c.JSON(http.StatusOK, gin.H{
 		"message": "workspace(s) deleted",
 	})
 }
+
+func (aH *AccessHandler) ReadWorkspaceData(c *gin.Context) {
+
+	var workspace models.Workspace
+
+	err := c.ShouldBindBodyWithJSON(&workspace)
+	if err != nil {
+		aH.logger.Error("ReadWorkspaceData", err)
+		c.JSON(http.StatusBadRequest, nil)
+		return
+	}
+
+	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)
+		return
+	}
+
+	var response []string
+	for _, f := range files {
+		if f.IsDir() || !strings.Contains(filepath.Ext(f.Name()), ".db") {
+			continue
+		}
+		response = append(response, f.Name())
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"data": response,
+	})
+}

models/settings.go

@@ -15,7 +15,6 @@ type Settings struct {
 	AppName            string `json:"appName,omitempty"`
 	DatabaseName       string `json:"databaseName,omitempty"`
 	DatabaseToken      string `json:"databaseToken,omitempty"`
-	Workspace          string `json:"workspace,omitempty"`
 }
 
 func (s *Settings) DefaultQuasarSettings() {

models/user.go

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

models/workspace.go

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