Step 8：数据管理（Queries + SDV/SDR 进度）

2025-12-16 19:16:50 +08:00
parent 8383fd1dd5
commit 566ebdf749
64 changed files with 646 additions and 1 deletions
@@ -0,0 +1,153 @@
+import uuid
+from datetime import date
+
+from fastapi import APIRouter, Depends, HTTPException, status
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.core.deps import get_current_user, get_db_session, require_study_member, require_study_roles
+from app.crud import data_query as dq_crud
+from app.crud import audit as audit_crud
+from app.crud import study as study_crud
+from app.schemas.data_query import DataQueryCreate, DataQueryRead, DataQueryUpdate
+
+router = APIRouter()
+
+
+def _is_overdue(dq: DataQueryRead) -> bool:
+    return bool(dq.due_date and date.today() > dq.due_date and dq.status != "CLOSED")
+
+
+async def _ensure_study_exists(db: AsyncSession, study_id: uuid.UUID):
+    study = await study_crud.get(db, study_id)
+    if not study:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Study not found")
+    return study
+
+
+@router.post(
+    "/",
+    response_model=DataQueryRead,
+    status_code=status.HTTP_201_CREATED,
+    dependencies=[Depends(require_study_roles(["PM", "CRA"]))],
+)
+async def create_query(
+    study_id: uuid.UUID,
+    query_in: DataQueryCreate,
+    db: AsyncSession = Depends(get_db_session),
+    current_user=Depends(get_current_user),
+) -> DataQueryRead:
+    await _ensure_study_exists(db, study_id)
+    try:
+        dq = await dq_crud.create_query(db, study_id, query_in, created_by=current_user.id)
+    except ValueError as exc:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)) from exc
+    await audit_crud.log_action(
+        db,
+        study_id=study_id,
+        entity_type="data_query",
+        entity_id=dq.id,
+        action="CREATE_DATA_QUERY",
+        detail=f"DataQuery {dq.id} created",
+        operator_id=current_user.id,
+        operator_role=current_user.role,
+    )
+    obj = DataQueryRead.model_validate(dq)
+    obj.is_overdue = _is_overdue(obj)
+    return obj
+
+
+@router.get(
+    "/",
+    response_model=list[DataQueryRead],
+    dependencies=[Depends(require_study_member())],
+)
+async def list_queries(
+    study_id: uuid.UUID,
+    status_filter: str | None = None,
+    site_id: uuid.UUID | None = None,
+    subject_id: uuid.UUID | None = None,
+    assigned_to: uuid.UUID | None = None,
+    overdue: bool | None = None,
+    category: str | None = None,
+    priority: str | None = None,
+    skip: int = 0,
+    limit: int = 100,
+    db: AsyncSession = Depends(get_db_session),
+) -> list[DataQueryRead]:
+    await _ensure_study_exists(db, study_id)
+    queries = await dq_crud.list_queries(
+        db,
+        study_id,
+        status=status_filter,
+        site_id=site_id,
+        subject_id=subject_id,
+        assigned_to=assigned_to,
+        overdue=overdue,
+        category=category,
+        priority=priority,
+        skip=skip,
+        limit=limit,
+    )
+    result: list[DataQueryRead] = []
+    for q in queries:
+        obj = DataQueryRead.model_validate(q)
+        obj.is_overdue = _is_overdue(obj)
+        result.append(obj)
+    return result
+
+
+@router.get(
+    "/{query_id}",
+    response_model=DataQueryRead,
+    dependencies=[Depends(require_study_member())],
+)
+async def get_query(
+    study_id: uuid.UUID,
+    query_id: uuid.UUID,
+    db: AsyncSession = Depends(get_db_session),
+) -> DataQueryRead:
+    await _ensure_study_exists(db, study_id)
+    dq = await dq_crud.get_query(db, query_id)
+    if not dq or dq.study_id != study_id:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="DataQuery not found")
+    obj = DataQueryRead.model_validate(dq)
+    obj.is_overdue = _is_overdue(obj)
+    return obj
+
+
+@router.patch(
+    "/{query_id}",
+    response_model=DataQueryRead,
+    dependencies=[Depends(require_study_roles(["PM", "CRA"]))],
+)
+async def update_query(
+    study_id: uuid.UUID,
+    query_id: uuid.UUID,
+    query_in: DataQueryUpdate,
+    db: AsyncSession = Depends(get_db_session),
+    current_user=Depends(get_current_user),
+) -> DataQueryRead:
+    await _ensure_study_exists(db, study_id)
+    dq = await dq_crud.get_query(db, query_id)
+    if not dq or dq.study_id != study_id:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="DataQuery not found")
+    old_status = dq.status
+    updated = await dq_crud.update_query(db, dq, query_in)
+    detail = None
+    action = "UPDATE_DATA_QUERY"
+    if query_in.status and query_in.status != old_status:
+        detail = f"DataQuery {query_id} status {old_status} -> {query_in.status}"
+        action = "DATA_QUERY_STATUS_CHANGE"
+    await audit_crud.log_action(
+        db,
+        study_id=study_id,
+        entity_type="data_query",
+        entity_id=query_id,
+        action=action,
+        detail=detail or "DataQuery updated",
+        operator_id=current_user.id,
+        operator_role=current_user.role,
+    )
+    obj = DataQueryRead.model_validate(updated)
+    obj.is_overdue = _is_overdue(obj)
+    return obj
@@ -1,6 +1,6 @@
 from fastapi import APIRouter

-from app.api.v1 import auth, users, studies, sites, members, comments, attachments, audit_logs, milestones, tasks, dashboard, subjects, visits, aes, issues
+from app.api.v1 import auth, users, studies, sites, members, comments, attachments, audit_logs, milestones, tasks, dashboard, subjects, visits, aes, issues, data_queries, verifications

 api_router = APIRouter()
 api_router.include_router(auth.router, prefix="/auth", tags=["auth"])
@@ -18,3 +18,5 @@ api_router.include_router(subjects.router, prefix="/studies/{study_id}/subjects"
 api_router.include_router(visits.router, prefix="/studies/{study_id}/subjects/{subject_id}/visits", tags=["visits"])
 api_router.include_router(aes.router, prefix="/studies/{study_id}/aes", tags=["aes"])
 api_router.include_router(issues.router, prefix="/studies/{study_id}/issues", tags=["issues"])
+api_router.include_router(data_queries.router, prefix="/studies/{study_id}/data-queries", tags=["data-queries"])
+api_router.include_router(verifications.router, prefix="/studies/{study_id}/verifications", tags=["verifications"])
@@ -0,0 +1,115 @@
+import uuid
+
+from fastapi import APIRouter, Depends, HTTPException, status
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.core.deps import get_current_user, get_db_session, require_study_member, require_study_roles
+from app.crud import audit as audit_crud
+from app.crud import verification as verification_crud
+from app.crud import study as study_crud
+from app.schemas.verification import VerificationCreate, VerificationRead, VerificationUpdate
+
+router = APIRouter()
+
+
+async def _ensure_study_exists(db: AsyncSession, study_id: uuid.UUID):
+    study = await study_crud.get(db, study_id)
+    if not study:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Study not found")
+    return study
+
+
+@router.put(
+    "/",
+    response_model=VerificationRead,
+    status_code=status.HTTP_200_OK,
+    dependencies=[Depends(require_study_roles(["PM", "CRA"]))],
+)
+async def upsert_verification(
+    study_id: uuid.UUID,
+    payload: VerificationCreate,
+    db: AsyncSession = Depends(get_db_session),
+    current_user=Depends(get_current_user),
+) -> VerificationRead:
+    await _ensure_study_exists(db, study_id)
+    try:
+        vp = await verification_crud.upsert_progress(db, study_id, payload)
+    except ValueError as exc:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)) from exc
+    await audit_crud.log_action(
+        db,
+        study_id=study_id,
+        entity_type="verification",
+        entity_id=vp.id,
+        action="UPSERT_VERIFICATION",
+        detail=f"{payload.level} progress subject {payload.subject_id} upserted",
+        operator_id=current_user.id,
+        operator_role=current_user.role,
+    )
+    return VerificationRead.model_validate(vp)
+
+
+@router.get(
+    "/",
+    response_model=list[VerificationRead],
+    dependencies=[Depends(require_study_member())],
+)
+async def list_verifications(
+    study_id: uuid.UUID,
+    site_id: uuid.UUID | None = None,
+    subject_id: uuid.UUID | None = None,
+    level: str | None = None,
+    db: AsyncSession = Depends(get_db_session),
+) -> list[VerificationRead]:
+    await _ensure_study_exists(db, study_id)
+    items = await verification_crud.list_progress(db, study_id, site_id=site_id, subject_id=subject_id, level=level)
+    return [VerificationRead.model_validate(i) for i in items]
+
+
+@router.get(
+    "/subjects/{subject_id}/{level}",
+    response_model=VerificationRead,
+    dependencies=[Depends(require_study_member())],
+)
+async def get_verification(
+    study_id: uuid.UUID,
+    subject_id: uuid.UUID,
+    level: str,
+    db: AsyncSession = Depends(get_db_session),
+) -> VerificationRead:
+    await _ensure_study_exists(db, study_id)
+    vp = await verification_crud.get_progress(db, study_id, subject_id, level)
+    if not vp:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Verification not found")
+    return VerificationRead.model_validate(vp)
+
+
+@router.patch(
+    "/{verification_id}",
+    response_model=VerificationRead,
+    dependencies=[Depends(require_study_roles(["PM", "CRA"]))],
+)
+async def update_verification(
+    study_id: uuid.UUID,
+    verification_id: uuid.UUID,
+    payload: VerificationUpdate,
+    db: AsyncSession = Depends(get_db_session),
+    current_user=Depends(get_current_user),
+) -> VerificationRead:
+    await _ensure_study_exists(db, study_id)
+    vp = await verification_crud.get_by_id(db, verification_id)
+    if not vp or vp.study_id != study_id:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Verification not found")
+
+    updated = await verification_crud.update_progress(db, vp, payload)
+    await audit_crud.log_action(
+        db,
+        study_id=study_id,
+        entity_type="verification",
+        entity_id=verification_id,
+        action="UPSERT_VERIFICATION",
+        detail=f"{updated.level} progress subject {updated.subject_id} updated",
+        operator_id=current_user.id,
+        operator_role=current_user.role,
+    )
+    return VerificationRead.model_validate(updated)