big refacto

cmd/root.go

@@ -2,9 +2,14 @@ package cmd
 
 import (
 	"fmt"
-	"nos-comptes/ginserver"
 	"nos-comptes/handler"
+	"nos-comptes/internal/account"
+	"nos-comptes/internal/expense"
+	ginserver "nos-comptes/internal/ginserver"
+	"nos-comptes/internal/storage/dao/postgresql"
+	"nos-comptes/internal/user"
 	"nos-comptes/internal/utils"
+	validatorInternal "nos-comptes/internal/utils/validator"
 	"os"
 
 	"github.com/sirupsen/logrus"
@@ -20,7 +25,6 @@ var (
 const (
 	parameterConfigurationFile = "config"
 	parameterLogLevel          = "loglevel"
-	parameterMock              = "mock"
 	parameterLogFormat         = "logformat"
 	parameterDBConnectionURI   = "dbconnectionuri"
 	parameterPort              = "port"
@@ -40,15 +44,19 @@ var rootCmd = &cobra.Command{
 		utils.InitLogger(config.LogLevel, config.LogFormat)
 		logrus.
 			WithField(parameterConfigurationFile, cfgFile).
-			WithField(parameterMock, config.Mock).
 			WithField(parameterLogLevel, config.LogLevel).
 			WithField(parameterLogFormat, config.LogFormat).
 			WithField(parameterPort, config.Port).
 			WithField(parameterDBConnectionURI, config.DBConnectionURI).
 			Warn("Configuration")
-
-		router := ginserver.NewRouter(config)
-		router.Run(fmt.Sprintf(":%d", config.Port))
+		injector := &utils.Injector{}
+		ginserver.Setup(injector, config)
+		postgresql.Setup(injector, config.DBConnectionURI)
+		validatorInternal.Setup(injector)
+		user.Setup(injector)
+		account.Setup(injector)
+		expense.Setup(injector)
+		ginserver.Start(injector)
 	},
 }
 
@@ -76,8 +84,6 @@ func init() {
 	rootCmd.Flags().Int(parameterPort, defaultPort, "Use this flag to set the listening port of the api")
 	viper.BindPFlag(parameterPort, rootCmd.Flags().Lookup(parameterPort))
 
-	rootCmd.Flags().Bool(parameterMock, false, "Use this flag to enable the mock mode")
-	viper.BindPFlag(parameterMock, rootCmd.Flags().Lookup(parameterMock))
 }
 
 // initConfig reads in config file and ENV variables if set.
@@ -96,7 +102,6 @@ func initConfig() {
 
 	config.LogLevel = viper.GetString(parameterLogLevel)
 	config.LogFormat = viper.GetString(parameterLogFormat)
-	config.Mock = viper.GetBool(parameterMock)
 	config.DBConnectionURI = viper.GetString(parameterDBConnectionURI)
 	config.Port = viper.GetInt(parameterPort)
 }