instanciar handlers

Author: Bulletdev

cmd/main.go

@@ -34,6 +34,7 @@ func main() {
 	}
 	defer dbPool.Close()
 
+	// Instantiate repositories
 	userRepo := users.NewPostgresUserRepository(dbPool)
 	productRepo := products.NewPostgresProductRepository(dbPool)
 	categoryRepo := categories.NewPostgresCategoryRepository(dbPool)
@@ -44,13 +45,15 @@ func main() {
 	// Instantiate the password hasher
 	hasher := auth.NewBcryptPasswordHasher()
 
-	// Pass the hasher to NewAuthHandler
+	// Instantiate handlers
 	authHandler := handlers.NewAuthHandler(userRepo, hasher, cfg.JWTSecret, defaultJWTExpiry)
 	userHandler := handlers.NewUserHandler(userRepo, addressRepo)
 	productHandler := handlers.NewProductHandler(productRepo)
 	categoryHandler := handlers.NewCategoryHandler(categoryRepo)
 	cartHandler := handlers.NewCartHandler(cartRepo, productRepo)
 	orderHandler := handlers.NewOrderHandler(orderRepo, cartRepo, addressRepo)
+
+	// Instantiate middleware
 	authMiddleware := auth.NewMiddleware(cfg.JWTSecret, userRepo)
 
 	r := setupRoutes(authHandler, userHandler, productHandler, categoryHandler, cartHandler, orderHandler, authMiddleware)
@@ -60,6 +63,7 @@ func main() {
 		port = defaultPort
 	}
 
+	// Configure HTTP server
 	srv := &http.Server{
 		Addr:         ":" + port,
 		Handler:      r,
@@ -68,19 +72,23 @@ func main() {
 		IdleTimeout:  15 * time.Second,
 	}
 
+	// Setup graceful shutdown
 	done := make(chan os.Signal, 1)
 	signal.Notify(done, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
 
+	// Start server in a goroutine
 	go func() {
 		log.Printf("Server starting on port %s", port)
 		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			log.Fatalf("listen: %s\n", err)
 		}
 	}()
 
+	// Wait for shutdown signal
 	<-done
 	log.Println("Server shutting down gracefully...")
 
+	// Create context for shutdown
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
 
@@ -91,11 +99,13 @@ func main() {
 	log.Println("Server exited properly")
 }
 
+// setupRoutes configures the API routes using mux router.
 func setupRoutes(ah *handlers.AuthHandler, uh *handlers.UserHandler, ph *handlers.ProductHandler, ch *handlers.CategoryHandler, cartH *handlers.CartHandler, oh *handlers.OrderHandler, mw *auth.Middleware) *mux.Router {
 	r := mux.NewRouter()
 
 	apiV1 := r.PathPrefix("/api").Subrouter()
 
+	// Public routes
 	apiV1.HandleFunc("/health", handlers.HealthCheck).Methods("GET")
 	apiV1.HandleFunc("/auth/register", ah.Register).Methods("POST")
 	apiV1.HandleFunc("/auth/login", ah.Login).Methods("POST")
@@ -104,6 +114,7 @@ func setupRoutes(ah *handlers.AuthHandler, uh *handlers.UserHandler, ph *handler
 	apiV1.HandleFunc("/categories", ch.GetAllCategories).Methods("GET")
 	apiV1.HandleFunc("/categories/{id:[0-9a-fA-F-]+}", ch.GetCategory).Methods("GET")
 
+	// Protected routes (grouped by resource)
 	protectedUserRoutes := apiV1.PathPrefix("/users").Subrouter()
 	protectedUserRoutes.Use(mw.Authenticate)
 	protectedUserRoutes.HandleFunc("/me", uh.GetMe).Methods("GET")

internal/handlers/auth_handler.go

@@ -81,7 +81,6 @@ func (h *AuthHandler) Register(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Hash the password using the injected hasher
 	hashedPassword, err := h.Hasher.HashPassword(req.Password)
 	if err != nil {
 		webutils.ErrorJSON(w, errors.New("failed to register user"), http.StatusInternalServerError)
@@ -94,7 +93,6 @@ func (h *AuthHandler) Register(w http.ResponseWriter, r *http.Request) {
 		PasswordHash: hashedPassword,
 	}
 
-	// Call UserRepo.Create with individual fields as per current repo signature
 	createdUser, err := h.UserRepo.Create(context.Background(), user.Name, user.Email, user.PasswordHash)
 	if err != nil {
 		webutils.ErrorJSON(w, errors.New("failed to register user"), http.StatusInternalServerError)
@@ -133,14 +131,12 @@ func (h *AuthHandler) Login(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Check the password using the injected hasher
 	err = h.Hasher.CheckPassword(user.PasswordHash, req.Password)
-	if err != nil { // bcrypt.CompareHashAndPassword returns error on mismatch
+	if err != nil {
 		webutils.ErrorJSON(w, errors.New("invalid email or password"), http.StatusUnauthorized)
 		return
 	}
 
-	// Generate JWT using the correct function name
 	token, err := auth.GenerateToken(user.ID, h.JwtSecret, h.TokenExpiryDuration)
 	if err != nil {
 		webutils.ErrorJSON(w, errors.New("login failed"), http.StatusInternalServerError)

internal/handlers/product_handler_test.go

@@ -20,20 +20,6 @@ import (
 	"github.com/stretchr/testify/mock"
 )
 
-// --- Test Setup Helpers ---
-
-// setupBaseTest creates common mocks and components for handler tests.
-func setupBaseTest(t *testing.T) (*users.MockUserRepository, *auth.Middleware, *mux.Router) {
-	mockUserRepo := new(users.MockUserRepository)
-	// Use a fixed test secret for predictable tokens
-	testJwtSecret := "test-secret-for-jwt-please-change"
-	authMiddleware := auth.NewMiddleware(testJwtSecret, mockUserRepo)
-
-	router := mux.NewRouter()
-
-	return mockUserRepo, authMiddleware, router
-}
-
 // setupProductTest creates mock repositories, handler, middleware, and router for tests.
 func setupProductTest(t *testing.T) (*products.MockProductRepository, *users.MockUserRepository, *handlers.ProductHandler, *auth.Middleware, *mux.Router) {
 	mockProductRepo := new(products.MockProductRepository)
@@ -187,15 +173,6 @@ func TestProductHandler_GetProduct(t *testing.T) {
 
 // --- Tests for Protected Routes (Require Authentication) ---
 
-// Helper to generate a test token
-func generateTestToken(userID uuid.UUID, secret string) string {
-	token, err := auth.GenerateToken(userID, secret, time.Hour)
-	if err != nil {
-		panic("failed to generate test token: " + err.Error()) // Panic in test setup is ok
-	}
-	return token
-}
-
 func TestProductHandler_CreateProduct(t *testing.T) {
 	// Removed setup from here
 	testUserID := uuid.New()

internal/handlers/test_helpers_test.go

@@ -0,0 +1,41 @@
+package handlers_test
+
+import (
+	"bullet-cloud-api/internal/auth"
+	"bullet-cloud-api/internal/users"
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/gorilla/mux"
+)
+
+// --- Common Test Setup --- //
+
+const testJwtSecret = "test-secret-for-jwt-please-change" // Consistent secret for tests
+
+// setupBaseTest initializes common components for handler tests:
+// - MockUserRepository
+// - AuthMiddleware (configured with test secret and user repo)
+// - Mux Router
+func setupBaseTest(t *testing.T) (*users.MockUserRepository, *auth.Middleware, *mux.Router) {
+	t * testing.T // Ensure t is used or remove if not needed directly
+	mockUserRepo := new(users.MockUserRepository)
+	// Use a fixed expiry for consistency in tests, can be overridden if needed
+	authMiddleware := auth.NewMiddleware(testJwtSecret, mockUserRepo)
+	router := mux.NewRouter()
+
+	return mockUserRepo, authMiddleware, router
+}
+
+// generateTestToken creates a JWT for testing purposes.
+func generateTestToken(userID uuid.UUID, secret string) string {
+	// Use a fixed expiry for consistency unless specific test requires different
+	tokenExpiry := time.Hour * 1
+	token, err := auth.GenerateToken(userID, secret, tokenExpiry)
+	if err != nil {
+		// Panic is acceptable in test setup if token generation fails fundamentally
+		panic("Failed to generate test token: " + err.Error())
+	}
+	return token
+}