From d2d0fc4337460f5745b71d2937338adf98b29a13 Mon Sep 17 00:00:00 2001 From: Ruidy Date: Fri, 16 Feb 2024 15:42:58 +0100 Subject: [PATCH] split handlers --- internal/server/handle_pdf.go | 16 ++++++++++++++++ internal/server/handle_public.go | 14 ++++++++++++++ .../server/{handlers.go => handler_booking.go} | 18 ------------------ internal/server/server.go | 2 +- 4 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 internal/server/handle_pdf.go create mode 100644 internal/server/handle_public.go rename internal/server/{handlers.go => handler_booking.go} (91%) diff --git a/internal/server/handle_pdf.go b/internal/server/handle_pdf.go new file mode 100644 index 0000000..2ba4381 --- /dev/null +++ b/internal/server/handle_pdf.go @@ -0,0 +1,16 @@ +package server + +import ( + "github.com/labstack/echo/v4" + "github.com/rjNemo/rentease/internal/pdf" +) + +func handleCreateInvoicePdf(ps *pdf.PdfService) echo.HandlerFunc { + return func(c echo.Context) error { + err := ps.BuildInvoice() + if err != nil { + return err + } + return c.Attachment("tmp.pdf", "tmp.pdf") + } +} diff --git a/internal/server/handle_public.go b/internal/server/handle_public.go new file mode 100644 index 0000000..6254a9b --- /dev/null +++ b/internal/server/handle_public.go @@ -0,0 +1,14 @@ +package server + +import ( + "net/http" + + "github.com/labstack/echo/v4" + "github.com/rjNemo/rentease/internal/views" +) + +func handleHomePage() echo.HandlerFunc { + return func(ctx echo.Context) error { + return renderTempl(ctx, http.StatusOK, views.Index()) + } +} diff --git a/internal/server/handlers.go b/internal/server/handler_booking.go similarity index 91% rename from internal/server/handlers.go rename to internal/server/handler_booking.go index 06e66d6..bfb107c 100644 --- a/internal/server/handlers.go +++ b/internal/server/handler_booking.go @@ -13,18 +13,10 @@ import ( "github.com/rjNemo/rentease/constants" "github.com/rjNemo/rentease/internal/booking" - "github.com/rjNemo/rentease/internal/pdf" "github.com/rjNemo/rentease/internal/views" myTime "github.com/rjNemo/rentease/pkg/time" ) -func handleHomePage() echo.HandlerFunc { - return func(ctx echo.Context) error { - component := views.Index() - return renderTempl(ctx, http.StatusOK, component) - } -} - func (s Server) handleListBookingPage() echo.HandlerFunc { return func(c echo.Context) error { bookings := make([]*booking.Booking, 0) @@ -166,13 +158,3 @@ func (s Server) handleCreateItem() echo.HandlerFunc { return s.renderTempl(c, http.StatusCreated, views.LineItem(i)) } } - -func handleCreateInvoicePdf(ps *pdf.PdfService) echo.HandlerFunc { - return func(c echo.Context) error { - err := ps.BuildInvoice() - if err != nil { - return err - } - return c.Attachment("tmp.pdf", "tmp.pdf") - } -} diff --git a/internal/server/server.go b/internal/server/server.go index cc098d7..9ed5077 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -38,7 +38,7 @@ func New(db *gorm.DB) *Server { func (s Server) Start() { go func() { if err := s.Router.Start(s.addr); err != nil && !errors.Is(err, http.ErrServerClosed) { - s.Router.Logger.Fatal("shutting down the server") + s.Router.Logger.Fatalf("shutting down the server: %s", err) } }()