Merge pull request #2 from isoppp/feature/refactor-initialization-and-config

refactor initialization and config

Author: isoppp

Makefile

@@ -1,12 +1,15 @@
 export PORT := 8081
-export MIGRATION_PATH := db/migrations
-export DEV_DATABASE_PATH := postgresql://postgres:postgres@localhost:5433/sandbox?sslmode=disable
+export _MIGRATION_DIR := db/migrations
+export _MIGRATION_DB_PATH := postgresql://postgres:postgres@localhost:5433/sandbox?sslmode=disable
 
 run:
 	go run ./cmd/api
 
 dev:
-	reflex -r '\.go$$' -s make run
+	go run ./cmd/api -dev
+
+devw:
+	reflex -r '\.go$$' -s make dev
 
 postgres:
 	docker-compose up -d
@@ -15,21 +18,21 @@ sqlboiler:
 	go generate
 
 migrateup:
-	migrate -path $(MIGRATION_PATH) -database $(DEV_DATABASE_PATH) -verbose up
+	migrate -path $(_MIGRATION_DIR) -database $(_MIGRATION_DB_PATH) -verbose up
 
 migrateup1:
-	migrate -path $(MIGRATION_PATH) -database $(DEV_DATABASE_PATH) -verbose up 1
+	migrate -path $(_MIGRATION_DIR) -database $(_MIGRATION_DB_PATH) -verbose up 1
 
 migratedown:
-	migrate -path $(MIGRATION_PATH) -database $(DEV_DATABASE_PATH) -verbose down
+	migrate -path $(_MIGRATION_DIR) -database $(_MIGRATION_DB_PATH) -verbose down
 
 migratedown1:
-	migrate -path $(MIGRATION_PATH) -database $(DEV_DATABASE_PATH) -verbose down 1
+	migrate -path $(_MIGRATION_DIR) -database $(_MIGRATION_DB_PATH) -verbose down 1
 
 migrateredo:
 	make migratedown1 && make migrateup1
 
 test:
 	go test -v -cover ./...
 
-.PHONY: run dev postgres sqlboiler migratedown migratedown1 migrateup migrateup1 migrateredo test
+.PHONY: run dev devw postgres sqlboiler migratedown migratedown1 migrateup migrateup1 migrateredo test

cmd/api/main.go

@@ -5,48 +5,44 @@ import (
 	"fmt"
 	"log"
 	"sandbox-go-api-sqlboiler-rest-auth/internal/config"
-	"sandbox-go-api-sqlboiler-rest-auth/internal/routes"
+	"sandbox-go-api-sqlboiler-rest-auth/internal/logger"
+	"sandbox-go-api-sqlboiler-rest-auth/internal/server"
 
 	"github.com/volatiletech/sqlboiler/v4/boil"
 
-	"go.uber.org/zap/zapcore"
-
-	"go.uber.org/zap"
-
 	_ "github.com/lib/pq"
 )
 
 func main() {
 	// config
-	cfg, err := config.NewConfig()
+	cfg := config.NewConfig()
+
+	// db
+	db, err := sql.Open("postgres", cfg.GetDataSourceName())
 	if err != nil {
-		log.Fatalln(err)
-		return
+		log.Fatalln("cannot open the database", cfg.GetDataSourceName())
 	}
-
-	// logger
-	zapConfig := zap.NewDevelopmentConfig()
-	encConfig := zap.NewDevelopmentEncoderConfig()
-	encConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
-	zapConfig.EncoderConfig = encConfig
-	logger, _ := zapConfig.Build()
 	defer func() {
-		_ = logger.Sync()
+		_ = db.Close()
 	}()
 
-	// db
-	connStr := "host=localhost port=5433 dbname=sandbox user=postgres password=postgres sslmode=disable"
-	db, err := sql.Open("postgres", connStr)
+	// enable debug mode
+	boil.DebugMode = cfg.IsDev
+
+	// logger
+	zl, err := logger.NewLogger(cfg)
 	if err != nil {
-		log.Fatalln("cannot open the database")
+		log.Fatalln("cannot create logger")
 	}
 	defer func() {
-		_ = db.Close()
+		_ = zl.Sync()
 	}()
 
-	// sqlboiler debug mode
-	boil.DebugMode = true
+	// router
+	e := server.NewServer(cfg, db, zl)
 
-	e := routes.NewRouter(db, logger)
-	e.Logger.Fatal(e.Start(fmt.Sprintf(":%s", cfg.Port)))
+	err = e.Start(fmt.Sprintf(":%s", cfg.Port))
+	if err != nil {
+		zl.Sugar().Fatal(err)
+	}
 }

go.mod

@@ -3,22 +3,21 @@ module sandbox-go-api-sqlboiler-rest-auth
 go 1.17
 
 require (
-	github.com/caarlos0/env/v6 v6.7.1
 	github.com/friendsofgo/errors v0.9.2
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/securecookie v1.1.1
 	github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12
 	github.com/labstack/echo/v4 v4.5.0
 	github.com/lib/pq v1.10.3
-	github.com/spf13/viper v1.8.1
+	github.com/spf13/viper v1.9.0
 	github.com/volatiletech/randomize v0.0.1
 	github.com/volatiletech/sqlboiler/v4 v4.6.0
 	github.com/volatiletech/strmangle v0.0.1
 	go.uber.org/zap v1.19.1
 )
 
 require (
-	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/fsnotify/fsnotify v1.5.1 // indirect
 	github.com/gofrs/uuid v3.2.0+incompatible // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
@@ -27,12 +26,12 @@ require (
 	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/mattn/go-isatty v0.0.12 // indirect
-	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/mitchellh/mapstructure v1.4.2 // indirect
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/pelletier/go-toml v1.9.3 // indirect
+	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
-	github.com/spf13/cast v1.3.1 // indirect
+	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
@@ -41,13 +40,13 @@ require (
 	github.com/volatiletech/inflect v0.0.1 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
-	golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf // indirect
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
-	golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 // indirect
+	golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
 	golang.org/x/text v0.3.6 // indirect
 	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	gopkg.in/ini.v1 v1.62.0 // indirect
+	gopkg.in/ini.v1 v1.63.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )