From f1c5325c5845584dc8b5ddb2e11fd08ba76fcdb1 Mon Sep 17 00:00:00 2001 From: kurtyoon Date: Wed, 20 Dec 2023 14:15:32 +0900 Subject: [PATCH] =?UTF-8?q?[Feat]=20=EB=8C=80=EA=B8=B0=20=EC=A4=91?= =?UTF-8?q?=EC=9D=B8=20=EC=B0=B8=EC=97=AC=20=EC=8B=A0=EC=B2=AD=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=82=AC=EC=9A=A9=EC=9E=90=EB=8A=94=20=EC=98=A8?= =?UTF-8?q?=EB=8F=84=EB=A5=BC=20=EA=B0=80=EC=A7=84=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../volunmate/dto/myPage/response/UserTeamDto.java | 6 +++++- .../java/donggukthon/volunmate/service/MyPageService.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/donggukthon/volunmate/dto/myPage/response/UserTeamDto.java b/src/main/java/donggukthon/volunmate/dto/myPage/response/UserTeamDto.java index 6d1c8a8..ce70e59 100644 --- a/src/main/java/donggukthon/volunmate/dto/myPage/response/UserTeamDto.java +++ b/src/main/java/donggukthon/volunmate/dto/myPage/response/UserTeamDto.java @@ -13,15 +13,19 @@ public record UserTeamDto( @JsonProperty("writer") String writer, + @JsonProperty("degree") + Float degree, + @JsonProperty("content") String content ) implements Serializable { public static UserTeamDto of( - Long teamId, String writer, String content + Long teamId, String writer, Float degree, String content ) { return UserTeamDto.builder() .teamId(teamId) .writer(writer) + .degree(degree) .content(content) .build(); } diff --git a/src/main/java/donggukthon/volunmate/service/MyPageService.java b/src/main/java/donggukthon/volunmate/service/MyPageService.java index 6bc4ad7..c5c3450 100644 --- a/src/main/java/donggukthon/volunmate/service/MyPageService.java +++ b/src/main/java/donggukthon/volunmate/service/MyPageService.java @@ -47,7 +47,7 @@ public List getUserTeamList(String socialId) { String title = volunteer.getTitle(); List userTeamDto = volunteer.getVolunmates().stream() .map(volunmate -> UserTeamDto.of( - volunmate.getId(), volunmate.getUser().getUserName(), volunmate.getContent() + volunmate.getId(), volunmate.getUser().getUserName(), volunmate.getUser().getDegree(), volunmate.getContent() )).toList(); return UserTeamListDto.of(title, userTeamDto); }).toList();