[refactor] 활동중인 팀 페이지 합류한 팀원 팀장 포함 집계로 수정

Kusitms-28th-Meetup-D · Nov 22, 2023 · 93e5e04 · 93e5e04
1 parent 6b21dae
commit 93e5e04
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/com/kusithm/meetupd/domain/team/dto/response/TeamDetailResponseDto.java b/src/main/java/com/kusithm/meetupd/domain/team/dto/response/TeamDetailResponseDto.java
@@ -40,11 +40,11 @@ public static TeamDetailResponseDto of(Team team, User leader, List<User> teamMe
                 .leaderInfo(new ResponseTeamMemeberDto(leader))
                 .leaderMessage(team.getLeaderMessage())
                 .max(max)
-                .cur(cur)
+                .cur(cur+1) //팀장 포함
                 .location(LocationType.ofCode(team.getLocation().getLocationType()).getValue())
                 .endDate(formattedDate)
                 .notice(team.getNotice())
-                .leftMember(max - cur)
+                .leftMember(max - cur -1)
                 .teamMemeberInfos(teamMemeberInfos.stream().map(ResponseTeamMemeberDto::new).collect(Collectors.toList()))
                 .status(status)
                 .build();

diff --git a/src/main/java/com/kusithm/meetupd/domain/team/dto/response/TeamIWorkedResponseDto.java b/src/main/java/com/kusithm/meetupd/domain/team/dto/response/TeamIWorkedResponseDto.java
@@ -14,6 +14,7 @@
 @Getter
 @Builder
 public class TeamIWorkedResponseDto {
+    private Long teamId;
     private String contestId;
     private String contestTitle;
     private String endDate;
@@ -27,6 +28,7 @@ public static TeamIWorkedResponseDto of(Team team, Contest contest, User leader,
         String formattedDate = sdFormat.format(team.getReviewDate());
 
         return TeamIWorkedResponseDto.builder()
+                .teamId(team.getId())
                 .contestId(contest.getId())
                 .contestTitle(contest.getTitle())
                 .endDate(formattedDate)

diff --git a/src/main/java/com/kusithm/meetupd/domain/team/dto/response/TeamIappliedResponseDto.java b/src/main/java/com/kusithm/meetupd/domain/team/dto/response/TeamIappliedResponseDto.java
@@ -42,7 +42,7 @@ public static TeamIappliedResponseDto of(Team team, int teamMemberSize,Contest c
                 .status(manufactureStatus(status))
                 .leaderMessage(team.getLeaderMessage())
                 .max(team.getHeadCount())
-                .cur(teamMemberSize)
+                .cur(teamMemberSize+1) //+1 : 팀장포함
                 .location(LocationType.ofCode(team.getLocation().getLocationType()).getValue())
                 .endDate(formatDate(team.getReviewDate()))
                 .build();