diff --git a/api/v1/test/test_router.py b/api/v1/test/test_router.py index 837e555..47aaefa 100644 --- a/api/v1/test/test_router.py +++ b/api/v1/test/test_router.py @@ -14,7 +14,7 @@ from app.test.usecase.rest_mode_usecase import rest_mode_usecase from app.test.dto.response.rest_mode_response import RestModeResponse from domain.user.entity.user import User -from exception.success import ok +from app.utils.dto.success import ok from sqlalchemy import text # 문제, 시험 등록하기 from app.test.dto.request.create_exam_request import CreateExamRequest diff --git a/api/v1/user/user_router.py b/api/v1/user/user_router.py index 523387a..6fa0996 100644 --- a/api/v1/user/user_router.py +++ b/api/v1/user/user_router.py @@ -16,7 +16,11 @@ # 사용자 정보 조회 @router.get("/get-user-info", response_model=GetUserInfoResponse) async def get_user_info(user=Depends(get_current_user)): - user_info = GetUserInfoResponse.model_validate(user) + user_dict = user.__dict__.copy() + if isinstance(user_dict.get("monthly_study_date"), dict): + user_dict["monthly_study_date"] = None + + user_info = GetUserInfoResponse.model_validate(user_dict) payload: dict = user_info.model_dump(mode="json") return ok(data=payload, message="사용자 정보 조회 성공") diff --git a/app/user/dto/response/get_user_info_response.py b/app/user/dto/response/get_user_info_response.py index 77ffa52..accd579 100644 --- a/app/user/dto/response/get_user_info_response.py +++ b/app/user/dto/response/get_user_info_response.py @@ -1,5 +1,5 @@ import datetime -from typing import List +from typing import List, Optional from pydantic import BaseModel, ConfigDict @@ -11,4 +11,4 @@ class GetUserInfoResponse(BaseModel): nickname: str created_at: datetime.datetime total_study_days: int - monthly_study_date: List[int] \ No newline at end of file + monthly_study_date: Optional[List[int]] = None