refactor: migrate DI to Wire, replace startup registries with on-demand DB queries
- Add google/wire; generate wire_gen.go from wire.go injector - Move all constructor wiring out of main.go into providers.go / wire.go - Export recognition.IngredientRepository (was unexported, blocked Wire binding) - Delete units/cuisine/tag registry.go files (global state + unused NameFor helpers) - Replace List handlers with NewListHandler(pool) using COALESCE SQL queries - Remove units/cuisine/tag LoadFromDB from server startup; locale.LoadFromDB kept (locale.Supported is used by language middleware on every request) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
dbastrikin
@@ -10,177 +10,51 @@ import (
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/food-ai/backend/internal/auth"
|
||||
"github.com/food-ai/backend/internal/config"
|
||||
"github.com/food-ai/backend/internal/cuisine"
|
||||
"github.com/food-ai/backend/internal/database"
|
||||
"github.com/food-ai/backend/internal/diary"
|
||||
"github.com/food-ai/backend/internal/dish"
|
||||
"github.com/food-ai/backend/internal/gemini"
|
||||
"github.com/food-ai/backend/internal/home"
|
||||
"github.com/food-ai/backend/internal/ingredient"
|
||||
"github.com/food-ai/backend/internal/locale"
|
||||
"github.com/food-ai/backend/internal/menu"
|
||||
"github.com/food-ai/backend/internal/middleware"
|
||||
"github.com/food-ai/backend/internal/units"
|
||||
"github.com/food-ai/backend/internal/pexels"
|
||||
"github.com/food-ai/backend/internal/product"
|
||||
"github.com/food-ai/backend/internal/recipe"
|
||||
"github.com/food-ai/backend/internal/recognition"
|
||||
"github.com/food-ai/backend/internal/recommendation"
|
||||
"github.com/food-ai/backend/internal/savedrecipe"
|
||||
"github.com/food-ai/backend/internal/server"
|
||||
"github.com/food-ai/backend/internal/tag"
|
||||
"github.com/food-ai/backend/internal/user"
|
||||
)
|
||||
|
||||
// jwtAdapter adapts auth.JWTManager to middleware.AccessTokenValidator.
|
||||
type jwtAdapter struct {
|
||||
jm *auth.JWTManager
|
||||
}
|
||||
|
||||
func (a *jwtAdapter) ValidateAccessToken(tokenStr string) (*middleware.TokenClaims, error) {
|
||||
claims, err := a.jm.ValidateAccessToken(tokenStr)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &middleware.TokenClaims{
|
||||
UserID: claims.UserID,
|
||||
Plan: claims.Plan,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func main() {
|
||||
logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
|
||||
Level: slog.LevelInfo,
|
||||
}))
|
||||
slog.SetDefault(logger)
|
||||
|
||||
if err := run(); err != nil {
|
||||
slog.Error("fatal error", "err", err)
|
||||
if runError := run(); runError != nil {
|
||||
slog.Error("fatal error", "err", runError)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
func run() error {
|
||||
cfg, err := config.Load()
|
||||
if err != nil {
|
||||
return fmt.Errorf("load config: %w", err)
|
||||
appConfig, configError := config.Load()
|
||||
if configError != nil {
|
||||
return fmt.Errorf("load config: %w", configError)
|
||||
}
|
||||
|
||||
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||
applicationContext, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||
defer stop()
|
||||
|
||||
pool, err := database.NewPool(ctx, cfg.DatabaseURL)
|
||||
if err != nil {
|
||||
return fmt.Errorf("connect to database: %w", err)
|
||||
pool, poolError := database.NewPool(applicationContext, appConfig.DatabaseURL)
|
||||
if poolError != nil {
|
||||
return fmt.Errorf("connect to database: %w", poolError)
|
||||
}
|
||||
defer pool.Close()
|
||||
slog.Info("connected to database")
|
||||
|
||||
if err := locale.LoadFromDB(ctx, pool); err != nil {
|
||||
return fmt.Errorf("load languages: %w", err)
|
||||
if loadError := locale.LoadFromDB(applicationContext, pool); loadError != nil {
|
||||
return fmt.Errorf("load languages: %w", loadError)
|
||||
}
|
||||
slog.Info("languages loaded", "count", len(locale.Languages))
|
||||
|
||||
if err := units.LoadFromDB(ctx, pool); err != nil {
|
||||
return fmt.Errorf("load units: %w", err)
|
||||
}
|
||||
slog.Info("units loaded", "count", len(units.Records))
|
||||
|
||||
if err := cuisine.LoadFromDB(ctx, pool); err != nil {
|
||||
return fmt.Errorf("load cuisines: %w", err)
|
||||
}
|
||||
slog.Info("cuisines loaded", "count", len(cuisine.Records))
|
||||
|
||||
if err := tag.LoadFromDB(ctx, pool); err != nil {
|
||||
return fmt.Errorf("load tags: %w", err)
|
||||
}
|
||||
slog.Info("tags loaded", "count", len(tag.Records))
|
||||
|
||||
// Firebase auth
|
||||
firebaseAuth, err := auth.NewFirebaseAuthOrNoop(cfg.FirebaseCredentialsFile)
|
||||
if err != nil {
|
||||
return fmt.Errorf("init firebase auth: %w", err)
|
||||
router, initError := initRouter(appConfig, pool)
|
||||
if initError != nil {
|
||||
return fmt.Errorf("init router: %w", initError)
|
||||
}
|
||||
|
||||
// JWT manager
|
||||
jwtManager := auth.NewJWTManager(cfg.JWTSecret, cfg.JWTAccessDuration, cfg.JWTRefreshDuration)
|
||||
|
||||
// User domain
|
||||
userRepo := user.NewRepository(pool)
|
||||
userService := user.NewService(userRepo)
|
||||
userHandler := user.NewHandler(userService)
|
||||
|
||||
// Auth domain
|
||||
authService := auth.NewService(firebaseAuth, userRepo, jwtManager)
|
||||
authHandler := auth.NewHandler(authService)
|
||||
|
||||
// Auth middleware
|
||||
authMW := middleware.Auth(&jwtAdapter{jm: jwtManager})
|
||||
|
||||
// External API clients
|
||||
geminiClient := gemini.NewClient(cfg.OpenAIAPIKey)
|
||||
pexelsClient := pexels.NewClient(cfg.PexelsAPIKey)
|
||||
|
||||
// Ingredient domain
|
||||
ingredientRepo := ingredient.NewRepository(pool)
|
||||
ingredientHandler := ingredient.NewHandler(ingredientRepo)
|
||||
|
||||
// Product domain
|
||||
productRepo := product.NewRepository(pool)
|
||||
productHandler := product.NewHandler(productRepo)
|
||||
|
||||
// Recognition domain
|
||||
recognitionHandler := recognition.NewHandler(geminiClient, ingredientRepo)
|
||||
|
||||
// Recommendation domain
|
||||
recommendationHandler := recommendation.NewHandler(geminiClient, pexelsClient, userRepo, productRepo)
|
||||
|
||||
// Dish domain
|
||||
dishRepo := dish.NewRepository(pool)
|
||||
dishHandler := dish.NewHandler(dishRepo)
|
||||
|
||||
// Recipe domain
|
||||
recipeRepo := recipe.NewRepository(pool)
|
||||
recipeHandler := recipe.NewHandler(recipeRepo)
|
||||
|
||||
// Saved recipes domain
|
||||
savedRecipeRepo := savedrecipe.NewRepository(pool, dishRepo)
|
||||
savedRecipeHandler := savedrecipe.NewHandler(savedRecipeRepo)
|
||||
|
||||
// Menu domain
|
||||
menuRepo := menu.NewRepository(pool)
|
||||
menuHandler := menu.NewHandler(menuRepo, geminiClient, pexelsClient, userRepo, productRepo, dishRepo)
|
||||
|
||||
// Diary domain
|
||||
diaryRepo := diary.NewRepository(pool)
|
||||
diaryHandler := diary.NewHandler(diaryRepo)
|
||||
|
||||
// Home domain
|
||||
homeHandler := home.NewHandler(pool)
|
||||
|
||||
// Router
|
||||
router := server.NewRouter(
|
||||
pool,
|
||||
authHandler,
|
||||
userHandler,
|
||||
recommendationHandler,
|
||||
savedRecipeHandler,
|
||||
ingredientHandler,
|
||||
productHandler,
|
||||
recognitionHandler,
|
||||
menuHandler,
|
||||
diaryHandler,
|
||||
homeHandler,
|
||||
dishHandler,
|
||||
recipeHandler,
|
||||
authMW,
|
||||
cfg.AllowedOrigins,
|
||||
)
|
||||
|
||||
srv := &http.Server{
|
||||
Addr: fmt.Sprintf(":%d", cfg.Port),
|
||||
httpServer := &http.Server{
|
||||
Addr: fmt.Sprintf(":%d", appConfig.Port),
|
||||
Handler: router,
|
||||
ReadTimeout: 10 * time.Second,
|
||||
WriteTimeout: 120 * time.Second, // menu generation can take ~60s
|
||||
@@ -188,17 +62,17 @@ func run() error {
|
||||
}
|
||||
|
||||
go func() {
|
||||
slog.Info("server starting", "port", cfg.Port)
|
||||
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
||||
slog.Error("server error", "err", err)
|
||||
slog.Info("server starting", "port", appConfig.Port)
|
||||
if serverError := httpServer.ListenAndServe(); serverError != nil && serverError != http.ErrServerClosed {
|
||||
slog.Error("server error", "err", serverError)
|
||||
}
|
||||
}()
|
||||
|
||||
<-ctx.Done()
|
||||
<-applicationContext.Done()
|
||||
slog.Info("shutting down...")
|
||||
|
||||
shutdownCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||
shutdownContext, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||
defer cancel()
|
||||
|
||||
return srv.Shutdown(shutdownCtx)
|
||||
return httpServer.Shutdown(shutdownContext)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user