Fix data fetch 2

2025-07-27 20:20:09 +02:00
parent 4684235111
commit a627b566d2
6 changed files with 179 additions and 115 deletions
--- a/services/data/app/api/traffic.py
+++ b/services/data/app/api/traffic.py
@@ -15,13 +15,11 @@ from app.services.traffic_service import TrafficService
 from app.services.messaging import data_publisher
 from app.schemas.external import (
    TrafficDataResponse,
-    LocationRequest,
-    DateRangeRequest
+    HistoricalTrafficRequest
 )

 from shared.auth.decorators import (
-    get_current_user_dep,
-    get_current_tenant_id_dep
+    get_current_user_dep
 )

 router = APIRouter(tags=["traffic"])
@@ -71,37 +69,34 @@ async def get_current_traffic(
        logger.error("Traffic API traceback", traceback=traceback.format_exc())
        raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")

-@router.get("/tenants/{tenant_id}/traffic/historical", response_model=List[TrafficDataResponse])
+@router.post("/tenants/{tenant_id}/traffic/historical")
 async def get_historical_traffic(
-    latitude: float = Query(..., description="Latitude"),
-    longitude: float = Query(..., description="Longitude"),
-    start_date: datetime = Query(..., description="Start date"),
-    end_date: datetime = Query(..., description="End date"),
+    request: HistoricalTrafficRequest,
    db: AsyncSession = Depends(get_db),
    tenant_id: UUID = Path(..., description="Tenant ID"),
    current_user: Dict[str, Any] = Depends(get_current_user_dep),
 ):
-    """Get historical traffic data"""
+    """Get historical traffic data with date range in payload"""
    try:
        # Validate date range
-        if end_date <= start_date:
+        if request.end_date <= request.start_date:
            raise HTTPException(status_code=400, detail="End date must be after start date")
        
-        if (end_date - start_date).days > 90:
+        if (request.end_date - request.start_date).days > 90:
            raise HTTPException(status_code=400, detail="Date range cannot exceed 90 days")
        
        historical_data = await traffic_service.get_historical_traffic(
-            latitude, longitude, start_date, end_date, db
+            request.latitude, request.longitude, request.start_date, request.end_date, db
        )
        
        # Publish event (with error handling)
        try:
            await data_publisher.publish_traffic_updated({
                "type": "historical_requested",
-                "latitude": latitude,
-                "longitude": longitude,
-                "start_date": start_date.isoformat(),
-                "end_date": end_date.isoformat(),
+                "latitude": request.latitude,
+                "longitude": request.longitude,
+                "start_date": request.start_date.isoformat(),
+                "end_date": request.end_date.isoformat(),
                "records_count": len(historical_data),
                "timestamp": datetime.utcnow().isoformat()
            })
@@ -112,49 +107,7 @@ async def get_historical_traffic(
        return historical_data
        
    except HTTPException:
-        # Re-raise HTTP exceptions
        raise
    except Exception as e:
        logger.error("Unexpected error in historical traffic API", error=str(e))
-        raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
-
-@router.post("/tenants/{tenant_id}/traffic/store")
-async def store_traffic_data(
-    latitude: float = Query(..., description="Latitude"),
-    longitude: float = Query(..., description="Longitude"),
-    db: AsyncSession = Depends(get_db),
-    tenant_id: UUID = Path(..., description="Tenant ID"),
-    current_user: Dict[str, Any] = Depends(get_current_user_dep)
-):
-    """Store current traffic data to database"""
-    try:
-        # Get current traffic data
-        traffic = await traffic_service.get_current_traffic(latitude, longitude)
-        
-        if not traffic:
-            raise HTTPException(status_code=404, detail="No traffic data to store")
-        
-        # Convert to dict for storage
-        traffic_dict = {
-            "date": traffic.date,
-            "traffic_volume": traffic.traffic_volume,
-            "pedestrian_count": traffic.pedestrian_count,
-            "congestion_level": traffic.congestion_level,
-            "average_speed": traffic.average_speed,
-            "source": traffic.source
-        }
-        
-        success = await traffic_service.store_traffic_data(
-            latitude, longitude, traffic_dict, db
-        )
-        
-        if success:
-            return {"status": "success", "message": "Traffic data stored successfully"}
-        else:
-            raise HTTPException(status_code=500, detail="Failed to store traffic data")
-            
-    except HTTPException:
-        raise
-    except Exception as e:
-        logger.error("Error storing traffic data", error=str(e))
        raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
--- a/services/data/app/api/weather.py
+++ b/services/data/app/api/weather.py
@@ -14,16 +14,24 @@ from app.schemas.external import (
 from app.services.weather_service import WeatherService
 from app.services.messaging import publish_weather_updated

+from app.schemas.external import (
+    HistoricalWeatherRequest
+)
+
 # Import unified authentication from shared library
 from shared.auth.decorators import (
    get_current_user_dep,
    get_current_tenant_id_dep
 )

+from sqlalchemy.ext.asyncio import AsyncSession
+from app.core.database import get_db
+
 router = APIRouter(tags=["weather"])
 logger = structlog.get_logger()
+weather_service = WeatherService()

-@router.get("/tenants/{tenant_id}/wetaher/current", response_model=WeatherDataResponse)
+@router.get("/tenants/{tenant_id}/weather/current", response_model=WeatherDataResponse)
 async def get_current_weather(
    latitude: float = Query(..., description="Latitude"),
    longitude: float = Query(..., description="Longitude"),
@@ -38,7 +46,6 @@ async def get_current_weather(
                    tenant_id=tenant_id,
                    user_id=current_user["user_id"])
        
-        weather_service = WeatherService()
        weather = await weather_service.get_current_weather(latitude, longitude)
        
        if not weather:
@@ -81,7 +88,6 @@ async def get_weather_forecast(
                    days=days,
                    tenant_id=tenant_id)
        
-        weather_service = WeatherService()
        forecast = await weather_service.get_weather_forecast(latitude, longitude, days)
        
        if not forecast:
@@ -109,30 +115,47 @@ async def get_weather_forecast(
        logger.error("Failed to get weather forecast", error=str(e))
        raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")

-@router.get("/tenants/{tenant_id}/weather/history", response_model=List[WeatherDataResponse])
-async def get_weather_history(
-    start_date: date = Query(..., description="Start date"),
-    end_date: date = Query(..., description="End date"),
-    latitude: float = Query(..., description="Latitude"),
-    longitude: float = Query(..., description="Longitude"),
-    tenant_id: str = Path(..., description="Tenant ID")
+@router.post("/tenants/{tenant_id}/weather/historical")
+async def get_historical_weather(
+    request: HistoricalWeatherRequest,
+    db: AsyncSession = Depends(get_db),
+    tenant_id: UUID = Path(..., description="Tenant ID"),
+    current_user: Dict[str, Any] = Depends(get_current_user_dep),
 ):
-    """Get historical weather data"""
+    """Get historical weather data with date range in payload"""
    try:
-        logger.debug("Getting weather history", 
-                    start_date=start_date,
-                    end_date=end_date,
-                    tenant_id=tenant_id)
+        # Validate date range
+        if request.end_date <= request.start_date:
+            raise HTTPException(status_code=400, detail="End date must be after start date")
        
-        weather_service = WeatherService()
-        history = await weather_service.get_historical_weather(
-            latitude, longitude, start_date, end_date
+        if (request.end_date - request.start_date).days > 90:
+            raise HTTPException(status_code=400, detail="Date range cannot exceed 90 days")
+        
+        historical_data = await weather_service.get_historical_weather(
+            request.latitude, request.longitude, request.start_date, request.end_date, db
        )
        
-        return history
+        # Publish event (with error handling)
+        try:
+            await publish_weather_updated({
+                "type": "historical_requested",
+                "latitude": request.latitude,
+                "longitude": request.longitude,
+                "start_date": request.start_date.isoformat(),
+                "end_date": request.end_date.isoformat(),
+                "records_count": len(historical_data),
+                "timestamp": datetime.utcnow().isoformat()
+            })
+        except Exception as pub_error:
+            logger.warning("Failed to publish historical weather event", error=str(pub_error))
+            # Continue processing
        
+        return historical_data
+        
+    except HTTPException:
+        raise
    except Exception as e:
-        logger.error("Failed to get weather history", error=str(e))
+        logger.error("Unexpected error in historical weather API", error=str(e))
        raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")

@router.post("/tenants/{tenant_id}weather/sync")
@@ -149,8 +172,6 @@ async def sync_weather_data(
                   user_id=current_user["user_id"],
                   force=force)
        
-        weather_service = WeatherService()
-        
        # Check if user has permission to sync (could be admin only)
        if current_user.get("role") not in ["admin", "manager"]:
            raise HTTPException(
--- a/services/data/app/schemas/external.py
+++ b/services/data/app/schemas/external.py
@@ -43,3 +43,15 @@ class LocationRequest(BaseModel):
 class DateRangeRequest(BaseModel):
    start_date: datetime
    end_date: datetime
+
+class HistoricalTrafficRequest(BaseModel):
+    latitude: float
+    longitude: float
+    start_date: datetime
+    end_date: datetime
+    
+class HistoricalWeatherRequest(BaseModel):
+    latitude: float
+    longitude: float
+    start_date: datetime
+    end_date: datetime