Merge pull request #73 from MonkyMars/monitor/services

Ft: Refactor codebase for health logging and different routing stragety

Author: MonkyMars

.gitignore

@@ -23,3 +23,6 @@ bin/
 # Exclude coverage reports
 *.out
 
+# Exclude IDE specific files
+.vscode/
+.idea/

apps/server/.env.example

@@ -58,17 +58,6 @@ CACHE_MAX_RETRIES=3
 CACHE_MIN_RETRY_BACKOFF=8ms
 CACHE_MAX_RETRY_BACKOFF=512ms
 
-# ===================
-# Audit Settings
-# ===================
-AUDIT_BATCH_SIZE=50
-AUDIT_FLUSH_TIME=20s
-AUDIT_CHANNEL_SIZE=1000
-AUDIT_MAX_RETRIES=3
-AUDIT_MAX_FAILURES=10
-AUDIT_RETENTION_DAYS=90
-AUDIT_ENABLED=true
-
 # ===================
 # Google Settings
 # ===================
@@ -88,9 +77,22 @@ CORS_ALLOW_CREDENTIALS=true
 # Audit Settings
 # ===================
 AUDIT_BATCH_SIZE=50
-AUDIT_FLUSH_TIME=20s
 AUDIT_CHANNEL_SIZE=1000
-AUDIT_MAX_RETRIES=3
+AUDIT_ENABLED=true
+AUDIT_FLUSH_TIME=30s
 AUDIT_MAX_FAILURES=10
+AUDIT_MAX_RETRIES=3
 AUDIT_RETENTION_DAYS=90
-AUDIT_ENABLED=true
+AUDIT_RETRY_DELAY=3s
+
+# ===================
+# Health Middleware Settings
+# ===================
+HEALTH_BATCH_SIZE=50
+HEALTH_CHANNEL_SIZE=1000
+HEALTH_ENABLED=true
+HEALTH_FLUSH_TIME=10m
+HEALTH_MAX_FAILURES=10
+HEALTH_MAX_RETRIES=3
+HEALTH_RETENTION_DAYS=21
+HEALTH_RETRY_DELAY=1m

apps/server/api/internal/app.go

@@ -8,7 +8,6 @@ import (
 	"github.com/MonkyMars/PWS/lib"
 	"github.com/MonkyMars/PWS/services"
 	"github.com/MonkyMars/PWS/types"
-	"github.com/MonkyMars/PWS/workers"
 	"github.com/gofiber/fiber/v3"
 )
 
@@ -17,7 +16,13 @@ var (
 	requestCount int64
 )
 
-func GetSystemHealth(c fiber.Ctx) error {
+type AppRoutes struct{}
+
+func NewAppRoutes() *AppRoutes {
+	return &AppRoutes{}
+}
+
+func (ar *AppRoutes) GetSystemHealth(c fiber.Ctx) error {
 	// Memory stats
 	var memStats runtime.MemStats
 	runtime.ReadMemStats(&memStats)
@@ -39,10 +44,7 @@ func GetSystemHealth(c fiber.Ctx) error {
 		Status:            status,
 		Message:           message,
 		ApplicationUptime: lib.GetUptimeString(appStartTime),
-		Services: map[string]string{
-			"database": dbStatus,
-			"api":      "ok",
-		},
+		DatabaseStatus:    dbStatus,
 		Metrics: types.HealthMetrics{
 			MemoryUsageMB: float64(memStats.Alloc) / 1024 / 1024,
 			GoRoutines:    runtime.NumGoroutine(),
@@ -51,34 +53,10 @@ func GetSystemHealth(c fiber.Ctx) error {
 	})
 }
 
-// GetAuditHealth returns the health status of the audit logging system
-func GetAuditHealth(c fiber.Ctx) error {
-	healthStatus := workers.HealthStatus()
-
-	status := "ok"
-	message := "Audit system operational"
-
-	if !healthStatus["is_healthy"].(bool) {
-		status = "degraded"
-		message = "Audit system experiencing issues"
-	}
-
-	if !healthStatus["worker_running"].(bool) {
-		status = "error"
-		message = "Audit worker not running"
-	}
-
-	return response.Success(c, map[string]any{
-		"status":  status,
-		"message": message,
-		"details": healthStatus,
-	})
-}
-
 // TODO: Add authentication middleware to protect this endpoint in production
 // Thus making sure only authorized admins can access it
 // Currently it's only available in development mode because of this issue
-func GetDatabaseHealth(c fiber.Ctx) error {
+func (ar *AppRoutes) GetDatabaseHealth(c fiber.Ctx) error {
 	now := time.Now()
 	if err := services.Ping(); err != nil {
 		return response.ServiceUnavailable(c, "Database connection error: "+err.Error())
@@ -91,6 +69,11 @@ func GetDatabaseHealth(c fiber.Ctx) error {
 	})
 }
 
-func NotFoundHandler(c fiber.Ctx) error {
-	return response.NotFound(c, "The requested resource was not found.")
+func (ar *AppRoutes) GetLogs(c fiber.Ctx) error {
+	auditService := services.NewAuditService()
+	logs, err := auditService.GetLogs()
+	if err != nil {
+		return response.InternalServerError(c, "Failed to retrieve audit logs")
+	}
+	return response.Success(c, logs)
 }

apps/server/api/internal/audit.go

@@ -1,4 +1,4 @@
-package internal
+package auth
 
 import (
 	"errors"
@@ -13,8 +13,14 @@ import (
 	"github.com/gofiber/fiber/v3"
 )
 
+type AuthRoutes struct{}
+
+func NewAuthRoutes() *AuthRoutes {
+	return &AuthRoutes{}
+}
+
 // Login handles user authentication and returns JWT tokens
-func Login(c fiber.Ctx) error {
+func (ar *AuthRoutes) Login(c fiber.Ctx) error {
 	logger := config.SetupLogger()
 
 	var authRequest types.AuthRequest
@@ -81,7 +87,7 @@ func Login(c fiber.Ctx) error {
 }
 
 // Register handles user registration and returns JWT tokens
-func Register(c fiber.Ctx) error {
+func (ar *AuthRoutes) Register(c fiber.Ctx) error {
 	logger := config.SetupLogger()
 
 	var registerRequest types.RegisterRequest
@@ -169,7 +175,7 @@ func Register(c fiber.Ctx) error {
 }
 
 // RefreshToken handles token refresh using refresh tokens
-func RefreshToken(c fiber.Ctx) error {
+func (ar *AuthRoutes) RefreshToken(c fiber.Ctx) error {
 	logger := config.SetupLogger()
 
 	token := c.Cookies(lib.RefreshTokenCookieName)
@@ -203,7 +209,7 @@ func RefreshToken(c fiber.Ctx) error {
 }
 
 // Me returns the current authenticated user's information
-func Me(c fiber.Ctx) error {
+func (ar *AuthRoutes) Me(c fiber.Ctx) error {
 	logger := config.SetupLogger()
 
 	claimsInterface := c.Locals("claims")
@@ -238,7 +244,7 @@ func Me(c fiber.Ctx) error {
 }
 
 // Logout handles user logout with graceful handling of missing/invalid tokens
-func Logout(c fiber.Ctx) error {
+func (ar *AuthRoutes) Logout(c fiber.Ctx) error {
 	logger := config.SetupLogger()
 
 	accessToken := c.Cookies(lib.AccessTokenCookieName)

apps/server/api/internal/auth.go apps/server/api/internal/auth/auth.goapps/server/api/internal/auth.go renamed to apps/server/api/internal/auth/auth.go

@@ -1,4 +1,4 @@
-package internal
+package auth
 
 import (
 	"github.com/MonkyMars/PWS/api/response"
@@ -10,7 +10,7 @@ import (
 
 // GoogleAuthURL handles getting the Google OAuth authorization URL
 // GET /auth/google/url
-func GoogleAuthURL(c fiber.Ctx) error {
+func (ar *AuthRoutes) GoogleAuthURL(c fiber.Ctx) error {
 	logger := config.SetupLogger()
 
 	// Get user from auth middleware
@@ -43,7 +43,7 @@ func GoogleAuthURL(c fiber.Ctx) error {
 
 // GoogleAuthCallback handles the OAuth callback from Google
 // GET /auth/google/callback
-func GoogleAuthCallback(c fiber.Ctx) error {
+func (ar *AuthRoutes) GoogleAuthCallback(c fiber.Ctx) error {
 	logger := config.SetupLogger()
 
 	state := c.Query("state")
@@ -70,7 +70,7 @@ func GoogleAuthCallback(c fiber.Ctx) error {
 
 // GoogleAccessToken handles getting a fresh Google access token
 // GET /auth/google/access-token
-func GoogleAccessToken(c fiber.Ctx) error {
+func (ar *AuthRoutes) GoogleAccessToken(c fiber.Ctx) error {
 	logger := config.SetupLogger()
 
 	// Get user from auth middleware
@@ -107,7 +107,7 @@ func GoogleAccessToken(c fiber.Ctx) error {
 
 // GoogleUnlink handles unlinking a user's Google account
 // DELETE /auth/google/unlink
-func GoogleUnlink(c fiber.Ctx) error {
+func (ar *AuthRoutes) GoogleUnlink(c fiber.Ctx) error {
 	logger := config.SetupLogger()
 
 	// Get user from auth middleware
@@ -138,7 +138,7 @@ func GoogleUnlink(c fiber.Ctx) error {
 
 // GoogleLinkStatus checks if user has linked their Google account
 // GET /auth/google/status
-func GoogleLinkStatus(c fiber.Ctx) error {
+func (ar *AuthRoutes) GoogleLinkStatus(c fiber.Ctx) error {
 	logger := config.SetupLogger()
 
 	// Get user from auth middleware

apps/server/api/internal/google_oauth.go …server/api/internal/auth/google_oauth.goapps/server/api/internal/google_oauth.go renamed to apps/server/api/internal/auth/google_oauth.go apps/server/api/internal/google_oauth.go renamed to apps/server/api/internal/auth/google_oauth.go

@@ -0,0 +1,7 @@
+package content
+
+type ContentRoutes struct{}
+
+func NewContentRoutes() *ContentRoutes {
+	return &ContentRoutes{}
+}

apps/server/api/internal/content/manager.go

@@ -1,4 +1,4 @@
-package files
+package content
 
 import (
 	"fmt"
@@ -9,7 +9,7 @@ import (
 )
 
 // /files/:fileId
-func GetSingleFile(c fiber.Ctx) error {
+func (cr *ContentRoutes) GetSingleFile(c fiber.Ctx) error {
 	// Get fileId from URL parameters
 	fileID := c.Params("fileId")
 	if fileID == "" {
@@ -31,7 +31,7 @@ func GetSingleFile(c fiber.Ctx) error {
 }
 
 // /files/subject/:subjectId/folder/:folderId
-func GetFilesBySubject(c fiber.Ctx) error {
+func (cr *ContentRoutes) GetFilesBySubject(c fiber.Ctx) error {
 	// Get subjectId from URL parameters
 	subjectId := c.Params("subjectId")
 	if subjectId == "" {
@@ -64,7 +64,7 @@ func GetFilesBySubject(c fiber.Ctx) error {
 	return response.Paginated(c, items, len(files), 1, len(files))
 }
 
-func GetFoldersBySubjectParent(c fiber.Ctx) error {
+func (cr *ContentRoutes) GetFoldersBySubjectParent(c fiber.Ctx) error {
 	subjectId := c.Params("subjectId")
 	if subjectId == "" {
 		return response.BadRequest(c, "subjectId parameter is required")

apps/server/api/internal/content/retrieve.go

@@ -1,4 +1,4 @@
-package files
+package content
 
 import (
 	"fmt"
@@ -14,7 +14,7 @@ import (
 )
 
 // /files/upload/single
-func UploadSingleFile(c fiber.Ctx) error {
+func (cr *ContentRoutes) UploadSingleFile(c fiber.Ctx) error {
 	claimsInterface := c.Locals("claims")
 
 	if claimsInterface == nil {
@@ -65,7 +65,7 @@ func UploadSingleFile(c fiber.Ctx) error {
 	return response.Created(c, data.Single)
 }
 
-func UploadMultipleFiles(c fiber.Ctx) error {
+func (cr *ContentRoutes) UploadMultipleFiles(c fiber.Ctx) error {
 	claimsInterface := c.Locals("claims")
 
 	if claimsInterface == nil {

apps/server/api/internal/content/upload.go

@@ -9,8 +9,14 @@ import (
 	"github.com/gofiber/fiber/v3"
 )
 
+type SubjectRoutes struct{}
+
+func NewSubjectRoutes() *SubjectRoutes {
+	return &SubjectRoutes{}
+}
+
 // GetSubjectByID retrieves a subject by its ID
-func GetSubjectByID(c fiber.Ctx) error {
+func (sr *SubjectRoutes) GetSubjectByID(c fiber.Ctx) error {
 	logger := config.SetupLogger()
 	subjectID := c.Params("subjectId")
 
@@ -32,7 +38,7 @@ func GetSubjectByID(c fiber.Ctx) error {
 	return response.Success(c, subject)
 }
 
-func GetAllSubjects(c fiber.Ctx) error {
+func (sr *SubjectRoutes) GetAllSubjects(c fiber.Ctx) error {
 	logger := config.SetupLogger()
 
 	subjectService := services.NewSubjectService()
@@ -45,7 +51,7 @@ func GetAllSubjects(c fiber.Ctx) error {
 	return response.Success(c, subjects)
 }
 
-func GetUserSubjects(c fiber.Ctx) error {
+func (sr *SubjectRoutes) GetUserSubjects(c fiber.Ctx) error {
 	logger := config.SetupLogger()
 	claimsInterface := c.Locals("claims")