From 188ebf853c2fb9ce36e2ccecae4cd179076a6fb7 Mon Sep 17 00:00:00 2001 From: ulflow_phattt2901 Date: Fri, 6 Jun 2025 12:49:18 +0700 Subject: [PATCH] fix:update feature-flag - enable database --- Makefile | 2 +- cmd/app/main.go | 56 ++++++++++----- configs/config.yaml | 4 +- docker-compose.yml | 48 +++---------- internal/helper/config/load.go | 1 + internal/transport/http/router.go | 109 +++++++++++++++++------------- 6 files changed, 114 insertions(+), 106 deletions(-) diff --git a/Makefile b/Makefile index 7d76af8..8ec1216 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,7 @@ docker-compose-up: # Stop Docker Compose services for local development docker-compose-down: @echo "Stopping all development services..." - docker-compose down + docker-compose down -v # Run Docker Compose for production docker-compose-prod-up: diff --git a/cmd/app/main.go b/cmd/app/main.go index 25ce7a1..99dbc1b 100644 --- a/cmd/app/main.go +++ b/cmd/app/main.go @@ -24,10 +24,14 @@ type HTTPService struct { } func NewHTTPService(cfg *config.Config, db *database.Database) *HTTPService { + var gormDB *gorm.DB + if db != nil { + gormDB = db.DB + } return &HTTPService{ - server: http.NewServer(cfg, db.DB), + server: http.NewServer(cfg, gormDB), // gormDB can be nil here cfg: cfg, - db: db, + db: db, // db itself (the *database.Database wrapper) can also be nil } } @@ -108,26 +112,44 @@ func main() { } lifecycleMgr := lifecycle.New(shutdownTimeout) - // Initialize database connection - db, err := database.NewConnection(&cfg.Database) - if err != nil { - logger.WithError(err).Fatal("Failed to connect to database") + var gormDB *gorm.DB // Declare gormDB for database connection + var dbInstance *database.Database // Declare dbInstance for HTTPService and other potential users + + if feature.IsEnabled(feature.EnableDatabase) { + logger.Info("Feature flag 'enable_database' is true. Initializing database connection...") + // Initialize database connection + var dbErr error + gormDB, dbErr = database.NewConnection(&cfg.Database) + if dbErr != nil { + logger.WithError(dbErr).Fatal("Failed to connect to database") + } + + // Run database migrations + if err := database.Migrate(cfg.Database); err != nil { // Migrate still needs cfg.Database for path etc. + logger.WithError(err).Fatal("Failed to migrate database") + } + + // Register database cleanup on shutdown + lifecycleMgr.Register(&databaseService{db: gormDB}) + + // Prepare dbInstance for HTTPService + dbInstance = &database.Database{DB: gormDB, Config: &cfg.Database} + } else { + logger.Info("Feature flag 'enable_database' is false. Skipping database initialization.") + // gormDB remains nil + // dbInstance remains nil + // No databaseService is registered with lifecycleMgr if DB is disabled. } - // Run database migrations - if err := database.Migrate(cfg.Database); err != nil { - logger.WithError(err).Fatal("Failed to migrate database") - } - - // Register database cleanup on shutdown - lifecycleMgr.Register(&databaseService{db: db}) - - // Initialize HTTP service with database - httpService := NewHTTPService(cfg, &database.Database{DB: db}) + // Initialize HTTP service + // NewHTTPService and its chain (http.NewServer, http.SetupRouter) + // must be able to handle a nil dbInstance or a dbInstance with a nil DB. + // The NewHTTPService function already checks if its db argument (or db.DB) is nil. + httpService := NewHTTPService(cfg, dbInstance) // dbInstance can be nil here if httpService == nil { logger.Fatal("Failed to create HTTP service") } - lifecycleMgr.Register(httpService) + lifecycleMgr.Register(httpService) // HTTP service is always registered // Start all services logger.Info("Đang khởi động các dịch vụ...") diff --git a/configs/config.yaml b/configs/config.yaml index 1fca4c2..5143571 100644 --- a/configs/config.yaml +++ b/configs/config.yaml @@ -19,11 +19,11 @@ server: database: driver: "postgres" - host: "localhost" + host: "postgres" port: 5432 username: "postgres" password: "postgres" - database: "ulflow" + database: "ulflow_zee" ssl_mode: "disable" max_open_conns: 25 max_idle_conns: 5 diff --git a/docker-compose.yml b/docker-compose.yml index 071fbef..b180a2c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,58 +26,30 @@ services: container_name: ulflow-postgres restart: unless-stopped environment: - POSTGRES_USER: ${DB_USER:-user} - POSTGRES_PASSWORD: ${DB_PASSWORD:-password} - POSTGRES_DB: ${DB_NAME:-ulflow_db} + POSTGRES_USER: postgres + POSTGRES_PASSWORD: Minhtuyen0605 + POSTGRES_DB: ulflow_zee ports: - "5432:5432" volumes: - postgres-data:/var/lib/postgresql/data networks: - ulflow-network - - # Gitea (Git Server, CI/CD, Registry) - gitea: - image: gitea/gitea:1.21 - container_name: ulflow-gitea + adminer: + image: adminer:latest # Hoặc adminer:4.8.1 (chọn phiên bản cụ thể nếu muốn) + container_name: ulflow-adminer restart: unless-stopped - environment: - - USER_UID=1000 - - USER_GID=1000 - - GITEA__database__DB_TYPE=postgres - - GITEA__database__HOST=postgres:5432 - - GITEA__database__NAME=gitea - - GITEA__database__USER=${DB_USER:-user} - - GITEA__database__PASSWD=${DB_PASSWORD:-password} ports: - - "3001:3000" - - "2222:22" - volumes: - - gitea-data:/data - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro + - "8080:8080" # Ánh xạ cổng 8080 của container ra cổng 8080 của host + environment: + ADMINER_DEFAULT_SERVER: postgres # Tên service của PostgreSQL trong Docker Compose depends_on: - - postgres - networks: - - ulflow-network - - # Gitea Runner for CI/CD - gitea-runner: - image: gitea/act_runner:latest - container_name: ulflow-gitea-runner - restart: unless-stopped - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - gitea-runner-data:/data - depends_on: - - gitea + - postgres # Đảm bảo postgres khởi động trước adminer networks: - ulflow-network volumes: postgres-data: - gitea-data: - gitea-runner-data: go-modules: networks: diff --git a/internal/helper/config/load.go b/internal/helper/config/load.go index 64eed47..bd352f5 100644 --- a/internal/helper/config/load.go +++ b/internal/helper/config/load.go @@ -107,6 +107,7 @@ func (l *ViperConfigLoader) loadEnvFile(v *viper.Viper) error { if err := os.Setenv(key, val); err != nil { return fmt.Errorf("failed to set environment variable %s: %w", key, err) } + fmt.Println("Loaded environment variable:", key, "=", val) } return nil diff --git a/internal/transport/http/router.go b/internal/transport/http/router.go index 64b1bf4..9faa30d 100644 --- a/internal/transport/http/router.go +++ b/internal/transport/http/router.go @@ -4,6 +4,7 @@ import ( "time" "zee/internal/adapter/postgres" "zee/internal/helper/config" + "zee/internal/helper/logger" // Added logger import "zee/internal/service" "zee/internal/transport/http/handler" "zee/internal/transport/http/middleware" @@ -31,60 +32,72 @@ func SetupRouter(cfg *config.Config, db *gorm.DB) *gin.Engine { securityCfg := middleware.DefaultSecurityConfig() securityCfg.Apply(router) - // Khởi tạo repositories - userRepo := postgres.NewUserRepository(db) - roleRepo := postgres.NewRoleRepository(db) - - // Get JWT configuration from config - jwtSecret := "your-secret-key" // Default fallback - accessTokenExpire := 24 * time.Hour - - // Override with config values if available - if cfg.JWT.Secret != "" { - jwtSecret = cfg.JWT.Secret - } - if cfg.JWT.AccessTokenExpire > 0 { - accessTokenExpire = time.Duration(cfg.JWT.AccessTokenExpire) * time.Minute - } - - // Khởi tạo services - authSvc := service.NewAuthService( - userRepo, - roleRepo, - jwtSecret, - accessTokenExpire, - ) - - // Khởi tạo middleware - authMiddleware := middleware.NewAuthMiddleware(authSvc) - _ = authMiddleware // TODO: Use authMiddleware when needed - - // Khởi tạo các handlers + // Khởi tạo các handlers không phụ thuộc DB healthHandler := handler.NewHealthHandler(cfg) - authHandler := handler.NewAuthHandler(authSvc) - // Đăng ký các routes - - // Health check routes (public) + // Đăng ký các routes không phụ thuộc DB router.GET("/ping", healthHandler.Ping) router.GET("/health", healthHandler.HealthCheck) - // Auth routes (public) - authGroup := router.Group("/api/v1/auth") - { - authGroup.POST("/register", authHandler.Register) - authGroup.POST("/login", authHandler.Login) - authGroup.POST("/refresh", authHandler.RefreshToken) - authGroup.POST("/logout", authMiddleware.Authenticate(), authHandler.Logout) - } + // Các thành phần và routes phụ thuộc vào DB + if db != nil { + logger.Info("Database connection is available. Initializing DB-dependent services and routes...") + // Khởi tạo repositories + userRepo := postgres.NewUserRepository(db) + roleRepo := postgres.NewRoleRepository(db) - // Protected API routes - api := router.Group("/api/v1") - api.Use(authMiddleware.Authenticate()) - { - // Ví dụ về protected endpoints - // api.GET("/profile", userHandler.GetProfile) - // api.PUT("/profile", userHandler.UpdateProfile) + // Get JWT configuration from config + jwtSecret := "your-secret-key" // Default fallback + accessTokenExpire := 24 * time.Hour + + // Override with config values if available + if cfg.JWT.Secret != "" { + jwtSecret = cfg.JWT.Secret + } + if cfg.JWT.AccessTokenExpire > 0 { + accessTokenExpire = time.Duration(cfg.JWT.AccessTokenExpire) * time.Minute + } + + // Khởi tạo services + authSvc := service.NewAuthService( + userRepo, + roleRepo, + jwtSecret, + accessTokenExpire, + ) + + // Khởi tạo middleware + authMiddleware := middleware.NewAuthMiddleware(authSvc) + + // Khởi tạo các handlers phụ thuộc DB + authHandler := handler.NewAuthHandler(authSvc) + + // Auth routes (public) + authGroup := router.Group("/api/v1/auth") + { + authGroup.POST("/register", authHandler.Register) + authGroup.POST("/login", authHandler.Login) + authGroup.POST("/refresh", authHandler.RefreshToken) + authGroup.POST("/logout", authMiddleware.Authenticate(), authHandler.Logout) + } + + // Protected API routes + api := router.Group("/api/v1") + api.Use(authMiddleware.Authenticate()) + { + // Ví dụ về protected endpoints + // api.GET("/profile", userHandler.GetProfile) + // api.PUT("/profile", userHandler.UpdateProfile) + } + } else { + logger.Info("Database is disabled via feature flag or connection failed. DB-dependent routes (e.g., /api/v1/auth, /api/v1/*) will not be available.") + // Optionally, register placeholder routes that return 503 Service Unavailable + // router.Any("/api/v1/auth/*any", func(c *gin.Context) { + // c.JSON(http.StatusServiceUnavailable, gin.H{"error": "Authentication service is currently disabled"}) + // }) + // router.Any("/api/v1/*any", func(c *gin.Context) { + // c.JSON(http.StatusServiceUnavailable, gin.H{"error": "API service is currently disabled due to database unavailability"}) + // }) } return router