细节优化——1

2025-12-30 14:07:57 +08:00
parent 71db309e12
commit 0c1fc49f17
40 changed files with 1610 additions and 389 deletions
@@ -25,22 +25,14 @@ from app.utils.pagination import paginate
 router = APIRouter()


-def _check_write_permission(study_id: uuid.UUID | None, current_user, member_role: str | None):
-    if study_id is None:
-        if current_user.role != "ADMIN":
-            raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Only admin can manage global FAQ")
-    else:
-        if current_user.role != "ADMIN" and member_role != "PM":
-            raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Insufficient permissions")
+def _check_write_permission(study_id: uuid.UUID, current_user, member_role: str | None):
+    if current_user.role != "ADMIN" and member_role != "PM":
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Insufficient permissions")


-def _check_create_permission(study_id: uuid.UUID | None, current_user, is_member: bool):
-    if study_id is None:
-        if current_user.role != "ADMIN":
-            raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Only admin can manage global FAQ")
-    else:
-        if current_user.role != "ADMIN" and not is_member:
-            raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Not a study member")
+def _check_create_permission(current_user, is_member: bool):
+    if current_user.role != "ADMIN" and not is_member:
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Not a study member")


@router.post(
@@ -55,6 +47,8 @@ async def create_faq(
    db: AsyncSession = Depends(get_db_session),
    current_user=Depends(get_current_user),
 ) -> FaqRead:
+    if not payload.study_id:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="study_id is required")
    cat = await category_crud.get_category(db, payload.category_id)
    if not cat:
        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Category not found")
@@ -62,11 +56,10 @@ async def create_faq(
        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Category scope mismatch")
    member_role = None
    is_member = False
-    if payload.study_id:
-        member = await member_crud.get_member(db, payload.study_id, current_user.id)
-        member_role = member.role_in_study if member else None
-        is_member = member is not None
-    _check_create_permission(payload.study_id, current_user, is_member)
+    member = await member_crud.get_member(db, payload.study_id, current_user.id)
+    member_role = member.role_in_study if member else None
+    is_member = member is not None
+    _check_create_permission(current_user, is_member)
    try:
        item = await faq_crud.create_item(db, payload, created_by=current_user.id)
    except ValueError as exc:
@@ -104,7 +97,6 @@ async def list_faqs(
    category_id: uuid.UUID | None = None,
    keyword: str | None = None,
    is_active: bool | None = None,
-    study_scope: str | None = "project",
    db: AsyncSession = Depends(get_db_session),
    current_user=Depends(get_current_user),
 ) -> list[FaqRead]:
@@ -118,16 +110,15 @@ async def list_faqs(
        membership_cache[sid] = role
        return role

-    if study_id:
-        if current_user.role != "ADMIN":
-            role = await _get_member_role(study_id)
-            if not role:
-                raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Not a study member")
+    if not study_id:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="study_id is required")
+    if current_user.role != "ADMIN":
+        role = await _get_member_role(study_id)
+        if not role:
+            raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Not a study member")

    if is_active is False and current_user.role != "ADMIN":
-        role = None
-        if study_id:
-            role = await _get_member_role(study_id)
+        role = await _get_member_role(study_id)
        if role != "PM":
            raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Insufficient permissions")

@@ -137,17 +128,17 @@ async def list_faqs(
        category_id=category_id,
        keyword=keyword,
        is_active=is_active,
-        study_scope=study_scope,
+        study_scope="project",
    )

    visible: list[FaqRead] = []
    for it in items:
-        if it.study_id and current_user.role != "ADMIN":
+        if current_user.role != "ADMIN":
            role = await _get_member_role(it.study_id)
            if not role:
                continue
        if not it.is_active and current_user.role != "ADMIN":
-            role = await _get_member_role(it.study_id) if it.study_id else None
+            role = await _get_member_role(it.study_id)
            if role != "PM":
                continue
        visible.append(FaqRead.model_validate(it))
@@ -168,15 +159,15 @@ async def get_faq(
    item = await faq_crud.get_item(db, item_id)
    if not item:
        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="FAQ not found")
-    if item.study_id and current_user.role != "ADMIN":
+    if not item.study_id:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="FAQ not found")
+    if current_user.role != "ADMIN":
        member = await member_crud.get_member(db, item.study_id, current_user.id)
        if not member:
            raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Not a study member")
    if not item.is_active and current_user.role not in {"ADMIN"}:
-        member_role = None
-        if item.study_id:
-            member = await member_crud.get_member(db, item.study_id, current_user.id)
-            member_role = member.role_in_study if member else None
+        member = await member_crud.get_member(db, item.study_id, current_user.id)
+        member_role = member.role_in_study if member else None
        if member_role != "PM":
            raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Inactive FAQ")
    return FaqRead.model_validate(item)
@@ -267,11 +258,12 @@ async def set_best_reply(
    item = await faq_crud.get_item(db, item_id)
    if not item:
        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="FAQ not found")
+    if not item.study_id:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="FAQ not found")
    is_member = False
-    if item.study_id:
-        member = await member_crud.get_member(db, item.study_id, current_user.id)
-        is_member = member is not None
-    _check_create_permission(item.study_id, current_user, is_member)
+    member = await member_crud.get_member(db, item.study_id, current_user.id)
+    is_member = member is not None
+    _check_create_permission(current_user, is_member)
    if payload.best_reply_id:
        reply = await reply_crud.get_reply(db, payload.best_reply_id)
        if not reply or reply.faq_id != item.id:
@@ -348,13 +340,14 @@ async def create_reply(
    item = await faq_crud.get_item(db, item_id)
    if not item:
        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="FAQ not found")
+    if not item.study_id:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="FAQ not found")
    if not payload.content.strip():
        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Reply content is required")
    is_member = False
-    if item.study_id:
-        member = await member_crud.get_member(db, item.study_id, current_user.id)
-        is_member = member is not None
-    _check_create_permission(item.study_id, current_user, is_member)
+    member = await member_crud.get_member(db, item.study_id, current_user.id)
+    is_member = member is not None
+    _check_create_permission(current_user, is_member)
    quote = None
    if payload.quote_reply_id:
        quote = await reply_crud.get_reply(db, payload.quote_reply_id)