v0.2测试

backend/routes/subject.py

@@ -9,97 +9,41 @@
 # 版权所有 © Sea Network Technology Studio
 # ===========================================
 
-from fastapi import APIRouter, Request, Query
+from fastapi import APIRouter, Request
 from typing import Optional
-
 from middleware.permission import get_current_user, PermissionChecker
 from services.subject_service import SubjectService
 from schemas.subject import CreateSubjectRequest, UpdateSubjectRequest
 from utils.response import success_response, error_response
-from utils.logger import get_logger
 
 router = APIRouter()
-logger = get_logger(__name__)
-
 
 @router.get("/list")
-async def get_subjects(
-    request: Request,
-    is_active: Optional[bool] = None
-):
-    """
-    获取科目列表
-    """
+async def get_subjects(request: Request, is_active: Optional[bool] = None):
     user = await get_current_user(request)
-    
     result = await SubjectService.get_subjects(is_active=is_active)
-    
     return success_response(data=result)
 
-
 @router.post("/create")
 async def create_subject(request: Request, req: CreateSubjectRequest):
-    """
-    创建科目（班主任）
-    """
     user = await get_current_user(request)
-    
-    is_teacher = await PermissionChecker.check_is_teacher(user["user_id"])
-    if not is_teacher:
-        return error_response(message="仅班主任可创建科目", code=403)
-    
-    result = await SubjectService.create_subject(
-        subject_name=req.subject_name,
-        subject_code=req.subject_code,
-        sort_order=req.sort_order
-    )
-    
-    if result["success"]:
-        return success_response(data=result, message="科目创建成功")
-    else:
-        return error_response(message=result["message"])
-
+    if not await PermissionChecker.check_can_manage_subjects(user["user_id"]):
+        return error_response(message="无权限", code=403)
+    result = await SubjectService.create_subject(req.subject_name, req.subject_code, req.sort_order)
+    return success_response(data=result, message="科目创建成功") if result["success"] else error_response(message=result["message"])
 
 @router.put("/update/{subject_id}")
-async def update_subject(
-    request: Request,
-    subject_id: int,
-    req: UpdateSubjectRequest
-):
-    """
-    更新科目（班主任）
-    """
+async def update_subject(request: Request, subject_id: int, req: UpdateSubjectRequest):
     user = await get_current_user(request)
-    
-    is_teacher = await PermissionChecker.check_is_teacher(user["user_id"])
-    if not is_teacher:
-        return error_response(message="仅班主任可更新科目", code=403)
-    
-    result = await SubjectService.update_subject(
-        subject_id=subject_id,
-        **req.dict(exclude_none=True)
-    )
-    
-    if result["success"]:
-        return success_response(message="科目更新成功")
-    else:
-        return error_response(message=result["message"])
-
+    if not await PermissionChecker.check_can_manage_subjects(user["user_id"]):
+        return error_response(message="无权限", code=403)
+    result = await SubjectService.update_subject(subject_id, **req.dict(exclude_none=True))
+    return success_response(message="科目更新成功") if result["success"] else error_response(message=result["message"])
 
 @router.delete("/delete/{subject_id}")
 async def delete_subject(request: Request, subject_id: int):
-    """
-    删除科目（软删除，班主任）
-    """
     user = await get_current_user(request)
-    
-    is_teacher = await PermissionChecker.check_is_teacher(user["user_id"])
-    if not is_teacher:
-        return error_response(message="仅班主任可删除科目", code=403)
-    
+    if not await PermissionChecker.check_can_manage_subjects(user["user_id"]):
+        return error_response(message="无权限", code=403)
     result = await SubjectService.delete_subject(subject_id)
-    
-    if result["success"]:
-        return success_response(message="科目已禁用")
-    else:
-        return error_response(message=result["message"])
+    return success_response(message="科目已禁用") if result["success"] else error_response(message=result["message"])