test upload file to server

server/server.go

@@ -23,31 +23,9 @@ import (
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/cors"
-	"github.com/spf13/viper"
 	"go.uber.org/zap"
 )
 
-func loadConfig(path string) (*config.ServerConfig, error) {
-	viper.AddConfigPath(path)
-	viper.SetConfigName("app")
-	viper.SetConfigType("env")
-
-	viper.AutomaticEnv()
-
-	var serverConfig config.ServerConfig
-	err := viper.ReadInConfig()
-	if err != nil {
-		return nil, err
-	}
-
-	err = viper.Unmarshal(&serverConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	return &serverConfig, nil
-}
-
 type Server struct {
 	server    *http.Server
 	data      *data.Data
@@ -57,22 +35,17 @@ type Server struct {
 	taoLogger *logger.TaoLogger
 }
 
-func NewServer() *Server {
+func NewServer(cfg *config.ServerConfig, oauthService oauth.OAuthService) *Server {
 
-	serverCfg, err := loadConfig(".")
-
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	taoLogger := logger.NewTaoLogger(serverCfg)
+	taoLogger := logger.NewTaoLogger(cfg)
+	taoLogger.Log = taoLogger.Log.Named("Server")
 
 	return &Server{
-		server:    &http.Server{Addr: fmt.Sprintf(":%d", serverCfg.ServerPort)},
+		server:    &http.Server{Addr: fmt.Sprintf(":%d", cfg.ServerPort)},
 		data:      data.NewData(taoLogger),
 		database:  data.NewSqliteDatabase(),
-		cfg:       serverCfg,
-		oauth:     oauth.NewOAuthService(serverCfg),
+		cfg:       cfg,
+		oauth:     oauthService,
 		taoLogger: taoLogger,
 	}
 }