Fix Alembic issue

services/auth/app/models/__init__.py

@@ -3,12 +3,14 @@
 Models export for auth service
 """
 
-from .users import User, RefreshToken
+from .users import User
+from .tokens import RefreshToken, LoginAttempt
 from .onboarding import UserOnboardingProgress, UserOnboardingSummary
 
 __all__ = [
     'User',
-    'RefreshToken', 
+    'RefreshToken',
+    'LoginAttempt',
     'UserOnboardingProgress',
     'UserOnboardingSummary',
 ]

services/auth/app/models/users.py

@@ -54,35 +54,4 @@ class User(Base):
             "created_at": self.created_at.isoformat() if self.created_at else None,
             "updated_at": self.updated_at.isoformat() if self.updated_at else None,
             "last_login": self.last_login.isoformat() if self.last_login else None
-        }
-
-
-class RefreshToken(Base):
-    """Refresh token model for JWT token management"""
-    __tablename__ = "refresh_tokens"
-    
-    id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
-    user_id = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False)
-    token = Column(String(500), unique=True, nullable=False)
-    expires_at = Column(DateTime(timezone=True), nullable=False)
-    is_revoked = Column(Boolean, default=False)
-    revoked_at = Column(DateTime(timezone=True), nullable=True)
-    
-    # Timezone-aware datetime fields
-    created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
-    
-    def __repr__(self):
-        return f"<RefreshToken(id={self.id}, user_id={self.user_id}, is_revoked={self.is_revoked})>"
-    
-    def to_dict(self):
-        """Convert refresh token to dictionary"""
-        return {
-            "id": str(self.id),
-            "user_id": str(self.user_id),
-            "token": self.token,
-            "expires_at": self.expires_at.isoformat() if self.expires_at else None,
-            "is_revoked": self.is_revoked,
-            "created_at": self.created_at.isoformat() if self.created_at else None,
-            "updated_at": self.updated_at.isoformat() if self.updated_at else None
         }

services/auth/app/repositories/token_repository.py

@@ -10,7 +10,7 @@ from datetime import datetime, timezone, timedelta
 import structlog
 
 from .base import AuthBaseRepository
-from app.models.users import RefreshToken
+from app.models.tokens import RefreshToken
 from shared.database.exceptions import DatabaseError
 
 logger = structlog.get_logger()

services/auth/app/services/admin_delete.py

@@ -138,7 +138,8 @@ class AdminUserDeleteService:
         """Validate user exists and get basic info from local database"""
         try:
             from app.models.users import User
-            
+            from app.models.tokens import RefreshToken
+
             # Query user from local auth database
             query = select(User).where(User.id == uuid.UUID(user_id))
             result = await self.db.execute(query)
@@ -403,8 +404,9 @@ class AdminUserDeleteService:
         }
         
         try:
-            from app.models.users import User, RefreshToken
-            
+            from app.models.users import User
+            from app.models.tokens import RefreshToken
+
             # Delete refresh tokens
             token_delete_query = delete(RefreshToken).where(RefreshToken.user_id == uuid.UUID(user_id))
             token_result = await self.db.execute(token_delete_query)

services/auth/app/services/auth_service.py

@@ -12,7 +12,8 @@ import structlog
 
 from app.repositories import UserRepository, TokenRepository
 from app.schemas.auth import UserRegistration, UserLogin, TokenResponse, UserResponse
-from app.models.users import User, RefreshToken
+from app.models.users import User
+from app.models.tokens import RefreshToken
 from app.core.security import SecurityManager
 from app.services.messaging import publish_user_registered, publish_user_login
 from shared.database.unit_of_work import UnitOfWork

services/auth/app/services/user_service.py

@@ -10,7 +10,8 @@ import structlog
 
 from app.repositories import UserRepository, TokenRepository
 from app.schemas.auth import UserResponse, UserUpdate
-from app.models.users import User, RefreshToken
+from app.models.users import User
+from app.models.tokens import RefreshToken
 from app.core.security import SecurityManager
 from shared.database.unit_of_work import UnitOfWork
 from shared.database.transactions import transactional