refactor code && make code readable

app/app.go

@@ -29,7 +29,6 @@ func GoStarter(app, extension, driver, host string, port int, username, password
 		"app/routers",
 		"app/middlewares",
 		"app/services",
-		"lib",
 		"utils",
 		"config",
 	}
@@ -45,18 +44,21 @@ func GoStarter(app, extension, driver, host string, port int, username, password
 
 	appStructure := []AppStructure{
 		{Path: "cmd/", FileName: "main.go", Code: writeFileCodeSelection(extension, code.MainCodeEnvConfig, code.MainCode)},
-		{Path: "config/", FileName: namingFileSelection(extension), Code: writeFileCodeSelection(extension, code.WriteAppConfiguration("env", host, driver, username, password, dbname, port), code.LoadConfigCode)},
-		{Path: "lib/", FileName: fmt.Sprintf("%s.go", driver), Code: writeFileCodeSelection(extension, code.DBLibWithEnvSetting, code.DBLib)},
+		{Path: "config/", FileName: fmt.Sprintf("%s.go", driver), Code: writeFileCodeSelection(extension, code.DBConfigWithEnvSetting, code.DBLib)},
+		{Path: pathSelection(extension), FileName: namingFileSelection(extension), Code: writeFileCodeSelection(extension, code.WriteAppConfiguration("env", host, driver, username, password, dbname, port), code.LoadConfigCode)},
 		{Path: "/", FileName: "go.mod", Code: writeFileCodeSelection(extension, code.GoModEnv, code.GoMod)},
 		{Path: "/", FileName: "docker-compose.yaml", Code: code.GenerateDockerCompose(driver, username, password, dbname, strconv.Itoa(port))},
 	}
 
-	if extension != "env" {
+	if extension == "env" {
+		appStructure = append(appStructure, AppStructure{Path: "config/", FileName: "config.go", Code: writeFileCodeSelection(extension, code.ConfigCodeEnv, "")})
+	} else {
 		appStructure = append(appStructure, AppStructure{
 			Path:     "/",
 			FileName: fmt.Sprintf("config.%s", extension),
 			Code:     code.WriteAppConfiguration(extension, host, driver, username, password, dbname, port),
 		})
+
 	}
 
 	for _, structure := range appStructure {
@@ -83,3 +85,10 @@ func namingFileSelection(extension string) string {
 	}
 	return fmt.Sprintf("%s_reader.go", extension)
 }
+
+func pathSelection(extension string) string {
+	if extension != "env" {
+		return "config/"
+	}
+	return "/"
+}

common/code/config_reader_code.go

@@ -10,11 +10,10 @@ import (
 
 	"github.com/mitchellh/mapstructure"
 	"github.com/spf13/viper"
-	"{{.Package}}/lib"
 )
 
-func InitDatabase() *lib.DB {
-	return &lib.DB{
+func InitDatabase() *DB {
+	return &DB{
 		Driver:   GetString("database.driver"),
 		Host:     GetString("database.host"),
 		Username: GetString("database.username"),
@@ -57,7 +56,7 @@ func (c *Configuration) Initialize() error {
 		return err
 	}
 
-	var dbStructure lib.DB
+	var dbStructure DB
 	err = viper.Unmarshal(&dbStructure, func(c *mapstructure.DecoderConfig) {
 		c.TagName = "mapstructure"
 	})
@@ -94,3 +93,30 @@ func GetBool(key string) bool {
 	return viper.GetBool(key)
 }
 `
+var ConfigCodeEnv = `package config
+
+import (
+	"os"
+
+	"github.com/joho/godotenv"
+)
+
+type Config interface {
+	Get(key string) string
+}
+
+type configImpl struct {
+}
+
+func (config *configImpl) Get(key string) string {
+	return os.Getenv(key)
+}
+
+func New(filenames ...string) Config {
+	err := godotenv.Load(filenames...)
+	if err != nil {
+		panic(err)
+	}
+	return &configImpl{}
+}
+`

common/code/db_code.go

@@ -1,6 +1,6 @@
 package code
 
-var DBLib = `package lib
+var DBLib = `package config
 
 import (
 	"fmt"
@@ -51,15 +51,13 @@ func (d *DB) DatabaseConnection() *gorm.DB {
 }
 `
 
-var DBLibWithEnvSetting = `package lib
+var DBConfigWithEnvSetting = `package config
 
 import (
 	"fmt"
 	"log"
 	"os"
-	"path"
 
-	"github.com/joho/godotenv"
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
@@ -70,22 +68,16 @@ var (
 	POSTGRES_CONFIG = "host=%s user=%s password=%s dbname=%s port=%v sslmode=%s TimeZone=Asia/Shanghai"
 )
 
-func DatabaseConnection(configFile string) *gorm.DB {
+func DatabaseConnection(configuration Config) *gorm.DB {
 	var dialect gorm.Dialector
 	var dbConnection string
 
-	filePath := path.Join("config", configFile)
-
-	if err := godotenv.Load(filePath); err != nil {
-		log.Fatalf("error while read configuration, %s", err.Error())
-	}
-
 	switch os.Getenv("db_driver") {
 	case "postgres":
-		dbConnection = fmt.Sprintf(POSTGRES_CONFIG, readEnvironment("db_host"), readEnvironment("db_username"), readEnvironment("db_password"), readEnvironment("db_name"), readEnvironment("db_port"), readEnvironment("db_sslmode"))
+		dbConnection = fmt.Sprintf(POSTGRES_CONFIG, configuration.Get("db_host"), configuration.Get("db_username"), configuration.Get("db_password"), configuration.Get("db_name"), configuration.Get("db_port"), configuration.Get("db_sslmode"))
 		dialect = postgres.Open(dbConnection)
 	case "mysql":
-		dbConnection = fmt.Sprintf(MYSQL_CONFIG, readEnvironment("db_username"), readEnvironment("db_password"), readEnvironment("db_host"), readEnvironment("db_port"), readEnvironment("db_name"))
+		dbConnection = fmt.Sprintf(MYSQL_CONFIG, configuration.Get("db_username"), configuration.Get("db_password"), configuration.Get("db_host"), configuration.Get("db_port"), configuration.Get("db_name"))
 		dialect = mysql.Open(dbConnection)
 	}
 
@@ -98,8 +90,4 @@ func DatabaseConnection(configFile string) *gorm.DB {
 	return db
 
 }
-
-func readEnvironment(key string) string {
-	return os.Getenv(key)
-}
 `

common/code/main_code.go

@@ -49,7 +49,7 @@ import (
 	"log"
 	"os"
 
-	"{{.Package}}/lib"
+	"{{.Package}}/config"
 )
 
 var fileConfiguration *string
@@ -64,8 +64,9 @@ func init() {
 }
 
 func main() {
-	dbConnection := lib.DatabaseConnection(*fileConfiguration)
+	configuration := config.New(*fileConfiguration)
 
+	dbConnection := config.DatabaseConnection(configuration)
 	// ping to database
 	responseDB, _ := dbConnection.DB()
 	if err := responseDB.Ping(); err != nil {