Skip to content

πŸ“š The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

Fix node delete childs when parent delete

Smaug6739461fd382aa87
diff --git a/backend/models/node.model.go b/backend/models/node.model.go
index bbd231ef..67cad06e 100644
--- a/backend/models/node.model.go
+++ b/backend/models/node.model.go
@@ -45,3 +45,10 @@ type NodeSearchResult struct {
CreatedTimestamp int64 `json:"created_timestamp"`
UpdatedTimestamp int64 `json:"updated_timestamp"`
}
+
+// NodeResourceInfo contains minimal info needed to delete a resource file from storage
+type NodeResourceInfo struct {
+ Id types.Snowflake `json:"id"`
+ UserId types.Snowflake `json:"user_id"`
+ Metadata *types.JSONB `json:"metadata"`
+}
diff --git a/backend/repositories/node.repository.go b/backend/repositories/node.repository.go
index 3fd7d5e8..80b0b5e9 100644
--- a/backend/repositories/node.repository.go
+++ b/backend/repositories/node.repository.go
@@ -22,6 +22,7 @@ type NodeRepository interface {
GetByID(nodeId types.Snowflake) (*models.Node, error)
GetPublic(nodeId types.Snowflake) (*models.Node, error)
GetUserUploadsSize(userId types.Snowflake) (int64, error)
+ GetDescendantResources(nodeId types.Snowflake) ([]*models.NodeResourceInfo, error)
Create(node *models.Node) error
Update(node *models.Node) error
Delete(nodeId types.Snowflake) error
@@ -30,17 +31,18 @@ type NodeRepository interface {
// Prepared statement keys
const (
- stmNodeGetAll = "node_get_all"
- stmNodeGetShared = "node_get_shared"
- stmNodeGetAllForBackup = "node_get_all_backup"
- stmtNodeGetByID = "node_get_by_id"
- stmtNodeGetPublic = "node_get_public"
- stmtNodeGetUserUploadsSize = "node_get_user_uploads_size"
- stmtNodeCreate = "node_create"
- stmtNodeUpdate = "node_update"
- stmtNodeDelete = "node_delete"
- stmtNodeSearchFulltext = "node_search_fulltext"
- stmtNodeSearchContent = "node_search_content"
+ stmNodeGetAll = "node_get_all"
+ stmNodeGetShared = "node_get_shared"
+ stmNodeGetAllForBackup = "node_get_all_backup"
+ stmtNodeGetByID = "node_get_by_id"
+ stmtNodeGetPublic = "node_get_public"
+ stmtNodeGetUserUploadsSize = "node_get_user_uploads_size"
+ stmtNodeGetDescendantResources = "node_get_descendant_resources"
+ stmtNodeCreate = "node_create"
+ stmtNodeUpdate = "node_update"
+ stmtNodeDelete = "node_delete"
+ stmtNodeSearchFulltext = "node_search_fulltext"
+ stmtNodeSearchContent = "node_search_content"
// Note: GetAll and GetShared use complex recursive CTEs, prepared separately
)
@@ -122,6 +124,24 @@ func (r *NodeRepositoryImpl) prepareStatements() error {
FROM nodes
WHERE user_id = ?`,
+ // Get all descendant resource nodes (role=4) for cleanup before deletion
+ // This includes the node itself if it's a resource, plus all descendant resources
+ stmtNodeGetDescendantResources: `
+ WITH RECURSIVE descendants AS (
+ SELECT id, user_id, role, metadata
+ FROM nodes
+ WHERE id = ?
+
+ UNION ALL
+
+ SELECT n.id, n.user_id, n.role, n.metadata
+ FROM nodes n
+ JOIN descendants d ON n.parent_id = d.id
+ )
+ SELECT id, user_id, metadata
+ FROM descendants
+ WHERE role = 4`,
+
stmtNodeCreate: `
INSERT INTO nodes (id, user_id, parent_id, name, description, tags, role, color, icon, thumbnail, theme,
accessibility, access, display, ` + "`order`" + `, content, content_compiled, size, metadata,
@@ -441,6 +461,36 @@ func (r *NodeRepositoryImpl) GetUserUploadsSize(userId types.Snowflake) (int64,
return totalSize, nil
}
+// GetDescendantResources retrieves all descendant nodes with role=4 (resources)
+// This is used to clean up MinIO files before deleting a node and its children
+func (r *NodeRepositoryImpl) GetDescendantResources(nodeId types.Snowflake) ([]*models.NodeResourceInfo, error) {
+ stmt, err := r.manager.GetStatement(stmtNodeGetDescendantResources)
+ if err != nil {
+ return nil, err
+ }
+
+ rows, err := stmt.Query(nodeId)
+ if err != nil {
+ return nil, fmt.Errorf("failed to query descendant resources: %w", err)
+ }
+ defer rows.Close()
+
+ resources := make([]*models.NodeResourceInfo, 0)
+ for rows.Next() {
+ var res models.NodeResourceInfo
+ if err := rows.Scan(&res.Id, &res.UserId, &res.Metadata); err != nil {
+ return nil, fmt.Errorf("failed to scan resource info: %w", err)
+ }
+ resources = append(resources, &res)
+ }
+
+ if err = rows.Err(); err != nil {
+ return nil, fmt.Errorf("error iterating descendant resources: %w", err)
+ }
+
+ return resources, nil
+}
+
// Create creates a new node
func (r *NodeRepositoryImpl) Create(node *models.Node) error {
stmt, err := r.manager.GetStatement(stmtNodeCreate)
diff --git a/backend/services/manager.go b/backend/services/manager.go
index 8c58949e..0d8c30c9 100644
--- a/backend/services/manager.go
+++ b/backend/services/manager.go
@@ -43,8 +43,11 @@ func (sm *ServiceManager) initializeServices(repos *repositories.RepositoryManag
// Initialize User Service
sm.User = NewUserService(repos.User, repos.Log, snowflake)
- // Initialize Node Service
- sm.Node = NewNodeService(repos.Node, repos.Permission, snowflake)
+ // Initialize Minio Service (must be initialized before NodeService)
+ sm.Minio = NewMinioService(minioClient)
+
+ // Initialize Node Service (depends on MinioService for file cleanup)
+ sm.Node = NewNodeService(repos.Node, repos.Permission, sm.Minio, snowflake)
// Initialize Permission Service
sm.Permission = NewPermissionService(repos.Permission, repos.Node, snowflake)
@@ -55,9 +58,6 @@ func (sm *ServiceManager) initializeServices(repos *repositories.RepositoryManag
// Initialize Session Service
sm.Session = NewSessionService(repos.Session)
- // Initialize Minio Service
- sm.Minio = NewMinioService(minioClient)
-
// Initialize Ressource Service
sm.Ressource = NewRessourceService(repos.Node, snowflake)
diff --git a/backend/services/minio.service.go b/backend/services/minio.service.go
index a68f61da..32350e6e 100644
--- a/backend/services/minio.service.go
+++ b/backend/services/minio.service.go
@@ -1,16 +1,21 @@
package services
import (
+ "alexandrie/logger"
+ "alexandrie/models"
"alexandrie/types"
"context"
"fmt"
"os"
+ "path/filepath"
"github.com/minio/minio-go/v7"
)
type MinioService interface {
DeleteAllFromUser(userId types.Snowflake) error
+ DeleteNodeFiles(resources []*models.NodeResourceInfo) error
+ DeleteSingleResource(userId types.Snowflake, nodeId types.Snowflake, metadata *types.JSONB) error
}
type minioService struct {
@@ -27,7 +32,7 @@ func (s *minioService) DeleteAllFromUser(userId types.Snowflake) error {
if s.minioClient == nil {
return nil
}
-
+
prefix := fmt.Sprintf("%d/", userId)
ctx := context.Background()
objectCh := s.minioClient.ListObjects(ctx, os.Getenv("MINIO_BUCKET"), minio.ListObjectsOptions{
@@ -46,3 +51,89 @@ func (s *minioService) DeleteAllFromUser(userId types.Snowflake) error {
}
return nil
}
+
+// DeleteNodeFiles deletes MinIO files for a list of resource nodes
+// This is used when deleting a node that may have descendant resources
+func (s *minioService) DeleteNodeFiles(resources []*models.NodeResourceInfo) error {
+ if s.minioClient == nil {
+ return nil
+ }
+
+ if len(resources) == 0 {
+ return nil
+ }
+
+ ctx := context.Background()
+ bucket := os.Getenv("MINIO_BUCKET")
+ var lastErr error
+
+ for _, res := range resources {
+ if err := s.DeleteSingleResource(res.UserId, res.Id, res.Metadata); err != nil {
+ // Log error but continue deleting other files
+ logger.Warn(fmt.Sprintf("Failed to delete MinIO file for node %d: %v", res.Id, err))
+ lastErr = err
+ }
+ }
+
+ // Also try to delete by prefix as fallback (catches any orphaned files)
+ for _, res := range resources {
+ prefix := fmt.Sprintf("%d/%d", res.UserId, res.Id)
+ objectCh := s.minioClient.ListObjects(ctx, bucket, minio.ListObjectsOptions{
+ Prefix: prefix,
+ Recursive: true,
+ })
+
+ for object := range objectCh {
+ if object.Err != nil {
+ logger.Warn(fmt.Sprintf("Error listing objects with prefix %s: %v", prefix, object.Err))
+ continue
+ }
+ if err := s.minioClient.RemoveObject(ctx, bucket, object.Key, minio.RemoveObjectOptions{}); err != nil {
+ logger.Warn(fmt.Sprintf("Failed to delete object %s: %v", object.Key, err))
+ lastErr = err
+ }
+ }
+ }
+
+ return lastErr
+}
+
+// DeleteSingleResource deletes a single resource file from MinIO
+func (s *minioService) DeleteSingleResource(userId types.Snowflake, nodeId types.Snowflake, metadata *types.JSONB) error {
+ if s.minioClient == nil {
+ return nil
+ }
+
+ ctx := context.Background()
+ bucket := os.Getenv("MINIO_BUCKET")
+
+ // Try to get the exact path from metadata
+ if metadata != nil {
+ if transformedPath, ok := (*metadata)["transformed_path"].(string); ok && transformedPath != "" {
+ ext := filepath.Ext(transformedPath)
+ objectName := fmt.Sprintf("%d/%d%s", userId, nodeId, ext)
+ if err := s.minioClient.RemoveObject(ctx, bucket, objectName, minio.RemoveObjectOptions{}); err != nil {
+ return fmt.Errorf("failed to delete object %s: %w", objectName, err)
+ }
+ return nil
+ }
+ }
+
+ // Fallback: delete by prefix (handles cases where metadata is missing or malformed)
+ prefix := fmt.Sprintf("%d/%d", userId, nodeId)
+ objectCh := s.minioClient.ListObjects(ctx, bucket, minio.ListObjectsOptions{
+ Prefix: prefix,
+ Recursive: true,
+ })
+
+ for object := range objectCh {
+ if object.Err != nil {
+ return object.Err
+ }
+ if err := s.minioClient.RemoveObject(ctx, bucket, object.Key, minio.RemoveObjectOptions{}); err != nil {
+ return fmt.Errorf("failed to delete object %s: %w", object.Key, err)
+ }
+ }
+
+ return nil
+}
diff --git a/backend/services/node.service.go b/backend/services/node.service.go
index 3e5df6e9..88fc3e22 100644
--- a/backend/services/node.service.go
+++ b/backend/services/node.service.go
@@ -1,12 +1,14 @@
package services
import (
+ "alexandrie/logger"
"alexandrie/models"
"alexandrie/permissions"
"alexandrie/repositories"
"alexandrie/types"
"alexandrie/utils"
"errors"
+ "fmt"
"time"
)
@@ -24,16 +26,18 @@ type NodeService interface {
}
type nodeService struct {
- nodeRepo repositories.NodeRepository
- permRepo repositories.PermissionRepository
- snowflake *utils.Snowflake
+ nodeRepo repositories.NodeRepository
+ permRepo repositories.PermissionRepository
+ minioService MinioService
+ snowflake *utils.Snowflake
}
-func NewNodeService(nodeRepo repositories.NodeRepository, permRepo repositories.PermissionRepository, snowflake *utils.Snowflake) NodeService {
+func NewNodeService(nodeRepo repositories.NodeRepository, permRepo repositories.PermissionRepository, minioService MinioService, snowflake *utils.Snowflake) NodeService {
return &nodeService{
- nodeRepo: nodeRepo,
- permRepo: permRepo,
- snowflake: snowflake,
+ nodeRepo: nodeRepo,
+ permRepo: permRepo,
+ minioService: minioService,
+ snowflake: snowflake,
}
}
@@ -188,11 +192,35 @@ func (s *nodeService) DeleteNode(nodeId types.Snowflake, connectedUserId types.S
return err
}
+ if dbNode == nil {
+ return errors.New("node not found")
+ }
+
allowed, _, err := authorizer.CanAccessNode(connectedUserId, connectedUserRole, dbNode, permissions.ActionDelete)
if !allowed || err != nil {
return errors.New("unauthorized")
}
+ // Get all descendant resources (role=4) before deletion
+ // This is necessary because ON DELETE CASCADE will remove them from DB
+ // but we need to clean up their files in MinIO first
+ resources, err := s.nodeRepo.GetDescendantResources(nodeId)
+ if err != nil {
+ logger.Warn(fmt.Sprintf("Failed to get descendant resources for node %d: %v", nodeId, err))
+ // Continue with deletion even if we can't get resources
+ // This prevents blocking deletion due to MinIO issues
+ }
+
+ // Delete MinIO files for all descendant resources
+ if len(resources) > 0 {
+ if err := s.minioService.DeleteNodeFiles(resources); err != nil {
+ // Log the error but continue with DB deletion
+ // Orphaned files can be cleaned up by a background job later
+ logger.Warn(fmt.Sprintf("Failed to delete some MinIO files for node %d: %v", nodeId, err))
+ }
+ }
+
+ // Now delete the node from DB (CASCADE will handle children)
return s.nodeRepo.Delete(nodeId)
}