feat: добавлены пути для миграции

Author: RahatMelsov

cmd/server/main.go

@@ -2,10 +2,11 @@ package main
 
 import (
 	"database/sql"
-	"log"
+	"fmt"
 	"net"
 	"time"
 
+	"github.com/charmbracelet/log"
 	"google.golang.org/grpc/reflection"
 
 	commonv1 "github.com/rtmelsov/adv-keeper/gen/go/proto/common/v1"
@@ -31,7 +32,9 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	helpers.RunMigrations(envs.DBDSN)
+	path := fmt.Sprintf("file:/%s", envs.MigrationsFilesDir)
+	log.Info("path", "path", path)
+	helpers.RunMigrations(envs.DBDSN, path)
 	// Подключение к Postgres
 	dbx, err := sql.Open("pgx", envs.DBDSN)
 	if err != nil {
@@ -56,7 +59,7 @@ func main() {
 
 	reflection.Register(s)
 
-	log.Println("gRPC listening on", lis.Addr())
+	log.Info("gRPC listening on", "add", lis.Addr())
 	if err := s.Serve(lis); err != nil {
 		log.Fatal(err)
 	}

internal/helpers/config.go

@@ -8,12 +8,13 @@ import (
 )
 
 type Config struct {
-	Addr             string `env:"AK_GRPC_ADDR,required"`
-	DBDSN            string `env:"DB_DSN,required"`
-	JWTSecret        string `env:"JWT_SECRET,required" json:"-"`
-	FilesDir         string `env:"FILES_DIR" envDefault:"./files"`
-	AccessTTL        string `env:"ACCESS_TTL" envDefault:"15m"`
-	DownloadFilesDir string `env:"DOWNLOAD_FILES_DIR" envDefault:"./opt/adv-keeper/download"`
+	Addr               string `env:"AK_GRPC_ADDR,required"`
+	DBDSN              string `env:"DB_DSN,required"`
+	JWTSecret          string `env:"JWT_SECRET,required" json:"-"`
+	FilesDir           string `env:"FILES_DIR"`
+	AccessTTL          string `env:"ACCESS_TTL"`
+	DownloadFilesDir   string `env:"DOWNLOAD_FILES_DIR"`
+	MigrationsFilesDir string `env:"MIGRATIONS_FILES_DIR"`
 }
 
 var (

internal/helpers/migrations.go

@@ -7,9 +7,9 @@ import (
 	"log"
 )
 
-func RunMigrations(dsn string) {
+func RunMigrations(dsn, filePath string) {
 	m, err := migrate.New(
-		"file://migrations", // путь до миграций
+		filePath,
 		dsn,
 	)
 	if err != nil {