#203 Fix: 팀 프로젝트 리스트 로직 수정

Codiary-UMC-6th · Aug 20, 2024 · b9db2c2 · b9db2c2
1 parent 20bd426
commit b9db2c2
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 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
@@ -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
@@ -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();
   }
 }
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
@@ -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
@@ -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