joakim/insertr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add position validation and position-only update support to collection item API

Browse Source
This commit is contained in:
Joakim
2025-09-23 22:04:54 +02:00
parent 3e5cb76d1d
commit c5754181f6
1 changed files with 113 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
internal/api/handlers.go
View File

@@ -1051,8 +1051,82 @@ func (h *ContentHandler) UpdateCollectionItem(w http.ResponseWriter, r *http.Req
var updatedItem interface{}
var err error
// Validate position bounds if position update is requested
if req.Position > 0 {
var maxPos int64
switch h.database.GetDBType() {
case "sqlite3":
result, err := h.database.GetSQLiteQueries().GetMaxPosition(context.Background(), sqlite.GetMaxPositionParams{
CollectionID: collectionID,
SiteID: siteID,
})
if err != nil {
http.Error(w, "Failed to get max position", http.StatusInternalServerError)
return
}
// Convert interface{} to int64
switch v := result.(type) {
case int64:
maxPos = v
case int:
maxPos = int64(v)
default:
maxPos = 0
}
case "postgresql":
result, err := h.database.GetPostgreSQLQueries().GetMaxPosition(context.Background(), postgresql.GetMaxPositionParams{
CollectionID: collectionID,
SiteID: siteID,
})
if err != nil {
http.Error(w, "Failed to get max position", http.StatusInternalServerError)
return
}
// Convert interface{} to int64
switch v := result.(type) {
case int64:
maxPos = v
case int32:
maxPos = int64(v)
case int:
maxPos = int64(v)
default:
maxPos = 0
}
}
// Check if position is valid (1-based, within bounds)
if int64(req.Position) > maxPos {
http.Error(w, fmt.Sprintf("Invalid position: %d exceeds max position %d", req.Position, maxPos), http.StatusBadRequest)
return
}
}
switch h.database.GetDBType() {
case "sqlite3":
// Update position if provided
if req.Position > 0 {
err = h.database.GetSQLiteQueries().UpdateCollectionItemPosition(context.Background(), sqlite.UpdateCollectionItemPositionParams{
ItemID: itemID,
CollectionID: collectionID,
SiteID: siteID,
Position: int64(req.Position),
})
if err != nil {
http.Error(w, fmt.Sprintf("Failed to update position: %v", err), http.StatusInternalServerError)
return
}
}
// If only position update (no html_content), just get the updated item
if req.HTMLContent == "" {
updatedItem, err = h.database.GetSQLiteQueries().GetCollectionItem(context.Background(), sqlite.GetCollectionItemParams{
ItemID: itemID,
CollectionID: collectionID,
SiteID: siteID,
})
} else {
// Update content and metadata
updatedItem, err = h.database.GetSQLiteQueries().UpdateCollectionItem(context.Background(), sqlite.UpdateCollectionItemParams{
ItemID: itemID,
CollectionID: collectionID,
@@ -1060,7 +1134,31 @@ func (h *ContentHandler) UpdateCollectionItem(w http.ResponseWriter, r *http.Req
HtmlContent: req.HTMLContent,
LastEditedBy: req.UpdatedBy,
})
}
case "postgresql":
// Update position if provided
if req.Position > 0 {
err = h.database.GetPostgreSQLQueries().UpdateCollectionItemPosition(context.Background(), postgresql.UpdateCollectionItemPositionParams{
ItemID: itemID,
CollectionID: collectionID,
SiteID: siteID,
Position: int32(req.Position),
})
if err != nil {
http.Error(w, fmt.Sprintf("Failed to update position: %v", err), http.StatusInternalServerError)
return
}
}
// If only position update (no html_content), just get the updated item
if req.HTMLContent == "" {
updatedItem, err = h.database.GetPostgreSQLQueries().GetCollectionItem(context.Background(), postgresql.GetCollectionItemParams{
ItemID: itemID,
CollectionID: collectionID,
SiteID: siteID,
})
} else {
// Update content and metadata
updatedItem, err = h.database.GetPostgreSQLQueries().UpdateCollectionItem(context.Background(), postgresql.UpdateCollectionItemParams{
ItemID: itemID,
CollectionID: collectionID,
@@ -1068,6 +1166,7 @@ func (h *ContentHandler) UpdateCollectionItem(w http.ResponseWriter, r *http.Req
HtmlContent: req.HTMLContent,
LastEditedBy: req.UpdatedBy,
})
}
default:
http.Error(w, "Unsupported database type", http.StatusInternalServerError)
return