refactor: Adding a service layer

Signed-off-by: Vincent Boutour <bob@vibioh.fr>

cmd/goweb/api.go → cmd/goweb/goweb.go

@@ -23,11 +23,12 @@ func main() {
 	defer clients.Close(ctx)
 	go clients.Start()
 
-	appServer := server.New(config.appServer)
+	services := newServices(config)
+	port := newPort(config, clients)
 
-	go appServer.Start(clients.health.EndCtx(), httputils.Handler(newPort(config, clients), clients.health, clients.telemetry.Middleware("http"), owasp.New(config.owasp).Middleware, cors.New(config.cors).Middleware))
+	go services.server.Start(clients.health.EndCtx(), httputils.Handler(port, clients.health, clients.telemetry.Middleware("http"), owasp.New(config.owasp).Middleware, cors.New(config.cors).Middleware))
 
-	clients.health.WaitForTermination(appServer.Done())
+	clients.health.WaitForTermination(services.server.Done())
 
-	server.GracefulWait(appServer.Done())
+	server.GracefulWait(services.server.Done())
 }

cmd/goweb/port.go

@@ -8,18 +8,12 @@ import (
 	"github.com/ViBiOh/goweb/pkg/hello"
 )
 
-const (
-	helloPath = "/hello/{name...}"
-	dumpPath  = "/dump/"
-	delayPath = "/delay/"
-)
-
 func newPort(config configuration, client client) http.Handler {
 	mux := http.NewServeMux()
 
-	mux.Handle(helloPath, hello.Handler(config.hello))
-	mux.Handle(dumpPath, dump.Handler(client.telemetry.MeterProvider()))
-	mux.Handle(delayPath, delay.Handler())
+	mux.Handle("GET /hello/{name...}", hello.Handler(config.hello))
+	mux.Handle("/dump/", dump.Handler(client.telemetry.MeterProvider()))
+	mux.Handle("/delay/", delay.Handler())
 
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusTeapot)

cmd/goweb/services.go

@@ -0,0 +1,13 @@
+package main
+
+import "github.com/ViBiOh/httputils/v4/pkg/server"
+
+type services struct {
+	server server.Server
+}
+
+func newServices(config configuration) services {
+	return services{
+		server: server.New(config.appServer),
+	}
+}

pkg/hello/hello.go

@@ -37,14 +37,8 @@ func Handler(config *Config) http.Handler {
 
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
-
 		telemetry.SetRouteTag(ctx, "/hello")
 
-		if r.Method != http.MethodGet {
-			w.WriteHeader(http.StatusMethodNotAllowed)
-			return
-		}
-
 		name := r.PathValue("name")
 		if len(name) == 0 {
 			name = "World"