修复前后端显示异常问题(受试者、中心、负责人、日期等)
This commit is contained in:
@@ -7,7 +7,11 @@ from app.core.deps import get_current_user, get_db_session, require_study_member
|
||||
from app.crud import audit as audit_crud
|
||||
from app.crud import milestone as milestone_crud
|
||||
from app.crud import study as study_crud
|
||||
from app.crud import user as user_crud
|
||||
from app.crud import site as site_crud
|
||||
from app.schemas.milestone import MilestoneCreate, MilestoneRead, MilestoneUpdate
|
||||
from app.schemas.user import UserDisplay
|
||||
from app.schemas.milestone import SiteDisplay
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
@@ -33,6 +37,12 @@ async def create_milestone(
|
||||
) -> MilestoneRead:
|
||||
await _ensure_study_exists(db, study_id)
|
||||
milestone = await milestone_crud.create(db, study_id, milestone_in)
|
||||
owner = None
|
||||
site = None
|
||||
if milestone.owner_id:
|
||||
owner = await user_crud.get_by_id(db, milestone.owner_id)
|
||||
if milestone.site_id:
|
||||
site = await site_crud.get_site(db, milestone.site_id)
|
||||
await audit_crud.log_action(
|
||||
db,
|
||||
study_id=study_id,
|
||||
@@ -43,7 +53,22 @@ async def create_milestone(
|
||||
operator_id=current_user.id,
|
||||
operator_role=current_user.role,
|
||||
)
|
||||
return milestone
|
||||
return MilestoneRead(
|
||||
id=milestone.id,
|
||||
study_id=milestone.study_id,
|
||||
type=milestone.type,
|
||||
name=milestone.name,
|
||||
planned_date=milestone.planned_date,
|
||||
actual_date=milestone.actual_date,
|
||||
status=milestone.status,
|
||||
owner_id=milestone.owner_id,
|
||||
site_id=milestone.site_id,
|
||||
owner=UserDisplay.model_validate(owner) if owner else None,
|
||||
site=SiteDisplay.model_validate(site) if site else None,
|
||||
notes=milestone.notes,
|
||||
created_at=milestone.created_at,
|
||||
updated_at=milestone.updated_at,
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
@@ -57,7 +82,33 @@ async def list_milestones(
|
||||
) -> list[MilestoneRead]:
|
||||
await _ensure_study_exists(db, study_id)
|
||||
milestones = await milestone_crud.list_milestones(db, study_id)
|
||||
return list(milestones)
|
||||
owner_ids = {m.owner_id for m in milestones if m.owner_id}
|
||||
site_ids = {m.site_id for m in milestones if m.site_id}
|
||||
users_map = await user_crud.get_users_by_ids(db, owner_ids)
|
||||
sites_map = await site_crud.get_sites_by_ids(db, site_ids)
|
||||
result: list[MilestoneRead] = []
|
||||
for m in milestones:
|
||||
owner = users_map.get(m.owner_id)
|
||||
site = sites_map.get(m.site_id)
|
||||
result.append(
|
||||
MilestoneRead(
|
||||
id=m.id,
|
||||
study_id=m.study_id,
|
||||
type=m.type,
|
||||
name=m.name,
|
||||
planned_date=m.planned_date,
|
||||
actual_date=m.actual_date,
|
||||
status=m.status,
|
||||
owner_id=m.owner_id,
|
||||
site_id=m.site_id,
|
||||
owner=UserDisplay.model_validate(owner) if owner else None,
|
||||
site=SiteDisplay.model_validate(site) if site else None,
|
||||
notes=m.notes,
|
||||
created_at=m.created_at,
|
||||
updated_at=m.updated_at,
|
||||
)
|
||||
)
|
||||
return result
|
||||
|
||||
|
||||
@router.patch(
|
||||
@@ -78,6 +129,12 @@ async def update_milestone(
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Milestone not found")
|
||||
old_status = milestone.status
|
||||
updated = await milestone_crud.update(db, milestone, milestone_in)
|
||||
owner = None
|
||||
site = None
|
||||
if updated.owner_id:
|
||||
owner = await user_crud.get_by_id(db, updated.owner_id)
|
||||
if updated.site_id:
|
||||
site = await site_crud.get_site(db, updated.site_id)
|
||||
detail = None
|
||||
if milestone_in.status and milestone_in.status != old_status:
|
||||
detail = f"milestone {milestone_id} status {old_status} -> {milestone_in.status}"
|
||||
@@ -91,4 +148,19 @@ async def update_milestone(
|
||||
operator_id=current_user.id,
|
||||
operator_role=current_user.role,
|
||||
)
|
||||
return updated
|
||||
return MilestoneRead(
|
||||
id=updated.id,
|
||||
study_id=updated.study_id,
|
||||
type=updated.type,
|
||||
name=updated.name,
|
||||
planned_date=updated.planned_date,
|
||||
actual_date=updated.actual_date,
|
||||
status=updated.status,
|
||||
owner_id=updated.owner_id,
|
||||
site_id=updated.site_id,
|
||||
owner=UserDisplay.model_validate(owner) if owner else None,
|
||||
site=SiteDisplay.model_validate(site) if site else None,
|
||||
notes=updated.notes,
|
||||
created_at=updated.created_at,
|
||||
updated_at=updated.updated_at,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user