feat: move all remaining inline logic from routers to services (Tier 2)

backend/app/routers/osint.py

@@ -10,14 +10,14 @@ from sqlalchemy.orm import Session
 
 from app.database import get_db
 from app.dependencies.auth import get_current_user, require_any_role
-from app.models.osint_item import OsintItem
-from app.models.technique import Technique
 from app.models.user import User
 from app.services.osint_enrichment_service import (
     enrich_technique_with_cves,
     get_osint_items_for_technique,
+    get_osint_summary,
+    get_technique_or_raise,
+    list_osint_items as service_list_osint_items,
     mark_osint_reviewed,
-    get_unreviewed_count,
 )
 
 router = APIRouter(prefix="/osint", tags=["osint"])
@@ -56,41 +56,15 @@ def list_osint_items(
     user: User = Depends(get_current_user),
 ):
     """List OSINT items with optional filters."""
-    query = db.query(OsintItem)
-    if technique_id:
-        query = query.filter(OsintItem.technique_id == technique_id)
-    if source_type:
-        query = query.filter(OsintItem.source_type == source_type)
-    if reviewed is not None:
-        query = query.filter(OsintItem.reviewed == reviewed)
-
-    total = query.count()
-    items = (
-        query.order_by(OsintItem.discovered_at.desc())
-        .offset(offset)
-        .limit(limit)
-        .all()
+    return service_list_osint_items(
+        db,
+        technique_id=technique_id,
+        source_type=source_type,
+        reviewed=reviewed,
+        offset=offset,
+        limit=limit,
     )
 
-    return {
-        "total": total,
-        "items": [
-            {
-                "id": str(item.id),
-                "technique_id": str(item.technique_id),
-                "source_type": item.source_type,
-                "source_url": item.source_url,
-                "title": item.title,
-                "description": item.description,
-                "severity": item.severity,
-                "discovered_at": item.discovered_at.isoformat() if item.discovered_at else None,
-                "reviewed": item.reviewed,
-                "metadata": item.metadata_,
-            }
-            for item in items
-        ],
-    }
-
 
 @router.get("/summary")
 def osint_summary(
@@ -98,34 +72,7 @@ def osint_summary(
     user: User = Depends(get_current_user),
 ):
     """Summary statistics for OSINT items."""
-    from sqlalchemy import func
-
-    total = db.query(func.count(OsintItem.id)).scalar() or 0
-    unreviewed = get_unreviewed_count(db)
-
-    by_severity = dict(
-        db.query(OsintItem.severity, func.count(OsintItem.id))
-        .group_by(OsintItem.severity)
-        .all()
-    )
-
-    by_type = dict(
-        db.query(OsintItem.source_type, func.count(OsintItem.id))
-        .group_by(OsintItem.source_type)
-        .all()
-    )
-
-    techniques_with_items = (
-        db.query(func.count(func.distinct(OsintItem.technique_id))).scalar() or 0
-    )
-
-    return {
-        "total_items": total,
-        "unreviewed": unreviewed,
-        "techniques_with_items": techniques_with_items,
-        "by_severity": by_severity,
-        "by_type": by_type,
-    }
+    return get_osint_summary(db)
 
 
 @router.post("/items/{item_id}/review")
@@ -151,13 +98,7 @@ def trigger_technique_enrichment(
     user: User = Depends(require_any_role("red_lead", "blue_lead")),
 ):
     """Manually trigger OSINT enrichment for a single technique."""
-    technique = db.query(Technique).filter(Technique.id == technique_id).first()
-    if not technique:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="Technique not found",
-        )
-
+    technique = get_technique_or_raise(db, technique_id)
     count = enrich_technique_with_cves(db, technique)
     return {
         "technique_id": str(technique.id),