From 35d41a46c068fb5c2e6b12c188fe44cec1c27a1d Mon Sep 17 00:00:00 2001 From: Masahiko AMANO Date: Fri, 4 Jul 2025 22:46:00 +0300 Subject: [PATCH] fix(backend/db): fix error and status handling in some functions --- backend/db/files.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/backend/db/files.go b/backend/db/files.go index 76b380d..b86d213 100644 --- a/backend/db/files.go +++ b/backend/db/files.go @@ -53,6 +53,7 @@ func FileGetSlice(user_id int, filter, sort string, limit, offset int) (files mo statusCode, err = handleDBError(err) return } + defer rows.Close() count := 0 for rows.Next() { var file models.FileItem @@ -120,6 +121,11 @@ func FileGet(user_id int, file_id string) (file models.FileFull, statusCode int, JOIN data.file_tag ft ON ft.tag_id=t.id WHERE ft.file_id=$1 `, file_id) + if err != nil { + statusCode, err = handleDBError(err) + return + } + defer rows.Close() for rows.Next() { var tag models.TagCore err = rows.Scan(&tag.ID, &tag.Name, &tag.Color) @@ -132,7 +138,9 @@ func FileGet(user_id int, file_id string) (file models.FileFull, statusCode int, err = rows.Err() if err != nil { statusCode = http.StatusInternalServerError + return } + statusCode = http.StatusOK return } @@ -166,6 +174,7 @@ func FileAdd(user_id int, name, mime string, datetime time.Time, notes string, m file.Name.Valid = (name != "") file.MIME.Name = mime file.MIME.Extension = extension + statusCode = http.StatusOK return }