Merge pull request #27 from donggukthon/dev

[Feat] 대기 중인 참여 신청에서 사용자는 온도를 가진다
donggukthon · Dec 20, 2023 · 5f8b531 · 5f8b531
2 parents 880d9a3 + ea06721
commit 5f8b531
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -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
@@ -47,7 +47,7 @@ public List<UserTeamListDto> getUserTeamList(String socialId) {
                     String title = volunteer.getTitle();
                     List<UserTeamDto> 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();