Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v1/test/test_router.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion api/v1/user/user_router.py
Original file line number Diff line number Diff line change
Expand Up @@ -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="์‚ฌ์šฉ์ž ์ •๋ณด ์กฐํšŒ ์„ฑ๊ณต")

Expand Down
4 changes: 2 additions & 2 deletions app/user/dto/response/get_user_info_response.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import datetime
from typing import List
from typing import List, Optional

from pydantic import BaseModel, ConfigDict

Expand All @@ -11,4 +11,4 @@ class GetUserInfoResponse(BaseModel):
nickname: str
created_at: datetime.datetime
total_study_days: int
monthly_study_date: List[int]
monthly_study_date: Optional[List[int]] = None
Loading