fixes and refactor

app/models/audit.py

@@ -3,7 +3,7 @@ Audit logging models
 """
 from sqlalchemy import Column, Integer, String, Text, DateTime, ForeignKey, JSON
 from sqlalchemy.orm import relationship
-from datetime import datetime
+from datetime import datetime, timezone
 from app.models.base import BaseModel
 
 
@@ -22,7 +22,7 @@ class AuditLog(BaseModel):
     details = Column(JSON, nullable=True)  # Additional details as JSON
     ip_address = Column(String(45), nullable=True)  # IPv4/IPv6 address
     user_agent = Column(Text, nullable=True)  # Browser/client information
-    timestamp = Column(DateTime, default=datetime.utcnow, nullable=False, index=True)
+    timestamp = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), nullable=False, index=True)
     
     # Relationships
     user = relationship("User", back_populates="audit_logs")
@@ -42,7 +42,7 @@ class LoginAttempt(BaseModel):
     ip_address = Column(String(45), nullable=False)
     user_agent = Column(Text, nullable=True)
     success = Column(Integer, default=0)  # 1 for success, 0 for failure
-    timestamp = Column(DateTime, default=datetime.utcnow, nullable=False, index=True)
+    timestamp = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), nullable=False, index=True)
     failure_reason = Column(String(200), nullable=True)  # Reason for failure
     
     def __repr__(self):
@@ -56,8 +56,8 @@ class ImportAudit(BaseModel):
     __tablename__ = "import_audit"
 
     id = Column(Integer, primary_key=True, autoincrement=True, index=True)
-    started_at = Column(DateTime, default=datetime.utcnow, nullable=False, index=True)
-    finished_at = Column(DateTime, nullable=True, index=True)
+    started_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), nullable=False, index=True)
+    finished_at = Column(DateTime(timezone=True), nullable=True, index=True)
     status = Column(String(30), nullable=False, default="running", index=True)  # running|success|completed_with_errors|failed
 
     total_files = Column(Integer, nullable=False, default=0)
@@ -94,7 +94,7 @@ class ImportAuditFile(BaseModel):
     errors = Column(Integer, nullable=False, default=0)
     message = Column(String(255), nullable=True)
     details = Column(JSON, nullable=True)
-    created_at = Column(DateTime, default=datetime.utcnow, nullable=False, index=True)
+    created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), nullable=False, index=True)
 
     audit = relationship("ImportAudit", back_populates="files")