diff --git a/main_dc/yalarba/api_yal/cmd/main.go b/main_dc/yalarba/api_yal/cmd/main.go index a9a1462..6d32bce 100644 --- a/main_dc/yalarba/api_yal/cmd/main.go +++ b/main_dc/yalarba/api_yal/cmd/main.go @@ -5,9 +5,12 @@ import ( "net/http" "api_yal/internal/config" + "api_yal/internal/database" "api_yal/internal/handlers" - "api_yal/internal/server" "api_yal/internal/logger" + "api_yal/internal/server" + + "go.uber.org/zap" ) func main() { @@ -15,30 +18,35 @@ func main() { // Конфигурация включает параметры БД, уровень логирования, порт приложения и т.д. cfg := config.Load() - // Инициализация логгера с указанным уровнем логирования и окружением (dev/prod) // Логгер будет настроен соответствующим образом для заданного окружения logger.Init(cfg.LogLevel, cfg.Environment) - // Получение инстанса логгера для использования во всем приложении zapLogger := logger.Get() // Логирование старта приложения с указанием используемого стека технологий zapLogger.Info("Start api_yal REST API on stack Golang (gorm, chi) and PostgresDB connect") + // Инициализация подключения к базе данных PostgreSQL с использованием параметров из конфигурации + // Возвращается объект gorm.DB для работы с ORM + _, err := database.NewPostgresConnection(cfg) + if err != nil { + // Критическая ошибка подключения к БД - приложение не может работать без БД + zapLogger.Panic("Failed to connect to database:", zap.Error(err)) + } + // Создаем маршрутизатор mux := http.NewServeMux() - + // Регистрируем обработчики handlers.RegisterAuthRoutes(mux) - + // Создаем и запускаем сервер srv := server.NewServer(":8787", mux) - + log.Printf("Server starting on port %s", ":8787") if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed { log.Fatalf("Server failed to start: %v", err) } } - diff --git a/main_dc/yalarba/api_yal/go.mod b/main_dc/yalarba/api_yal/go.mod index ebfe147..d89ebfa 100644 --- a/main_dc/yalarba/api_yal/go.mod +++ b/main_dc/yalarba/api_yal/go.mod @@ -4,11 +4,20 @@ go 1.22.5 require gorm.io/gorm v1.31.1 -require go.uber.org/multierr v1.10.0 // indirect +require ( + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect + github.com/jackc/pgx/v5 v5.6.0 // indirect + github.com/jackc/puddle/v2 v2.2.2 // indirect + go.uber.org/multierr v1.10.0 // indirect + golang.org/x/crypto v0.31.0 // indirect + golang.org/x/sync v0.10.0 // indirect +) require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect go.uber.org/zap v1.27.1 - golang.org/x/text v0.20.0 // indirect + golang.org/x/text v0.21.0 // indirect + gorm.io/driver/postgres v1.6.0 ) diff --git a/main_dc/yalarba/api_yal/go.sum b/main_dc/yalarba/api_yal/go.sum index 7024308..c50a080 100644 --- a/main_dc/yalarba/api_yal/go.sum +++ b/main_dc/yalarba/api_yal/go.sum @@ -1,12 +1,35 @@ +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.6.0 h1:SWJzexBzPL5jb0GEsrPMLIsi/3jOo7RHlzTjcAeDrPY= +github.com/jackc/pgx/v5 v5.6.0/go.mod h1:DNZ/vlrUnhWCoFGxHAG8U2ljioxukquj7utPDgtQdTw= +github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= +github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc= go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= +gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= diff --git a/main_dc/yalarba/api_yal/internal/database/psql_db.go b/main_dc/yalarba/api_yal/internal/database/psql_db.go new file mode 100644 index 0000000..45aa4b2 --- /dev/null +++ b/main_dc/yalarba/api_yal/internal/database/psql_db.go @@ -0,0 +1,59 @@ +package database + +import ( + "api_yal/internal/config" + "api_yal/internal/models" + "api_yal/internal/logger" + "fmt" + + "go.uber.org/zap" + "gorm.io/driver/postgres" + "gorm.io/gorm" +) + +func NewPostgresConnection(cfg *config.Config) (*gorm.DB, error) { + zapLogger := logger.Get() + zapLogger.Info("Start connect to Postgres DB") + dsn := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%s sslmode=disable TimeZone=UTC", + cfg.DBHost, cfg.DBUser, cfg.DBPassword, cfg.DBName, cfg.DBPort) + zapLogger.Info("dsn = %s", zap.String("dsn", dsn)) + + db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{}) + if err != nil { + return nil, fmt.Errorf("failed to connect to database: %w", err) + } + + zapLogger.Info("AutoMigrate models") + // Автомиграция + if err := autoMigrate(db); err != nil { + zapLogger.Error("can't migrate models, error = %s", zap.Error(err)) + return nil, fmt.Errorf("can't migrate models, error = %s", err) + } + zapLogger.Info("Migrate complite successfully") + + zapLogger.Info("Fill init data") + + zapLogger.Info("Successfully connected to database") + return db, nil +} + +func autoMigrate(db *gorm.DB) error { + zapLogger := logger.Get() + zapLogger.Debug("Start migration") + models := []interface{}{ + &models.User{}, + &models.Object{}, + &models.ObjectImage{}, + &models.Amenity{}, + &models.ObjectAmenity{}, + } + + for _, model := range models { + if err := db.AutoMigrate(model); err != nil { + return fmt.Errorf("failed to migrate %T: %w", model, err) + } + } + + zapLogger.Debug("End migration seccessfully") + return nil +}