From 2465956fc215b306e75d30b568fa7406393b0258 Mon Sep 17 00:00:00 2001 From: bronku Date: Tue, 16 Jun 2026 16:15:40 +0200 Subject: [PATCH] refactor and order template --- server/dto/pages.go | 10 +++++ server/get.go | 87 +++++++++++++++++++++--------------- server/server.go | 58 ++++++++++++++++++------ server/template.go | 23 ---------- server/templates/order.templ | 47 +++++++++---------- 5 files changed, 126 insertions(+), 99 deletions(-) create mode 100644 server/dto/pages.go delete mode 100644 server/template.go diff --git a/server/dto/pages.go b/server/dto/pages.go new file mode 100644 index 0000000..b0e0518 --- /dev/null +++ b/server/dto/pages.go @@ -0,0 +1,10 @@ +package dto + +import "git.bronku.xyz/bronku/cake-order-tracker/models" + +type OrderPage struct { + Order models.Order + Catalogue []models.Cake + Tags []models.Tag + BlockedDates []models.BlockedDate +} diff --git a/server/get.go b/server/get.go index 71968d9..a583f45 100644 --- a/server/get.go +++ b/server/get.go @@ -10,6 +10,7 @@ import ( "git.bronku.xyz/bronku/cake-order-tracker/config" "git.bronku.xyz/bronku/cake-order-tracker/models" + "git.bronku.xyz/bronku/cake-order-tracker/server/dto" "git.bronku.xyz/bronku/cake-order-tracker/server/templates" ) @@ -158,41 +159,53 @@ func (h *Server) blocked(r *http.Request) (templ.Component, int, error) { return templates.BlockedPage(dates), http.StatusOK, nil } -func (h *Server) order(r *http.Request) (templ.Component, int, error) { - catalogue, err := h.s.GetCakes() - if err != nil { - return nil, http.StatusInternalServerError, err - } - tags, err := h.s.GetTags() - if err != nil { - return nil, http.StatusInternalServerError, err - } - blockedDates, err := h.s.GetBlockedDates() - if err != nil { - return nil, http.StatusInternalServerError, err - } - - url := strings.Split(r.URL.Path, "/") - if len(url) < 3 || url[2] == "" { - if r.Header.Get("HX-Request") == "true" { - return templates.MainContent("Nowe zamówienie", templates.OrderForm(models.Order{Date: time.Now()}, catalogue, tags, blockedDates)), http.StatusOK, nil - } - return templates.OrderPage(models.Order{Date: time.Now()}, catalogue, tags, blockedDates), http.StatusOK, nil - } - - id, err := strconv.Atoi(url[2]) - if err != nil { - return nil, http.StatusBadRequest, err - } - - order, err := h.s.GetOrder(id) - if err != nil { - return nil, http.StatusNotFound, err - } - - if r.Header.Get("HX-Request") == "true" { - return templates.MainContent(templates.OrderTitle(order), templates.OrderForm(order, catalogue, tags, blockedDates)), http.StatusOK, nil - } - - return templates.OrderPage(order, catalogue, tags, blockedDates), http.StatusOK, nil +func internalError(err error) *httpError { + return &httpError{http.StatusInternalServerError, err} +} +func badRequest(err error) *httpError { + return &httpError{http.StatusBadRequest, err} +} +func notFound(err error) *httpError { + return &httpError{http.StatusNotFound, err} +} + +func (h *Server) newOrder(r *http.Request) (dto.OrderPage, *httpError) { + var dto dto.OrderPage + var err error + + dto.Catalogue, err = h.s.GetCakes() + if err != nil { + return dto, internalError(err) + } + + dto.Tags, err = h.s.GetTags() + if err != nil { + return dto, internalError(err) + } + + dto.BlockedDates, err = h.s.GetBlockedDates() + if err != nil { + return dto, internalError(err) + } + + return dto, nil +} + +func (h *Server) order(r *http.Request) (dto.OrderPage, *httpError) { + dto, httpErr := h.newOrder(r) + if httpErr != nil { + return dto, httpErr + } + + id, err := strconv.Atoi(r.PathValue("id")) + if err != nil { + return dto, badRequest(err) + } + + dto.Order, err = h.s.GetOrder(id) + if err != nil { + return dto, notFound(err) + } + + return dto, nil } diff --git a/server/server.go b/server/server.go index c23e330..4ed4cfa 100644 --- a/server/server.go +++ b/server/server.go @@ -4,12 +4,43 @@ import ( "embed" "net/http" - "github.com/a-h/templ" - + "git.bronku.xyz/bronku/cake-order-tracker/logging" + "git.bronku.xyz/bronku/cake-order-tracker/server/templates" "git.bronku.xyz/bronku/cake-order-tracker/store" + "github.com/a-h/templ" ) -type fetcher func(r *http.Request) (templ.Component, int, error) +type httpError struct { + code int + error +} + +type fetcher[T any] func(r *http.Request) (T, *httpError) +type templateBuilder[T any] func(data T) templ.Component + +func render[T any](title string, fetch fetcher[T], builder templateBuilder[T]) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + data, fetchErr := fetch(r) + if fetchErr != nil { + logging.ErrorPage(fetchErr, fetchErr.code).ServeHTTP(w, r) + return + } + w.Header().Set("content-type", "text/html") + + var component templ.Component + if r.Header.Get("HX-Request") == "true" { + component = templates.MainContent(title, builder(data)) + } else { + component = templates.Layout(title, builder(data)) + } + + err := component.Render(r.Context(), w) + if err != nil { + logging.ErrorPage(err, http.StatusInternalServerError).ServeHTTP(w, r) + return + } + } +} type Server struct { s *store.Store @@ -31,16 +62,17 @@ func New(store *store.Store) *Server { mux := http.NewServeMux() mux.HandleFunc("GET /", redirect("/orders", http.StatusSeeOther)) - mux.HandleFunc("GET /order", server.render(server.order)) - mux.HandleFunc("GET /orders", server.render(server.orders)) - mux.HandleFunc("GET /cake", server.render(server.cake)) - mux.HandleFunc("GET /cakes", server.render(server.cakes)) - mux.HandleFunc("POST /order", server.render(server.postOrder)) - mux.HandleFunc("POST /order/{id}/status", server.render(server.updateStatus)) - mux.HandleFunc("POST /cake", server.render(server.postCake)) - mux.HandleFunc("GET /blocked", server.render(server.blocked)) - mux.HandleFunc("POST /blocked", server.render(server.postBlocked)) - mux.HandleFunc("POST /blocked/{id}/delete", server.render(server.deleteBlocked)) + mux.HandleFunc("GET /order", render("Nowe zamówienie", server.newOrder, templates.OrderForm)) + mux.HandleFunc("GET /order/{id}", render("Zamówienie", server.order, templates.OrderForm)) + // mux.HandleFunc("GET /orders", render(server.orders)) + // mux.HandleFunc("GET /cake", render(server.cake)) + // mux.HandleFunc("GET /cakes", render(server.cakes)) + // mux.HandleFunc("POST /order", render(server.postOrder)) + // mux.HandleFunc("POST /order/{id}/status", render(server.updateStatus)) + // mux.HandleFunc("POST /cake", render(server.postCake)) + // mux.HandleFunc("GET /blocked", render(server.blocked)) + // mux.HandleFunc("POST /blocked", render(server.postBlocked)) + // mux.HandleFunc("POST /blocked/{id}/delete", render(server.deleteBlocked)) fs := http.FileServerFS(static) mux.Handle("GET /static/", fs) diff --git a/server/template.go b/server/template.go deleted file mode 100644 index e31b080..0000000 --- a/server/template.go +++ /dev/null @@ -1,23 +0,0 @@ -package server - -import ( - "net/http" - - "git.bronku.xyz/bronku/cake-order-tracker/logging" -) - -func (h *Server) render(fetch fetcher) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - component, code, err := fetch(r) - if err != nil { - logging.ErrorPage(err, code).ServeHTTP(w, r) - return - } - w.Header().Set("content-type", "text/html") - err = component.Render(r.Context(), w) - if err != nil { - logging.ErrorPage(err, http.StatusInternalServerError).ServeHTTP(w, r) - return - } - } -} diff --git a/server/templates/order.templ b/server/templates/order.templ index 250d458..7b38cae 100644 --- a/server/templates/order.templ +++ b/server/templates/order.templ @@ -5,15 +5,12 @@ import ( "strconv" "git.bronku.xyz/bronku/cake-order-tracker/models" + "git.bronku.xyz/bronku/cake-order-tracker/server/dto" ) -templ OrderPage(order models.Order, catalogue []models.Cake, allTags []models.Tag, blockedDates []models.BlockedDate) { - @Layout(OrderTitle(order), OrderForm(order, catalogue, allTags, blockedDates)) -} - -templ OrderForm(order models.Order, catalogue []models.Cake, allTags []models.Tag, blockedDates []models.BlockedDate) { -
- +templ OrderForm(dto dto.OrderPage) { + +
@@ -26,33 +23,32 @@ templ OrderForm(order models.Order, catalogue []models.Cake, allTags []models.Ta
- +
- +
- +
- - - + + +
- +
- +
-
@@ -81,16 +77,16 @@ templ OrderForm(order models.Order, catalogue []models.Cake, allTags []models.Ta - if len(allTags) > 0 { + if len(dto.Tags) > 0 {
- for _, t := range allTags { + for _, t := range dto.Tags { }
}
    - for _, c := range catalogue { + for _, c := range dto.Catalogue {
  • @@ -125,7 +121,7 @@ templ OrderForm(order models.Order, catalogue []models.Cake, allTags []models.Ta
      - for _, c := range order.Cakes { + for _, c := range dto.Order.Cakes {
    • { c.Name }
      @@ -138,7 +134,7 @@ templ OrderForm(order models.Order, catalogue []models.Cake, allTags []models.Ta
      • } - for _, s := range order.SpecialCakes { + for _, s := range dto.Order.SpecialCakes {
    • { s.Name }
      @@ -173,15 +169,15 @@ templ OrderForm(order models.Order, catalogue []models.Cake, allTags []models.Ta
      Subtotal - { order.Subtotal().String() } PLN + { dto.Order.Subtotal().String() } PLN
      Zaliczka - +
      Do zapłaty - { order.Total().String() } PLN + { dto.Order.Total().String() } PLN