Refactor services alembic

services/auth/migrations/alembic.ini

@@ -1,5 +1,5 @@
 # ================================================================
-# services/auth/migrations/alembic.ini
+# services/auth/alembic.ini - Alembic Configuration
 # ================================================================
 [alembic]
 # path to migration scripts
@@ -36,14 +36,14 @@ version_path_separator = os
 
 # set to 'true' to search source files recursively
 # in each "version_locations" directory
-# new in Alembic version 1.10
 recursive_version_locations = false
 
 # the output encoding used when revision files
 # are written from script.py.mako
 output_encoding = utf-8
 
-sqlalchemy.url = postgresql+asyncpg://auth_user:auth_pass123@auth-db:5432/auth_db
+# Database URL - will be overridden by environment variable or settings
+sqlalchemy.url = postgresql+asyncpg://auth_user:password@auth-db-service:5432/auth_db
 
 [post_write_hooks]
 # post_write_hooks defines scripts or Python functions that are run
@@ -81,4 +81,4 @@ formatter = generic
 
 [formatter_generic]
 format = %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
+datefmt = %H:%M:%S

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()

services/auth/migrations/script.py.mako

@@ -1,6 +1,3 @@
-# ================================================================
-# services/auth/migrations/script.py.mako
-# ================================================================
 """${message}
 
 Revision ID: ${up_revision}
@@ -8,15 +5,17 @@ Revises: ${down_revision | comma,n}
 Create Date: ${create_date}
 
 """
+from typing import Sequence, Union
+
 from alembic import op
 import sqlalchemy as sa
 ${imports if imports else ""}
 
 # revision identifiers, used by Alembic.
-revision = ${repr(up_revision)}
-down_revision = ${repr(down_revision)}
-branch_labels = ${repr(branch_labels)}
-depends_on = ${repr(depends_on)}
+revision: str = ${repr(up_revision)}
+down_revision: Union[str, None] = ${repr(down_revision)}
+branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
+depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
 
 
 def upgrade() -> None:
@@ -24,4 +23,4 @@ def upgrade() -> None:
 
 
 def downgrade() -> None:
-    ${downgrades if downgrades else "pass"}
+    ${downgrades if downgrades else "pass"}

services/auth/migrations/versions/001_initial_auth_tables.py

@@ -0,0 +1,29 @@
+"""Initial auth service tables
+
+Revision ID: 001_initial_auth
+Revises:
+Create Date: 2024-01-01 12:00:00.000000
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = '001_initial_auth'
+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:
+    # TODO: Add table creation statements for alert_processor service
+    # This is a placeholder migration - replace with actual table definitions
+    pass
+
+
+def downgrade() -> None:
+    # TODO: Add table drop statements for alert_processor service
+    pass