Merge branch 'dev' into template-cleanup

cmd/api/main.go

@@ -45,6 +45,26 @@ var interruptSignals = []os.Signal{
 	syscall.SIGINT,
 }
 
+type App struct {
+	config          config.Config
+	store           db.Store
+	taskDistributor worker.TaskDistributor
+	tokenMaker      auth.Maker
+	userService     service.UserService
+	authService     service.AuthService
+}
+
+func NewApp(config config.Config, store db.Store, taskDistributor worker.TaskDistributor, tokenMaker auth.Maker, userService service.UserService, authService service.AuthService) *App {
+	return &App{
+		config:          config,
+		store:           store,
+		taskDistributor: taskDistributor,
+		tokenMaker:      tokenMaker,
+		userService:     userService,
+		authService:     authService,
+	}
+}
+
 // @title API Template
 // @version 1.0
 // @description Backend API template service
@@ -103,10 +123,12 @@ func main() {
 
 	wg, ctx := errgroup.WithContext(ctx)
 
-	runGinServer(ctx, wg, config, store, taskDist, tokenMaker, userService, authService)
+	app := NewApp(config, store, taskDist, tokenMaker, userService, authService)
-	runTaskProcessor(ctx, wg, redisOpt, store, config)
+
-	//runGatewayServer(ctx, wg, config, store, taskDist, tokenMaker, userService, authService)
+	runGinServer(ctx, wg, app)
-	//runGrpcServer(ctx, wg, config, store, taskDist, tokenMaker, userService, authService)
+	runTaskProcessor(ctx, wg, redisOpt, app.store, app.config)
+	//runGatewayServer(ctx, wg, app)
+	//runGrpcServer(ctx, wg, app)
 
 	err = wg.Wait()
 	if err != nil {
@@ -144,14 +166,14 @@ func runDBMigration(migrationURL, dbSource string) {
 	log.Info().Msg("db migrated successfully")
 }
 
-func runGinServer(ctx context.Context, wg *errgroup.Group, config config.Config, store db.Store, td worker.TaskDistributor, tokenMaker auth.Maker, userService service.UserService, authService service.AuthService) {
+func runGinServer(ctx context.Context, wg *errgroup.Group, app *App) {
-	s, err := api.NewServer(config, store, td, tokenMaker, userService, authService)
+	s, err := api.NewServer(app.config, app.store, app.taskDistributor, app.tokenMaker, app.userService, app.authService)
 	if err != nil {
 		log.Fatal().Err(err).Msg("cannot create server")
 	}
 
 	wg.Go(func() error {
-		err = s.Start(config.HTTPServerAddr)
+		err = s.Start(app.config.HTTPServerAddr)
 		if err != nil {
 			log.Fatal().Err(err).Msg("cannot start server:")
 			return err
@@ -172,8 +194,8 @@ func runGinServer(ctx context.Context, wg *errgroup.Group, config config.Config,
 	})
 }
 
-func runGrpcServer(ctx context.Context, wg *errgroup.Group, config config.Config, store db.Store, taskDistributor worker.TaskDistributor, tokenMaker auth.Maker, userService service.UserService, authService service.AuthService) {
+func runGrpcServer(ctx context.Context, wg *errgroup.Group, app *App) {
-	server, err := gapi.NewServer(config, store, taskDistributor, tokenMaker, userService, authService)
+	server, err := gapi.NewServer(app.config, app.store, app.taskDistributor, app.tokenMaker, app.userService, app.authService)
 	if err != nil {
 		log.Fatal().Err(err).Msg("cannot create server:")
 	}
@@ -184,7 +206,7 @@ func runGrpcServer(ctx context.Context, wg *errgroup.Group, config config.Config
 	pb.RegisterApiTmplServer(grpcServer, server)
 	reflection.Register(grpcServer)
 
-	listener, err := net.Listen("tcp", config.GrpcServerAddr)
+	listener, err := net.Listen("tcp", app.config.GrpcServerAddr)
 	if err != nil {
 		log.Fatal().Err(err).Msg("cannot create listener")
 	}
@@ -211,8 +233,8 @@ func runGrpcServer(ctx context.Context, wg *errgroup.Group, config config.Config
 	})
 }
 
-func runGatewayServer(ctx context.Context, wg *errgroup.Group, config config.Config, store db.Store, taskDistributor worker.TaskDistributor, tokenMaker auth.Maker, userService service.UserService, authService service.AuthService) {
+func runGatewayServer(ctx context.Context, wg *errgroup.Group, app *App) {
-	server, err := gapi.NewServer(config, store, taskDistributor, tokenMaker, userService, authService)
+	server, err := gapi.NewServer(app.config, app.store, app.taskDistributor, app.tokenMaker, app.userService, app.authService)
 	if err != nil {
 		log.Fatal().Err(err).Msg("cannot create server:")
 	}
@@ -246,7 +268,7 @@ func runGatewayServer(ctx context.Context, wg *errgroup.Group, config config.Con
 
 	c := cors.New(
 		cors.Options{
-			AllowedOrigins: config.AllowedOrigins,
+			AllowedOrigins: app.config.AllowedOrigins,
 			AllowedMethods: []string{
 				http.MethodGet,
 				http.MethodPost,
@@ -262,13 +284,13 @@ func runGatewayServer(ctx context.Context, wg *errgroup.Group, config config.Con
 				"X-CSRF-Token",
 			},
 			AllowCredentials: true,
-			Debug:            config.Environment == "development",
+			Debug:            app.config.Environment == "development",
 		},
 	)
 	handler := c.Handler(gapi.HTTPLogger(mux))
 	httpServer := &http.Server{
 		Handler: handler,
-		Addr:    config.HTTPServerAddr,
+		Addr:    app.config.HTTPServerAddr,
 	}
 
 	wg.Go(func() error {