Fix Alembic issue

services/recipes/migrations/env.py

@@ -1,7 +1,6 @@
 """Alembic environment configuration for recipes 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('RECIPES_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: