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.

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

Feat: 사용자가 속한 팀 목록 조회 API 구현 #334

Merged
merged 2 commits into from
Feb 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,6 @@ public ApiResponse<MemberResponseDTO.DayCalendarDTO> getCalendar(@Authentication
Map<Project, List<Post>> postList = memberQueryService.getPostsByDay(memberId, date);
return ApiResponse.onSuccess(SuccessStatus.MEMBER_OK, MemberConverter.toDayCalendarResponseDto(postList));
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,6 @@ public record MonthCalendarDTO(
public record DayCalendarDTO(
Map<String, List<PostResponseDTO.PostTitleResponseDTO>> postsByDate) {
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@ public Map<Project, List<Post>> getPostsByDay(Long memberId, LocalDate date) {
Member member = memberRepository.findById(memberId).orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND));
return postRepository.findPostsForCalendar(member.getMemberId(), date);
}

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package com.codiary.backend.domain.team.controller;

import com.codiary.backend.domain.alert.service.AlertService;
import com.codiary.backend.domain.member.converter.MemberConverter;
import com.codiary.backend.domain.member.dto.response.MemberResponseDTO;
import com.codiary.backend.domain.member.entity.Member;
import com.codiary.backend.domain.member.security.CustomMemberDetails;
import com.codiary.backend.domain.team.converter.TeamConverter;
import com.codiary.backend.domain.team.dto.request.TeamRequestDTO;
Expand Down Expand Up @@ -167,6 +170,15 @@ public ApiResponse<TeamResponseDTO.TeamPreviewListDTO> findTeams(){
return ApiResponse.onSuccess(SuccessStatus.TEAM_OK, TeamConverter.toTeamPreviewListDTO(teams));
}


@GetMapping("/{member_id}/myTeam")
@Operation(summary = "사용자의 팀 목록 조회", description = "사용자의 팀 목록 조회 기능")
public ApiResponse<List<TeamResponseDTO.SimpleTeamDTO>> getMemberTeam(@PathVariable("member_id") Long memberId, @AuthenticationPrincipal CustomMemberDetails memberDetails) {
List<TeamMember> teams = teamMemberService.getMemberTeam(memberId, memberDetails.getId());
return ApiResponse.onSuccess(SuccessStatus.MEMBER_OK, TeamConverter.toSimpleTeamListResponseDTO(teams));
}


@GetMapping("/check_duplicate")
@Operation(summary = "팀 이름 중복 확인 API", description = "팀 이름 중복을 확인합니다.")
public ApiResponse<String> checkDuplicateTeamName(@RequestParam("team_name") String teamName){
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package com.codiary.backend.domain.team.converter;

import com.codiary.backend.domain.member.converter.MemberConverter;
import com.codiary.backend.domain.project.converter.ProjectConverter;
import com.codiary.backend.domain.project.dto.response.ProjectResponseDTO;
import com.codiary.backend.domain.project.entity.Project;
import com.codiary.backend.domain.team.dto.response.TeamResponseDTO;
import com.codiary.backend.domain.team.entity.Team;
import com.codiary.backend.domain.team.entity.TeamBannerImage;
Expand All @@ -11,6 +14,8 @@
import java.util.stream.Collectors;
import java.util.stream.IntStream;

import static com.codiary.backend.domain.team.entity.QTeamMember.teamMember;

public class TeamConverter {
public static TeamResponseDTO.TeamDTO toTeamResponseDto(Team team) {
return TeamResponseDTO.TeamDTO.builder()
Expand Down Expand Up @@ -114,4 +119,19 @@ public static TeamResponseDTO.TeamPreviewListDTO toTeamPreviewListDTO(List<Team>
.build();
}

public static TeamResponseDTO.SimpleTeamDTO toSimpleTeamResponseDTO(TeamMember teamMember) {
return TeamResponseDTO.SimpleTeamDTO.builder()
.teamId(teamMember.getTeam().getTeamId())
.teamName(teamMember.getTeam().getName())
.build();
}

public static List<TeamResponseDTO.SimpleTeamDTO> toSimpleTeamListResponseDTO(List<TeamMember> teams) {
return teams.stream()
.map(TeamConverter::toSimpleTeamResponseDTO)
.collect(Collectors.toList());
}



}
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ public interface TeamMemberRepository extends JpaRepository<TeamMember, Long> {
Long countTeamMembersByTeamAndTeamMemberRole(Team team, TeamMemberRole teamMemberRole);

List<TeamMember> findTeamMembersByTeam(Team team);

List<TeamMember> findByMember(Member member);
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.codiary.backend.domain.team.repository;

import com.codiary.backend.domain.member.entity.Member;
import com.codiary.backend.domain.team.entity.Team;
import org.springframework.data.jpa.repository.JpaRepository;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
Expand Down Expand Up @@ -96,4 +98,14 @@ public Team getTeamMember(Long teamId){
return teamRepository.findByIdWithTeamMemberList(teamId)
.orElseThrow(() -> new GeneralException(ErrorStatus.TEAM_NOT_FOUND));
}

public List<TeamMember> getMemberTeam(Long memberId, Long currentId) {
//validation
Member member = memberRepository.findById(memberId)
.orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND));
Member currentMember = memberRepository.findById(currentId)
.orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND));

return teamMemberRepository.findByMember(member);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.codiary.backend.domain.member.entity.Member;
import com.codiary.backend.domain.member.repository.MemberRepository;
import com.codiary.backend.domain.project.entity.Project;
import com.codiary.backend.domain.team.dto.request.TeamRequestDTO;
import com.codiary.backend.domain.team.entity.Team;
import com.codiary.backend.domain.team.entity.TeamBannerImage;
Expand Down
Loading