Fix issues

services/data/app/core/database.py

@@ -1,12 +1,46 @@
-"""
-Database configuration for data service
-"""
+"""Database configuration for data service"""
+
+from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession, async_sessionmaker
+from sqlalchemy.orm import declarative_base
+import structlog
 
-from shared.database.base import DatabaseManager
 from app.core.config import settings
 
-# Initialize database manager
-database_manager = DatabaseManager(settings.DATABASE_URL)
+logger = structlog.get_logger()
 
-# Alias for convenience
-get_db = database_manager.get_db
+# Create async engine
+engine = create_async_engine(
+    settings.DATABASE_URL,
+    echo=False,
+    pool_pre_ping=True,
+    pool_size=10,
+    max_overflow=20
+)
+
+# Create async session factory
+AsyncSessionLocal = async_sessionmaker(
+    engine,
+    class_=AsyncSession,
+    expire_on_commit=False
+)
+
+# Base class for models
+Base = declarative_base()
+
+async def get_db() -> AsyncSession:
+    """Get database session"""
+    async with AsyncSessionLocal() as session:
+        try:
+            yield session
+        finally:
+            await session.close()
+
+async def init_db():
+    """Initialize database tables"""
+    try:
+        async with engine.begin() as conn:
+            await conn.run_sync(Base.metadata.create_all)
+        logger.info("Database initialized successfully")
+    except Exception as e:
+        logger.error("Failed to initialize database", error=str(e))
+        raise