exclude users from json

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{
@@ -153,23 +154,34 @@ func (aH *AccessHandler) DeleteWorkspace(c *gin.Context) {
 			c.JSON(http.StatusInternalServerError, nil)
 			return
 		}
+
 		for _, u := range users {
-			if u.Settings.Workspace == workspace.Name {
+			if u.Settings.Workspace == nil {
-				u.Settings.Workspace = ""
+				continue
+			} else if u.Settings.Workspace.Uuid.String() == workspace.Uuid.String() {
+				u.Settings.Workspace = 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
 			}
 
-		// crearemove folder
+		}
+
+		// 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{
@@ -188,12 +200,21 @@ func (aH *AccessHandler) ReadWorkspaceData(c *gin.Context) {
 		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") {

models/settings.go

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

models/workspace.go

@@ -6,6 +6,6 @@ type Workspace struct {
 	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"`
+	Uuid        *uuid.UUID `gorm:"type:text" json:"uuid,omitempty"`
-	Users       []*User   `gorm:"many2many:users_workspaces;" `
+	Users       []*User    `gorm:"many2many:users_workspaces;" json:"-"`
 }