diff --git a/internal/middleware/rate_limit.go b/internal/middleware/rate_limit.go index 88fd579..c00c1aa 100644 --- a/internal/middleware/rate_limit.go +++ b/internal/middleware/rate_limit.go @@ -53,18 +53,15 @@ func (rl *RateLimiter) cleanupVisitors() { ticker := time.NewTicker(5 * time.Minute) defer ticker.Stop() - for { - select { - case <-ticker.C: - rl.mu.Lock() - for ip, limiter := range rl.visitors { - // Remove visitors that haven't been used recently - if limiter.TokensAt(time.Now()) == float64(rl.burst) { - delete(rl.visitors, ip) - } + for range ticker.C { + rl.mu.Lock() + for ip, limiter := range rl.visitors { + // Remove visitors that haven't been used recently + if limiter.TokensAt(time.Now()) == float64(rl.burst) { + delete(rl.visitors, ip) } - rl.mu.Unlock() } + rl.mu.Unlock() } } diff --git a/internal/services/auth_service.go b/internal/services/auth_service.go index df75974..0a5c430 100644 --- a/internal/services/auth_service.go +++ b/internal/services/auth_service.go @@ -93,7 +93,7 @@ func (s *authService) Login(req models.LoginRequest, ipAddress, userAgent string // Log successful login s.logAudit(&user.ID, user.Username, models.ActionLogin, models.ResourceAuth, - fmt.Sprintf("User logged in successfully"), ipAddress, userAgent, true) + "User logged in successfully", ipAddress, userAgent, true) return authResponse, nil } diff --git a/internal/services/holiday_service.go b/internal/services/holiday_service.go index a1ac469..e9ac04b 100644 --- a/internal/services/holiday_service.go +++ b/internal/services/holiday_service.go @@ -171,7 +171,17 @@ func (s *holidayService) GetUpcomingHolidays(limit int) ([]models.Holiday, error today := time.Now() endDate := today.AddDate(1, 0, 0) // Next year - return s.repo.GetByDateRange(today, endDate, nil) + holidays, err := s.repo.GetByDateRange(today, endDate, nil) + if err != nil { + return nil, err + } + + // Apply limit + if len(holidays) > limit { + holidays = holidays[:limit] + } + + return holidays, nil } // GetHolidaysByYear gets holidays by specific year