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

backend/app/routers/d3fend.py

@@ -3,18 +3,20 @@
 import logging
 from typing import Optional
 
-from fastapi import APIRouter, Depends, HTTPException, Query
+from fastapi import APIRouter, Depends, Query
 from sqlalchemy.orm import Session
 
 from app.database import get_db
 from app.dependencies.auth import get_current_user, require_role
 from app.models.user import User
-from app.models.technique import Technique
-from app.models.defensive_technique import DefensiveTechnique, DefensiveTechniqueMapping
 from app.services.d3fend_import_service import (
     import_d3fend_techniques,
     import_d3fend_mappings,
-    get_defenses_for_technique,
+)
+from app.services.d3fend_query_service import (
+    list_defensive_techniques as list_defensive_techniques_svc,
+    list_d3fend_tactics,
+    get_defenses_for_attack_technique,
 )
 
 logger = logging.getLogger(__name__)
@@ -36,38 +38,9 @@ def list_defensive_techniques(
     current_user: User = Depends(get_current_user),
 ):
     """List all D3FEND defensive techniques with optional filters."""
-    query = db.query(DefensiveTechnique)
-
-    if tactic:
-        query = query.filter(DefensiveTechnique.tactic == tactic)
-
-    if search:
-        from app.utils import escape_like
-        pattern = f"%{escape_like(search)}%"
-        query = query.filter(
-            DefensiveTechnique.name.ilike(pattern)
-            | DefensiveTechnique.d3fend_id.ilike(pattern)
-        )
-
-    total = query.count()
-    items = query.order_by(DefensiveTechnique.d3fend_id).offset(offset).limit(limit).all()
-
-    return {
-        "total": total,
-        "offset": offset,
-        "limit": limit,
-        "items": [
-            {
-                "id": str(dt.id),
-                "d3fend_id": dt.d3fend_id,
-                "name": dt.name,
-                "description": dt.description,
-                "tactic": dt.tactic,
-                "d3fend_url": dt.d3fend_url,
-            }
-            for dt in items
-        ],
-    }
+    return list_defensive_techniques_svc(
+        db, tactic=tactic, search=search, offset=offset, limit=limit
+    )
 
 
 # ---------------------------------------------------------------------------
@@ -75,21 +48,12 @@ def list_defensive_techniques(
 # ---------------------------------------------------------------------------
 
 @router.get("/tactics")
-def list_d3fend_tactics(
+def list_d3fend_tactics_endpoint(
     db: Session = Depends(get_db),
     current_user: User = Depends(get_current_user),
 ):
     """Return a list of all D3FEND tactics with counts."""
-    from sqlalchemy import func
-
-    rows = (
-        db.query(DefensiveTechnique.tactic, func.count(DefensiveTechnique.id))
-        .group_by(DefensiveTechnique.tactic)
-        .order_by(DefensiveTechnique.tactic)
-        .all()
-    )
-
-    return [{"tactic": tactic or "Unknown", "count": count} for tactic, count in rows]
+    return list_d3fend_tactics(db)
 
 
 # ---------------------------------------------------------------------------
@@ -97,24 +61,13 @@ def list_d3fend_tactics(
 # ---------------------------------------------------------------------------
 
 @router.get("/for-technique/{mitre_id}")
-def get_defenses_for_attack_technique(
+def get_defenses_for_attack_technique_endpoint(
     mitre_id: str,
     db: Session = Depends(get_db),
     current_user: User = Depends(get_current_user),
 ):
     """Get all D3FEND defensive techniques mapped to a given ATT&CK technique."""
-    technique = db.query(Technique).filter(Technique.mitre_id == mitre_id).first()
-    if not technique:
-        raise HTTPException(status_code=404, detail=f"Technique {mitre_id} not found")
-
-    defenses = get_defenses_for_technique(db, technique.id)
-
-    return {
-        "mitre_id": mitre_id,
-        "technique_name": technique.name,
-        "defenses": defenses,
-        "total": len(defenses),
-    }
+    return get_defenses_for_attack_technique(db, mitre_id)
 
 
 # ---------------------------------------------------------------------------