From 226346a65be5b9c8c684dcc0df83ca578d414b8f Mon Sep 17 00:00:00 2001 From: brookjeynes Date: Wed, 15 Oct 2025 11:46:13 +1000 Subject: [PATCH] feat(handlers/activity): use slogger Change-Id: xotllokmvtvnmxtxmvxkstmwplxmsspo Signed-off-by: brookjeynes --- internal/server/handlers/activity.go | 53 +++++++++++++++------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/internal/server/handlers/activity.go b/internal/server/handlers/activity.go index f519ff2..d4f2ac9 100644 --- a/internal/server/handlers/activity.go +++ b/internal/server/handlers/activity.go @@ -3,7 +3,6 @@ package handlers import ( "errors" "fmt" - "log" "net/http" "time" @@ -55,9 +54,11 @@ func parseActivityForm(r *http.Request) (db.Activity, error) { } func (h *Handler) HandleNewActivityPage(w http.ResponseWriter, r *http.Request) { + l := h.Logger.With("handler", "HandleNewActivityPage") + user, err := bsky.GetUserWithBskyProfile(h.Oauth, r) if err != nil { - log.Println("failed to get logged-in user:", err) + l.Error("failed to get logged-in user", "err", err) htmx.HxRedirect(w, "/login") return } @@ -71,14 +72,14 @@ func (h *Handler) HandleNewActivityPage(w http.ResponseWriter, r *http.Request) case http.MethodPost: client, err := h.Oauth.AuthorizedClient(r) if err != nil { - log.Println("failed to get authorized client:", err) + l.Error("failed to get authorized client", "err", err) htmx.HxRedirect(w, "/login") return } newActivity, err := parseActivityForm(r) if err != nil { - log.Println("invalid activity form:", err) + l.Error("invalid activity form", "err", err) htmx.HxError(w, http.StatusBadRequest, "Failed to create activity, ensure all fields contain valid data.") return } @@ -87,7 +88,7 @@ func (h *Handler) HandleNewActivityPage(w http.ResponseWriter, r *http.Request) newActivity.CreatedAt = time.Now().UTC() if err := db.ValidateActivity(newActivity); err != nil { - log.Println("invalid activity def:", err) + l.Error("invalid activity def", "err", err) switch { case errors.Is(err, db.ErrActivityNameEmpty): htmx.HxError(w, http.StatusBadRequest, "Activity must have a name.") @@ -123,14 +124,14 @@ func (h *Handler) HandleNewActivityPage(w http.ResponseWriter, r *http.Request) }, }) if err != nil { - log.Println("failed to create activity record:", err) + l.Error("failed to create activity record", "err", err) htmx.HxError(w, http.StatusInternalServerError, "Failed to create activity, try again later.") return } err = SavePendingCreate(h, w, r, PendingActivityCreation, newActivity) if err != nil { - log.Printf("failed to save yoten-session to add pending activity creation: %v", err) + l.Error("failed to save yoten-session to add pending activity creation", "err", err) } if !h.Config.Core.Dev { @@ -145,7 +146,7 @@ func (h *Handler) HandleNewActivityPage(w http.ResponseWriter, r *http.Request) Set("category_count", len(categoriesString)), }) if err != nil { - log.Println("failed to enqueue posthog event:", err) + l.Error("failed to enqueue posthog event", "err", err) } } @@ -154,15 +155,17 @@ func (h *Handler) HandleNewActivityPage(w http.ResponseWriter, r *http.Request) } func (h *Handler) HandleDeleteActivity(w http.ResponseWriter, r *http.Request) { + l := h.Logger.With("handler", "HandleDeleteActivity") + user := h.Oauth.GetUser(r) if user == nil { - log.Println("failed to get logged-in user") + l.Error("failed to get logged-in user") htmx.HxRedirect(w, "/login") return } client, err := h.Oauth.AuthorizedClient(r) if err != nil { - log.Println("failed to get authorized client:", err) + l.Error("failed to get authorized client", "err", err) htmx.HxError(w, http.StatusUnauthorized, "Failed to delete activity, try again later.") return } @@ -172,13 +175,13 @@ func (h *Handler) HandleDeleteActivity(w http.ResponseWriter, r *http.Request) { rkey := chi.URLParam(r, "rkey") activity, err := db.GetActivityByRkey(h.Db, user.Did, rkey) if err != nil { - log.Println("failed to get activity from db:", err) + l.Error("failed to get activity from db", "err", err) htmx.HxError(w, http.StatusInternalServerError, "Failed to delete activity, try again later.") return } if user.Did != activity.Did { - log.Printf("user '%s' does not own record '%s'", user.Did, rkey) + l.Error("user does not own record", "did", user.Did, "activityDid", activity.Did) htmx.HxError(w, http.StatusUnauthorized, "You do not have permissions to edit this activity.") return } @@ -189,14 +192,14 @@ func (h *Handler) HandleDeleteActivity(w http.ResponseWriter, r *http.Request) { Rkey: activity.Rkey, }) if err != nil { - log.Println("failed to delete activity from PDS:", err) + l.Error("failed to delete activity from PDS", "err", err) htmx.HxError(w, http.StatusInternalServerError, "Failed to delete activity, try again later.") return } err = SavePendingDelete(h, w, r, PendingActivityDeletion, activity) if err != nil { - log.Printf("failed to save yoten-session to add pending activity deletion: %v", err) + l.Error("failed to save yoten-session to add pending activity deletion", "err", err) } if !h.Config.Core.Dev { @@ -207,7 +210,7 @@ func (h *Handler) HandleDeleteActivity(w http.ResponseWriter, r *http.Request) { Set("activity_id", activity.ID), }) if err != nil { - log.Println("failed to enqueue posthog event:", err) + l.Error("failed to enqueue posthog event", "err", err) } } @@ -216,9 +219,11 @@ func (h *Handler) HandleDeleteActivity(w http.ResponseWriter, r *http.Request) { } func (h *Handler) HandleEditActivityPage(w http.ResponseWriter, r *http.Request) { + l := h.Logger.With("handler", "HandleEditActivityPage") + user, err := bsky.GetUserWithBskyProfile(h.Oauth, r) if err != nil { - log.Println("failed to get logged-in user:", err) + l.Error("failed to get logged-in user", "err", err) htmx.HxRedirect(w, "/login") return } @@ -226,13 +231,13 @@ func (h *Handler) HandleEditActivityPage(w http.ResponseWriter, r *http.Request) rkey := chi.URLParam(r, "rkey") activity, err := db.GetActivityByRkey(h.Db, user.Did, rkey) if err != nil { - log.Println("failed to get activity from db:", err) + l.Error("failed to get activity from db", "err", err) htmx.HxError(w, http.StatusInternalServerError, "Failed to update activity, try again later.") return } if user.Did != activity.Did { - log.Printf("user '%s' does not own record '%s'", user.Did, rkey) + l.Error("user does not own record", "did", user.Did, "activityDid", activity.Did) htmx.HxError(w, http.StatusUnauthorized, "You do not have permissions to edit this activity.") return } @@ -247,14 +252,14 @@ func (h *Handler) HandleEditActivityPage(w http.ResponseWriter, r *http.Request) case http.MethodPost: client, err := h.Oauth.AuthorizedClient(r) if err != nil { - log.Println("failed to get authorized client:", err) + l.Error("failed to get authorized client", "err", err) htmx.HxRedirect(w, "/login") return } updatedActivity, err := parseActivityForm(r) if err != nil { - log.Println("invalid activity form:", err) + l.Error("invalid activity form", "err", err) htmx.HxError(w, http.StatusBadRequest, "Failed to create activity, ensure all fields contain valid data.") return } @@ -263,7 +268,7 @@ func (h *Handler) HandleEditActivityPage(w http.ResponseWriter, r *http.Request) updatedActivity.CreatedAt = activity.CreatedAt if err := db.ValidateActivity(updatedActivity); err != nil { - log.Println("invalid activity def:", err) + l.Error("invalid activity def", "err", err) switch { case errors.Is(err, db.ErrActivityNameEmpty): htmx.HxError(w, http.StatusBadRequest, "Activity must have a name.") @@ -306,14 +311,14 @@ func (h *Handler) HandleEditActivityPage(w http.ResponseWriter, r *http.Request) SwapRecord: cid, }) if err != nil { - log.Println("failed to update study session record:", err) + l.Error("failed to update study session record", "err", err) htmx.HxError(w, http.StatusInternalServerError, "Failed to update activity, try again later.") return } err = SavePendingUpdate(h, w, r, PendingActivityUpdates, updatedActivity) if err != nil { - log.Printf("failed to save yoten-session to add pending activity updates: %v", err) + l.Error("failed to save yoten-session to add pending activity updates", "err", err) } if !h.Config.Core.Dev { @@ -328,7 +333,7 @@ func (h *Handler) HandleEditActivityPage(w http.ResponseWriter, r *http.Request) Set("category_count", len(categoriesString)), }) if err != nil { - log.Println("failed to enqueue posthog event:", err) + l.Error("failed to enqueue posthog event", "err", err) } } -- 2.43.0