Skip to content

Commit 0b883c1

Browse files
authored
Merge pull request #42 from RestTest-App/release
Release
2 parents f167f77 + 9c7015e commit 0b883c1

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

β€Žapi/v1/test/test_router.pyβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from app.test.usecase.rest_mode_usecase import rest_mode_usecase
1515
from app.test.dto.response.rest_mode_response import RestModeResponse
1616
from domain.user.entity.user import User
17-
from exception.success import ok
17+
from app.utils.dto.success import ok
1818
from sqlalchemy import text
1919
# 문제, μ‹œν—˜ λ“±λ‘ν•˜κΈ°
2020
from app.test.dto.request.create_exam_request import CreateExamRequest

β€Žapi/v1/user/user_router.pyβ€Ž

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@
1616
# μ‚¬μš©μž 정보 쑰회
1717
@router.get("/get-user-info", response_model=GetUserInfoResponse)
1818
async def get_user_info(user=Depends(get_current_user)):
19-
user_info = GetUserInfoResponse.model_validate(user)
19+
user_dict = user.__dict__.copy()
20+
if isinstance(user_dict.get("monthly_study_date"), dict):
21+
user_dict["monthly_study_date"] = None
22+
23+
user_info = GetUserInfoResponse.model_validate(user_dict)
2024
payload: dict = user_info.model_dump(mode="json")
2125
return ok(data=payload, message="μ‚¬μš©μž 정보 쑰회 성곡")
2226

β€Žapp/user/dto/response/get_user_info_response.pyβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import datetime
2-
from typing import List
2+
from typing import List, Optional
33

44
from pydantic import BaseModel, ConfigDict
55

@@ -11,4 +11,4 @@ class GetUserInfoResponse(BaseModel):
1111
nickname: str
1212
created_at: datetime.datetime
1313
total_study_days: int
14-
monthly_study_date: List[int]
14+
monthly_study_date: Optional[List[int]] = None

0 commit comments

Comments
Β (0)