Fix traffic data

services/data/app/services/traffic_service.py

@@ -1,7 +1,7 @@
 # ================================================================
-# services/data/app/services/traffic_service.py
+# services/data/app/services/traffic_service.py - FIXED VERSION
 # ================================================================
-"""Traffic data service"""
+"""Traffic data service with improved error handling"""
 
 from typing import List, Dict, Any, Optional
 from datetime import datetime, timedelta
@@ -23,12 +23,29 @@ class TrafficService:
     async def get_current_traffic(self, latitude: float, longitude: float) -> Optional[TrafficDataResponse]:
         """Get current traffic data for location"""
         try:
+            logger.debug("Getting current traffic", lat=latitude, lon=longitude)
             traffic_data = await self.madrid_client.get_current_traffic(latitude, longitude)
+            
             if traffic_data:
-                return TrafficDataResponse(**traffic_data)
-            return None
+                logger.debug("Traffic data received", source=traffic_data.get('source'))
+                
+                # Validate and clean traffic data before creating response
+                validated_data = {
+                    "date": traffic_data.get("date", datetime.now()),
+                    "traffic_volume": int(traffic_data.get("traffic_volume", 100)),
+                    "pedestrian_count": int(traffic_data.get("pedestrian_count", 150)),
+                    "congestion_level": str(traffic_data.get("congestion_level", "medium")),
+                    "average_speed": int(traffic_data.get("average_speed", 25)),
+                    "source": str(traffic_data.get("source", "unknown"))
+                }
+                
+                return TrafficDataResponse(**validated_data)
+            else:
+                logger.warning("No traffic data received from Madrid client")
+                return None
+                
         except Exception as e:
-            logger.error("Failed to get current traffic", error=str(e))
+            logger.error("Failed to get current traffic", error=str(e), lat=latitude, lon=longitude)
             return None
     
     async def get_historical_traffic(self, 
@@ -39,6 +56,10 @@ class TrafficService:
                                    db: AsyncSession) -> List[TrafficDataResponse]:
         """Get historical traffic data"""
         try:
+            logger.debug("Getting historical traffic", 
+                        lat=latitude, lon=longitude, 
+                        start=start_date, end=end_date)
+            
             # Check database first
             location_id = f"{latitude:.4f},{longitude:.4f}"
             stmt = select(TrafficData).where(
@@ -53,6 +74,7 @@ class TrafficService:
             db_records = result.scalars().all()
             
             if db_records:
+                logger.debug("Historical traffic data found in database", count=len(db_records))
                 return [TrafficDataResponse(
                     date=record.date,
                     traffic_volume=record.traffic_volume,
@@ -63,28 +85,39 @@ class TrafficService:
                 ) for record in db_records]
             
             # Fetch from API if not in database
+            logger.debug("Fetching historical traffic data from Madrid API")
             traffic_data = await self.madrid_client.get_historical_traffic(
                 latitude, longitude, start_date, end_date
             )
             
-            # Store in database
-            for data in traffic_data:
-                traffic_record = TrafficData(
-                    location_id=location_id,
-                    date=data['date'],
-                    traffic_volume=data.get('traffic_volume'),
-                    pedestrian_count=data.get('pedestrian_count'),
-                    congestion_level=data.get('congestion_level'),
-                    average_speed=data.get('average_speed'),
-                    source="madrid_opendata",
-                    raw_data=str(data)
-                )
-                db.add(traffic_record)
-            
-            await db.commit()
-            
-            return [TrafficDataResponse(**item) for item in traffic_data]
+            if traffic_data:
+                # Store in database for future use
+                try:
+                    for data in traffic_data:
+                        if isinstance(data, dict):
+                            traffic_record = TrafficData(
+                                location_id=location_id,
+                                date=data.get('date', datetime.now()),
+                                traffic_volume=data.get('traffic_volume'),
+                                pedestrian_count=data.get('pedestrian_count'),
+                                congestion_level=data.get('congestion_level'),
+                                average_speed=data.get('average_speed'),
+                                source="madrid_opendata",
+                                raw_data=str(data)
+                            )
+                            db.add(traffic_record)
+                    
+                    await db.commit()
+                    logger.debug("Historical traffic data stored in database", count=len(traffic_data))
+                except Exception as db_error:
+                    logger.warning("Failed to store historical traffic data", error=str(db_error))
+                    await db.rollback()
+                
+                return [TrafficDataResponse(**item) for item in traffic_data if isinstance(item, dict)]
+            else:
+                logger.warning("No historical traffic data received")
+                return []
             
         except Exception as e:
             logger.error("Failed to get historical traffic", error=str(e))
-            return []
+            return []