From f1fd9eb96b1e15d2b2058b41d9f8cbf0f6ec27aa Mon Sep 17 00:00:00 2001 From: choigiwoong Date: Thu, 12 Sep 2024 21:44:14 +0900 Subject: [PATCH] =?UTF-8?q?Refactor(#10):=20=ED=8C=80=20=EB=8C=80=EC=8B=9C?= =?UTF-8?q?=EB=B3=B4=EB=93=9C=20=ED=8C=80=EC=9B=90=EC=97=90=20=EB=8C=80?= =?UTF-8?q?=EC=8B=9C=EB=B3=B4=EB=93=9C=20=EC=83=9D=EC=84=B1=EC=9E=90=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#125)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Refactor(#110): 대시보드 접근 권한 수정, 카테고리 중복 수정 * Test(#110): 카테고리 중복 수정으로 인한 테스트 코드 수정 * Fix(#110): 404에러 발생 수정 * Fix(#110): 404에러 발생 수정 * Refactor(#10): 팀 대시보드 팀원에 대시보드 생성자 추가 --- .../api/dto/response/TeamDashboardInfoResDto.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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(); }