0cc87210af
## 主要完成内容
### 1. 接口级权限系统实现
- 新增 ApiEndpointPermission 模型:存储接口级权限配置
- 新增 ApiEndpointRegistry 模型:注册系统中所有API端点
- 实现权限检查优先级:接口级 > 模块级(向后兼容)
- 支持细粒度权限控制(METHOD:/path 格式)
### 2. 权限配置系统
- 创建 api_permissions.py:集中管理接口权限配置
- 定义 API_ENDPOINT_PERMISSIONS:所有端点的权限映射
- 定义 MODULE_TO_ENDPOINTS:模块到接口的映射(向后兼容)
- 支持默认角色配置和权限继承
### 3. 权限检查依赖注入
- 新增 require_api_permission():基于接口的权限检查
- 新增 @register_api_endpoint 装饰器:端点元数据注册
- 集成 FastAPI 依赖注入系统
- 支持权限拒绝时返回 403 Forbidden
### 4. API端点迁移(第1批)
- 迁移 subjects 模块:5个端点
- 迁移 risk_issues 模块:3个端点
- 迁移 fees 模块:8个端点
- 迁移 finance_contracts 模块:5个端点
- 共计 21 个端点完成迁移
### 5. 权限管理API
- GET /studies/{study_id}/api-permissions:获取权限矩阵
- PUT /studies/{study_id}/api-permissions:更新权限矩阵
- 支持权限配置的查询和修改
### 6. 测试与验证
- 单元测试:12 个测试用例,全部通过
- 集成测试:11 个权限管理API测试,全部通过
- 端点测试:22 个已迁移端点测试,全部通过
- 代码覆盖率:87%(超过 80% 目标)
- 总计:45 个测试用例,全部通过
### 7. 文档
- TESTING_SUMMARY.md:详细的测试结果总结
- IMPLEMENTATION_SUMMARY.md:实现细节文档
- TESTING_GUIDE.md:测试指南
## 技术亮点
1. **向后兼容性**:保留模块级权限,接口级权限优先
2. **灵活的权限配置**:支持默认角色和自定义权限
3. **细粒度控制**:支持跨模块数据访问权限
4. **完整的测试覆盖**:单元测试、集成测试、端点测试
5. **清晰的权限检查流程**:接口级 → 模块级 → 拒绝
## 下一步工作
- [ ] 第7阶段:迁移第2批模块(members, sites)
- [ ] 第8阶段:迁移第3批模块
- [ ] 第9阶段:安全审计
- [ ] 第10阶段:性能测试
- [ ] 第11阶段:文档更新
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
178 lines
6.9 KiB
Python
178 lines
6.9 KiB
Python
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_api_permission
|
|
from app.crud import audit as audit_crud
|
|
from app.crud import finance_contract as contract_crud
|
|
from app.crud import site as site_crud
|
|
from app.crud import study as study_crud
|
|
from app.schemas.finance_contract import FinanceContractCreate, FinanceContractRead, FinanceContractUpdate
|
|
|
|
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="项目不存在")
|
|
return study
|
|
|
|
|
|
async def _ensure_site_name_active(db: AsyncSession, study_id: uuid.UUID, site_name: str | None):
|
|
if not site_name:
|
|
return
|
|
active_names = await site_crud.list_active_names(db, study_id)
|
|
if site_name not in active_names:
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="中心已停用")
|
|
|
|
|
|
@router.post(
|
|
"/contracts",
|
|
response_model=FinanceContractRead,
|
|
status_code=status.HTTP_201_CREATED,
|
|
dependencies=[Depends(require_api_permission("POST:/finance/contracts")), Depends(require_study_not_locked())],
|
|
)
|
|
async def create_contract(
|
|
study_id: uuid.UUID,
|
|
contract_in: FinanceContractCreate,
|
|
db: AsyncSession = Depends(get_db_session),
|
|
current_user=Depends(get_current_user),
|
|
) -> FinanceContractRead:
|
|
await _ensure_study_exists(db, study_id)
|
|
cra_scope = await get_cra_site_scope(db, study_id, current_user)
|
|
if cra_scope and contract_in.site_name not in cra_scope[1]:
|
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="权限不足")
|
|
await _ensure_site_name_active(db, study_id, contract_in.site_name)
|
|
contract = await contract_crud.create_contract(db, study_id, contract_in, created_by=current_user.id)
|
|
await audit_crud.log_action(
|
|
db,
|
|
study_id=study_id,
|
|
entity_type="finance_contract",
|
|
entity_id=contract.id,
|
|
action="CREATE_FINANCE_CONTRACT",
|
|
detail=f"合同费用 {contract.contract_no} 已创建",
|
|
operator_id=current_user.id,
|
|
operator_role=current_user.role,
|
|
)
|
|
return FinanceContractRead.model_validate(contract)
|
|
|
|
|
|
@router.get(
|
|
"/contracts",
|
|
response_model=list[FinanceContractRead],
|
|
dependencies=[Depends(require_api_permission("GET:/finance/contracts"))],
|
|
)
|
|
async def list_contracts(
|
|
study_id: uuid.UUID,
|
|
site_name: str | None = None,
|
|
contract_no: str | None = None,
|
|
skip: int = 0,
|
|
limit: int = 100,
|
|
db: AsyncSession = Depends(get_db_session),
|
|
current_user=Depends(get_current_user),
|
|
) -> list[FinanceContractRead]:
|
|
await _ensure_study_exists(db, study_id)
|
|
cra_scope = await get_cra_site_scope(db, study_id, current_user)
|
|
site_names = cra_scope[1] if cra_scope else None
|
|
if site_name and site_names is not None and site_name not in site_names:
|
|
return []
|
|
items = await contract_crud.list_contracts(
|
|
db,
|
|
study_id,
|
|
site_name=site_name,
|
|
site_names=site_names,
|
|
contract_no=contract_no,
|
|
skip=skip,
|
|
limit=limit,
|
|
)
|
|
return [FinanceContractRead.model_validate(item) for item in items]
|
|
|
|
|
|
@router.get(
|
|
"/contracts/{contract_id}",
|
|
response_model=FinanceContractRead,
|
|
dependencies=[Depends(require_api_permission("GET:/finance/contracts/{id}"))],
|
|
)
|
|
async def get_contract(
|
|
study_id: uuid.UUID,
|
|
contract_id: uuid.UUID,
|
|
db: AsyncSession = Depends(get_db_session),
|
|
current_user=Depends(get_current_user),
|
|
) -> FinanceContractRead:
|
|
await _ensure_study_exists(db, study_id)
|
|
contract = await contract_crud.get_contract(db, contract_id)
|
|
if not contract or contract.study_id != study_id:
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="合同不存在")
|
|
cra_scope = await get_cra_site_scope(db, study_id, current_user)
|
|
if cra_scope and contract.site_name not in cra_scope[1]:
|
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="权限不足")
|
|
return FinanceContractRead.model_validate(contract)
|
|
|
|
|
|
@router.patch(
|
|
"/contracts/{contract_id}",
|
|
response_model=FinanceContractRead,
|
|
dependencies=[Depends(require_api_permission("PATCH:/finance/contracts/{id}")), Depends(require_study_not_locked())],
|
|
)
|
|
async def update_contract(
|
|
study_id: uuid.UUID,
|
|
contract_id: uuid.UUID,
|
|
contract_in: FinanceContractUpdate,
|
|
db: AsyncSession = Depends(get_db_session),
|
|
current_user=Depends(get_current_user),
|
|
) -> FinanceContractRead:
|
|
await _ensure_study_exists(db, study_id)
|
|
contract = await contract_crud.get_contract(db, contract_id)
|
|
if not contract or contract.study_id != study_id:
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="合同不存在")
|
|
cra_scope = await get_cra_site_scope(db, study_id, current_user)
|
|
if cra_scope and contract.site_name not in cra_scope[1]:
|
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="权限不足")
|
|
await _ensure_site_name_active(db, study_id, contract.site_name)
|
|
contract = await contract_crud.update_contract(db, contract, contract_in)
|
|
await audit_crud.log_action(
|
|
db,
|
|
study_id=study_id,
|
|
entity_type="finance_contract",
|
|
entity_id=contract_id,
|
|
action="UPDATE_FINANCE_CONTRACT",
|
|
detail=f"合同费用 {contract_id} 已更新",
|
|
operator_id=current_user.id,
|
|
operator_role=current_user.role,
|
|
)
|
|
return FinanceContractRead.model_validate(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())],
|
|
)
|
|
async def delete_contract(
|
|
study_id: uuid.UUID,
|
|
contract_id: uuid.UUID,
|
|
db: AsyncSession = Depends(get_db_session),
|
|
current_user=Depends(get_current_user),
|
|
) -> None:
|
|
await _ensure_study_exists(db, study_id)
|
|
contract = await contract_crud.get_contract(db, contract_id)
|
|
if not contract or contract.study_id != study_id:
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="合同不存在")
|
|
cra_scope = await get_cra_site_scope(db, study_id, current_user)
|
|
if cra_scope and contract.site_name not in cra_scope[1]:
|
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="权限不足")
|
|
await _ensure_site_name_active(db, study_id, contract.site_name)
|
|
await contract_crud.delete_contract(db, contract)
|
|
await audit_crud.log_action(
|
|
db,
|
|
study_id=study_id,
|
|
entity_type="finance_contract",
|
|
entity_id=contract_id,
|
|
action="DELETE_FINANCE_CONTRACT",
|
|
detail=f"合同费用 {contract_id} 已删除",
|
|
operator_id=current_user.id,
|
|
operator_role=current_user.role,
|
|
)
|