kitos
9ff0f04ba3
Enable ANN rules in ruff.toml (flake8-annotations) and resolve all 221 violations: ANN201/ANN202 — return types on 168 public/private functions: - All 28 FastAPI routers: endpoints annotated with dict/list/specific schema/ StreamingResponse/FileResponse/JSONResponse as appropriate - main.py: lifespan→AsyncGenerator[None,None], exception handlers→JSONResponse - database.py: get_db→Generator[Session,None,None], proxy methods→correct types - middleware/request_context.py: dispatch→Response with Callable call_next type ANN001/ANN002/ANN003 — 32 missing argument types: - seed_demo.py: all db parameters typed as Session - domain/unit_of_work.py: __aexit__ exc_type/exc_val/exc_tb typed with TracebackType - services: audit_service user_id→UUID|None, heatmap_service query/model/builder, notification_service test→Test, tempo_service test→Test/user→User, test_workflow_service test_id→UUID, campaign_crud **fields→object, test_crud **fields→object (4 sites) ANN401 — 16 Any usages resolved: - Domain entities (campaign/technique/threat_actor/test_entity): replaced Any with actual ORM types via TYPE_CHECKING guards to avoid circular imports - detection_rule_service: test_id/detection_rule_id/evaluator_id→UUID - score_cache: kept Any with # noqa: ANN401 (genuinely generic cache) - jira_service/tempo_service: kept Any with # noqa: ANN401 (lazy optional deps) - d3fend_import_service: _to_str(v: Any) kept with # noqa: ANN401 ANN204/ANN205/ANN206 — special/static/class methods: - database.py proxy __call__/__getattr__: *args: object/**kwargs: object - schemas/test.py model_validate: obj→object, **kwargs→object - sa_technique_repository._int_type→type All 439 unit tests pass. ruff check app/ → All checks passed!
117 lines
3.6 KiB
Python
117 lines
3.6 KiB
Python
"""Worklog router — internal time-tracking records with integrity verification."""
|
|
|
|
from datetime import datetime
|
|
from typing import Optional
|
|
from uuid import UUID
|
|
|
|
from fastapi import APIRouter, Depends
|
|
from pydantic import BaseModel, Field
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.database import get_db
|
|
from app.dependencies.auth import get_current_user, require_any_role
|
|
from app.domain.unit_of_work import UnitOfWork
|
|
from app.models.user import User
|
|
from app.services import worklog_service
|
|
|
|
router = APIRouter(prefix="/worklogs", tags=["worklogs"])
|
|
|
|
|
|
# ── Schemas ──────────────────────────────────────────────────────────────
|
|
|
|
|
|
class WorklogCreate(BaseModel):
|
|
entity_type: str = Field(..., max_length=50)
|
|
entity_id: UUID
|
|
activity_type: str = Field(..., max_length=100)
|
|
started_at: datetime
|
|
ended_at: Optional[datetime] = None
|
|
duration_seconds: int = Field(..., gt=0)
|
|
description: Optional[str] = None
|
|
|
|
|
|
class WorklogOut(BaseModel):
|
|
id: UUID
|
|
entity_type: str
|
|
entity_id: UUID
|
|
user_id: UUID
|
|
activity_type: str
|
|
started_at: datetime
|
|
ended_at: Optional[datetime] = None
|
|
duration_seconds: int
|
|
description: Optional[str] = None
|
|
tempo_synced: Optional[datetime] = None
|
|
integrity_hash: Optional[str] = None
|
|
created_at: datetime
|
|
|
|
class Config:
|
|
from_attributes = True
|
|
|
|
|
|
# ── Endpoints ────────────────────────────────────────────────────────────
|
|
|
|
|
|
@router.post("", response_model=WorklogOut, status_code=201)
|
|
def create(
|
|
body: WorklogCreate,
|
|
db: Session = Depends(get_db),
|
|
user: User = Depends(require_any_role("red_tech", "blue_tech", "red_lead", "blue_lead")),
|
|
) -> WorklogOut:
|
|
"""Create a manually-logged worklog entry."""
|
|
with UnitOfWork(db) as uow:
|
|
wl = worklog_service.create_worklog(
|
|
db,
|
|
entity_type=body.entity_type,
|
|
entity_id=body.entity_id,
|
|
user_id=user.id,
|
|
activity_type=body.activity_type,
|
|
started_at=body.started_at,
|
|
ended_at=body.ended_at,
|
|
duration_seconds=body.duration_seconds,
|
|
description=body.description,
|
|
)
|
|
uow.commit()
|
|
db.refresh(wl)
|
|
return wl
|
|
|
|
|
|
@router.get("", response_model=list[WorklogOut])
|
|
def list_all(
|
|
entity_type: Optional[str] = None,
|
|
entity_id: Optional[UUID] = None,
|
|
user_id: Optional[UUID] = None,
|
|
db: Session = Depends(get_db),
|
|
_user: User = Depends(get_current_user),
|
|
) -> list[WorklogOut]:
|
|
"""List worklogs with optional filters."""
|
|
return worklog_service.list_worklogs(
|
|
db,
|
|
entity_type=entity_type,
|
|
entity_id=entity_id,
|
|
user_id=user_id,
|
|
)
|
|
|
|
|
|
@router.get("/{worklog_id}", response_model=WorklogOut)
|
|
def get_one(
|
|
worklog_id: UUID,
|
|
db: Session = Depends(get_db),
|
|
_user: User = Depends(get_current_user),
|
|
) -> WorklogOut:
|
|
"""Get a single worklog by ID."""
|
|
return worklog_service.get_worklog_or_raise(db, worklog_id)
|
|
|
|
|
|
@router.get("/{worklog_id}/verify")
|
|
def verify_integrity(
|
|
worklog_id: UUID,
|
|
db: Session = Depends(get_db),
|
|
_user: User = Depends(get_current_user),
|
|
) -> dict:
|
|
"""Check whether a worklog's integrity hash is still valid."""
|
|
wl = worklog_service.get_worklog_or_raise(db, worklog_id)
|
|
return {
|
|
"worklog_id": str(wl.id),
|
|
"integrity_valid": worklog_service.verify_worklog_integrity(wl),
|
|
}
|