From c1bbc9ce010eb38f2b22b3c1ca821ff5f662ab03 Mon Sep 17 00:00:00 2001 From: Ross Date: Tue, 9 Jan 2024 14:27:28 +0000 Subject: [PATCH] no need to send user/cid details when single request --- anatomy/api.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/anatomy/api.py b/anatomy/api.py index 36654062..1d2cf0e6 100644 --- a/anatomy/api.py +++ b/anatomy/api.py @@ -29,15 +29,17 @@ class UserUserSchema(ModelSchema): model = get_user_model() model_fields = ["id", "email"] +class ExamStatusSchema(ModelSchema): + class Config: + model = ExamUserStatus + model_fields = ["id", "datetime", "status", "extra"] + class ExamUserStatusSchema(ModelSchema): cid_user : CidUserSchema | None user_user : UserUserSchema | None class Config: model = ExamUserStatus - - #model_fields = ["question", "history", "feedback", "normal", "laterality"] - #model_fields = "__all__" model_fields = ["id", "datetime", "status", "extra"] class QuestionSchema(ModelSchema): @@ -97,7 +99,7 @@ def get_exam_user_status_all(request, exam_id: int, latest:bool=True): return results -@router.get('/exam/{exam_id}/user_status/{cid}/cid', response=List[ExamUserStatusSchema]) +@router.get('/exam/{exam_id}/user_status/{cid}/cid', response=List[ExamStatusSchema]) def get_exam_user_status_cid_user(request, exam_id: int, cid: int): exam = get_object_or_404(Exam, id=exam_id) if not exam.check_user_can_edit(request.user): @@ -107,7 +109,7 @@ def get_exam_user_status_cid_user(request, exam_id: int, cid: int): return exam.exam_user_status.filter(cid_user__cid=cid) -@router.get('/exam/{exam_id}/user_status/{user_id}/user', response=List[ExamUserStatusSchema]) +@router.get('/exam/{exam_id}/user_status/{user_id}/user', response=List[ExamStatusSchema]) def get_exam_user_status_user_user(request, exam_id: int, user_id: int): exam = get_object_or_404(Exam, id=exam_id) if not exam.check_user_can_edit(request.user):