From 5c932158e9c89a24e05c8815ebda7acebe9dae33 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 12 Dec 2024 16:53:51 +0100 Subject: [PATCH] refactor(handlers): Use shared gotenberg --- handlers/card.go | 4 ++-- handlers/certificate.go | 4 ++-- handlers/contract.go | 3 +-- handlers/handlers.go | 1 + main.go | 3 +++ 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/handlers/card.go b/handlers/card.go index 6ea2d80..28e37c6 100644 --- a/handlers/card.go +++ b/handlers/card.go @@ -61,8 +61,8 @@ func (h *DefaultHandler) GenerateCard(c *fiber.Ctx) error { }) } c.Set(fiber.HeaderContentType, "text/html") - converter := services.GotenbergConverter{BaseUrl: h.Config.GotenbergBaseUrl} - pdf, err := converter.ToPdf(result, "a4", false) + + pdf, err := h.Converter.ToPdf(result, "a4", false) if err != nil { return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{ "error": err.Error(), diff --git a/handlers/certificate.go b/handlers/certificate.go index 0715e51..557eff5 100644 --- a/handlers/certificate.go +++ b/handlers/certificate.go @@ -61,8 +61,8 @@ func (h *DefaultHandler) GenerateCertificate(c *fiber.Ctx) error { }) } c.Set(fiber.HeaderContentType, "text/html") - converter := services.GotenbergConverter{BaseUrl: h.Config.GotenbergBaseUrl} - pdf, err := converter.ToPdf(result, "a4", false) + + pdf, err := h.Converter.ToPdf(result, "a4", false) if err != nil { return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{ "error": err.Error(), diff --git a/handlers/contract.go b/handlers/contract.go index da4b625..f697a62 100644 --- a/handlers/contract.go +++ b/handlers/contract.go @@ -65,8 +65,7 @@ func (h *DefaultHandler) GenerateContract(c *fiber.Ctx) error { }) } - converter := services.GotenbergConverter{BaseUrl: h.Config.GotenbergBaseUrl} - pdf, err := converter.ToPdf(result, "a5", true) + pdf, err := h.Converter.ToPdf(result, "a5", true) if err != nil { return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{ "error": err.Error(), diff --git a/handlers/handlers.go b/handlers/handlers.go index 96607af..00f1270 100644 --- a/handlers/handlers.go +++ b/handlers/handlers.go @@ -17,4 +17,5 @@ type DefaultHandler struct { Config *models.Config BarcodeService services.BarcodeService Templater services.Templater + Converter services.Converter } diff --git a/main.go b/main.go index 428a5d1..f4fa441 100644 --- a/main.go +++ b/main.go @@ -80,6 +80,9 @@ func main() { Templater: &services.DefaultTemplater{ BarcodeService: barcodeGenerator, }, + Converter: &services.GotenbergConverter{ + BaseUrl: config.GotenbergBaseUrl, + }, } // Create a new Fiber instance