Refactor user test

Author: pauljamescleary

Taskfile.yaml

@@ -53,4 +53,4 @@ tasks:
   test:
     cmds:
       - (rm /tmp/unit_coverage.out || echo "Deleted Old files")
-      - go test -mod=mod -v  -coverprofile  /tmp/unit_coverage.out ./...
+      - go test -test.v ./...

cmd/main.go

@@ -1,11 +1,26 @@
 package main
 
 import (
-	router "github.com/pauljamescleary/gomin/pkg/common"
+	"flag"
+	"os"
+
+	"github.com/pauljamescleary/gomin/pkg/common/handler"
+	router "github.com/pauljamescleary/gomin/pkg/common/router"
+	"github.com/rs/zerolog/log"
 )
 
 func main() {
-	e := router.SetupRouter()
+	configPath := flag.String("configpath", "", "Config Path")
+	flag.Parse()
+	if configPath == nil || len(*configPath) == 0 {
+		log.Fatal().Msgf("Unable to load config path. Empty Path specified. %s", *configPath)
+	}
+	if _, err := os.Stat(*configPath); os.IsNotExist(err) {
+		// path/to/whatever does not exist
+		log.Fatal().Msgf("Unable to load config path. Path not found. %s", *configPath)
+	}
+	h := handler.LoadHandler(configPath)
+	e := router.SetupRouter(h)
 
 	// Start server
 	e.Logger.Fatal(e.Start(":1323"))

go.mod

@@ -8,9 +8,11 @@ require (
 	github.com/labstack/echo/v4 v4.10.1
 	github.com/rs/zerolog v1.29.0
 	github.com/spf13/viper v1.15.0
+	github.com/stretchr/testify v1.8.2
 )
 
 require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
@@ -23,6 +25,7 @@ require (
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/spf13/afero v1.9.3 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect

go.sum

@@ -193,8 +193,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=

pkg/common/config/config.go

@@ -1,9 +1,6 @@
 package config
 
 import (
-	"flag"
-	"os"
-
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
 )
@@ -13,18 +10,7 @@ type Config struct {
 	DbUrl string `mapstructure:"DB_URL"`
 }
 
-func LoadConfig() (c Config, err error) {
-	// Assumes a configpath Flag passed into our application
-	configPath := flag.String("configpath", "", "Config Path")
-	flag.Parse()
-	if configPath == nil || len(*configPath) == 0 {
-		log.Fatal().Msgf("Unable to load config path. Empty Path specified. ")
-	}
-	if _, err := os.Stat(*configPath); os.IsNotExist(err) {
-		// path/to/whatever does not exist
-		log.Fatal().Msgf("Unable to load config path. Path not found. ")
-	}
-
+func LoadConfig(configPath *string) (c Config, err error) {
 	// Actually load in the config file from the path provided
 	viper.SetConfigFile(*configPath)
 	viper.SetConfigType("yaml")

pkg/common/handler/handler.go

@@ -1,6 +1,9 @@
 package handler
 
 import (
+	"fmt"
+
+	"github.com/pauljamescleary/gomin/pkg/common/config"
 	"github.com/pauljamescleary/gomin/pkg/common/db"
 )
 
@@ -11,3 +14,18 @@ type Handler struct {
 func NewHandler(ur db.UserRepository) *Handler {
 	return &Handler{UserRepo: ur}
 }
+
+func LoadHandler(configPath *string) *Handler {
+	cfg, _ := config.LoadConfig(configPath)
+	return LoadHandlerFromConfig(cfg)
+}
+
+func LoadHandlerFromConfig(cfg config.Config) *Handler {
+	fmt.Printf("*** DB URL %s", cfg.DbUrl)
+
+	database := db.NewDatabase(cfg)
+	userRepo, _ := db.NewUserRepository(database)
+	handler := NewHandler(userRepo)
+
+	return handler
+}

pkg/common/router.go pkg/common/router/router.gopkg/common/router.go renamed to pkg/common/router/router.go

@@ -1,30 +1,19 @@
 package router
 
 import (
-	"fmt"
-
-	"github.com/pauljamescleary/gomin/pkg/common/config"
-	"github.com/pauljamescleary/gomin/pkg/common/db"
 	"github.com/pauljamescleary/gomin/pkg/common/handler"
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 )
 
-func SetupRouter() *echo.Echo {
+func SetupRouter(handler *handler.Handler) *echo.Echo {
 	e := echo.New()
 
 	// Middleware
 	e.Use(middleware.Logger())
 	e.Use(middleware.Recover())
 
-	cfg, _ := config.LoadConfig()
-	fmt.Printf("*** DB URL %s", cfg.DbUrl)
-
-	database := db.NewDatabase(cfg)
-	userRepo, _ := db.NewUserRepository(database)
-	handler := handler.NewHandler(userRepo)
-
 	// Routes
 	// e.GET("/users", api.GetAllUsers)
 	e.POST("/users", handler.CreateUser)

pkg/common/router/router_test.go

@@ -0,0 +1,34 @@
+package router
+
+import (
+	"bytes"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+
+	"github.com/labstack/echo/v4"
+	"github.com/pauljamescleary/gomin/pkg/common/config"
+	"github.com/pauljamescleary/gomin/pkg/common/handler"
+)
+
+var testEchoContext *echo.Echo
+var testHandler *handler.Handler
+var testConfig *config.Config
+
+func init() {
+	testConfig = &config.Config{
+		Port:  1323,
+		DbUrl: "postgres://test:test@localhost:5435/gomin",
+	}
+	testHandler = handler.LoadHandlerFromConfig(*testConfig)
+	testEchoContext = SetupRouter(testHandler)
+}
+
+func makeRequest(method, url string, body interface{}) (*http.Request, *httptest.ResponseRecorder) {
+	requestBody, _ := json.Marshal(body)
+	req := httptest.NewRequest(method, url, bytes.NewBuffer(requestBody))
+	req.Header.Set(echo.HeaderContentType, echo.MIMEApplicationJSON)
+	rec := httptest.NewRecorder()
+
+	return req, rec
+}

pkg/common/router/user_test.go

@@ -0,0 +1,20 @@
+package router
+
+import (
+	"net/http"
+	"os/user"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCreateUser(t *testing.T) {
+	u := user.User{Name: "test1"}
+	req, rec := makeRequest(http.MethodPost, "/users", u)
+	c := testEchoContext.NewContext(req, rec)
+
+	// Assertions
+	if assert.NoError(t, testHandler.CreateUser(c)) {
+		assert.Equal(t, http.StatusCreated, rec.Code)
+	}
+}