Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Aug 20, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/main/java/com/codiary/backend/global/converter/TeamConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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();
}

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/codiary/backend/global/converter/TeamMemberConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
9 changes: 8 additions & 1 deletion src/main/java/com/codiary/backend/global/service/TeamService/TeamQueryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/com/codiary/backend/global/web/dto/Team/TeamResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down