Merge pull request #27 from CIAT-DAPA/develop

Add new endpoints for indicators and historical data

Author: Dan3s

.gitignore

@@ -146,3 +146,4 @@ coverage.xml
 
 # Pre-commit
 .pre-commit-config.yaml.backup
+src/populate_sample_data.py

src/routes/get_climate_historical_indicator.py

@@ -203,3 +203,46 @@ def get_by_indicator_and_location(
             end_date=d.end_date
         ) for d in data
     ]
+
+@router.get("/by-location-date-period", response_model=List[ClimateHistoricalIndicatorRecord])
+def get_by_location_date_period(
+    location_id: int = Query(..., description="Location ID"),
+    start_date: str = Query(..., description="Start date (YYYY-MM-DD)"),
+    end_date: str = Query(..., description="End date (YYYY-MM-DD)"),
+    period: str = Query(..., description="Period type (e.g. monthly, yearly)")
+):
+    """
+    Returns historical indicator records filtered by:
+    - Location ID
+    - Date range (inclusive)
+    - Period type
+    
+    Example: /by-location-date-period?location_id=123&start_date=2023-01-01&end_date=2023-12-31&period=monthly
+    """
+    service = ClimateHistoricalIndicatorService()
+    
+    # Validación adicional para fechas
+    if start_date > end_date:
+        raise HTTPException(
+            status_code=400, 
+            detail="Start date cannot be after end date"
+        )
+    
+    period_upper = period.upper()
+    data = service.get_by_location_date_period(location_id, start_date, end_date, period_upper)
+    
+    return [
+        ClimateHistoricalIndicatorRecord(
+            id=d.id,
+            indicator_id=d.indicator_id,
+            indicator_name=d.indicator.name if d.indicator else None,
+            indicator_short_name=d.indicator.short_name if d.indicator else None,
+            indicator_unit=d.indicator.unit if d.indicator else None,
+            location_id=d.location_id,
+            location_name=d.location.name if d.location else None,
+            value=d.value,
+            period=d.period,
+            start_date=d.start_date,
+            end_date=d.end_date
+        ) for d in data
+    ]

src/routes/get_locations_by_id.py

@@ -35,7 +35,8 @@ def get_locations_by_id(
             "admin1_ext_id": location.admin_2.admin_1.ext_id if location.admin_2 and location.admin_2.admin_1 and location.admin_2.admin_1.ext_id else None,
             "country_id": location.admin_2.admin_1.country.id if location.admin_2 and location.admin_2.admin_1 and location.admin_2.admin_1.country else None,
             "country_name": location.admin_2.admin_1.country.name if location.admin_2 and location.admin_2.admin_1 and location.admin_2.admin_1.country else None,
-            "country_iso2": location.admin_2.admin_1.country.iso2 if location.admin_2 and location.admin_2.admin_1 and location.admin_2.admin_1.country else None
+            "country_iso2": location.admin_2.admin_1.country.iso2 if location.admin_2 and location.admin_2.admin_1 and location.admin_2.admin_1.country else None,
+            "source": location.source.name if location.source else None
     }
 
     result.append(flat_loc)

src/routes/get_mng_indicators.py

@@ -114,6 +114,33 @@ def get_by_type(
             updated_at=d.updated_at
         ) for d in data
     ]
+@router.get("/by-id", response_model=List[Indicator])
+def get_by_id(
+    id: int = Query(..., description="Indicator ID")
+):
+    """
+    Returns indicators filtered by ID.
+    - **id**: ID of the indicator to filter by.
+    """
+    service = MngIndicatorService()
+
+    try:
+        data = service.get_by_id(id)
+    except Exception as e:
+        raise HTTPException(status_code=400, detail=f"Invalid indicator ID: {id}")
+    return [
+        Indicator(
+            id=d.id,
+            name=d.name,
+            short_name=d.short_name,
+            unit=d.unit,
+            type=d.type,
+            description=d.description,
+            enable=d.enable,
+            registered_at=d.registered_at,
+            updated_at=d.updated_at
+        ) for d in data
+    ]
 
 @router.get("/all-enabled", response_model=List[Indicator])
 def get_all_enabled():