From 3a962cc8a33e14e2ad0182a3b3d80393c47734d1 Mon Sep 17 00:00:00 2001 From: nefrace Date: Tue, 6 Dec 2022 14:26:47 +0300 Subject: [PATCH] Fixed headers and added endpoints --- server/server.go | 2 +- webapi.go | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/server/server.go b/server/server.go index 00e19a2..b491835 100644 --- a/server/server.go +++ b/server/server.go @@ -66,8 +66,8 @@ func (g group) Endpoint(path string, f apiFunc) *group { } func StatusAndContent(w http.ResponseWriter, status int, contentType string) { - w.WriteHeader(status) w.Header().Add("Content-Type", contentType) + w.WriteHeader(status) } func WriteJSON(w http.ResponseWriter, status int, v any) error { diff --git a/webapi.go b/webapi.go index 49e2335..6585adb 100644 --- a/webapi.go +++ b/webapi.go @@ -9,7 +9,10 @@ import ( func InitServer(host string) server.Api { app := server.NewApi(host) - app.Group("/api").Endpoint("gen", ImageHandler) + app.Group("/api"). + Endpoint("gen", ImageHandler). + Endpoint("hello", HelloHandler) + app.Group("/").Endpoint("", HealthHandler) return app } @@ -26,3 +29,15 @@ func ImageHandler(w http.ResponseWriter, r *http.Request) error { } return server.WriteBlob(w, 200, "image/png", *img) } + +type hello struct { + Hello string +} + +func HelloHandler(w http.ResponseWriter, r *http.Request) error { + return server.WriteJSON(w, 200, hello{"world"}) +} + +func HealthHandler(w http.ResponseWriter, r *http.Request) error { + return server.WritePlain(w, 200, "ok") +}