diff --git a/src/main/java/com/tiki/server/member/controller/MemberController.java b/src/main/java/com/tiki/server/member/controller/MemberController.java index 504f57c4..9ee109c5 100644 --- a/src/main/java/com/tiki/server/member/controller/MemberController.java +++ b/src/main/java/com/tiki/server/member/controller/MemberController.java @@ -68,7 +68,7 @@ public SuccessResponse changePassword( } @ResponseStatus(HttpStatus.OK) - @GetMapping("/withdrawal") + @DeleteMapping("/withdrawal") public SuccessResponse withdrawal(final Principal principal) { long memberId = Long.parseLong(principal.getName()); memberService.withdrawal(memberId); diff --git a/src/main/java/com/tiki/server/member/service/MemberService.java b/src/main/java/com/tiki/server/member/service/MemberService.java index 379b0e8a..552c0085 100644 --- a/src/main/java/com/tiki/server/member/service/MemberService.java +++ b/src/main/java/com/tiki/server/member/service/MemberService.java @@ -77,8 +77,7 @@ public void changePassword(final PasswordChangeRequest request) { @Transactional public void withdrawal(final long memberId) { Member member = memberFinder.findById(memberId); - List memberTeamManagers = memberTeamManagerFinder.findAllByMemberIdOrderByCreatedAt( - memberId); + List memberTeamManagers = memberTeamManagerFinder.findAllByMemberId(memberId); for (MemberTeamManager memberTeamManager : memberTeamManagers) { Team team = teamFinder.findById(memberTeamManager.getTeamId()); memberTeamManager.checkMemberIsNotAdmin(); diff --git a/src/main/java/com/tiki/server/memberteammanager/adapter/MemberTeamManagerFinder.java b/src/main/java/com/tiki/server/memberteammanager/adapter/MemberTeamManagerFinder.java index 668fb66b..973a2dc8 100644 --- a/src/main/java/com/tiki/server/memberteammanager/adapter/MemberTeamManagerFinder.java +++ b/src/main/java/com/tiki/server/memberteammanager/adapter/MemberTeamManagerFinder.java @@ -24,6 +24,10 @@ public MemberTeamManager findByMemberIdAndTeamId(final long memberId, final long .orElseThrow(() -> new MemberTeamManagerException(INVALID_MEMBER_TEAM_MANAGER)); } + public List findAllByMemberId(final long memberId) { + return memberTeamManagerRepository.findAllByMemberId(memberId); + } + public List findAllByMemberIdOrderByCreatedAt(final long memberId) { return memberTeamManagerRepository.findAllByMemberIdOrderByCreatedAt(memberId); } diff --git a/src/main/java/com/tiki/server/memberteammanager/repository/MemberTeamManagerRepository.java b/src/main/java/com/tiki/server/memberteammanager/repository/MemberTeamManagerRepository.java index 6b8e831a..c2c957af 100644 --- a/src/main/java/com/tiki/server/memberteammanager/repository/MemberTeamManagerRepository.java +++ b/src/main/java/com/tiki/server/memberteammanager/repository/MemberTeamManagerRepository.java @@ -16,6 +16,8 @@ public interface MemberTeamManagerRepository extends JpaRepository findAllByTeamId(final long teamId); + List findAllByMemberId(final long memberId); + List findAllByMemberIdOrderByCreatedAt(final long memberId); @Query("SELECT m.name AS memberName, m.email AS memberEmail, mtm.position AS memberPosition " +