Update app/routers/devices.py

app/routers/devices.py

@@ -3,6 +3,7 @@ from datetime import datetime, timedelta, timezone
 from fastapi import APIRouter
 
 from app.models.schemas import (
+    DeviceStatusResponse,
     DeviceStatusRow,
     HeartbeatRequest,
     HeartbeatResponse,
@@ -58,16 +59,16 @@ async def heartbeat(payload: HeartbeatRequest) -> HeartbeatResponse:
     return HeartbeatResponse()
 
 
-@router.get("")
-async def list_devices() -> list[dict[str, str | bool]]:
+@router.get("", response_model=list[DeviceStatusResponse])
+async def list_devices() -> list[DeviceStatusResponse]:
     now = datetime.now(timezone.utc)
     online_threshold = now - timedelta(seconds=90)
     rows = await device_repo.list()
-    output: list[dict[str, str | bool]] = []
+    output: list[DeviceStatusResponse] = []
     for row in rows:
         last_heartbeat_at = _to_utc_aware(row.get("last_heartbeat_at"))
         output.append(
-            DeviceStatusRow(
+            DeviceStatusResponse(
                 device_id=row.get("device_id", ""),
                 hostname=row.get("hostname", ""),
                 agent_version=row.get("agent_version", ""),
@@ -76,12 +77,10 @@ async def list_devices() -> list[dict[str, str | bool]]:
                 active_restriction_window=bool(
                     row.get("active_restriction_window", False)
                 ),
-            ).model_dump()
-            | {
-                "is_online": bool(
+                is_online=bool(
                     last_heartbeat_at is not None
                     and last_heartbeat_at >= online_threshold
-                )
-            }
+                ),
+            )
         )
     return output