Fix gateway

gateway/app/main.py

@@ -14,9 +14,9 @@ from typing import Dict, Any
 
 from app.core.config import settings
 from app.core.service_discovery import ServiceDiscovery
-from app.middleware.auth import auth_middleware
-from app.middleware.logging import logging_middleware
-from app.middleware.rate_limit import rate_limit_middleware
+from app.middleware.auth import AuthMiddleware
+from app.middleware.logging import LoggingMiddleware
+from app.middleware.rate_limit import RateLimitMiddleware
 from app.routes import auth, training, forecasting, data, tenant, notification
 from shared.monitoring.logging import setup_logging
 from shared.monitoring.metrics import MetricsCollector
@@ -40,7 +40,7 @@ metrics_collector = MetricsCollector("gateway")
 # Service discovery
 service_discovery = ServiceDiscovery()
 
-# CORS middleware - FIXED: Use the parsed list property
+# CORS middleware - Add first
 app.add_middleware(
     CORSMiddleware,
     allow_origins=settings.CORS_ORIGINS_LIST,
@@ -49,10 +49,10 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-# Custom middleware
-app.add_middleware(auth_middleware)
-app.add_middleware(logging_middleware)
-app.add_middleware(rate_limit_middleware)
+# Custom middleware - Add in correct order (outer to inner)
+app.add_middleware(LoggingMiddleware)
+app.add_middleware(RateLimitMiddleware, calls_per_minute=60)
+app.add_middleware(AuthMiddleware)
 
 # Include routers
 app.include_router(auth.router, prefix="/api/v1/auth", tags=["authentication"])
@@ -88,43 +88,17 @@ async def shutdown_event():
 @app.get("/health")
 async def health_check():
     """Health check endpoint"""
-    healthy_services = await service_discovery.get_healthy_services()
-    
     return {
         "status": "healthy",
-        "service": "gateway",
+        "service": "api-gateway",
         "version": "1.0.0",
-        "healthy_services": healthy_services,
-        "total_services": len(settings.SERVICES),
         "timestamp": time.time()
     }
 
 @app.get("/metrics")
-async def get_metrics():
-    """Get basic metrics"""
-    return {
-        "service": "gateway",
-        "uptime": time.time() - app.state.start_time if hasattr(app.state, 'start_time') else 0,
-        "healthy_services": await service_discovery.get_healthy_services()
-    }
-
-@app.exception_handler(HTTPException)
-async def http_exception_handler(request: Request, exc: HTTPException):
-    """Handle HTTP exceptions"""
-    logger.error(f"HTTP {exc.status_code}: {exc.detail}")
-    return JSONResponse(
-        status_code=exc.status_code,
-        content={"detail": exc.detail, "service": "gateway"}
-    )
-
-@app.exception_handler(Exception)
-async def general_exception_handler(request: Request, exc: Exception):
-    """Handle general exceptions"""
-    logger.error(f"Unhandled exception: {exc}", exc_info=True)
-    return JSONResponse(
-        status_code=500,
-        content={"detail": "Internal server error", "service": "gateway"}
-    )
+async def metrics():
+    """Metrics endpoint for monitoring"""
+    return {"metrics": "enabled"}
 
 if __name__ == "__main__":
     import uvicorn