From 99e01ddb42b80ff4e7f730fb52eb95a1ddcb6153 Mon Sep 17 00:00:00 2001 From: Piotr Biernat Date: Thu, 6 Oct 2022 22:06:00 +0200 Subject: [PATCH] some code quality fixes --- src/cmd/main.go | 12 ++++++------ src/internal/app/router.go | 2 +- src/internal/app/server.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cmd/main.go b/src/cmd/main.go index 0319bd3..049e3ab 100644 --- a/src/cmd/main.go +++ b/src/cmd/main.go @@ -14,9 +14,9 @@ import ( ) const ( - defHttpIp = "0.0.0.0" - defHttpPort = "8080" - defDbUrl = "postgres://postgres:12345678@127.0.0.1:5432/egommerce" + defHTTPIP = "0.0.0.0" + defHTTPPort = "8080" + defDbURL = "postgres://postgres:12345678@127.0.0.1:5432/egommerce" ) func main() { @@ -24,15 +24,15 @@ func main() { app.Panicf("Error loading .env file") } - httpAddr := net.JoinHostPort(config.GetEnv("SERVER_IP", defHttpIp), defHttpPort) - dbConnStr := config.GetEnv("DATABASE_URL", defDbUrl) + httpAddr := net.JoinHostPort(config.GetEnv("SERVER_IP", defHTTPIP), defHTTPPort) + dbConnStr := config.GetEnv("DATABASE_URL", defDbURL) dbc, err := database.Connect(dbConnStr) if err != nil { app.Panicf("Unable to connect to database: %v\n", err) } - env := &handler.Env{httpAddr, dbc} + env := &handler.Env{Addr: httpAddr, DB: dbc} srv := app.NewServer(env) go srv.Start() diff --git a/src/internal/app/router.go b/src/internal/app/router.go index 4231758..daf9eea 100644 --- a/src/internal/app/router.go +++ b/src/internal/app/router.go @@ -13,7 +13,7 @@ func SetupRouter(env *handler.Env) *mux.Router { r.MethodNotAllowedHandler = &handler.MethodNotAllowedHandler{} r.Use(PrepareHeadersMiddleware) - r.Use(ValidateJsonBodyMiddleware) // probably not needed + r.Use(ValidateJSONBodyMiddleware) // probably not needed r.Use(LoggingMiddleware) r.Handle("/health", handler.Init(env, handler.HealthCheckHandler)).Methods(http.MethodGet) diff --git a/src/internal/app/server.go b/src/internal/app/server.go index 2982371..b7a114f 100644 --- a/src/internal/app/server.go +++ b/src/internal/app/server.go @@ -61,7 +61,7 @@ func PrepareHeadersMiddleware(next http.Handler) http.Handler { }) } -func ValidateJsonBodyMiddleware(next http.Handler) http.Handler { +func ValidateJSONBodyMiddleware(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { buf, _ := io.ReadAll(r.Body) r.Body = io.NopCloser(bytes.NewReader(buf)) // rollack *Request to original state