bronku/cake-order-tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor: Fetch handler to return status code

Browse source
This commit is contained in:
bronku 2025-03-22 23:53:38 +01:00
parent a7bd1478bf
commit 47323b32f8
4 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/fetcher.go
View file

@ -2,4 +2,4 @@ package server
import "net/http"
type fetcher func(r *http.Request) (any, error)
type fetcher func(r *http.Request) (any, int, error)

17
server/get.go
View file

@ -8,11 +8,12 @@ import (
"github.com/Bronku/iroon/store"
)
func (h *Server) index(r *http.Request) (any, error) {
return h.s.GetOrders()
func (h *Server) index(r *http.Request) (any, int, error) {
data, err := h.s.GetOrders()
return data, http.StatusOK, err
}
func (h *Server) order(r *http.Request) (any, error) {
func (h *Server) getOrder(r *http.Request) (any, int, error) {
type formData struct {
Order store.Order
Catalogue []store.Cake
@ -22,23 +23,23 @@ func (h *Server) order(r *http.Request) (any, error) {
data.Catalogue, err = h.s.GetCakes()
if err != nil {
return nil, err
return nil, http.StatusInternalServerError, err
}
url := strings.Split(r.URL.String(), "/")
if len(url) < 3 || url[2] == "" {
return data, nil
return data, http.StatusOK, nil
}
id, err := strconv.Atoi(url[2])
if err != nil {
return nil, err
return nil, http.StatusBadRequest, err
}
data.Order, err = h.s.GetOrder(id)
if err != nil {
return nil, err
return nil, http.StatusNotFound, err
}
return data, nil
return data, http.StatusOK, nil
}

2
server/server.go
View file

@ -31,7 +31,7 @@ func (h *Server) openStore() error {
func (h *Server) loadHandler() {
mux := http.NewServeMux()
mux.HandleFunc("GET /order/", h.render(h.order, "order.html"))
mux.HandleFunc("GET /order/", h.render(h.getOrder, "order.html"))
mux.HandleFunc("GET /", h.render(h.index, "index.html"))
mux.HandleFunc("POST /order/", h.postOrder)

4
server/template.go
View file

@ -18,9 +18,9 @@ func (h *Server) loadTemplates() error {
func (s *Server) render(fetch fetcher, templateName string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("content-type", "text/html")
data, err := fetch(r)
data, code, err := fetch(r)
if err != nil {
errorPage(err, http.StatusInternalServerError).ServeHTTP(w, r)
errorPage(err, code).ServeHTTP(w, r)
return
}
err = s.tmpl.ExecuteTemplate(w, templateName, data)