feat(15-01): add signal history and site alert services, routers, and main.py wiring
- Create signal_history_service with TimescaleDB time_bucket queries for 24h/7d/30d ranges - Create site_alert_service with full CRUD for rules, events list/resolve, and active count - Create signal_history router with GET endpoint for time-bucketed signal data - Create site_alerts router with CRUD endpoints for rules and event management - Wire both routers into main.py with /api prefix Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Jason Staack
52
backend/app/routers/signal_history.py
Normal file
52
backend/app/routers/signal_history.py
Normal file
@@ -0,0 +1,52 @@
|
||||
"""
|
||||
Signal history API endpoint.
|
||||
|
||||
Routes: /api/tenants/{tenant_id}/devices/{device_id}/signal-history
|
||||
|
||||
RBAC:
|
||||
- viewer: GET (read-only)
|
||||
"""
|
||||
|
||||
import uuid
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.database import get_db
|
||||
from app.middleware.tenant_context import CurrentUser, get_current_user
|
||||
from app.routers.devices import _check_tenant_access
|
||||
from app.schemas.site_alert import SignalHistoryResponse
|
||||
from app.services import signal_history_service
|
||||
|
||||
router = APIRouter(tags=["signal-history"])
|
||||
|
||||
|
||||
@router.get(
|
||||
"/tenants/{tenant_id}/devices/{device_id}/signal-history",
|
||||
response_model=SignalHistoryResponse,
|
||||
summary="Get signal strength history for a wireless client",
|
||||
)
|
||||
async def get_signal_history(
|
||||
tenant_id: uuid.UUID,
|
||||
device_id: uuid.UUID,
|
||||
mac_address: str = Query(..., description="Client MAC address to query history for"),
|
||||
range: str = Query("7d", description="Time range: 24h, 7d, or 30d"),
|
||||
current_user: CurrentUser = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> SignalHistoryResponse:
|
||||
"""Get time-bucketed signal strength history for a wireless client on a device."""
|
||||
await _check_tenant_access(current_user, tenant_id, db)
|
||||
|
||||
if range not in ("24h", "7d", "30d"):
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="range must be one of: 24h, 7d, 30d",
|
||||
)
|
||||
|
||||
return await signal_history_service.get_signal_history(
|
||||
db=db,
|
||||
tenant_id=tenant_id,
|
||||
device_id=device_id,
|
||||
mac_address=mac_address,
|
||||
range=range,
|
||||
)
|
||||
219
backend/app/routers/site_alerts.py
Normal file
219
backend/app/routers/site_alerts.py
Normal file
@@ -0,0 +1,219 @@
|
||||
"""
|
||||
Site alert rules and events API endpoints.
|
||||
|
||||
Routes:
|
||||
/api/tenants/{tenant_id}/sites/{site_id}/alert-rules (CRUD)
|
||||
/api/tenants/{tenant_id}/sites/{site_id}/alert-events (list)
|
||||
/api/tenants/{tenant_id}/alert-events/{event_id}/resolve (resolve)
|
||||
/api/tenants/{tenant_id}/alert-events/count (active count for bell badge)
|
||||
|
||||
RBAC:
|
||||
- viewer: GET endpoints (read-only)
|
||||
- operator: POST, PUT, DELETE, resolve (write)
|
||||
"""
|
||||
|
||||
import uuid
|
||||
from typing import Optional
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.database import get_db
|
||||
from app.middleware.rbac import require_operator_or_above
|
||||
from app.middleware.tenant_context import CurrentUser, get_current_user
|
||||
from app.routers.devices import _check_tenant_access
|
||||
from app.schemas.site_alert import (
|
||||
SiteAlertEventListResponse,
|
||||
SiteAlertEventResponse,
|
||||
SiteAlertRuleCreate,
|
||||
SiteAlertRuleListResponse,
|
||||
SiteAlertRuleResponse,
|
||||
SiteAlertRuleUpdate,
|
||||
)
|
||||
from app.services import site_alert_service
|
||||
|
||||
router = APIRouter(tags=["site-alerts"])
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Alert Rules CRUD
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@router.post(
|
||||
"/tenants/{tenant_id}/sites/{site_id}/alert-rules",
|
||||
response_model=SiteAlertRuleResponse,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
summary="Create a site alert rule",
|
||||
dependencies=[Depends(require_operator_or_above)],
|
||||
)
|
||||
async def create_alert_rule(
|
||||
tenant_id: uuid.UUID,
|
||||
site_id: uuid.UUID,
|
||||
data: SiteAlertRuleCreate,
|
||||
current_user: CurrentUser = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> SiteAlertRuleResponse:
|
||||
"""Create a new site/sector alert rule. Requires operator role or above."""
|
||||
await _check_tenant_access(current_user, tenant_id, db)
|
||||
return await site_alert_service.create_alert_rule(
|
||||
db=db, tenant_id=tenant_id, site_id=site_id, data=data
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
"/tenants/{tenant_id}/sites/{site_id}/alert-rules",
|
||||
response_model=SiteAlertRuleListResponse,
|
||||
summary="List site alert rules",
|
||||
)
|
||||
async def list_alert_rules(
|
||||
tenant_id: uuid.UUID,
|
||||
site_id: uuid.UUID,
|
||||
sector_id: Optional[uuid.UUID] = Query(None, description="Filter by sector"),
|
||||
current_user: CurrentUser = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> SiteAlertRuleListResponse:
|
||||
"""List alert rules for a site, optionally filtered by sector. Viewer role and above."""
|
||||
await _check_tenant_access(current_user, tenant_id, db)
|
||||
return await site_alert_service.list_alert_rules(
|
||||
db=db, tenant_id=tenant_id, site_id=site_id, sector_id=sector_id
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
"/tenants/{tenant_id}/sites/{site_id}/alert-rules/{rule_id}",
|
||||
response_model=SiteAlertRuleResponse,
|
||||
summary="Get a site alert rule",
|
||||
)
|
||||
async def get_alert_rule(
|
||||
tenant_id: uuid.UUID,
|
||||
site_id: uuid.UUID,
|
||||
rule_id: uuid.UUID,
|
||||
current_user: CurrentUser = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> SiteAlertRuleResponse:
|
||||
"""Get a single site alert rule by ID. Viewer role and above."""
|
||||
await _check_tenant_access(current_user, tenant_id, db)
|
||||
result = await site_alert_service.get_alert_rule(
|
||||
db=db, tenant_id=tenant_id, site_id=site_id, rule_id=rule_id
|
||||
)
|
||||
if not result:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND, detail="Alert rule not found"
|
||||
)
|
||||
return result
|
||||
|
||||
|
||||
@router.put(
|
||||
"/tenants/{tenant_id}/sites/{site_id}/alert-rules/{rule_id}",
|
||||
response_model=SiteAlertRuleResponse,
|
||||
summary="Update a site alert rule",
|
||||
dependencies=[Depends(require_operator_or_above)],
|
||||
)
|
||||
async def update_alert_rule(
|
||||
tenant_id: uuid.UUID,
|
||||
site_id: uuid.UUID,
|
||||
rule_id: uuid.UUID,
|
||||
data: SiteAlertRuleUpdate,
|
||||
current_user: CurrentUser = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> SiteAlertRuleResponse:
|
||||
"""Update a site alert rule. Requires operator role or above."""
|
||||
await _check_tenant_access(current_user, tenant_id, db)
|
||||
result = await site_alert_service.update_alert_rule(
|
||||
db=db, tenant_id=tenant_id, site_id=site_id, rule_id=rule_id, data=data
|
||||
)
|
||||
if not result:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND, detail="Alert rule not found"
|
||||
)
|
||||
return result
|
||||
|
||||
|
||||
@router.delete(
|
||||
"/tenants/{tenant_id}/sites/{site_id}/alert-rules/{rule_id}",
|
||||
status_code=status.HTTP_204_NO_CONTENT,
|
||||
summary="Delete a site alert rule",
|
||||
dependencies=[Depends(require_operator_or_above)],
|
||||
)
|
||||
async def delete_alert_rule(
|
||||
tenant_id: uuid.UUID,
|
||||
site_id: uuid.UUID,
|
||||
rule_id: uuid.UUID,
|
||||
current_user: CurrentUser = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> None:
|
||||
"""Delete a site alert rule. Requires operator role or above."""
|
||||
await _check_tenant_access(current_user, tenant_id, db)
|
||||
deleted = await site_alert_service.delete_alert_rule(
|
||||
db=db, tenant_id=tenant_id, site_id=site_id, rule_id=rule_id
|
||||
)
|
||||
if not deleted:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND, detail="Alert rule not found"
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Alert Events
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@router.get(
|
||||
"/tenants/{tenant_id}/sites/{site_id}/alert-events",
|
||||
response_model=SiteAlertEventListResponse,
|
||||
summary="List site alert events",
|
||||
)
|
||||
async def list_alert_events(
|
||||
tenant_id: uuid.UUID,
|
||||
site_id: uuid.UUID,
|
||||
state: Optional[str] = Query(None, description="Filter by state (active, resolved)"),
|
||||
limit: int = Query(50, ge=1, le=200, description="Max events to return"),
|
||||
current_user: CurrentUser = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> SiteAlertEventListResponse:
|
||||
"""List alert events for a site. Viewer role and above."""
|
||||
await _check_tenant_access(current_user, tenant_id, db)
|
||||
return await site_alert_service.list_alert_events(
|
||||
db=db, tenant_id=tenant_id, site_id=site_id, state=state, limit=limit
|
||||
)
|
||||
|
||||
|
||||
@router.post(
|
||||
"/tenants/{tenant_id}/alert-events/{event_id}/resolve",
|
||||
response_model=SiteAlertEventResponse,
|
||||
summary="Resolve a site alert event",
|
||||
dependencies=[Depends(require_operator_or_above)],
|
||||
)
|
||||
async def resolve_alert_event(
|
||||
tenant_id: uuid.UUID,
|
||||
event_id: uuid.UUID,
|
||||
current_user: CurrentUser = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> SiteAlertEventResponse:
|
||||
"""Resolve an active alert event. Requires operator role or above."""
|
||||
await _check_tenant_access(current_user, tenant_id, db)
|
||||
result = await site_alert_service.resolve_alert_event(
|
||||
db=db, tenant_id=tenant_id, event_id=event_id, user_id=current_user.user_id
|
||||
)
|
||||
if not result:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Alert event not found or already resolved",
|
||||
)
|
||||
return result
|
||||
|
||||
|
||||
@router.get(
|
||||
"/tenants/{tenant_id}/alert-events/count",
|
||||
summary="Get active alert event count",
|
||||
)
|
||||
async def get_active_event_count(
|
||||
tenant_id: uuid.UUID,
|
||||
current_user: CurrentUser = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> dict:
|
||||
"""Get count of active site alert events for notification bell badge. Viewer role and above."""
|
||||
await _check_tenant_access(current_user, tenant_id, db)
|
||||
count = await site_alert_service.get_active_event_count(db=db, tenant_id=tenant_id)
|
||||
return {"count": count}
|
||||
Reference in New Issue
Block a user