权限系统迁移完成:接口级权限 + 前置权限检查
## 核心改进
- 完全迁移到接口级权限(68个API端点)
- 实现前置权限检查机制,解决跨模块数据访问权限问题
- 添加权限管理API端点,支持前置权限查询
## 关键变更
1. 权限配置系统
- 添加OPERATION_PREREQUISITES映射表
- 所有操作配置前置权限依赖
2. 权限检查函数
- role_has_api_permission()支持前置权限检查
- get_missing_prerequisites()获取缺失权限列表
3. 权限管理API
- GET /api-permissions/operations - 获取所有操作及前置权限
- GET /api-permissions/operations/prerequisites - 获取前置权限依赖
- GET /api-permissions/{endpoint_key}/prerequisites - 检查缺失权限
4. API端点迁移
- 第1批:subjects, visits, aes, monitoring_visit_issues (23个)
- 第2批:members, sites, project_milestones (11个)
- 第3批:finance_contracts, fees_contracts, drug_shipments (15个)
- 第4批:startup endpoints (19个)
## 测试验证
- 单元测试:24个测试全部通过
- 集成测试:22个迁移端点测试通过
- 前置权限测试:12个测试全部通过
- 总计:46个测试全部通过
## 向后兼容性
- 模块级权限表保留用于历史数据
- 接口级权限未配置时自动回退到模块级权限
- 现有权限配置继续有效
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -48,7 +48,7 @@ def _is_overdue(ae: AERead) -> bool:
|
||||
"/",
|
||||
response_model=AERead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
dependencies=[Depends(require_api_permission("POST:/risk-issues")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("risk_issues:create")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def create_ae(
|
||||
study_id: uuid.UUID,
|
||||
@@ -89,7 +89,7 @@ async def create_ae(
|
||||
@router.get(
|
||||
"/",
|
||||
response_model=list[AERead],
|
||||
dependencies=[Depends(require_api_permission("GET:/risk-issues"))],
|
||||
dependencies=[Depends(require_api_permission("risk_issues:read"))],
|
||||
)
|
||||
async def list_ae(
|
||||
study_id: uuid.UUID,
|
||||
@@ -127,7 +127,7 @@ async def list_ae(
|
||||
@router.get(
|
||||
"/{ae_id}",
|
||||
response_model=AERead,
|
||||
dependencies=[Depends(require_api_permission("GET:/risk-issues/{id}"))],
|
||||
dependencies=[Depends(require_api_permission("risk_issues:read"))],
|
||||
)
|
||||
async def get_ae(
|
||||
study_id: uuid.UUID,
|
||||
@@ -155,7 +155,7 @@ async def get_ae(
|
||||
@router.patch(
|
||||
"/{ae_id}",
|
||||
response_model=AERead,
|
||||
dependencies=[Depends(require_api_permission("PATCH:/risk-issues/{id}")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("risk_issues:update")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def update_ae(
|
||||
study_id: uuid.UUID,
|
||||
@@ -210,7 +210,7 @@ async def update_ae(
|
||||
@router.delete(
|
||||
"/{ae_id}",
|
||||
status_code=status.HTTP_204_NO_CONTENT,
|
||||
dependencies=[Depends(require_api_permission("DELETE:/risk-issues/{id}")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("risk_issues:delete")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def delete_ae(
|
||||
study_id: uuid.UUID,
|
||||
|
||||
@@ -13,9 +13,10 @@ from app.core.deps import get_db_session, require_study_roles
|
||||
from app.core.project_permissions import (
|
||||
get_api_endpoint_permissions,
|
||||
replace_api_endpoint_permissions,
|
||||
get_missing_prerequisites,
|
||||
)
|
||||
from app.models.api_endpoint_registry import ApiEndpointRegistry
|
||||
from app.core.api_permissions import API_ENDPOINT_PERMISSIONS, PROJECT_PERMISSION_ROLES
|
||||
from app.core.api_permissions import API_ENDPOINT_PERMISSIONS, PROJECT_PERMISSION_ROLES, OPERATION_PREREQUISITES
|
||||
|
||||
router = APIRouter(prefix="/api-permissions", tags=["api-permissions"])
|
||||
|
||||
@@ -23,7 +24,7 @@ router = APIRouter(prefix="/api-permissions", tags=["api-permissions"])
|
||||
@router.get(
|
||||
"/operations",
|
||||
summary="获取系统中所有权限操作",
|
||||
description="返回系统中所有权限操作及其描述",
|
||||
description="返回系统中所有权限操作及其描述和前置权限",
|
||||
)
|
||||
async def list_api_operations() -> dict[str, list[dict]]:
|
||||
"""获取所有权限操作"""
|
||||
@@ -34,6 +35,7 @@ async def list_api_operations() -> dict[str, list[dict]]:
|
||||
"action": config["action"],
|
||||
"description": config["description"],
|
||||
"default_roles": config["default_roles"],
|
||||
"prerequisite_permissions": config.get("prerequisite_permissions", []),
|
||||
}
|
||||
for key, config in API_ENDPOINT_PERMISSIONS.items()
|
||||
]
|
||||
@@ -70,24 +72,70 @@ async def list_api_endpoints(
|
||||
|
||||
|
||||
@router.get(
|
||||
"/operations",
|
||||
summary="获取系统中所有权限操作",
|
||||
description="返回系统中所有权限操作及其描述",
|
||||
"/operations/prerequisites",
|
||||
summary="获取所有权限操作的前置权限依赖",
|
||||
description="返回系统中所有权限操作及其前置权限依赖关系",
|
||||
)
|
||||
async def list_api_operations() -> dict[str, list[dict]]:
|
||||
"""获取所有权限操作"""
|
||||
operations_list = [
|
||||
{
|
||||
"operation_key": key,
|
||||
"module": config["module"],
|
||||
"action": config["action"],
|
||||
"description": config["description"],
|
||||
"default_roles": config["default_roles"],
|
||||
async def list_operation_prerequisites() -> dict[str, dict]:
|
||||
"""获取所有权限操作的前置权限依赖"""
|
||||
prerequisites_map = {}
|
||||
for operation_key, prerequisites in OPERATION_PREREQUISITES.items():
|
||||
prerequisites_map[operation_key] = {
|
||||
"prerequisites": prerequisites,
|
||||
"description": API_ENDPOINT_PERMISSIONS.get(operation_key, {}).get("description", ""),
|
||||
}
|
||||
for key, config in API_ENDPOINT_PERMISSIONS.items()
|
||||
]
|
||||
|
||||
return {"operations": operations_list}
|
||||
return {"prerequisites": prerequisites_map}
|
||||
|
||||
|
||||
@router.get(
|
||||
"/{endpoint_key}/prerequisites",
|
||||
summary="获取特定操作的缺失前置权限",
|
||||
description="检查指定角色对特定操作的前置权限是否满足",
|
||||
)
|
||||
async def check_operation_prerequisites(
|
||||
study_id: uuid.UUID,
|
||||
endpoint_key: str,
|
||||
role: str,
|
||||
db: Annotated[AsyncSession, Depends(get_db_session)],
|
||||
) -> dict:
|
||||
"""检查特定操作的前置权限
|
||||
|
||||
返回格式:
|
||||
{
|
||||
"endpoint_key": "subjects:create",
|
||||
"role": "CRA",
|
||||
"has_main_permission": true,
|
||||
"prerequisites": ["sites:read"],
|
||||
"missing_prerequisites": [],
|
||||
"can_perform": true
|
||||
}
|
||||
"""
|
||||
from app.core.project_permissions import role_has_api_permission
|
||||
|
||||
if role == "ADMIN":
|
||||
return {
|
||||
"endpoint_key": endpoint_key,
|
||||
"role": role,
|
||||
"has_main_permission": True,
|
||||
"prerequisites": OPERATION_PREREQUISITES.get(endpoint_key, []),
|
||||
"missing_prerequisites": [],
|
||||
"can_perform": True,
|
||||
}
|
||||
|
||||
has_main = await role_has_api_permission(
|
||||
db, study_id, role, endpoint_key, check_prerequisites=False
|
||||
)
|
||||
missing = await get_missing_prerequisites(db, study_id, role, endpoint_key)
|
||||
|
||||
return {
|
||||
"endpoint_key": endpoint_key,
|
||||
"role": role,
|
||||
"has_main_permission": has_main,
|
||||
"prerequisites": OPERATION_PREREQUISITES.get(endpoint_key, []),
|
||||
"missing_prerequisites": missing,
|
||||
"can_perform": has_main and len(missing) == 0,
|
||||
}
|
||||
|
||||
|
||||
@router.get(
|
||||
|
||||
@@ -3,7 +3,7 @@ import uuid
|
||||
from fastapi import APIRouter, Depends, HTTPException, status
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.core.deps import get_cra_site_scope, get_current_user, get_db_session, require_study_not_locked, require_study_permission
|
||||
from app.core.deps import get_cra_site_scope, get_current_user, get_db_session, require_study_not_locked, require_api_permission
|
||||
from app.crud import audit as audit_crud
|
||||
from app.crud import drug_shipment as shipment_crud
|
||||
from app.crud import site as site_crud
|
||||
@@ -33,7 +33,7 @@ async def _ensure_center_active(db: AsyncSession, study_id: uuid.UUID, center_id
|
||||
"/shipments",
|
||||
response_model=DrugShipmentRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
dependencies=[Depends(require_study_permission("materials", "write")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("drug_shipments:create")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def create_shipment(
|
||||
study_id: uuid.UUID,
|
||||
@@ -64,7 +64,7 @@ async def create_shipment(
|
||||
@router.get(
|
||||
"/shipments",
|
||||
response_model=list[DrugShipmentRead],
|
||||
dependencies=[Depends(require_study_permission("materials", "read"))],
|
||||
dependencies=[Depends(require_api_permission("drug_shipments:read"))],
|
||||
)
|
||||
async def list_shipments(
|
||||
study_id: uuid.UUID,
|
||||
@@ -101,7 +101,7 @@ async def list_shipments(
|
||||
@router.get(
|
||||
"/shipments/{shipment_id}",
|
||||
response_model=DrugShipmentRead,
|
||||
dependencies=[Depends(require_study_permission("materials", "read"))],
|
||||
dependencies=[Depends(require_api_permission("drug_shipments:read"))],
|
||||
)
|
||||
async def get_shipment(
|
||||
study_id: uuid.UUID,
|
||||
@@ -122,7 +122,7 @@ async def get_shipment(
|
||||
@router.patch(
|
||||
"/shipments/{shipment_id}",
|
||||
response_model=DrugShipmentRead,
|
||||
dependencies=[Depends(require_study_permission("materials", "write")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("drug_shipments:update")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def update_shipment(
|
||||
study_id: uuid.UUID,
|
||||
@@ -160,7 +160,7 @@ async def update_shipment(
|
||||
@router.delete(
|
||||
"/shipments/{shipment_id}",
|
||||
status_code=status.HTTP_204_NO_CONTENT,
|
||||
dependencies=[Depends(require_study_permission("materials", "write")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("drug_shipments:delete")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def delete_shipment(
|
||||
study_id: uuid.UUID,
|
||||
|
||||
@@ -85,7 +85,7 @@ async def list_contract_fees(
|
||||
db: AsyncSession = Depends(get_db_session),
|
||||
current_user=Depends(get_current_user),
|
||||
) -> FeeApiResponse[list[ContractFeeListItem]]:
|
||||
await _ensure_project_access(db, project_id, current_user, "GET:/fees/contracts")
|
||||
await _ensure_project_access(db, project_id, current_user, "fees_contracts:read")
|
||||
cra_scope = await get_cra_site_scope(db, project_id, current_user)
|
||||
center_ids = cra_scope[0] if cra_scope else None
|
||||
if center_id and center_ids is not None and center_id not in center_ids:
|
||||
@@ -141,7 +141,7 @@ async def get_contract_fee(
|
||||
contract = await contract_fee_crud.get_contract_fee(db, contract_id)
|
||||
if not contract:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="合同费用不存在")
|
||||
await _ensure_project_access(db, contract.project_id, current_user, "GET:/fees/contracts/{id}")
|
||||
await _ensure_project_access(db, contract.project_id, current_user, "fees_contracts:read")
|
||||
cra_scope = await get_cra_site_scope(db, contract.project_id, current_user)
|
||||
if cra_scope and contract.center_id not in cra_scope[0]:
|
||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="权限不足")
|
||||
@@ -216,7 +216,7 @@ async def create_contract_fee(
|
||||
db: AsyncSession = Depends(get_db_session),
|
||||
current_user=Depends(get_current_user),
|
||||
) -> FeeApiResponse[ContractFeeRead]:
|
||||
await _ensure_project_access(db, contract_in.project_id, current_user, "POST:/fees/contracts")
|
||||
await _ensure_project_access(db, contract_in.project_id, current_user, "fees_contracts:create")
|
||||
existing = await contract_fee_crud.get_contract_fee_by_project_center(
|
||||
db, contract_in.project_id, contract_in.center_id
|
||||
)
|
||||
@@ -255,7 +255,7 @@ async def update_contract_fee(
|
||||
contract = await contract_fee_crud.get_contract_fee(db, contract_id)
|
||||
if not contract:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="合同费用不存在")
|
||||
await _ensure_project_access(db, contract.project_id, current_user, "PATCH:/fees/contracts/{id}")
|
||||
await _ensure_project_access(db, contract.project_id, current_user, "fees_contracts:update")
|
||||
await _ensure_center_active(db, contract.project_id, contract.center_id)
|
||||
contract = await contract_fee_crud.update_contract_fee(db, contract, contract_in)
|
||||
await audit_crud.log_action(
|
||||
@@ -284,7 +284,7 @@ async def delete_contract_fee(
|
||||
contract = await contract_fee_crud.get_contract_fee(db, contract_id)
|
||||
if not contract:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="合同费用不存在")
|
||||
await _ensure_project_access(db, contract.project_id, current_user, "DELETE:/fees/contracts/{id}")
|
||||
await _ensure_project_access(db, contract.project_id, current_user, "fees_contracts:delete")
|
||||
await _ensure_center_active(db, contract.project_id, contract.center_id)
|
||||
await contract_fee_crud.delete_contract_fee(db, contract)
|
||||
await audit_crud.log_action(
|
||||
|
||||
@@ -32,7 +32,7 @@ async def _ensure_site_name_active(db: AsyncSession, study_id: uuid.UUID, site_n
|
||||
"/contracts",
|
||||
response_model=FinanceContractRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
dependencies=[Depends(require_api_permission("POST:/finance/contracts")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("finance_contracts:create")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def create_contract(
|
||||
study_id: uuid.UUID,
|
||||
@@ -62,7 +62,7 @@ async def create_contract(
|
||||
@router.get(
|
||||
"/contracts",
|
||||
response_model=list[FinanceContractRead],
|
||||
dependencies=[Depends(require_api_permission("GET:/finance/contracts"))],
|
||||
dependencies=[Depends(require_api_permission("finance_contracts:read"))],
|
||||
)
|
||||
async def list_contracts(
|
||||
study_id: uuid.UUID,
|
||||
@@ -93,7 +93,7 @@ async def list_contracts(
|
||||
@router.get(
|
||||
"/contracts/{contract_id}",
|
||||
response_model=FinanceContractRead,
|
||||
dependencies=[Depends(require_api_permission("GET:/finance/contracts/{id}"))],
|
||||
dependencies=[Depends(require_api_permission("finance_contracts:read"))],
|
||||
)
|
||||
async def get_contract(
|
||||
study_id: uuid.UUID,
|
||||
@@ -114,7 +114,7 @@ async def get_contract(
|
||||
@router.patch(
|
||||
"/contracts/{contract_id}",
|
||||
response_model=FinanceContractRead,
|
||||
dependencies=[Depends(require_api_permission("PATCH:/finance/contracts/{id}")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("finance_contracts:update")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def update_contract(
|
||||
study_id: uuid.UUID,
|
||||
@@ -148,7 +148,7 @@ async def update_contract(
|
||||
@router.delete(
|
||||
"/contracts/{contract_id}",
|
||||
status_code=status.HTTP_204_NO_CONTENT,
|
||||
dependencies=[Depends(require_api_permission("DELETE:/finance/contracts/{id}")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("finance_contracts:delete")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def delete_contract(
|
||||
study_id: uuid.UUID,
|
||||
|
||||
@@ -75,10 +75,10 @@ async def _ensure_member_mutation_allowed(
|
||||
"/",
|
||||
response_model=StudyMemberRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
dependencies=[Depends(require_api_permission("POST:/studies/{study_id}/members")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("project_members:create")), Depends(require_study_not_locked())],
|
||||
)
|
||||
@register_api_endpoint(
|
||||
endpoint_key="POST:/studies/{study_id}/members",
|
||||
endpoint_key="project_members:create",
|
||||
module="project_members",
|
||||
action="write",
|
||||
description="添加项目成员",
|
||||
@@ -140,10 +140,10 @@ async def add_member(
|
||||
@router.get(
|
||||
"/",
|
||||
response_model=list[StudyMemberReadWithUser],
|
||||
dependencies=[Depends(require_api_permission("GET:/studies/{study_id}/members"))],
|
||||
dependencies=[Depends(require_api_permission("project_members:list"))],
|
||||
)
|
||||
@register_api_endpoint(
|
||||
endpoint_key="GET:/studies/{study_id}/members",
|
||||
endpoint_key="project_members:list",
|
||||
module="project_members",
|
||||
action="read",
|
||||
description="查询项目成员列表",
|
||||
@@ -186,10 +186,10 @@ async def list_members(
|
||||
@router.get(
|
||||
"/candidates",
|
||||
response_model=list[UserResponse],
|
||||
dependencies=[Depends(require_api_permission("GET:/studies/{study_id}/members/candidates"))],
|
||||
dependencies=[Depends(require_api_permission("project_members:candidates"))],
|
||||
)
|
||||
@register_api_endpoint(
|
||||
endpoint_key="GET:/studies/{study_id}/members/candidates",
|
||||
endpoint_key="project_members:candidates",
|
||||
module="project_members",
|
||||
action="read",
|
||||
description="查询项目成员候选人",
|
||||
@@ -209,10 +209,10 @@ async def list_member_candidates(
|
||||
@router.patch(
|
||||
"/{member_id}",
|
||||
response_model=StudyMemberRead,
|
||||
dependencies=[Depends(require_api_permission("PATCH:/studies/{study_id}/members/{member_id}")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("project_members:update")), Depends(require_study_not_locked())],
|
||||
)
|
||||
@register_api_endpoint(
|
||||
endpoint_key="PATCH:/studies/{study_id}/members/{member_id}",
|
||||
endpoint_key="project_members:update",
|
||||
module="project_members",
|
||||
action="write",
|
||||
description="更新项目成员",
|
||||
@@ -255,10 +255,10 @@ async def update_member(
|
||||
@router.delete(
|
||||
"/{member_id}",
|
||||
response_model=StudyMemberRead,
|
||||
dependencies=[Depends(require_api_permission("DELETE:/studies/{study_id}/members/{member_id}")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("project_members:delete")), Depends(require_study_not_locked())],
|
||||
)
|
||||
@register_api_endpoint(
|
||||
endpoint_key="DELETE:/studies/{study_id}/members/{member_id}",
|
||||
endpoint_key="project_members:delete",
|
||||
module="project_members",
|
||||
action="write",
|
||||
description="删除项目成员",
|
||||
|
||||
@@ -11,7 +11,7 @@ from openpyxl import Workbook, load_workbook
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.core.deps import get_current_user, get_db_session, require_study_not_locked, require_study_permission
|
||||
from app.core.deps import get_current_user, get_db_session, require_study_not_locked, require_api_permission
|
||||
from app.crud import audit as audit_crud
|
||||
from app.crud import monitoring_visit_issue as issue_crud
|
||||
from app.crud import site as site_crud
|
||||
@@ -332,7 +332,7 @@ def _normalize_file_rows(filename: str, content: bytes) -> list[dict[str, object
|
||||
@router.get(
|
||||
"/issues",
|
||||
response_model=list[MonitoringVisitIssueRead],
|
||||
dependencies=[Depends(require_study_permission("monitoring_audit", "read"))],
|
||||
dependencies=[Depends(require_api_permission("monitoring_audit:read"))],
|
||||
)
|
||||
async def list_monitoring_visit_issues(
|
||||
study_id: uuid.UUID,
|
||||
@@ -382,7 +382,7 @@ async def list_monitoring_visit_issues(
|
||||
"/issues",
|
||||
response_model=MonitoringVisitIssueRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
dependencies=[Depends(require_study_permission("monitoring_audit", "write")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("monitoring_audit:create")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def create_monitoring_visit_issue(
|
||||
study_id: uuid.UUID,
|
||||
@@ -421,7 +421,7 @@ async def create_monitoring_visit_issue(
|
||||
@router.get(
|
||||
"/issues/export",
|
||||
response_class=StreamingResponse,
|
||||
dependencies=[Depends(require_study_permission("monitoring_audit", "read"))],
|
||||
dependencies=[Depends(require_api_permission("monitoring_audit:read"))],
|
||||
)
|
||||
async def export_monitoring_visit_issues(
|
||||
study_id: uuid.UUID,
|
||||
@@ -553,7 +553,7 @@ async def export_monitoring_visit_issues(
|
||||
@router.get(
|
||||
"/issues/{issue_id}",
|
||||
response_model=MonitoringVisitIssueRead,
|
||||
dependencies=[Depends(require_study_permission("monitoring_audit", "read"))],
|
||||
dependencies=[Depends(require_api_permission("monitoring_audit:read"))],
|
||||
)
|
||||
async def get_monitoring_visit_issue(
|
||||
study_id: uuid.UUID,
|
||||
@@ -570,7 +570,7 @@ async def get_monitoring_visit_issue(
|
||||
@router.patch(
|
||||
"/issues/{issue_id}",
|
||||
response_model=MonitoringVisitIssueRead,
|
||||
dependencies=[Depends(require_study_permission("monitoring_audit", "write")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("monitoring_audit:update")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def update_monitoring_visit_issue(
|
||||
study_id: uuid.UUID,
|
||||
@@ -625,7 +625,7 @@ async def update_monitoring_visit_issue(
|
||||
@router.delete(
|
||||
"/issues/{issue_id}",
|
||||
status_code=status.HTTP_204_NO_CONTENT,
|
||||
dependencies=[Depends(require_study_permission("monitoring_audit", "write")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("monitoring_audit:delete")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def delete_monitoring_visit_issue(
|
||||
study_id: uuid.UUID,
|
||||
@@ -655,7 +655,7 @@ async def delete_monitoring_visit_issue(
|
||||
@router.post(
|
||||
"/issues/import",
|
||||
response_model=MonitoringVisitIssueImportSummary,
|
||||
dependencies=[Depends(require_study_permission("monitoring_audit", "write")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("monitoring_audit:create")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def import_monitoring_visit_issues(
|
||||
study_id: uuid.UUID,
|
||||
|
||||
@@ -3,7 +3,7 @@ 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_not_locked, require_study_permission
|
||||
from app.core.deps import get_current_user, get_db_session, require_study_not_locked, require_api_permission
|
||||
from app.crud import audit as audit_crud
|
||||
from app.crud import project_milestone as milestone_crud
|
||||
from app.crud import study as study_crud
|
||||
@@ -29,7 +29,7 @@ def _validate_date_range(start, end, label: str):
|
||||
@router.get(
|
||||
"/milestones",
|
||||
response_model=list[ProjectMilestoneRead],
|
||||
dependencies=[Depends(require_study_permission("project_milestones", "read"))],
|
||||
dependencies=[Depends(require_api_permission("project_milestones:read"))],
|
||||
)
|
||||
async def list_project_milestones(
|
||||
study_id: uuid.UUID,
|
||||
@@ -43,7 +43,7 @@ async def list_project_milestones(
|
||||
@router.patch(
|
||||
"/milestones/{milestone_id}",
|
||||
response_model=ProjectMilestoneRead,
|
||||
dependencies=[Depends(require_study_permission("project_milestones", "write")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("project_milestones:update")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def update_project_milestone(
|
||||
study_id: uuid.UUID,
|
||||
|
||||
@@ -13,7 +13,6 @@ api_router.include_router(notifications.router, prefix="/studies/{study_id}", ta
|
||||
api_router.include_router(sites.router, prefix="/studies/{study_id}/sites", tags=["sites"])
|
||||
api_router.include_router(members.router, prefix="/studies/{study_id}/members", tags=["study-members"])
|
||||
api_router.include_router(project_permissions.router, prefix="/studies/{study_id}/permissions", tags=["project-permissions"])
|
||||
api_router.include_router(api_permissions.router, prefix="/studies/{study_id}", tags=["api-permissions"])
|
||||
api_router.include_router(api_permissions.router, tags=["api-permissions"])
|
||||
api_router.include_router(attachments.router, prefix="/studies/{study_id}/{entity_type}/{entity_id}/attachments", tags=["attachments"])
|
||||
api_router.include_router(attachments.global_router, prefix="/attachments", tags=["attachments"])
|
||||
|
||||
@@ -27,10 +27,10 @@ async def _ensure_study_exists(db: AsyncSession, study_id: uuid.UUID):
|
||||
"/",
|
||||
response_model=SiteRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
dependencies=[Depends(require_api_permission("POST:/studies/{study_id}/sites")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("sites:create")), Depends(require_study_not_locked())],
|
||||
)
|
||||
@register_api_endpoint(
|
||||
endpoint_key="POST:/studies/{study_id}/sites",
|
||||
endpoint_key="sites:create",
|
||||
module="sites",
|
||||
action="write",
|
||||
description="创建中心",
|
||||
@@ -72,10 +72,10 @@ async def create_site(
|
||||
@router.get(
|
||||
"/",
|
||||
response_model=list[SiteRead],
|
||||
dependencies=[Depends(require_api_permission("GET:/studies/{study_id}/sites")), Depends(require_study_member())],
|
||||
dependencies=[Depends(require_api_permission("sites:read")), Depends(require_study_member())],
|
||||
)
|
||||
@register_api_endpoint(
|
||||
endpoint_key="GET:/studies/{study_id}/sites",
|
||||
endpoint_key="sites:read",
|
||||
module="sites",
|
||||
action="read",
|
||||
description="查询中心列表",
|
||||
@@ -106,10 +106,10 @@ async def list_sites(
|
||||
@router.patch(
|
||||
"/{site_id}",
|
||||
response_model=SiteRead,
|
||||
dependencies=[Depends(require_api_permission("PATCH:/studies/{study_id}/sites/{site_id}")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("sites:update")), Depends(require_study_not_locked())],
|
||||
)
|
||||
@register_api_endpoint(
|
||||
endpoint_key="PATCH:/studies/{study_id}/sites/{site_id}",
|
||||
endpoint_key="sites:update",
|
||||
module="sites",
|
||||
action="write",
|
||||
description="更新中心",
|
||||
@@ -160,10 +160,10 @@ async def update_site(
|
||||
@router.delete(
|
||||
"/{site_id}",
|
||||
status_code=status.HTTP_204_NO_CONTENT,
|
||||
dependencies=[Depends(require_api_permission("DELETE:/studies/{study_id}/sites/{site_id}")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("sites:delete")), Depends(require_study_not_locked())],
|
||||
)
|
||||
@register_api_endpoint(
|
||||
endpoint_key="DELETE:/studies/{study_id}/sites/{site_id}",
|
||||
endpoint_key="sites:delete",
|
||||
module="sites",
|
||||
action="write",
|
||||
description="删除中心",
|
||||
|
||||
@@ -3,7 +3,7 @@ import uuid
|
||||
from fastapi import APIRouter, Depends, HTTPException, status
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.core.deps import get_cra_site_scope, get_current_user, get_db_session, require_study_permission
|
||||
from app.core.deps import get_cra_site_scope, get_current_user, get_db_session, require_api_permission
|
||||
from app.crud import audit as audit_crud
|
||||
from app.crud import site as site_crud
|
||||
from app.crud import startup as startup_crud
|
||||
@@ -53,7 +53,7 @@ async def _ensure_site_active(db: AsyncSession, site_id: uuid.UUID | None):
|
||||
"/feasibility",
|
||||
response_model=StartupFeasibilityRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
dependencies=[Depends(require_study_permission("startup_ethics", "write"))],
|
||||
dependencies=[Depends(require_api_permission("ethics:create"))],
|
||||
)
|
||||
async def create_feasibility(
|
||||
study_id: uuid.UUID,
|
||||
@@ -83,7 +83,7 @@ async def create_feasibility(
|
||||
@router.get(
|
||||
"/feasibility",
|
||||
response_model=list[StartupFeasibilityRead],
|
||||
dependencies=[Depends(require_study_permission("startup_ethics", "read"))],
|
||||
dependencies=[Depends(require_api_permission("ethics:read"))],
|
||||
)
|
||||
async def list_feasibilities(
|
||||
study_id: uuid.UUID,
|
||||
@@ -102,7 +102,7 @@ async def list_feasibilities(
|
||||
@router.get(
|
||||
"/feasibility/{record_id}",
|
||||
response_model=StartupFeasibilityRead,
|
||||
dependencies=[Depends(require_study_permission("startup_ethics", "read"))],
|
||||
dependencies=[Depends(require_api_permission("ethics:read"))],
|
||||
)
|
||||
async def get_feasibility(
|
||||
study_id: uuid.UUID,
|
||||
@@ -123,7 +123,7 @@ async def get_feasibility(
|
||||
@router.patch(
|
||||
"/feasibility/{record_id}",
|
||||
response_model=StartupFeasibilityRead,
|
||||
dependencies=[Depends(require_study_permission("startup_ethics", "write"))],
|
||||
dependencies=[Depends(require_api_permission("ethics:update"))],
|
||||
)
|
||||
async def update_feasibility(
|
||||
study_id: uuid.UUID,
|
||||
@@ -157,7 +157,7 @@ async def update_feasibility(
|
||||
@router.delete(
|
||||
"/feasibility/{record_id}",
|
||||
status_code=status.HTTP_204_NO_CONTENT,
|
||||
dependencies=[Depends(require_study_permission("startup_ethics", "write"))],
|
||||
dependencies=[Depends(require_api_permission("ethics:delete"))],
|
||||
)
|
||||
async def delete_feasibility(
|
||||
study_id: uuid.UUID,
|
||||
@@ -190,7 +190,7 @@ async def delete_feasibility(
|
||||
"/ethics",
|
||||
response_model=StartupEthicsRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
dependencies=[Depends(require_study_permission("startup_ethics", "write"))],
|
||||
dependencies=[Depends(require_api_permission("ethics:create"))],
|
||||
)
|
||||
async def create_ethics(
|
||||
study_id: uuid.UUID,
|
||||
@@ -220,7 +220,7 @@ async def create_ethics(
|
||||
@router.get(
|
||||
"/ethics",
|
||||
response_model=list[StartupEthicsRead],
|
||||
dependencies=[Depends(require_study_permission("startup_ethics", "read"))],
|
||||
dependencies=[Depends(require_api_permission("ethics:read"))],
|
||||
)
|
||||
async def list_ethics(
|
||||
study_id: uuid.UUID,
|
||||
@@ -239,7 +239,7 @@ async def list_ethics(
|
||||
@router.get(
|
||||
"/ethics/{record_id}",
|
||||
response_model=StartupEthicsRead,
|
||||
dependencies=[Depends(require_study_permission("startup_ethics", "read"))],
|
||||
dependencies=[Depends(require_api_permission("ethics:read"))],
|
||||
)
|
||||
async def get_ethics(
|
||||
study_id: uuid.UUID,
|
||||
@@ -260,7 +260,7 @@ async def get_ethics(
|
||||
@router.patch(
|
||||
"/ethics/{record_id}",
|
||||
response_model=StartupEthicsRead,
|
||||
dependencies=[Depends(require_study_permission("startup_ethics", "write"))],
|
||||
dependencies=[Depends(require_api_permission("ethics:update"))],
|
||||
)
|
||||
async def update_ethics(
|
||||
study_id: uuid.UUID,
|
||||
@@ -294,7 +294,7 @@ async def update_ethics(
|
||||
@router.delete(
|
||||
"/ethics/{record_id}",
|
||||
status_code=status.HTTP_204_NO_CONTENT,
|
||||
dependencies=[Depends(require_study_permission("startup_ethics", "write"))],
|
||||
dependencies=[Depends(require_api_permission("ethics:delete"))],
|
||||
)
|
||||
async def delete_ethics(
|
||||
study_id: uuid.UUID,
|
||||
@@ -327,7 +327,7 @@ async def delete_ethics(
|
||||
"/kickoff",
|
||||
response_model=KickoffMeetingRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
dependencies=[Depends(require_study_permission("startup_auth", "write"))],
|
||||
dependencies=[Depends(require_api_permission("startup_auth:create"))],
|
||||
)
|
||||
async def create_kickoff(
|
||||
study_id: uuid.UUID,
|
||||
@@ -357,7 +357,7 @@ async def create_kickoff(
|
||||
@router.get(
|
||||
"/kickoff",
|
||||
response_model=list[KickoffMeetingRead],
|
||||
dependencies=[Depends(require_study_permission("startup_auth", "read"))],
|
||||
dependencies=[Depends(require_api_permission("startup_auth:read"))],
|
||||
)
|
||||
async def list_kickoffs(
|
||||
study_id: uuid.UUID,
|
||||
@@ -376,7 +376,7 @@ async def list_kickoffs(
|
||||
@router.get(
|
||||
"/kickoff/{meeting_id}",
|
||||
response_model=KickoffMeetingRead,
|
||||
dependencies=[Depends(require_study_permission("startup_auth", "read"))],
|
||||
dependencies=[Depends(require_api_permission("startup_auth:read"))],
|
||||
)
|
||||
async def get_kickoff(
|
||||
study_id: uuid.UUID,
|
||||
@@ -397,7 +397,7 @@ async def get_kickoff(
|
||||
@router.patch(
|
||||
"/kickoff/{meeting_id}",
|
||||
response_model=KickoffMeetingRead,
|
||||
dependencies=[Depends(require_study_permission("startup_auth", "write"))],
|
||||
dependencies=[Depends(require_api_permission("startup_auth:update"))],
|
||||
)
|
||||
async def update_kickoff(
|
||||
study_id: uuid.UUID,
|
||||
@@ -432,7 +432,7 @@ async def update_kickoff(
|
||||
"/training-authorizations",
|
||||
response_model=TrainingAuthorizationRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
dependencies=[Depends(require_study_permission("startup_auth", "write"))],
|
||||
dependencies=[Depends(require_api_permission("startup_auth:create"))],
|
||||
)
|
||||
async def create_training_authorization(
|
||||
study_id: uuid.UUID,
|
||||
@@ -462,7 +462,7 @@ async def create_training_authorization(
|
||||
@router.get(
|
||||
"/training-authorizations",
|
||||
response_model=list[TrainingAuthorizationRead],
|
||||
dependencies=[Depends(require_study_permission("startup_auth", "read"))],
|
||||
dependencies=[Depends(require_api_permission("startup_auth:read"))],
|
||||
)
|
||||
async def list_training_authorizations(
|
||||
study_id: uuid.UUID,
|
||||
@@ -481,7 +481,7 @@ async def list_training_authorizations(
|
||||
@router.get(
|
||||
"/training-authorizations/{record_id}",
|
||||
response_model=TrainingAuthorizationRead,
|
||||
dependencies=[Depends(require_study_permission("startup_auth", "read"))],
|
||||
dependencies=[Depends(require_api_permission("startup_auth:read"))],
|
||||
)
|
||||
async def get_training_authorization(
|
||||
study_id: uuid.UUID,
|
||||
@@ -502,7 +502,7 @@ async def get_training_authorization(
|
||||
@router.patch(
|
||||
"/training-authorizations/{record_id}",
|
||||
response_model=TrainingAuthorizationRead,
|
||||
dependencies=[Depends(require_study_permission("startup_auth", "write"))],
|
||||
dependencies=[Depends(require_api_permission("startup_auth:update"))],
|
||||
)
|
||||
async def update_training_authorization(
|
||||
study_id: uuid.UUID,
|
||||
@@ -536,7 +536,7 @@ async def update_training_authorization(
|
||||
@router.delete(
|
||||
"/training-authorizations/{record_id}",
|
||||
status_code=status.HTTP_204_NO_CONTENT,
|
||||
dependencies=[Depends(require_study_permission("startup_auth", "write"))],
|
||||
dependencies=[Depends(require_api_permission("startup_auth:delete"))],
|
||||
)
|
||||
async def delete_training_authorization(
|
||||
study_id: uuid.UUID,
|
||||
|
||||
@@ -34,7 +34,7 @@ async def _ensure_subject_active(db: AsyncSession, subject) -> None:
|
||||
"/",
|
||||
response_model=SubjectRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
dependencies=[Depends(require_api_permission("POST:/subjects")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("subjects:create")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def create_subject(
|
||||
study_id: uuid.UUID,
|
||||
@@ -66,7 +66,7 @@ async def create_subject(
|
||||
@router.get(
|
||||
"/",
|
||||
response_model=list[SubjectRead],
|
||||
dependencies=[Depends(require_api_permission("GET:/subjects"))],
|
||||
dependencies=[Depends(require_api_permission("subjects:list"))],
|
||||
)
|
||||
async def list_subjects(
|
||||
study_id: uuid.UUID,
|
||||
@@ -115,7 +115,7 @@ async def list_subjects(
|
||||
@router.get(
|
||||
"/{subject_id}",
|
||||
response_model=SubjectRead,
|
||||
dependencies=[Depends(require_api_permission("GET:/subjects/{id}"))],
|
||||
dependencies=[Depends(require_api_permission("subjects:read"))],
|
||||
)
|
||||
async def get_subject(
|
||||
study_id: uuid.UUID,
|
||||
@@ -154,7 +154,7 @@ async def get_subject(
|
||||
@router.patch(
|
||||
"/{subject_id}",
|
||||
response_model=SubjectRead,
|
||||
dependencies=[Depends(require_api_permission("PATCH:/subjects/{id}")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("subjects:update")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def update_subject(
|
||||
study_id: uuid.UUID,
|
||||
@@ -195,7 +195,7 @@ async def update_subject(
|
||||
@router.delete(
|
||||
"/{subject_id}",
|
||||
status_code=status.HTTP_204_NO_CONTENT,
|
||||
dependencies=[Depends(require_api_permission("DELETE:/subjects/{id}")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("subjects:delete")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def delete_subject(
|
||||
study_id: uuid.UUID,
|
||||
|
||||
@@ -3,7 +3,7 @@ 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_not_locked, require_study_permission
|
||||
from app.core.deps import get_current_user, get_db_session, require_study_not_locked, require_api_permission
|
||||
from app.crud import audit as audit_crud
|
||||
from app.crud import site as site_crud
|
||||
from app.crud import subject as subject_crud
|
||||
@@ -33,7 +33,7 @@ async def _ensure_subject_active(db: AsyncSession, subject) -> None:
|
||||
@router.get(
|
||||
"/",
|
||||
response_model=list[VisitRead],
|
||||
dependencies=[Depends(require_study_permission("subjects", "read"))],
|
||||
dependencies=[Depends(require_api_permission("visits:read"))],
|
||||
)
|
||||
async def list_visits(
|
||||
study_id: uuid.UUID,
|
||||
@@ -50,7 +50,7 @@ async def list_visits(
|
||||
"/",
|
||||
response_model=VisitRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
dependencies=[Depends(require_study_permission("subjects", "write")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("visits:create")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def create_visit(
|
||||
study_id: uuid.UUID,
|
||||
@@ -115,7 +115,7 @@ async def create_visit(
|
||||
"/early-termination",
|
||||
response_model=VisitRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
dependencies=[Depends(require_study_permission("subjects", "write")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("visits:create")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def create_early_termination(
|
||||
study_id: uuid.UUID,
|
||||
@@ -168,7 +168,7 @@ async def create_early_termination(
|
||||
@router.patch(
|
||||
"/{visit_id}",
|
||||
response_model=VisitRead,
|
||||
dependencies=[Depends(require_study_permission("subjects", "write")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("visits:update")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def update_visit(
|
||||
study_id: uuid.UUID,
|
||||
@@ -211,7 +211,7 @@ async def update_visit(
|
||||
@router.delete(
|
||||
"/{visit_id}",
|
||||
status_code=status.HTTP_204_NO_CONTENT,
|
||||
dependencies=[Depends(require_study_permission("subjects", "write")), Depends(require_study_not_locked())],
|
||||
dependencies=[Depends(require_api_permission("visits:delete")), Depends(require_study_not_locked())],
|
||||
)
|
||||
async def delete_visit(
|
||||
study_id: uuid.UUID,
|
||||
|
||||
Reference in New Issue
Block a user