Add role-based filtering and imporve code

gateway/app/main.py

@@ -11,11 +11,11 @@ from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse, StreamingResponse
 import httpx
 import time
-import redis.asyncio as aioredis
+from shared.redis_utils import initialize_redis, close_redis, get_redis_client
 from typing import Dict, Any
 
 from app.core.config import settings
-from app.core.service_discovery import ServiceDiscovery
+from app.middleware.request_id import RequestIDMiddleware
 from app.middleware.auth import AuthMiddleware
 from app.middleware.logging import LoggingMiddleware
 from app.middleware.rate_limit import RateLimitMiddleware
@@ -41,9 +41,6 @@ app = FastAPI(
 # Initialize metrics collector
 metrics_collector = MetricsCollector("gateway")
 
-# Service discovery
-service_discovery = ServiceDiscovery()
-
 # Redis client for SSE streaming
 redis_client = None
 
@@ -57,12 +54,13 @@ app.add_middleware(
 )
 
 # Custom middleware - Add in REVERSE order (last added = first executed)
-# Execution order: DemoMiddleware -> AuthMiddleware -> SubscriptionMiddleware -> RateLimitMiddleware -> LoggingMiddleware
-app.add_middleware(LoggingMiddleware)          # Executes 5th (outermost)
-app.add_middleware(RateLimitMiddleware, calls_per_minute=300)  # Executes 4th
-app.add_middleware(SubscriptionMiddleware, tenant_service_url=settings.TENANT_SERVICE_URL)  # Executes 3rd
-app.add_middleware(AuthMiddleware)             # Executes 2nd - Checks for demo context
-app.add_middleware(DemoMiddleware)             # Executes 1st (innermost) - Sets demo user context FIRST
+# Execution order: RequestIDMiddleware -> DemoMiddleware -> AuthMiddleware -> SubscriptionMiddleware -> RateLimitMiddleware -> LoggingMiddleware
+app.add_middleware(LoggingMiddleware)          # Executes 6th (outermost)
+app.add_middleware(RateLimitMiddleware, calls_per_minute=300)  # Executes 5th
+app.add_middleware(SubscriptionMiddleware, tenant_service_url=settings.TENANT_SERVICE_URL)  # Executes 4th
+app.add_middleware(AuthMiddleware)             # Executes 3rd - Checks for demo context
+app.add_middleware(DemoMiddleware)             # Executes 2nd - Sets demo user context
+app.add_middleware(RequestIDMiddleware)        # Executes 1st (innermost) - Generates request ID for tracing
 
 # Include routers
 app.include_router(auth.router, prefix="/api/v1/auth", tags=["authentication"])
@@ -79,12 +77,13 @@ app.include_router(demo.router, prefix="/api/v1", tags=["demo"])
 async def startup_event():
     """Application startup"""
     global redis_client
-    
+
     logger.info("Starting API Gateway")
-    
-    # Connect to Redis for SSE streaming
+
+    # Initialize shared Redis connection
     try:
-        redis_client = aioredis.from_url(settings.REDIS_URL)
+        await initialize_redis(settings.REDIS_URL, db=0, max_connections=50)
+        redis_client = await get_redis_client()
         logger.info("Connected to Redis for SSE streaming")
     except Exception as e:
         logger.error(f"Failed to connect to Redis: {e}")
@@ -116,17 +115,14 @@ async def startup_event():
 @app.on_event("shutdown")
 async def shutdown_event():
     """Application shutdown"""
-    global redis_client
-    
     logger.info("Shutting down API Gateway")
-    
-    # Close Redis connection
-    if redis_client:
-        await redis_client.close()
-    
+
+    # Close shared Redis connection
+    await close_redis()
+
     # Clean up service discovery
     # await service_discovery.cleanup()
-    
+
     logger.info("API Gateway shutdown complete")
 
 @app.get("/health")