diff --git a/src/main/java/shop/kkeujeok/kkeujeokbackend/dashboard/team/api/dto/response/TeamDashboardInfoResDto.java b/src/main/java/shop/kkeujeok/kkeujeokbackend/dashboard/team/api/dto/response/TeamDashboardInfoResDto.java index cdf94b61..8d98ecd5 100644 --- a/src/main/java/shop/kkeujeok/kkeujeokbackend/dashboard/team/api/dto/response/TeamDashboardInfoResDto.java +++ b/src/main/java/shop/kkeujeok/kkeujeokbackend/dashboard/team/api/dto/response/TeamDashboardInfoResDto.java @@ -22,13 +22,16 @@ public static TeamDashboardInfoResDto of(Member member, TeamDashboard dashboard) } public static TeamDashboardInfoResDto detailOf(Member member, TeamDashboard dashboard, double blockProgress) { + List joinMemberInfoResDtos = new java.util.ArrayList<>(); + joinMemberInfoResDtos.add(JoinMemberInfoResDto.from(dashboard.getMember())); + + joinMemberInfoResDtos.addAll(dashboard.getTeamDashboardMemberMappings().stream() + .map(mapping -> JoinMemberInfoResDto.from(mapping.getMember())) + .toList()); + return commonBuilder(member, dashboard) .blockProgress(blockProgress) - .joinMembers(dashboard.getTeamDashboardMemberMappings().stream() - .map(teamDashboardMemberMapping -> { - return JoinMemberInfoResDto.from(teamDashboardMemberMapping.getMember()); - }) - .toList()) + .joinMembers(joinMemberInfoResDtos) .build(); }