Skip to content

[Feature] 이미 탈퇴한 스터디에 재가입 뒤 탈퇴하는 경우도 체크 #124

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

Merged
msk226 merged 1 commit into from
Jan 27, 2026
Merged

[Feature] 이미 탈퇴한 스터디에 재가입 뒤 탈퇴하는 경우도 체크 #124

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
6 changes: 5 additions & 1 deletion modules/study/src/main/java/kr/spot/study/application/command/WithdrawStudyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import kr.spot.exception.GeneralException;
import kr.spot.study.domain.Study;
import kr.spot.study.domain.associations.StudyMember;
import kr.spot.study.domain.enums.StudyMemberStatus;
import kr.spot.study.infrastructure.jpa.StudyRepository;
import kr.spot.study.infrastructure.jpa.associations.StudyMemberRepository;
import kr.spot.study.presentation.command.dto.request.WithdrawStudyRequest;
Expand All @@ -20,7 +21,10 @@ public class WithdrawStudyService {
private final StudyMemberRepository studyMemberRepository;

public void withdrawStudy(long studyId, long memberId, WithdrawStudyRequest request) {
StudyMember studyMember = studyMemberRepository.getByMemberIdAndStudyId(memberId, studyId);
StudyMember studyMember = studyMemberRepository.getByMemberIdAndStudyIdAndStudyMemberStatusNot(
memberId,
studyId,
StudyMemberStatus.WITHDRAWN);
Study study = studyRepository.getStudyById(studyId);

StudyMember nextOwner = findNextOwner(studyId, request.nextOwnerId());
Expand Down
9 changes: 9 additions & 0 deletions ...dy/src/main/java/kr/spot/study/infrastructure/jpa/associations/StudyMemberRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ default StudyMember getByMemberIdAndStudyId(Long memberId, Long studyId) {
.orElseThrow(() -> new GeneralException(ErrorStatus._STUDY_MEMBER_NOT_FOUND));
}

default StudyMember getByMemberIdAndStudyIdAndStudyMemberStatusNot(Long memberId, Long studyId,
StudyMemberStatus status) {
return findByMemberIdAndStudyIdAndStudyMemberStatusNot(memberId, studyId, status)
.orElseThrow(() -> new GeneralException(ErrorStatus._STUDY_MEMBER_NOT_FOUND));
}

Optional<StudyMember> findByMemberIdAndStudyIdAndStudyMemberStatusNot(Long memberId, Long studyId,
StudyMemberStatus status);

Optional<StudyMember> findByMemberIdAndStudyId(Long memberId, Long studyId);

boolean existsByStudyIdAndMemberIdAndStudyMemberStatusIn(Long studyId, Long memberId,
Expand Down
Loading