Fixed some small bugs after merge

internal/server/healthHandler.go

@@ -8,10 +8,11 @@ import (
 )
 
 type HealthHandler struct {
+	db *db.Database
 }
 
-func NewHealthHandler() *HealthHandler {
-	return &HealthHandler{}
+func NewHealthHandler(database *db.Database) *HealthHandler {
+	return &HealthHandler{db: database}
 }
 
 // HealthCheck godoc
@@ -24,5 +25,5 @@ func NewHealthHandler() *HealthHandler {
 //	@Success		200	{string}	string	"OK"
 //	@Router			/health [get]
 func (h *HealthHandler) HealthCheck(ctx *echo.Context) error {
-	return ctx.JSON(http.StatusOK, db.Health())
+	return ctx.JSON(http.StatusOK, h.db.Health())
 }

internal/server/health_handler_test.go

@@ -5,18 +5,13 @@ import (
 	"net/http"
 	"testing"
 
-	"music-server/internal/db"
-
 	"github.com/stretchr/testify/assert"
 )
 
 // TestHealthCheck verifies the health endpoint returns database status
 func TestHealthCheck(t *testing.T) {
-	// Setup database
-	db.TestSetupDB(t)
-	defer db.TestTearDownDB(t)
-
 	e := StartTestServer(t)
+	// No explicit teardown - handled by StartTestServer's sync.Once
 
 	resp := MakeTestRequest(t, e, "GET", "/health")
 	assert.Equal(t, http.StatusOK, resp.Code)

internal/server/routes.go

@@ -63,7 +63,7 @@ func (s *Server) RegisterRoutes() http.Handler {
 	// ============================================
 	deprecatedMiddleware := middleware.DeprecationMiddleware
 
-	health := NewHealthHandler()
+	health := NewHealthHandler(s.db)
 	e.GET("/health", deprecatedMiddleware(health.HealthCheck))
 
 	version := NewVersionHandler()
@@ -112,10 +112,10 @@ func (s *Server) RegisterRoutes() http.Handler {
 	// ============================================
 	// API v1 Routes with Token Authentication
 	// ============================================
-	
+
 	// Create /api/v1 group
 	apiV1 := e.Group("/api/v1")
-	
+
 	// Public endpoints - no token required
 	apiV1.POST("/token", func(c *echo.Context) error {
 		return s.tokenHandler.CreateTokenHandler(c)
@@ -164,33 +164,6 @@ func (s *Server) RegisterRoutes() http.Handler {
 	// Future: VGMQ endpoints will be added to protectedV1 group
 	_ = protectedV1 // Use the variable to avoid unused variable error
 
-	// ============================================
-	// API v1 Routes with Token Authentication
-	// ============================================
-	
-	// Create /api/v1 group
-	apiV1 := e.Group("/api/v1")
-	
-	// Public endpoints - no token required
-	apiV1.POST("/token", func(c *echo.Context) error {
-		return s.tokenHandler.CreateTokenHandler(c)
-	})
-	apiV1.DELETE("/token", func(c *echo.Context) error {
-		return s.tokenHandler.DeleteTokenHandler(c)
-	})
-	apiV1.POST("/token/cleanup", func(c *echo.Context) error {
-		return s.tokenHandler.CleanupExpiredSessionsHandler(c)
-	})
-
-	// Protected endpoints - require valid token
-	// Create token auth middleware with pool access
-	tokenAuthMiddleware := middleware.TokenAuthMiddleware(s.db.Pool)
-
-	// Protected group with token authentication - will be used by VGMQ and Statistics API
-	_ = apiV1.Group("", tokenAuthMiddleware)
-
-	// Note: Future protected endpoints (VGMQ, Statistics) will be added here
-
 	routes := e.Router().Routes()
 	sort.Slice(routes, func(i, j int) bool {
 		return routes[i].Path < routes[j].Path

internal/server/statistics_handler_test.go

@@ -73,6 +73,11 @@ func TestPartialMigrationThenSyncThenComplete(t *testing.T) {
 
 	require.Equal(t, http.StatusOK, rec.Code)
 
+	// Wait for sync to complete
+	if !waitForSyncCompletion(t, e, 60) {
+		t.Error("Sync did not complete within timeout")
+	}
+
 	// Verify data via statistics endpoint
 	req = httptest.NewRequest(http.MethodGet, "/api/v1/statistics/summary", nil)
 	req.Header.Set("Authorization", "Bearer "+token)
@@ -85,9 +90,9 @@ func TestPartialMigrationThenSyncThenComplete(t *testing.T) {
 	err := json.Unmarshal(rec.Body.Bytes(), &summary)
 	require.NoError(t, err)
 
-	// We inserted 5 soundtracks, so total should be at least 5
-	// (there might be existing data)
-	require.GreaterOrEqual(t, summary.TotalGames, int64(5))
+	// After sync with /sync/new, only soundtracks matching filesystem remain
+	// testMusic has 3 games
+	require.Equal(t, int64(3), summary.TotalGames)
 }
 
 // insertTestData inserts 5 test soundtracks with songs into the database
@@ -115,8 +120,8 @@ func insertTestData(t *testing.T) {
 	for _, st := range soundtracks {
 		_, err := queries.InsertSoundtrack(ctx, repository.InsertSoundtrackParams{
 			SoundtrackName: st.name,
-			Path:          st.path,
-			Hash:          "test-hash-" + st.name,
+			Path:           st.path,
+			Hash:           "test-hash-" + st.name,
 		})
 		require.NoError(t, err, "Failed to insert soundtrack: %s", st.name)
 	}

internal/server/test_helpers.go

@@ -50,7 +50,7 @@ func StartTestServer(t *testing.T) *echo.Echo {
 
 	// Initialize database for tests
 	db.TestSetupDB(t)
-	
+
 	// Initialize backend with test database pool
 	// This ensures BackendRepo() and BackendCtx() are available
 	if db.TestDatabase != nil && db.TestDatabase.Pool != nil {
@@ -59,8 +59,9 @@ func StartTestServer(t *testing.T) *echo.Echo {
 
 	// Create a Server instance and get its routes
 	s := &Server{
-		db:            db.TestDatabase,
-		tokenHandler:   NewTokenHandler(db.TestDatabase.Pool),
+		db:                db.TestDatabase,
+		tokenHandler:      NewTokenHandler(db.TestDatabase.Pool),
+		statisticsHandler: NewStatisticsHandler(),
 	}
 	handler := s.RegisterRoutes()