Fixes after review

cmd/main.go

@@ -7,10 +7,10 @@ import (
 )
 
 func main() {
-	a, ctx, err := app.New()
+	a, err := app.New()
 	if err != nil {
 		log.Fatalf(err.Error())
 	}
 
-	a.Run(ctx)
+	a.Run()
 }

config/config.go

@@ -1,6 +1,11 @@
 package config
 
-import "time"
+import (
+	"fmt"
+	"time"
+
+	"github.com/spf13/viper"
+)
 
 type Config struct {
 	Listener Listener `yaml:"listener"`
@@ -24,6 +29,51 @@ type Listener struct {
 	IdleTimeout time.Duration `yaml:"idle_timeout"`
 }
 
-func NewConfig() *Config {
-	return &Config{}
+func New() (*Config, error) {
+	err := setupViper()
+	if err != nil {
+		return nil, fmt.Errorf("config creation error: %w", err)
+	}
+
+	listner := Listener{
+		Address:     viper.GetString("listener.address"),
+		Port:        viper.GetInt("listener.port"),
+		Timeout:     viper.GetDuration("listener.timeout"),
+		IdleTimeout: viper.GetDuration("listener.idle_timeout"),
+	}
+
+	postgres := Postgres{
+		Host:     viper.GetString("postgres.host"),
+		Port:     viper.GetInt("postgres.port"),
+		User:     viper.GetString("postgres.user"),
+		Password: viper.GetString("postgres.password"),
+		Name:     viper.GetString("postgres.name"),
+	}
+
+	return &Config{
+		Listener: listner,
+		Postgres: postgres,
+	}, nil
+}
+
+func setupViper() error {
+	viper.SetConfigName(".env")
+	viper.SetConfigType("env")
+	viper.AddConfigPath(".")
+
+	err := viper.ReadInConfig()
+	if err != nil {
+		return fmt.Errorf("failed to read .env file: %v", err)
+	}
+
+	viper.SetConfigName("config")
+	viper.SetConfigType("yml")
+	viper.AddConfigPath(viper.GetString("VIPER_CFG_PATH"))
+
+	err = viper.MergeInConfig()
+	if err != nil {
+		return fmt.Errorf("failed to read config.yml file: %v", err)
+	}
+
+	return nil
 }

config/context.go

@@ -2,27 +2,9 @@ package config
 
 import (
 	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/spf13/viper"
-	"gopkg.in/yaml.v3"
 )
 
 func WrapContext(cfg *Config) (context.Context, error) {
-	filename, _ := filepath.Abs(viper.GetString("CFG_PATH"))
-	data, err := os.ReadFile(filename)
-
-	if err != nil {
-		return nil, fmt.Errorf("failed to open env: %w", err)
-	}
-
-	err = yaml.Unmarshal(data, cfg)
-	if err != nil {
-		return nil, fmt.Errorf("cannot unmarshall config.yml: %w", err)
-	}
-
 	return context.WithValue(context.Background(), ConfigContextKey{}, cfg), nil
 }
 

docker-compose.yml

@@ -11,29 +11,29 @@ services:
     ports:
       - 8080:8080
     networks:
-      - netflix
+      - cassette-world
   redis:
     image: 'redis:latest'
     command: redis-server
     volumes:
       - redis:/data
     networks:
-      - netflix
+      - cassette-world
   db:
     image: postgres:latest
     container_name: db
     environment:
-      - "POSTGRES_DB=netflix"
+      - "POSTGRES_DB=cassette-world"
       - "POSTGRES_USER=test"
       - "POSTGRES_PASSWORD=test"
     volumes:
       - ./dev/SQL:/docker-entrypoint-initdb.d/
       - "postgres_volume:/var/lib/postgresql/data"
     networks:
-      - netflix
+      - cassette-world
 
 networks:
-  netflix:
+  cassette-world:
   default:
     external:
-      name: netflix # Не забыть создать сеть перед деплоем
+      name: cassette-world # Не забыть создать сеть перед деплоем

internal/app/app.go

@@ -8,7 +8,6 @@ import (
 	"net/http"
 
 	_ "github.com/lib/pq"
-	"github.com/spf13/viper"
 
 	"github.com/go-park-mail-ru/2024_2_GOATS/config"
 	"github.com/go-park-mail-ru/2024_2_GOATS/internal/app/api"
@@ -20,30 +19,38 @@ import (
 
 type App struct {
 	Database *sql.DB
+	Context  context.Context
 }
 
-func New() (*App, context.Context, error) {
-	setupViper()
-	ctx, err := config.WrapContext(config.NewConfig())
+func New() (*App, error) {
+	cfg, err := config.New()
 	if err != nil {
-		return nil, nil, err
+		return nil, fmt.Errorf("error initialize app cfg: %w", err)
+	}
+
+	ctx, err := config.WrapContext(cfg)
+	if err != nil {
+		return nil, fmt.Errorf("error wrap app context: %w", err)
 	}
 
 	db, err := db.SetupDatabase(ctx)
 	if err != nil {
-		return nil, nil, err
+		return nil, fmt.Errorf("error initialize database: %w", err)
 	}
 
-	return &App{Database: db}, ctx, nil
+	return &App{
+		Database: db,
+		Context:  ctx,
+	}, nil
 }
 
-func (a *App) Run(ctx context.Context) {
+func (a *App) Run() {
 	repoLayer := repository.NewRepository(a.Database)
 	srvLayer := service.NewService(repoLayer)
-	apiLayer := api.NewImplementation(ctx, srvLayer)
-	mux := router.Setup(ctx, apiLayer)
+	apiLayer := api.NewImplementation(a.Context, srvLayer)
+	mux := router.Setup(a.Context, apiLayer)
 
-	ctxValues := config.FromContext(ctx)
+	ctxValues := config.FromContext(a.Context)
 
 	srv := &http.Server{
 		Addr:         fmt.Sprintf(":%d", ctxValues.Listener.Port),
@@ -59,25 +66,3 @@ func (a *App) Run(ctx context.Context) {
 		log.Fatalf(err.Error())
 	}
 }
-
-func setupViper() {
-	viper.SetConfigName(".env")
-	viper.SetConfigType("env")
-	viper.AddConfigPath(".")
-
-	err := viper.ReadInConfig()
-	if err != nil {
-		fmt.Printf("Failed to read .env file: %v\n", err)
-		return
-	}
-
-	viper.SetConfigName("config")
-	viper.SetConfigType("yml")
-	viper.AddConfigPath(viper.GetString("VIPER_CFG_PATH"))
-
-	err = viper.MergeInConfig()
-	if err != nil {
-		fmt.Printf("Failed to read config.yml file: %v\n", err)
-		return
-	}
-}

internal/app/handler/handler.go → internal/app/handlers/auth/handler.go

@@ -1,4 +1,4 @@
-package handler
+package auth
 
 import (
 	"context"
@@ -17,9 +17,3 @@ func Register(ctx context.Context, api *api.Implementation, next http.Handler) h
 
 	})
 }
-
-func MovieCollections(ctx context.Context, api *api.Implementation, next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		api.GetCollection(ctx, r.URL.Query())
-	})
-}

internal/app/handlers/movie_collections/handler.go

@@ -0,0 +1,14 @@
+package handler
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/go-park-mail-ru/2024_2_GOATS/internal/app/api"
+)
+
+func MovieCollections(ctx context.Context, api *api.Implementation, next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		api.GetCollection(ctx, r.URL.Query())
+	})
+}

internal/app/router/router.go

@@ -5,15 +5,20 @@ import (
 	"net/http"
 
 	"github.com/go-park-mail-ru/2024_2_GOATS/internal/app/api"
-	"github.com/go-park-mail-ru/2024_2_GOATS/internal/app/handler"
+	authHandlers "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/handlers/auth"
+	movieCollectionHandlers "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/handlers/movie_collections"
 	"github.com/gorilla/mux"
 )
 
 func Setup(ctx context.Context, api *api.Implementation) *mux.Router {
 	router := mux.NewRouter()
-	router.Handle("/login", handler.Login(ctx, api, router)).Methods("POST")
-	router.Handle("/signup", handler.Register(ctx, api, router)).Methods("POST")
-	router.Handle("/movie_collections", handler.MovieCollections(ctx, api, router)).Methods("GET")
+
+	authRouter := router.PathPrefix("/auth").Subrouter()
+	authRouter.Handle("/login", authHandlers.Login(ctx, api, router)).Methods("POST")
+	authRouter.Handle("/signup", authHandlers.Register(ctx, api, router)).Methods("POST")
+
+	movieCollectionsRouter := router.PathPrefix("/movie_collections").Subrouter()
+	movieCollectionsRouter.Handle("", movieCollectionHandlers.MovieCollections(ctx, api, router)).Methods("GET")
 
 	// TODO: Add middleware using for sessions
 	http.Handle("/", router)

internal/config/config.yml

@@ -9,4 +9,4 @@ postgres:
   port: 5432
   user: test
   password: test
-  name: netflix
+  name: cassette-world