fixes and refactor

app/services/audit.py

@@ -3,7 +3,7 @@ Audit logging service
 """
 import json
 from typing import Dict, Any, Optional
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from sqlalchemy.orm import Session
 from fastapi import Request
 
@@ -65,7 +65,7 @@ class AuditService:
             details=details,
             ip_address=ip_address,
             user_agent=user_agent,
-            timestamp=datetime.utcnow()
+            timestamp=datetime.now(timezone.utc)
         )
         
         try:
@@ -76,7 +76,7 @@ class AuditService:
         except Exception as e:
             db.rollback()
             # Log the error but don't fail the main operation
-            logger.error("Failed to log audit entry", error=str(e), action=action, user_id=user_id)
+            logger.error("Failed to log audit entry", error=str(e), action=action)
             return audit_log
     
     @staticmethod
@@ -119,7 +119,7 @@ class AuditService:
             ip_address=ip_address or "unknown",
             user_agent=user_agent,
             success=1 if success else 0,
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(timezone.utc),
             failure_reason=failure_reason if not success else None
         )
         
@@ -252,7 +252,7 @@ class AuditService:
         Returns:
             List of failed login attempts
         """
-        cutoff_time = datetime.utcnow() - timedelta(hours=hours)
+        cutoff_time = datetime.now(timezone.utc) - timedelta(hours=hours)
         query = db.query(LoginAttempt).filter(
             LoginAttempt.success == 0,
             LoginAttempt.timestamp >= cutoff_time