Merge pull request #249 from Codiary-UMC-6th/feature/#248-team-member

Feat: 팀원 추가/삭제/조회 API 개발

src/main/java/com/codiary/backend/domain/member/converter/MemberConverter.java

@@ -76,7 +76,15 @@ public static List<MemberResponseDTO.SimpleMemberDTO> toSimpleFollowResponseDto(
                 .collect(Collectors.toList());
     }
 
-    public static List<MemberResponseDTO.SimpleMemberProfileDTO> toSimpleMemberProfileResponseDto(List<Member> members){
+    public static MemberResponseDTO.SimpleMemberProfileDTO tosimpleMemberProfileResponseDto(Member member){
+        return MemberResponseDTO.SimpleMemberProfileDTO.builder()
+                .userId(member.getMemberId())
+                .userName(member.getNickname())
+                .photoUrl(member.getImage() != null ? member.getImage().getImageUrl() : "")
+                .build();
+    }
+
+    public static List<MemberResponseDTO.SimpleMemberProfileDTO> toSimpleMemberProfileListResponseDto(List<Member> members){
         return members.stream()
                 .map(member -> MemberResponseDTO.SimpleMemberProfileDTO.builder()
                         .userId(member.getMemberId())

src/main/java/com/codiary/backend/domain/member/repository/MemberRepository.java

@@ -12,4 +12,6 @@ public interface MemberRepository extends JpaRepository<Member, Long>, MemberRep
     Boolean existsByNickname(String nickname);
 
     Optional<Member> findByEmail(String email);
+
+    Optional<Member> findByNicknameIgnoreCase(String nickname);
 }

src/main/java/com/codiary/backend/domain/team/controller/TeamController.java

@@ -1,57 +1,94 @@
 package com.codiary.backend.domain.team.controller;
 
-import com.codiary.backend.domain.member.entity.Member;
+import com.codiary.backend.domain.member.security.CustomMemberDetails;
 import com.codiary.backend.domain.member.service.MemberCommandService;
 import com.codiary.backend.domain.team.converter.TeamConverter;
 import com.codiary.backend.domain.team.dto.request.TeamRequestDTO;
 import com.codiary.backend.domain.team.dto.response.TeamResponseDTO;
 import com.codiary.backend.domain.team.entity.Team;
+import com.codiary.backend.domain.team.entity.TeamMember;
+import com.codiary.backend.domain.team.service.TeamMemberService;
 import com.codiary.backend.domain.team.service.TeamService;
 import com.codiary.backend.global.apiPayload.ApiResponse;
 import com.codiary.backend.global.apiPayload.code.status.SuccessStatus;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
-@RequestMapping("/teams")
+@RequestMapping("/api/v2/teams")
 @RequiredArgsConstructor
 @Tag(name = "팀 API", description = "팀 생성/조회/수정 관련 API 입니다.")
 public class TeamController {
     private final TeamService teamService;
+    private final TeamMemberService teamMemberService;
     private final MemberCommandService memberCommandService;
 
     @PostMapping("")
     @Operation(summary = "팀 생성")
-    public ApiResponse<TeamResponseDTO.TeamDTO> createTeam(@RequestBody TeamRequestDTO.CreateTeamDTO request){
-        Member member = memberCommandService.getRequester();
-        Team newTeam = teamService.createTeam(request, member);
+    public ApiResponse<TeamResponseDTO.TeamDTO> createTeam(@RequestBody TeamRequestDTO.CreateTeamDTO request,
+                                                           @AuthenticationPrincipal CustomMemberDetails memberDetails){
+        Team newTeam = teamService.createTeam(request, memberDetails.getId());
         return ApiResponse.onSuccess(SuccessStatus.TEAM_OK, TeamConverter.toTeamResponseDto(newTeam));
     }
 
     @GetMapping("/profile/{team_id}")
     @Operation(summary = "팀 프로필 조회")
-    public ApiResponse<TeamResponseDTO.TeamProfileDTO> getTeamProfile(@PathVariable("team_id") Long teamId){
-        Member member = memberCommandService.getRequester();
-        Team fetchedTeam = teamService.getTeamProfile(teamId, member);
+    public ApiResponse<TeamResponseDTO.TeamProfileDTO> getTeamProfile(@PathVariable("team_id") Long teamId,
+                                                                      @AuthenticationPrincipal CustomMemberDetails memberDetails){
+        Team fetchedTeam = teamService.getTeamProfile(teamId, memberDetails.getId());
         return ApiResponse.onSuccess(SuccessStatus.TEAM_OK, TeamConverter.toTeamProfileResponseDto(fetchedTeam));
     }
 
     @GetMapping("/{team_id}")
     @Operation(summary = "팀 정보 조회")
-    public ApiResponse<TeamResponseDTO.TeamDTO> getTeam(@PathVariable("team_id") Long teamId){
-        Member member = memberCommandService.getRequester();
-        Team fetchedTeam = teamService.getTeam(teamId, member);
+    public ApiResponse<TeamResponseDTO.TeamDTO> getTeam(@PathVariable("team_id") Long teamId,
+                                                        @AuthenticationPrincipal CustomMemberDetails memberDetails){
+        Team fetchedTeam = teamService.getTeam(teamId, memberDetails.getId());
         return ApiResponse.onSuccess(SuccessStatus.TEAM_OK, TeamConverter.toTeamResponseDto(fetchedTeam));
     }
 
     @PutMapping("/{team_id}")
     @Operation(summary = "팀 정보 수정")
-    public ApiResponse<TeamResponseDTO.TeamDTO> updateTeam(@PathVariable("team_id") Long teamId, @RequestBody TeamRequestDTO.UpdateTeamDTO request){
-        Member member = memberCommandService.getRequester();
-        Team updatedTeam = teamService.updateTeam(request, teamId, member);
+    public ApiResponse<TeamResponseDTO.TeamDTO> updateTeam(@PathVariable("team_id") Long teamId,
+                                                           @RequestBody TeamRequestDTO.UpdateTeamDTO request,
+                                                           @AuthenticationPrincipal CustomMemberDetails memberDetails){
+        Team updatedTeam = teamService.updateTeam(request, teamId, memberDetails.getId());
         return ApiResponse.onSuccess(SuccessStatus.TEAM_OK, TeamConverter.toTeamResponseDto(updatedTeam));
     }
 
+    @PostMapping("/team_member")
+    @Operation(summary = "팀원 추가")
+    public ApiResponse<TeamResponseDTO.TeamMemberDTO> addTeamMember(
+            @RequestParam("team_id") Long teamId,
+            @RequestBody TeamRequestDTO.TeamMemberDTO request,
+            @AuthenticationPrincipal CustomMemberDetails memberDetails
+    ){
+       TeamMember teamMember = teamMemberService.addTeamMember(memberDetails.getId(), teamId, request);
+        return ApiResponse.onSuccess(SuccessStatus.TEAM_OK, TeamConverter.toTeamMemberResponseDTO(teamMember));
+    }
+
+    @DeleteMapping("/team_member")
+    @Operation(summary = "팀원 삭제")
+    public ApiResponse<String> deleteTeamMember(
+            @RequestParam("team_id") Long teamId,
+            @RequestParam("member_id") Long memberId,
+            @AuthenticationPrincipal CustomMemberDetails memberDetails
+    ){
+        teamMemberService.deleteTeamMember(memberDetails.getId(), teamId, memberId);
+        return ApiResponse.onSuccess(SuccessStatus.TEAM_OK, "팀원 삭제가 완료되었습니다.");
+    }
+
+    @GetMapping("/team_member")
+    @Operation(summary = "팀원 조회")
+    public ApiResponse<List<TeamResponseDTO.TeamMemberDTO>> getTeamMember(
+            @RequestParam("team_id") Long teamId
+    ){
+        Team team = teamMemberService.getTeamMember(teamId);
+        return ApiResponse.onSuccess(SuccessStatus.TEAM_OK, TeamConverter.toTeamMemberListResponseDto(team));
+    }
 }

src/main/java/com/codiary/backend/domain/team/converter/TeamConverter.java

@@ -41,7 +41,7 @@ public static TeamResponseDTO.TeamProfileDTO toTeamProfileResponseDto(Team team)
                 .instagram(team.getInstagram())
                 .isFollowed(false)
                 .teamMemberList(team.getTeamMemberList() == null ? null :
-                        MemberConverter.toSimpleMemberProfileResponseDto(team.getTeamMemberList()
+                        MemberConverter.toSimpleMemberProfileListResponseDto(team.getTeamMemberList()
                                 .stream()
                                 .map(TeamMember::getMember)
                                 .collect(Collectors.toList())))
@@ -70,4 +70,19 @@ public static TeamResponseDTO.TeamFollowersDTO toTeamFollowersResponseDTO(Long t
                 )
                 .build();
     }
+
+    public static TeamResponseDTO.TeamMemberDTO toTeamMemberResponseDTO(TeamMember teamMember){
+        return TeamResponseDTO.TeamMemberDTO.builder()
+                .teamMemberId(teamMember.getTeamMemberId())
+                .member(MemberConverter.tosimpleMemberProfileResponseDto(teamMember.getMember()))
+                .teamMemberRole(teamMember.getTeamMemberRole().name())
+                .build();
+
+    }
+
+    public static List<TeamResponseDTO.TeamMemberDTO> toTeamMemberListResponseDto(Team team) {
+        return team.getTeamMemberList().stream()
+                .map(TeamConverter::toTeamMemberResponseDTO)
+                .collect(Collectors.toList());
+    }
 }

src/main/java/com/codiary/backend/domain/team/dto/request/TeamRequestDTO.java

@@ -3,10 +3,12 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import io.swagger.v3.oas.annotations.media.Schema;
 
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class TeamRequestDTO {
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
     public record CreateTeamDTO(
             String name,
             String intro,
@@ -16,6 +18,8 @@ public record CreateTeamDTO(
             String instagram
     ) {}
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
     public record UpdateTeamDTO(
             String name,
             String email,
@@ -25,4 +29,13 @@ public record UpdateTeamDTO(
             String discord,
             String instagram
     ) {}
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+    public record TeamMemberDTO(
+            @Schema(description = "추가할 팀원 닉네임", example = "abc123*")
+            String memberNickName,
+            @Schema(description = "추가할 팀원 역할", example = "MEMBER | ADMIN")
+            String memberRole
+    ){}
 }

src/main/java/com/codiary/backend/domain/team/dto/response/TeamResponseDTO.java

@@ -67,4 +67,12 @@ public record TeamFollowDTO(
     public record TeamFollowersDTO(
         Long teamId,
         List<MemberResponseDTO.SimpleMemberDTO> followers) {}
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+    @Builder
+    public record TeamMemberDTO(
+            Long teamMemberId,
+            String teamMemberRole,
+            MemberResponseDTO.SimpleMemberProfileDTO member) {}
 }

src/main/java/com/codiary/backend/domain/team/entity/TeamMember.java

@@ -30,9 +30,6 @@ public class TeamMember {
   @JoinColumn(name = "team_id")
   private Team team;
 
-  @Column(name = "member_position", columnDefinition = "varchar(500)")
-  private String memberPosition;
-
   @Builder
     public TeamMember(TeamMemberRole teamMemberRole, Member member, Team team) {
         this.teamMemberRole = teamMemberRole;

src/main/java/com/codiary/backend/domain/team/repository/TeamFollowRepository.java

@@ -9,7 +9,7 @@
 
 public interface TeamFollowRepository extends JpaRepository<TeamFollow, Long>, TeamFollowRepositoryCustom {
 
-    Boolean existsByTeamAndAndMember(Team team, Member member);
+    Boolean existsByTeamAndMember(Team team, Member member);
 
     Optional<TeamFollow> findTeamFollowByTeamAndMember(Team team, Member member);
 }

src/main/java/com/codiary/backend/domain/team/repository/TeamMemberRepository.java

@@ -0,0 +1,14 @@
+package com.codiary.backend.domain.team.repository;
+
+import com.codiary.backend.domain.member.entity.Member;
+import com.codiary.backend.domain.team.entity.Team;
+import com.codiary.backend.domain.team.entity.TeamMember;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface TeamMemberRepository extends JpaRepository<TeamMember, Long> {
+    boolean existsByTeamAndMember(Team team, Member member);
+
+    Optional<TeamMember> findByTeamAndMember(Team team, Member member);
+}

src/main/java/com/codiary/backend/domain/team/repository/TeamRepositoryCustom.java

@@ -11,4 +11,6 @@ public interface TeamRepositoryCustom {
     boolean isTeamMember(Team team, Member member);
 
     Optional<Team> findByIdWithFollowers(Long teamId);
+
+    Optional<Team> findByIdWithTeamMemberList(Long teamId);
 }

src/main/java/com/codiary/backend/domain/team/repository/TeamRepositoryImpl.java

@@ -49,4 +49,14 @@ public Optional<Team> findByIdWithFollowers(Long teamId) {
                 .where(team.teamId.eq(teamId))
                 .fetchOne());
     }
+
+    @Override
+    public Optional<Team> findByIdWithTeamMemberList(Long teamId) {
+        return Optional.ofNullable(queryFactory
+                .selectFrom(team)
+                .leftJoin(team.teamMemberList, teamMember).fetchJoin()
+                .leftJoin(teamMember.member).fetchJoin()
+                .where(team.teamId.eq(teamId))
+                .fetchOne());
+    }
 }

src/main/java/com/codiary/backend/domain/team/service/TeamFollowService.java

@@ -33,7 +33,7 @@ public TeamFollow followTeam(Long toId, Member fromMember) {
         TeamFollow teamFollow;
 
         // business logic: 팔로우/언팔로우
-        if (teamFollowRepository.existsByTeamAndAndMember(toTeam, fromMember)) {
+        if (teamFollowRepository.existsByTeamAndMember(toTeam, fromMember)) {
             // 관계 있음
             teamFollow = teamFollowRepository.findTeamFollowByTeamAndMember(toTeam, fromMember).get();
 

src/main/java/com/codiary/backend/domain/team/service/TeamMemberService.java

@@ -0,0 +1,83 @@
+package com.codiary.backend.domain.team.service;
+
+import com.codiary.backend.domain.member.entity.Member;
+import com.codiary.backend.domain.member.repository.MemberRepository;
+import com.codiary.backend.domain.team.dto.request.TeamRequestDTO;
+import com.codiary.backend.domain.team.entity.Team;
+import com.codiary.backend.domain.team.entity.TeamMember;
+import com.codiary.backend.domain.team.enumerate.TeamMemberRole;
+import com.codiary.backend.domain.team.repository.TeamMemberRepository;
+import com.codiary.backend.domain.team.repository.TeamRepository;
+import com.codiary.backend.global.apiPayload.code.status.ErrorStatus;
+import com.codiary.backend.global.apiPayload.exception.GeneralException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class TeamMemberService {
+    private final TeamMemberRepository teamMemberRepository;
+    private final TeamRepository teamRepository;
+    private final MemberRepository memberRepository;
+
+    @Transactional
+    public TeamMember addTeamMember(Long requestMemberId, Long teamId, TeamRequestDTO.TeamMemberDTO request) {
+        //validation: 팀/멤버 유효성 및 팀원 접근인지, 존재하는 닉네임인지, 이미 추가한 팀원인지 유효성 검사
+        Team team = teamRepository.findById(teamId)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.TEAM_NOT_FOUND));
+
+        Member requestMember = memberRepository.findById(requestMemberId)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND));
+
+        if(!teamMemberRepository.existsByTeamAndMember(team, requestMember)){
+            throw new GeneralException(ErrorStatus.TEAM_MEMBER_ONLY_ACCESS);
+        }
+
+        Member newMember = memberRepository.findByNicknameIgnoreCase(request.memberNickName().toString())
+                .orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND));
+
+        if(teamMemberRepository.existsByTeamAndMember(team, newMember)){
+            throw new GeneralException(ErrorStatus.TEAM_MEMBER_ALREADY_EXISTS);
+        }
+
+        //business logic: 팀원 추가
+        TeamMember teamMember = TeamMember.builder()
+                .team(team)
+                .member(newMember)
+                .teamMemberRole(TeamMemberRole.valueOf(request.memberRole()))
+                .build();
+
+        //return
+        return teamMemberRepository.save(teamMember);
+    }
+
+    @Transactional
+    public void deleteTeamMember(Long requestMemberId, Long teamId, Long memberId) {
+        //validation: 팀/요청자/팀원 유효성 및 요청자가 팀원인지, 존재하는 팀원인지 유효성 검사
+        Team team = teamRepository.findById(teamId)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.TEAM_NOT_FOUND));
+
+        Member requester = memberRepository.findById(requestMemberId)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND));
+
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND));
+
+        if(!teamMemberRepository.existsByTeamAndMember(team, requester)){
+            throw new GeneralException(ErrorStatus.TEAM_MEMBER_NOT_FOUND);
+        }
+
+        TeamMember teamMember = teamMemberRepository.findByTeamAndMember(team, member)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.TEAM_MEMBER_NOT_FOUND));
+
+        //business logic: 팀원 삭제
+        teamMemberRepository.delete(teamMember);
+    }
+
+    public Team getTeamMember(Long teamId){
+        return teamRepository.findByIdWithTeamMemberList(teamId)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.TEAM_NOT_FOUND));
+    }
+}