From 8abf8e2ff7d323e26731a20949a653a8eaf1cb76 Mon Sep 17 00:00:00 2001 From: Arthur Lefebvre Date: Fri, 21 Nov 2025 11:36:41 +0100 Subject: [PATCH] Simplify query code to get start read date --- internal/query/query.go | 2 +- internal/routes/bookget.go | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/internal/query/query.go b/internal/query/query.go index cf8521f..bdcac93 100644 --- a/internal/query/query.go +++ b/internal/query/query.go @@ -22,7 +22,7 @@ type BookGet struct { func FetchBookGet(db *gorm.DB, userId uint, bookId uint64) (BookGet, error) { var book BookGet query := db.Model(&model.Book{}) - query = query.Select("books.title, books.author, books.summary, user_books.rating, user_books.read, user_books.want_read, user_books.start_read_date, " + selectStaticFilesPath()) + query = query.Select("books.title, books.author, books.summary, user_books.rating, user_books.read, user_books.want_read, DATE(user_books.start_read_date) as start_read_date, " + selectStaticFilesPath()) query = query.Joins("left join user_books on (user_books.book_id = books.id and user_books.user_id = ?)", userId) query = query.Joins("left join static_files on (static_files.id = books.cover_id)") query = query.Where("books.id = ?", bookId) diff --git a/internal/routes/bookget.go b/internal/routes/bookget.go index 7f63d00..cda15f7 100644 --- a/internal/routes/bookget.go +++ b/internal/routes/bookget.go @@ -3,7 +3,6 @@ package routes import ( "net/http" "strconv" - "time" "git.artlef.fr/PersonalLibraryManager/internal/appcontext" "git.artlef.fr/PersonalLibraryManager/internal/model" @@ -33,22 +32,5 @@ func GetBookHandler(ac appcontext.AppContext) { myvalidator.ReturnErrorsAsJsonResponse(&ac, err) return } - err = fixBookGetDateFields(&book) - if err != nil { - myvalidator.ReturnErrorsAsJsonResponse(&ac, err) - return - } ac.C.JSON(http.StatusOK, book) } - -func fixBookGetDateFields(book *query.BookGet) error { - if book.StartReadDate == "" { - return nil - } - startDate, err := time.Parse(time.RFC3339, book.StartReadDate) - if err != nil { - return err - } - book.StartReadDate = startDate.Format(time.DateOnly) - return nil -}