Refactor services alembic

services/auth/migrations/env.py

@@ -1,31 +1,50 @@
-# ================================================================
-# services/auth/migrations/env.py
-# ================================================================
-"""Alembic environment configuration"""
+"""Alembic environment configuration for auth service"""
 
 import asyncio
 import logging
+import os
+import sys
 from logging.config import fileConfig
 from sqlalchemy import pool
 from sqlalchemy.engine import Connection
 from sqlalchemy.ext.asyncio import async_engine_from_config
 from alembic import context
 
-from app.core.config import settings
-from app.models.users import User
-from app.models.tokens import RefreshToken, LoginAttempt
-from shared.database.base import Base
+# Add the service directory to the Python path
+service_path = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if service_path not in sys.path:
+    sys.path.insert(0, service_path)
+
+# Add shared modules to path
+shared_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "shared"))
+if shared_path not in sys.path:
+    sys.path.insert(0, shared_path)
+
+try:
+    from app.core.config import settings
+    from shared.database.base import Base
+
+    # Import all models to ensure they are registered with Base.metadata
+    from app.models import *  # Import all models
+
+except ImportError as e:
+    print(f"Import error in migrations env.py: {e}")
+    print(f"Current Python path: {sys.path}")
+    raise
 
 # this is the Alembic Config object
 config = context.config
 
-# Set database URL
-config.set_main_option("sqlalchemy.url", settings.DATABASE_URL)
+# Set database URL from settings if not already set
+database_url = os.getenv('DATABASE_URL') or getattr(settings, 'DATABASE_URL', None)
+if database_url:
+    config.set_main_option("sqlalchemy.url", database_url)
 
 # Interpret the config file for Python logging
 if config.config_file_name is not None:
     fileConfig(config.config_file_name)
 
+# Set target metadata
 target_metadata = Base.metadata
 
 def run_migrations_offline() -> None:
@@ -36,13 +55,20 @@ def run_migrations_offline() -> None:
         target_metadata=target_metadata,
         literal_binds=True,
         dialect_opts={"paramstyle": "named"},
+        compare_type=True,
+        compare_server_default=True,
     )
 
     with context.begin_transaction():
         context.run_migrations()
 
 def do_run_migrations(connection: Connection) -> None:
-    context.configure(connection=connection, target_metadata=target_metadata)
+    context.configure(
+        connection=connection,
+        target_metadata=target_metadata,
+        compare_type=True,
+        compare_server_default=True,
+    )
 
     with context.begin_transaction():
         context.run_migrations()