Helper to render template

handlers/index.go

@@ -7,16 +7,8 @@ import (
 )
 
 func (app *Application) Index(w http.ResponseWriter, r *http.Request) {
-	l := hlog.FromRequest(r)
+	renderTemplate(*indexTemplate, nil, func(w http.ResponseWriter, r *http.Request) {
-	l.Info().Msg("Index")
+		l := hlog.FromRequest(r)
-
+		l.Info().Msg("Index")
-	reqId := RequestID(r)
+	})(w, r)
-
-	err := indexTemplate.Execute(w, templateData{
-		RequestID: reqId,
-	})
-	if err != nil {
-		l.Error().Err(err).Msg("error executing template")
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-	}
 }

handlers/not_found.go

@@ -7,17 +7,10 @@ import (
 )
 
 func (app *Application) NotFound(w http.ResponseWriter, r *http.Request) {
-	l := hlog.FromRequest(r)
+	renderTemplate(*notFoundTemplate, nil, func(w http.ResponseWriter, r *http.Request) {
-	l.Info().Msg("Not found")
+		l := hlog.FromRequest(r)
+		l.Info().Msg("Not found")
 
-	reqId := RequestID(r)
+		w.WriteHeader(http.StatusNotFound)
-	w.WriteHeader(http.StatusNotFound)
+	})(w, r)
-
-	err := notFoundTemplate.Execute(w, templateData{
-		RequestID: reqId,
-	})
-	if err != nil {
-		l.Error().Err(err).Msg("error executing template")
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-	}
 }

handlers/template.go

@@ -2,8 +2,10 @@ package handlers
 
 import (
 	"html/template"
+	"net/http"
 
 	"git.vbrandl.net/vbrandl/go-web-template/assets"
+	"github.com/rs/zerolog/hlog"
 )
 
 var indexTemplate *template.Template
@@ -28,3 +30,26 @@ func (app *Application) ParseTemplates() error {
 
 	return nil
 }
+
+func renderTemplate(template template.Template, data map[any]any, additionalHandling http.HandlerFunc) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		l := hlog.FromRequest(r)
+
+		if data == nil {
+			data = make(map[any]any)
+		}
+
+		reqId := RequestID(r)
+		data["RequestID"] = reqId
+
+		if additionalHandling != nil {
+			additionalHandling(w, r)
+		}
+
+		err := template.Execute(w, data)
+		if err != nil {
+			l.Error().Err(err).Msg("error rendering template")
+			http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+		}
+	}
+}