Changeset 0.37.14 (#226)

Co-authored-by: gobha <jasafpro@gmail.com>
Co-committed-by: gobha <jasafpro@gmail.com>

server/handlers/folders.go

@@ -5,6 +5,7 @@ package handlers
 // v0.29.0: Raw SQL replaced with FolderStore methods.
 
 import (
+	"encoding/json"
 	"net/http"
 	"strings"
 
@@ -30,14 +31,15 @@ func (h *FolderHandler) List(c *gin.Context) {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to list folders"})
 		return
 	}
-	c.JSON(http.StatusOK, gin.H{"folders": folders})
+	c.JSON(http.StatusOK, gin.H{"data": folders})
 }
 
 func (h *FolderHandler) Create(c *gin.Context) {
 	userID := getUserID(c)
 	var req struct {
-		Name      string `json:"name" binding:"required"`
-		SortOrder int    `json:"sort_order"`
+		Name      string  `json:"name" binding:"required"`
+		ParentID  *string `json:"parent_id"`
+		SortOrder int     `json:"sort_order"`
 	}
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
@@ -52,6 +54,7 @@ func (h *FolderHandler) Create(c *gin.Context) {
 	f := &models.Folder{
 		UserID:    userID,
 		Name:      req.Name,
+		ParentID:  req.ParentID,
 		SortOrder: req.SortOrder,
 	}
 	if err := h.stores.Folders.Create(c.Request.Context(), f); err != nil {
@@ -64,11 +67,19 @@ func (h *FolderHandler) Create(c *gin.Context) {
 func (h *FolderHandler) Update(c *gin.Context) {
 	userID := getUserID(c)
 	folderID := c.Param("id")
-	var req struct {
-		Name      string `json:"name"`
-		SortOrder *int   `json:"sort_order"`
+
+	// Read raw body to detect which fields were explicitly sent
+	data, err := c.GetRawData()
+	if err != nil || len(data) == 0 {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid request body"})
+		return
 	}
-	if err := c.ShouldBindJSON(&req); err != nil {
+	var req struct {
+		Name      string  `json:"name"`
+		SortOrder *int    `json:"sort_order"`
+		ParentID  *string `json:"parent_id"`
+	}
+	if err := json.Unmarshal(data, &req); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
@@ -76,7 +87,15 @@ func (h *FolderHandler) Update(c *gin.Context) {
 		req.Name = strings.TrimSpace(req.Name)
 	}
 
-	n, err := h.stores.Folders.Update(c.Request.Context(), folderID, userID, req.Name, req.SortOrder)
+	// Only update parent_id if it was explicitly present in the JSON
+	var parentID **string
+	var raw map[string]json.RawMessage
+	_ = json.Unmarshal(data, &raw)
+	if _, ok := raw["parent_id"]; ok {
+		parentID = &req.ParentID
+	}
+
+	n, err := h.stores.Folders.Update(c.Request.Context(), folderID, userID, req.Name, req.SortOrder, parentID)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to update folder"})
 		return