From b9db2c23881cb92a11b4fb9e01e82a58f867629f Mon Sep 17 00:00:00 2001
From: insa658723 <insa658723@gmail.com>
Date: Tue, 20 Aug 2024 22:33:26 +0900
Subject: [PATCH] =?UTF-8?q?#203=20Fix:=20=ED=8C=80=20=ED=94=84=EB=A1=9C?=
 =?UTF-8?q?=EC=A0=9D=ED=8A=B8=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/global/converter/TeamConverter.java      |  7 +++++--
 .../global/converter/TeamMemberConverter.java        |  2 ++
 .../service/TeamService/TeamQueryServiceImpl.java    |  9 ++++++++-
 .../backend/global/web/dto/Team/TeamResponseDTO.java | 12 ++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/codiary/backend/global/converter/TeamConverter.java b/src/main/java/com/codiary/backend/global/converter/TeamConverter.java
index ed5689f2..25033abc 100644
--- a/src/main/java/com/codiary/backend/global/converter/TeamConverter.java
+++ b/src/main/java/com/codiary/backend/global/converter/TeamConverter.java
@@ -32,7 +32,9 @@ public static TeamResponseDTO.CreateTeamResponseDTO toCreateMemberDTO(Team team)
   }
 
   //팀 조회
-  public static TeamResponseDTO.TeamCheckResponseDTO toTeamCheckResponseDTO(Team team, boolean isAdmin, List<TeamMemberResponseDTO.TeamMemberDTO> members) {
+  public static TeamResponseDTO.TeamCheckResponseDTO toTeamCheckResponseDTO(Team team, boolean isAdmin,
+                                                                            List<TeamMemberResponseDTO.TeamMemberDTO> members,
+                                                                            List<TeamResponseDTO.TeamCheckResponseDTO.ProjectDTO> projects) {
     return TeamResponseDTO.TeamCheckResponseDTO.builder()
         .teamId(team.getTeamId())
         .name(team.getName())
@@ -47,7 +49,8 @@ public static TeamResponseDTO.TeamCheckResponseDTO toTeamCheckResponseDTO(Team t
         .email(team.getEmail())
         .linkedIn(team.getLinkedin())
         .members(members)  // 멤버 리스트 포함
-        .isAdmin(isAdmin) 
+        .isAdmin(isAdmin)
+        .projects(projects)
         .build();
   }
 
diff --git a/src/main/java/com/codiary/backend/global/converter/TeamMemberConverter.java b/src/main/java/com/codiary/backend/global/converter/TeamMemberConverter.java
index 5d13bdfb..4143a097 100644
--- a/src/main/java/com/codiary/backend/global/converter/TeamMemberConverter.java
+++ b/src/main/java/com/codiary/backend/global/converter/TeamMemberConverter.java
@@ -11,6 +11,8 @@ public static TeamMemberResponseDTO.TeamMemberDTO toTeamMemberDTO(TeamMember tea
         .teamId(teamMember.getTeam().getTeamId())
         .memberId(teamMember.getMember().getMemberId())
         .memberRole(teamMember.getTeamMemberRole())
+        .memberPosition(teamMember.getMemberPosition())
+        .nickname(teamMember.getMember().getNickname())
         .build();
   }
 }
\ No newline at end of file
diff --git a/src/main/java/com/codiary/backend/global/service/TeamService/TeamQueryServiceImpl.java b/src/main/java/com/codiary/backend/global/service/TeamService/TeamQueryServiceImpl.java
index df2521ac..2fe1642c 100644
--- a/src/main/java/com/codiary/backend/global/service/TeamService/TeamQueryServiceImpl.java
+++ b/src/main/java/com/codiary/backend/global/service/TeamService/TeamQueryServiceImpl.java
@@ -83,7 +83,14 @@ public TeamResponseDTO.TeamCheckResponseDTO getTeamById(Long teamId) {
             .build())
         .collect(Collectors.toList());
 
-    return TeamConverter.toTeamCheckResponseDTO(team, isAdmin, members);
+    List<TeamResponseDTO.TeamCheckResponseDTO.ProjectDTO> projects = team.getTeamProjectMapList().stream()
+        .map(teamProjectMap -> TeamResponseDTO.TeamCheckResponseDTO.ProjectDTO.builder()
+            .projectId(teamProjectMap.getProject().getProjectId())
+            .projectName(teamProjectMap.getProject().getProjectName())
+            .build())
+        .collect(Collectors.toList());
+
+    return TeamConverter.toTeamCheckResponseDTO(team, isAdmin, members, projects);
   }
 
   private Member getRequester() {
diff --git a/src/main/java/com/codiary/backend/global/web/dto/Team/TeamResponseDTO.java b/src/main/java/com/codiary/backend/global/web/dto/Team/TeamResponseDTO.java
index b8fd108e..2776efb2 100644
--- a/src/main/java/com/codiary/backend/global/web/dto/Team/TeamResponseDTO.java
+++ b/src/main/java/com/codiary/backend/global/web/dto/Team/TeamResponseDTO.java
@@ -58,8 +58,20 @@ public static class TeamCheckResponseDTO {  // 팀 조회
     private List<TeamMemberResponseDTO.TeamMemberDTO> members; // 팀원 목록 추가
     private Boolean isAdmin;
     private TeamFollowResponseDto followInfo; // 팀 팔로우 정보를 추가
+    private List<ProjectDTO> projects;
+
+    @Getter
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class ProjectDTO {
+      private Long projectId;
+      private String projectName;
+    }
   }
 
+
+
   @Getter
   @Builder
   @AllArgsConstructor