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] 회원 탈퇴 수정 및 테스트 #266

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+8 −3
Open

[FIX] 회원 탈퇴 수정 및 테스트 #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdf712e
[FIX] Http Method 수정
Chan531 Feb 25, 2025
4793341
[REFACTOR] 파라미터 수정
Chan531 Feb 25, 2025
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
2 changes: 1 addition & 1 deletion src/main/java/com/tiki/server/member/controller/MemberController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/tiki/server/member/service/MemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ public void changePassword(final PasswordChangeRequest request) {
@Transactional
public void withdrawal(final long memberId) {
Member member = memberFinder.findById(memberId);
List<MemberTeamManager> memberTeamManagers = memberTeamManagerFinder.findAllByMemberIdOrderByCreatedAt(
memberId);
List<MemberTeamManager> memberTeamManagers = memberTeamManagerFinder.findAllByMemberId(memberId);
for (MemberTeamManager memberTeamManager : memberTeamManagers) {
Team team = teamFinder.findById(memberTeamManager.getTeamId());
memberTeamManager.checkMemberIsNotAdmin();
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/tiki/server/memberteammanager/adapter/MemberTeamManagerFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ public MemberTeamManager findByMemberIdAndTeamId(final long memberId, final long
.orElseThrow(() -> new MemberTeamManagerException(INVALID_MEMBER_TEAM_MANAGER));
}

public List<MemberTeamManager> findAllByMemberId(final long memberId) {
return memberTeamManagerRepository.findAllByMemberId(memberId);
}

public List<MemberTeamManager> findAllByMemberIdOrderByCreatedAt(final long memberId) {
return memberTeamManagerRepository.findAllByMemberIdOrderByCreatedAt(memberId);
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/tiki/server/memberteammanager/repository/MemberTeamManagerRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public interface MemberTeamManagerRepository extends JpaRepository<MemberTeamMan

List<MemberTeamManager> findAllByTeamId(final long teamId);

List<MemberTeamManager> findAllByMemberId(final long memberId);

List<MemberTeamManager> findAllByMemberIdOrderByCreatedAt(final long memberId);

@Query("SELECT m.name AS memberName, m.email AS memberEmail, mtm.position AS memberPosition " +
Expand Down