bvandeusen/minstrel
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 38 Wiki Activity

refactor(server/api): writeErr accepts error; migrate admin handlers (1/3)

Browse Source 
Rewrite writeErr(w, err) to wrap *apierror.Error via apierror.From,
preserving the existing {"error": {"code", "message"}} wire envelope.
Add writeErrWithLog helper for 500-class errors that need an operator
log line. Migrate all 13 admin_*.go handler files (~76 call sites) to
the new signature; T3 will sweep the remaining api package.

The old 4-arg writeErr is removed, so non-admin call sites in
internal/api will not compile until T3 lands. This is by design — T2
and T3 are paired.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Bryan Van Deusen
2026-05-07 19:48:25 -04:00
parent c919650606
commit 1cc7eb6cad
12 changed files with 229 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/admin_covers.go
+5 -6
View File
@@ -8,6 +8,7 @@ import (
"github.com/go-chi/chi/v5"
"github.com/jackc/pgx/v5"
"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
"git.fabledsword.com/bvandeusen/minstrel/internal/coverart"
"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
)
@@ -23,22 +24,20 @@ type adminCoverRefetchResp struct {
func (h *handlers) handleAdminAlbumRefetchCover(w http.ResponseWriter, r *http.Request) {
albumID, ok := parseUUID(chi.URLParam(r, "id"))
if !ok {
writeErr(w, http.StatusBadRequest, "bad_request", "invalid album id")
writeErr(w, apierror.BadRequest("bad_request", "invalid album id"))
return
}
if err := h.coverart.RetryAlbum(r.Context(), albumID); err != nil {
if errors.Is(err, coverart.ErrNotFound) || errors.Is(err, pgx.ErrNoRows) {
writeErr(w, http.StatusNotFound, "not_found", "album not found")
writeErr(w, &apierror.Error{Status: http.StatusNotFound, Code: "not_found", Message: "album not found"})
return
}
h.logger.Error("admin: cover refetch failed", "err", err)
writeErr(w, http.StatusInternalServerError, "server_error", "refetch failed")
writeErrWithLog(w, h.logger, "admin: cover refetch failed", apierror.Internal(err))
return
}
row, err := dbq.New(h.pool).GetAlbumWithFirstTrackPath(r.Context(), albumID)
if err != nil {
h.logger.Error("admin: post-refetch read failed", "err", err)
writeErr(w, http.StatusInternalServerError, "server_error", "read failed")
writeErrWithLog(w, h.logger, "admin: post-refetch read failed", apierror.Internal(err))
return
}
writeJSON(w, http.StatusOK, adminCoverRefetchResp{