Fix issues

services/data/app/core/auth.py

@@ -0,0 +1,36 @@
+# ================================================================
+# services/data/app/core/auth.py
+# ================================================================
+"""Authentication utilities for data service"""
+
+from fastapi import HTTPException, Depends, status
+from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
+import httpx
+import structlog
+
+from app.core.config import settings
+
+logger = structlog.get_logger()
+security = HTTPBearer()
+
+async def verify_token(credentials: HTTPAuthorizationCredentials = Depends(security)) -> dict:
+    """Verify JWT token with auth service"""
+    try:
+        async with httpx.AsyncClient() as client:
+            response = await client.post(
+                f"{settings.AUTH_SERVICE_URL}/api/v1/auth/verify",
+                headers={"Authorization": f"Bearer {credentials.credentials}"}
+            )
+            
+            if response.status_code == 200:
+                return response.json()
+            else:
+                raise HTTPException(
+                    status_code=status.HTTP_401_UNAUTHORIZED,
+                    detail="Invalid authentication credentials"
+                )
+    except httpx.RequestError:
+        raise HTTPException(
+            status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
+            detail="Authentication service unavailable"
+        )

services/data/app/core/config.py

@@ -1,30 +1,35 @@
-"""
-uLudata service configuration
-"""
+"""Data service configuration"""
 
-import os
 from pydantic_settings import BaseSettings
+from typing import List
 
 class Settings(BaseSettings):
-    """Application settings"""
+    # Database
+    DATABASE_URL: str = "postgresql+asyncpg://data_user:data_pass123@data-db:5432/data_db"
     
-    # Basic settings
-    APP_NAME: str = "uLudata Service"
-    VERSION: str = "1.0.0"
-    DEBUG: bool = os.getenv("DEBUG", "False").lower() == "true"
-    LOG_LEVEL: str = os.getenv("LOG_LEVEL", "INFO")
+    # Redis
+    REDIS_URL: str = "redis://redis:6379/3"
     
-    # Database settings
-    DATABASE_URL: str = os.getenv("DATABASE_URL", "postgresql+asyncpg://data_user:data_pass123@data-db:5432/data_db")
+    # RabbitMQ
+    RABBITMQ_URL: str = "amqp://bakery:forecast123@rabbitmq:5672/"
     
-    # Redis settings
-    REDIS_URL: str = os.getenv("REDIS_URL", "redis://redis:6379/0")
+    # External APIs
+    AEMET_API_KEY: str = "your-aemet-api-key-here"
+    MADRID_OPENDATA_API_KEY: str = "your-madrid-opendata-key-here"
     
-    # RabbitMQ settings
-    RABBITMQ_URL: str = os.getenv("RABBITMQ_URL", "amqp://bakery:forecast123@rabbitmq:5672/")
+    # Service settings
+    SERVICE_NAME: str = "data-service"
+    SERVICE_VERSION: str = "1.0.0"
     
-    # Service URLs
-    AUTH_SERVICE_URL: str = os.getenv("AUTH_SERVICE_URL", "http://auth-service:8000")
+    # Auth
+    AUTH_SERVICE_URL: str = "http://auth-service:8000"
+    
+    # CORS
+    CORS_ORIGINS: List[str] = ["http://localhost:3000", "http://localhost:3001"]
+    
+    # Monitoring
+    LOG_LEVEL: str = "INFO"
+    ENABLE_METRICS: bool = True
     
     class Config:
         env_file = ".env"

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