Improve auth flow

services/tenant/app/main.py

@@ -1,5 +1,6 @@
+# services/tenant/app/main.py
 """
-uLutenant Service
+Tenant Service FastAPI application
 """
 
 import structlog
@@ -7,23 +8,27 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 
 from app.core.config import settings
-from app.core.database import database_manager
+from app.core.database import engine
+from app.api import tenants
 from shared.monitoring.logging import setup_logging
 from shared.monitoring.metrics import MetricsCollector
 
 # Setup logging
-setup_logging("tenant-service", "INFO")
+setup_logging("tenant-service", settings.LOG_LEVEL)
 logger = structlog.get_logger()
 
 # Create FastAPI app
 app = FastAPI(
-    title="uLutenant Service",
-    description="uLutenant service for bakery forecasting",
-    version="1.0.0"
+    title="Tenant Management Service",
+    description="Multi-tenant bakery management service",
+    version="1.0.0",
+    docs_url="/docs",
+    redoc_url="/redoc"
 )
 
-# Initialize metrics collector
-metrics_collector = MetricsCollector("tenant-service")
+# Initialize metrics
+metrics_collector = MetricsCollector("tenant_service")
+app.state.metrics_collector = metrics_collector
 
 # CORS middleware
 app.add_middleware(
@@ -34,18 +39,19 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
+# Include routers
+app.include_router(tenants.router, prefix="/api/v1", tags=["tenants"])
+
 @app.on_event("startup")
 async def startup_event():
-    """Application startup"""
-    logger.info("Starting uLutenant Service")
+    """Initialize service on startup"""
+    logger.info("Starting Tenant Service...")
     
-    # Create database tables
-    await database_manager.create_tables()
-    
-    # Start metrics server
-    metrics_collector.start_metrics_server(8080)
-    
-    logger.info("uLutenant Service started successfully")
+@app.on_event("shutdown")
+async def shutdown_event():
+    """Cleanup on shutdown"""
+    logger.info("Shutting down Tenant Service...")
+    await engine.dispose()
 
 @app.get("/health")
 async def health_check():
@@ -56,6 +62,11 @@ async def health_check():
         "version": "1.0.0"
     }
 
+@app.get("/metrics")
+async def metrics():
+    """Prometheus metrics endpoint"""
+    return metrics_collector.generate_latest()
+
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+    uvicorn.run(app, host="0.0.0.0", port=8000)