From e66691083a2455c29b50a2970c0aba1d6afca753 Mon Sep 17 00:00:00 2001 From: xengineering Date: Wed, 23 Oct 2024 20:34:57 +0200 Subject: Switch to http.Handler The used `func(http.ResponseWriter, *http.Request)` return values made the HTTP handler factory functions quite unreadable. Thus it is switched to the http.Handler type. --- view/recipes.go | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'view/recipes.go') diff --git a/view/recipes.go b/view/recipes.go index e7153cd..8cd107e 100644 --- a/view/recipes.go +++ b/view/recipes.go @@ -6,21 +6,23 @@ import ( "xengineering.eu/ceres/model" ) -func RecipesRead(db *model.DB) func(http.ResponseWriter, *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - recipes := make(model.Recipes, 0) +func RecipesRead(db *model.DB) http.Handler { + return http.HandlerFunc( + func(w http.ResponseWriter, r *http.Request) { + recipes := make(model.Recipes, 0) - var obj model.Object = &recipes - err := db.Transaction(obj.Read) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } + var obj model.Object = &recipes + err := db.Transaction(obj.Read) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } - err = html.ExecuteTemplate(w, "recipes", recipes) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - } + err = html.ExecuteTemplate(w, "recipes", recipes) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + }, + ) } -- cgit v1.2.3-70-g09d2