From 0cb15a49d405a885b92dd35c5491dc58824304d4 Mon Sep 17 00:00:00 2001 From: Tim Wundenberg Date: Tue, 3 Sep 2024 22:20:32 +0200 Subject: [PATCH] fix(workout): #128 delete not working on newly added workout --- service/workout.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/service/workout.go b/service/workout.go index e0d5f7b..be74d7e 100644 --- a/service/workout.go +++ b/service/workout.go @@ -1,6 +1,7 @@ package service import ( + "log/slog" "me-fit/template" "me-fit/template/workout" @@ -61,13 +62,15 @@ func HandleWorkoutNewComp(db *sql.DB) http.HandlerFunc { return } - _, err = db.Exec("INSERT INTO workout (user_id, date, type, sets, reps) VALUES (?, ?, ?, ?, ?)", user.id, date, typeStr, sets, reps) - + var rowId int + err = db.QueryRow("INSERT INTO workout (user_id, date, type, sets, reps) VALUES (?, ?, ?, ?, ?) RETURNING rowid", user.id, date, typeStr, sets, reps).Scan(&rowId) if err != nil { + slog.Error(err.Error()) http.Error(w, err.Error(), http.StatusInternalServerError) return } wo := workout.Workout{ + Id: strconv.Itoa(rowId), Date: renderDate(date), Type: r.FormValue("type"), Sets: r.FormValue("sets"), @@ -86,7 +89,7 @@ func HandleWorkoutGetComp(db *sql.DB) http.HandlerFunc { return } - rows, err := db.Query("SELECT rowid, date, type, sets, reps FROM workout WHERE user_id = ?", user.id) + rows, err := db.Query("SELECT rowid, date, type, sets, reps FROM workout WHERE user_id = ? ORDER BY date desc", user.id) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return