b0esche/b0esche_cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor moveOrgFileHandler to retrieve source and target files by path, improving error handling for file not found scenarios

Browse Source
This commit is contained in:
Leon Bösche
2026-02-07 23:45:45 +01:00
parent b95f3c22be
commit d4e0b1b27f
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
go_cloud/internal/http/routes.go
View File

@@ -2224,24 +2224,15 @@ func moveOrgFileHandler(w http.ResponseWriter, r *http.Request, db *database.DB,
return return
} }
// Get source file details before moving // Get source file directly by path
sourceFiles, err := db.GetOrgFiles(r.Context(), orgID, userID, "/", "", 0, 1000) sourceFile, err := db.GetOrgFileByPath(r.Context(), orgID, userID, req.SourcePath)
if err != nil { if err != nil {
errors.LogError(r, err, "Failed to get org files") if err == sql.ErrNoRows {
errors.WriteError(w, errors.CodeInternal, "Server error", http.StatusInternalServerError) errors.WriteError(w, errors.CodeInvalidArgument, "Source file not found", http.StatusNotFound)
return return
}
var sourceFile *database.File
for i := range sourceFiles {
if sourceFiles[i].Path == req.SourcePath {
sourceFile = &sourceFiles[i]
break
} }
} errors.LogError(r, err, "Failed to get source file")
errors.WriteError(w, errors.CodeInternal, "Server error", http.StatusInternalServerError)
if sourceFile == nil {
errors.WriteError(w, errors.CodeInvalidArgument, "Source file not found", http.StatusNotFound)
return return
} }
@@ -2261,13 +2252,13 @@ func moveOrgFileHandler(w http.ResponseWriter, r *http.Request, db *database.DB,
// Determine new file name - check if target is a folder // Determine new file name - check if target is a folder
var newPath string var newPath string
var targetFile *database.File targetFile, err := db.GetOrgFileByPath(r.Context(), orgID, userID, req.TargetPath)
for i := range sourceFiles { if err != nil && err != sql.ErrNoRows {
if sourceFiles[i].Path == req.TargetPath { errors.LogError(r, err, "Failed to get target file")
targetFile = &sourceFiles[i] errors.WriteError(w, errors.CodeInternal, "Server error", http.StatusInternalServerError)
break return
}
} }
// If err == sql.ErrNoRows, targetFile is nil
if targetFile != nil && targetFile.Type == "folder" { if targetFile != nil && targetFile.Type == "folder" {
// Target is a folder, move file into it // Target is a folder, move file into it