feat: implemented ongoing/historical separation and frontline detection

api/intel_engine.py

@@ -96,3 +96,25 @@ async def get_priority_monitor():
     async with db.pool.acquire() as conn:
         rows = await conn.fetch(query)
     return [dict(r) for r in rows]
+
+async def get_active_frontlines():
+    """Identifies active frontline clusters based on intensity and recency."""
+    query = """
+    SELECT 
+        ST_X(ST_Centroid(ST_Collect(geom::geometry))) as lon,
+        ST_Y(ST_Centroid(ST_Collect(geom::geometry))) as lat,
+        COUNT(*) as event_count,
+        country,
+        country_iso3,
+        MAX(severity_score) as highest_severity,
+        mode() WITHIN GROUP (ORDER BY event_type) as primary_engagement
+    FROM conflict_events
+    WHERE event_time >= NOW() - INTERVAL '48 hours'
+    AND category IN ('MILITARY', 'MILITANT')
+    GROUP BY country, country_iso3, ST_SnapToGrid(geom::geometry, 1.5)
+    HAVING COUNT(*) >= 2
+    ORDER BY event_count DESC
+    """
+    async with db.pool.acquire() as conn:
+        rows = await conn.fetch(query)
+    return [dict(r) for r in rows]

api/routes/conflicts.py

@@ -125,6 +125,57 @@ async def get_recent_conflicts(request: Request, days: int = 7, limit: int = 100
     }
     await set_cache(cache_key, response, ttl=300)
     return response
+@router.get("/ongoing")
+async def get_ongoing_conflicts(request: Request, limit: int = 50):
+    """Returns only MILITARY/MILITANT events from the last 48 hours."""
+    cache_key = f"conflicts:ongoing:{limit}"
+    cached = await check_cache(request, cache_key)
+    if cached: return cached
+
+    query = """
+    SELECT * FROM conflict_events 
+    WHERE event_time >= NOW() - INTERVAL '48 hours'
+    AND category IN ('MILITARY', 'MILITANT', 'TERRORIST')
+    ORDER BY event_time DESC LIMIT $1
+    """
+    async with db.pool.acquire() as conn:
+        records = await conn.fetch(query, limit)
+    
+    data = [dict(r) for r in records]
+    for d in data:
+        if d.get("geom"): del d["geom"]
+        d["event_time"] = d["event_time"].isoformat() + "Z" if d["event_time"] else None
+    
+    res = {"status": 200, "success": True, "count": len(data), "data": data}
+    await set_cache(cache_key, res, ttl=60) # Short TTL for live data
+    return res
+
+@router.get("/historical")
+async def get_historical_conflicts(request: Request, days_ago: int = 2, limit: int = 100):
+    """Returns military events older than the specified timeframe (default 2 days)."""
+    cache_key = f"conflicts:historical:{days_ago}:{limit}"
+    cached = await check_cache(request, cache_key)
+    if cached: return cached
+
+    query = """
+    SELECT * FROM conflict_events 
+    WHERE event_time < NOW() - INTERVAL '$1 days'
+    AND category IN ('MILITARY', 'MILITANT', 'TERRORIST')
+    ORDER BY event_time DESC LIMIT $2
+    """
+    # Note: Using parameterized interval is tricky in asyncpg, so we simplify
+    query = query.replace("$1", str(days_ago))
+    async with db.pool.acquire() as conn:
+        records = await conn.fetch(query, limit)
+
+    data = [dict(r) for r in records]
+    for d in data:
+        if d.get("geom"): del d["geom"]
+        d["event_time"] = d["event_time"].isoformat() + "Z" if d["event_time"] else None
+
+    res = {"status": 200, "success": True, "count": len(data), "data": data}
+    await set_cache(cache_key, res, ttl=3600) # Long TTL for history
+    return res
 
 @router.get("/near")
 async def get_conflicts_near(

api/routes/intel.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter, HTTPException
 from api.intel_engine import (
-    get_daily_sitrep, get_conflict_trends, get_world_hotspots, get_priority_monitor
+    get_daily_sitrep, get_conflict_trends, get_world_hotspots, get_priority_monitor, get_active_frontlines
 )
 
 router = APIRouter(prefix="/intel", tags=["Intelligence"])
@@ -36,3 +36,11 @@ async def monitor():
         return await get_priority_monitor()
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
+
+@router.get("/frontlines")
+async def frontlines():
+    """Get active frontline clusters (Ongoing high-intensity conflict zones)."""
+    try:
+        return await get_active_frontlines()
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))