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

services/auth/migrations/env.py

@@ -1,7 +1,6 @@
 """Alembic environment configuration for auth service"""
 
 import asyncio
-import logging
 import os
 import sys
 from logging.config import fileConfig
@@ -25,7 +24,7 @@ try:
     from shared.database.base import Base
 
     # Import all models to ensure they are registered with Base.metadata
-    from app.models import *  # Import all models
+    from app.models import *  # noqa: F401, F403
 
 except ImportError as e:
     print(f"Import error in migrations env.py: {e}")
@@ -35,12 +34,19 @@ except ImportError as e:
 # this is the Alembic Config object
 config = context.config
 
-# Set database URL from environment variables or settings
-# Try service-specific DATABASE_URL first, then fall back to generic
-database_url = os.getenv('AUTH_DATABASE_URL') or os.getenv('DATABASE_URL')
+# Determine service name from file path
+service_name = os.path.basename(os.path.dirname(os.path.dirname(__file__)))
+service_name_upper = service_name.upper().replace('-', '_')
+
+# Set database URL from environment variables with multiple fallback strategies
+database_url = (
+    os.getenv(f'{service_name_upper}_DATABASE_URL') or  # Service-specific
+    os.getenv('DATABASE_URL')  # Generic fallback
+)
 
 # If DATABASE_URL is not set, construct from individual components
 if not database_url:
+    # Try generic PostgreSQL environment variables first
     postgres_host = os.getenv('POSTGRES_HOST')
     postgres_port = os.getenv('POSTGRES_PORT', '5432')
     postgres_db = os.getenv('POSTGRES_DB')
@@ -50,11 +56,28 @@ if not database_url:
     if all([postgres_host, postgres_db, postgres_user, postgres_password]):
         database_url = f"postgresql+asyncpg://{postgres_user}:{postgres_password}@{postgres_host}:{postgres_port}/{postgres_db}"
     else:
-        # Fallback to settings
-        database_url = getattr(settings, 'DATABASE_URL', None)
+        # Try service-specific environment variables
+        db_host = os.getenv(f'{service_name_upper}_DB_HOST', f'{service_name}-db-service')
+        db_port = os.getenv(f'{service_name_upper}_DB_PORT', '5432')
+        db_name = os.getenv(f'{service_name_upper}_DB_NAME', f'{service_name.replace("-", "_")}_db')
+        db_user = os.getenv(f'{service_name_upper}_DB_USER', f'{service_name.replace("-", "_")}_user')
+        db_password = os.getenv(f'{service_name_upper}_DB_PASSWORD')
 
-if database_url:
-    config.set_main_option("sqlalchemy.url", database_url)
+        if db_password:
+            database_url = f"postgresql+asyncpg://{db_user}:{db_password}@{db_host}:{db_port}/{db_name}"
+        else:
+            # Final fallback: try to get from settings object
+            try:
+                database_url = getattr(settings, 'DATABASE_URL', None)
+            except Exception:
+                pass
+
+if not database_url:
+    error_msg = f"ERROR: No database URL configured for {service_name} service"
+    print(error_msg)
+    raise Exception(error_msg)
+
+config.set_main_option("sqlalchemy.url", database_url)
 
 # Interpret the config file for Python logging
 if config.config_file_name is not None:
@@ -63,6 +86,7 @@ if config.config_file_name is not None:
 # Set target metadata
 target_metadata = Base.metadata
 
+
 def run_migrations_offline() -> None:
     """Run migrations in 'offline' mode."""
     url = config.get_main_option("sqlalchemy.url")
@@ -78,7 +102,9 @@ def run_migrations_offline() -> None:
     with context.begin_transaction():
         context.run_migrations()
 
+
 def do_run_migrations(connection: Connection) -> None:
+    """Execute migrations with the given connection."""
     context.configure(
         connection=connection,
         target_metadata=target_metadata,
@@ -89,8 +115,9 @@ def do_run_migrations(connection: Connection) -> None:
     with context.begin_transaction():
         context.run_migrations()
 
+
 async def run_async_migrations() -> None:
-    """Run migrations in 'online' mode."""
+    """Run migrations in 'online' mode with async support."""
     connectable = async_engine_from_config(
         config.get_section(config.config_ini_section, {}),
         prefix="sqlalchemy.",
@@ -102,10 +129,12 @@ async def run_async_migrations() -> None:
 
     await connectable.dispose()
 
+
 def run_migrations_online() -> None:
     """Run migrations in 'online' mode."""
     asyncio.run(run_async_migrations())
 
+
 if context.is_offline_mode():
     run_migrations_offline()
 else:

services/auth/migrations/versions/000001_initial_schema.py

@@ -1,108 +0,0 @@
-"""Initial schema for auth service
-
-Revision ID: 0000001
-Revises: 
-Create Date: 2025-09-30 18:00:00.00000
-
-"""
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision = '000001'
-down_revision = None
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.create_table('users',
-        sa.Column('id', sa.UUID(), nullable=False),
-        sa.Column('username', sa.String(), nullable=False),
-        sa.Column('email', sa.String(), nullable=False),
-        sa.Column('hashed_password', sa.String(), nullable=False),
-        sa.Column('is_active', sa.Boolean(), nullable=True),
-        sa.Column('is_superuser', sa.Boolean(), nullable=True),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
-        sa.Column('updated_at', sa.DateTime(), nullable=True),
-        sa.Column('tenant_id', sa.UUID(), nullable=True),
-        sa.PrimaryKeyConstraint('id')
-    )
-    op.create_index(op.f('ix_users_email'), 'users', ['email'], unique=True)
-    op.create_index(op.f('ix_users_id'), 'users', ['id'], unique=False)
-    op.create_index(op.f('ix_users_username'), 'users', ['username'], unique=True)
-    
-    op.create_table('refresh_tokens',
-        sa.Column('id', sa.UUID(), nullable=False),
-        sa.Column('user_id', sa.UUID(), nullable=True),
-        sa.Column('token', sa.String(), nullable=False),
-        sa.Column('expires_at', sa.DateTime(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
-        sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
-        sa.PrimaryKeyConstraint('id')
-    )
-    op.create_index(op.f('ix_refresh_tokens_id'), 'refresh_tokens', ['id'], unique=False)
-    op.create_index(op.f('ix_refresh_tokens_token'), 'refresh_tokens', ['token'], unique=True)
-    
-    op.create_table('user_onboarding_progress',
-        sa.Column('id', sa.UUID(), nullable=False),
-        sa.Column('user_id', sa.UUID(), nullable=True),
-        sa.Column('tenant_id', sa.UUID(), nullable=True),
-        sa.Column('step', sa.String(), nullable=False),
-        sa.Column('completed', sa.Boolean(), nullable=True),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
-        sa.Column('updated_at', sa.DateTime(), nullable=True),
-        sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
-        sa.PrimaryKeyConstraint('id')
-    )
-    op.create_index(op.f('ix_user_onboarding_progress_id'), 'user_onboarding_progress', ['id'], unique=False)
-    
-    op.create_table('user_onboarding_summary',
-        sa.Column('id', sa.UUID(), nullable=False),
-        sa.Column('user_id', sa.UUID(), nullable=True),
-        sa.Column('tenant_id', sa.UUID(), nullable=True),
-        sa.Column('total_steps', sa.Integer(), nullable=True),
-        sa.Column('completed_steps', sa.Integer(), nullable=True),
-        sa.Column('completion_percentage', sa.Float(), nullable=True),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
-        sa.Column('updated_at', sa.DateTime(), nullable=True),
-        sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
-        sa.PrimaryKeyConstraint('id')
-    )
-    op.create_index(op.f('ix_user_onboarding_summary_id'), 'user_onboarding_summary', ['id'], unique=False)
-    
-    # Create login_attempts table
-    op.create_table('login_attempts',
-        sa.Column('id', sa.UUID(), nullable=False),
-        sa.Column('email', sa.String(255), nullable=False),
-        sa.Column('ip_address', sa.String(45), nullable=False),
-        sa.Column('user_agent', sa.Text(), nullable=True),
-        sa.Column('success', sa.Boolean(), nullable=True),
-        sa.Column('failure_reason', sa.String(255), nullable=True),
-        sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('timezone(\'utc\', now())'), nullable=True),
-        sa.PrimaryKeyConstraint('id')
-    )
-    op.create_index(op.f('ix_login_attempts_email'), 'login_attempts', ['email'], unique=False)
-    op.create_index(op.f('ix_login_attempts_ip_address'), 'login_attempts', ['ip_address'], unique=False)
-    op.create_index(op.f('ix_login_attempts_success'), 'login_attempts', ['success'], unique=False)
-    op.create_index(op.f('ix_login_attempts_created_at'), 'login_attempts', ['created_at'], unique=False)
-
-
-def downgrade() -> None:
-    op.drop_index(op.f('ix_login_attempts_created_at'), table_name='login_attempts')
-    op.drop_index(op.f('ix_login_attempts_success'), table_name='login_attempts')
-    op.drop_index(op.f('ix_login_attempts_ip_address'), table_name='login_attempts')
-    op.drop_index(op.f('ix_login_attempts_email'), table_name='login_attempts')
-    op.drop_table('login_attempts')
-    op.drop_index(op.f('ix_user_onboarding_summary_id'), table_name='user_onboarding_summary')
-    op.drop_table('user_onboarding_summary')
-    op.drop_index(op.f('ix_user_onboarding_progress_id'), table_name='user_onboarding_progress')
-    op.drop_table('user_onboarding_progress')
-    op.drop_index(op.f('ix_refresh_tokens_token'), table_name='refresh_tokens')
-    op.drop_index(op.f('ix_refresh_tokens_id'), table_name='refresh_tokens')
-    op.drop_table('refresh_tokens')
-    op.drop_index(op.f('ix_users_username'), table_name='users')
-    op.drop_index(op.f('ix_users_id'), table_name='users')
-    op.drop_index(op.f('ix_users_email'), table_name='users')
-    op.drop_table('users')

services/auth/migrations/versions/20251001_1118_2822f7ec9874_initial_schema_20251001_1118.py

@@ -0,0 +1,114 @@
+"""initial_schema_20251001_1118
+
+Revision ID: 2822f7ec9874
+Revises: 
+Create Date: 2025-10-01 11:18:44.973074+02:00
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '2822f7ec9874'
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('login_attempts',
+    sa.Column('id', sa.UUID(), nullable=False),
+    sa.Column('email', sa.String(length=255), nullable=False),
+    sa.Column('ip_address', sa.String(length=45), nullable=False),
+    sa.Column('user_agent', sa.Text(), nullable=True),
+    sa.Column('success', sa.Boolean(), nullable=True),
+    sa.Column('failure_reason', sa.String(length=255), nullable=True),
+    sa.Column('created_at', sa.DateTime(timezone=True), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_login_attempts_email'), 'login_attempts', ['email'], unique=False)
+    op.create_table('refresh_tokens',
+    sa.Column('id', sa.UUID(), nullable=False),
+    sa.Column('user_id', sa.UUID(), nullable=False),
+    sa.Column('token', sa.Text(), nullable=False),
+    sa.Column('token_hash', sa.String(length=255), nullable=True),
+    sa.Column('expires_at', sa.DateTime(timezone=True), nullable=False),
+    sa.Column('is_revoked', sa.Boolean(), nullable=False),
+    sa.Column('created_at', sa.DateTime(timezone=True), nullable=True),
+    sa.Column('revoked_at', sa.DateTime(timezone=True), nullable=True),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('token_hash')
+    )
+    op.create_index('ix_refresh_tokens_expires_at', 'refresh_tokens', ['expires_at'], unique=False)
+    op.create_index('ix_refresh_tokens_token_hash', 'refresh_tokens', ['token_hash'], unique=False)
+    op.create_index(op.f('ix_refresh_tokens_user_id'), 'refresh_tokens', ['user_id'], unique=False)
+    op.create_index('ix_refresh_tokens_user_id_active', 'refresh_tokens', ['user_id', 'is_revoked'], unique=False)
+    op.create_table('users',
+    sa.Column('id', sa.UUID(), nullable=False),
+    sa.Column('email', sa.String(length=255), nullable=False),
+    sa.Column('hashed_password', sa.String(length=255), nullable=False),
+    sa.Column('full_name', sa.String(length=255), nullable=False),
+    sa.Column('is_active', sa.Boolean(), nullable=True),
+    sa.Column('is_verified', sa.Boolean(), nullable=True),
+    sa.Column('created_at', sa.DateTime(timezone=True), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), nullable=True),
+    sa.Column('last_login', sa.DateTime(timezone=True), nullable=True),
+    sa.Column('phone', sa.String(length=20), nullable=True),
+    sa.Column('language', sa.String(length=10), nullable=True),
+    sa.Column('timezone', sa.String(length=50), nullable=True),
+    sa.Column('role', sa.String(length=20), nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_users_email'), 'users', ['email'], unique=True)
+    op.create_table('user_onboarding_progress',
+    sa.Column('id', sa.UUID(), nullable=False),
+    sa.Column('user_id', sa.UUID(), nullable=False),
+    sa.Column('step_name', sa.String(length=50), nullable=False),
+    sa.Column('completed', sa.Boolean(), nullable=False),
+    sa.Column('completed_at', sa.DateTime(timezone=True), nullable=True),
+    sa.Column('step_data', sa.JSON(), nullable=True),
+    sa.Column('created_at', sa.DateTime(timezone=True), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), nullable=True),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('user_id', 'step_name', name='uq_user_step')
+    )
+    op.create_index(op.f('ix_user_onboarding_progress_user_id'), 'user_onboarding_progress', ['user_id'], unique=False)
+    op.create_table('user_onboarding_summary',
+    sa.Column('id', sa.UUID(), nullable=False),
+    sa.Column('user_id', sa.UUID(), nullable=False),
+    sa.Column('current_step', sa.String(length=50), nullable=False),
+    sa.Column('next_step', sa.String(length=50), nullable=True),
+    sa.Column('completion_percentage', sa.String(length=50), nullable=True),
+    sa.Column('fully_completed', sa.Boolean(), nullable=True),
+    sa.Column('steps_completed_count', sa.String(length=50), nullable=True),
+    sa.Column('created_at', sa.DateTime(timezone=True), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), nullable=True),
+    sa.Column('last_activity_at', sa.DateTime(timezone=True), nullable=True),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_user_onboarding_summary_user_id'), 'user_onboarding_summary', ['user_id'], unique=True)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_user_onboarding_summary_user_id'), table_name='user_onboarding_summary')
+    op.drop_table('user_onboarding_summary')
+    op.drop_index(op.f('ix_user_onboarding_progress_user_id'), table_name='user_onboarding_progress')
+    op.drop_table('user_onboarding_progress')
+    op.drop_index(op.f('ix_users_email'), table_name='users')
+    op.drop_table('users')
+    op.drop_index('ix_refresh_tokens_user_id_active', table_name='refresh_tokens')
+    op.drop_index(op.f('ix_refresh_tokens_user_id'), table_name='refresh_tokens')
+    op.drop_index('ix_refresh_tokens_token_hash', table_name='refresh_tokens')
+    op.drop_index('ix_refresh_tokens_expires_at', table_name='refresh_tokens')
+    op.drop_table('refresh_tokens')
+    op.drop_index(op.f('ix_login_attempts_email'), table_name='login_attempts')
+    op.drop_table('login_attempts')
+    # ### end Alembic commands ###