[Feature] 스터디 탈퇴 시 대상 회원 조회 로직 수정

modules/study/src/main/java/kr/spot/study/application/command/WithdrawStudyService.java

@@ -1,6 +1,7 @@
 package kr.spot.study.application.command;
 
 import jakarta.transaction.Transactional;
+import java.util.List;
 import kr.spot.code.status.ErrorStatus;
 import kr.spot.exception.GeneralException;
 import kr.spot.study.domain.Study;
@@ -21,10 +22,10 @@ public class WithdrawStudyService {
   private final StudyMemberRepository studyMemberRepository;
 
   public void withdrawStudy(long studyId, long memberId, WithdrawStudyRequest request) {
-    StudyMember studyMember = studyMemberRepository.getByMemberIdAndStudyIdAndStudyMemberStatusNot(
+    StudyMember studyMember = studyMemberRepository.getByMemberIdAndStudyIdAndStudyMemberStatusIn(
         memberId,
         studyId,
-        StudyMemberStatus.WITHDRAWN);
+        List.of(StudyMemberStatus.APPROVED, StudyMemberStatus.OWNER));
     Study study = studyRepository.getStudyById(studyId);
 
     StudyMember nextOwner = findNextOwner(studyId, request.nextOwnerId());

modules/study/src/main/java/kr/spot/study/infrastructure/jpa/associations/StudyMemberRepository.java

@@ -23,14 +23,14 @@ 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)
+  default StudyMember getByMemberIdAndStudyIdAndStudyMemberStatusIn(Long memberId, Long studyId,
+      List<StudyMemberStatus> studyMemberStatuses) {
+    return findByMemberIdAndStudyIdAndStudyMemberStatusIn(memberId, studyId, studyMemberStatuses)
         .orElseThrow(() -> new GeneralException(ErrorStatus._STUDY_MEMBER_NOT_FOUND));
   }
 
-  Optional<StudyMember> findByMemberIdAndStudyIdAndStudyMemberStatusNot(Long memberId, Long studyId,
-      StudyMemberStatus status);
+  Optional<StudyMember> findByMemberIdAndStudyIdAndStudyMemberStatusIn(Long memberId, Long studyId,
+      List<StudyMemberStatus> studyMemberStatuses);
 
   Optional<StudyMember> findByMemberIdAndStudyId(Long memberId, Long studyId);
 

modules/study/src/test/java/kr/spot/study/application/command/WithdrawStudyServiceTest.java

@@ -7,6 +7,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.when;
 
+import java.util.List;
 import java.util.Optional;
 import kr.spot.exception.GeneralException;
 import kr.spot.study.domain.Study;
@@ -58,8 +59,8 @@ void should_change_status_to_withdrawn_and_decrease_member_count() {
 
       WithdrawStudyRequest request = new WithdrawStudyRequest(WithdrawReason.NO_MORE_NEEDS, null);
 
-      when(studyMemberRepository.getByMemberIdAndStudyIdAndStudyMemberStatusNot(memberId, STUDY_ID,
-          StudyMemberStatus.WITHDRAWN))
+      when(studyMemberRepository.getByMemberIdAndStudyIdAndStudyMemberStatusIn(memberId, STUDY_ID,
+          List.of(StudyMemberStatus.APPROVED, StudyMemberStatus.OWNER)))
           .thenReturn(regularMember);
       when(studyRepository.getStudyById(STUDY_ID)).thenReturn(study);
 
@@ -87,9 +88,8 @@ void should_transfer_ownership_and_decrease_member_count() {
 
       WithdrawStudyRequest request = new WithdrawStudyRequest(WithdrawReason.FINISHED, nextOwnerId);
 
-      when(studyMemberRepository.getByMemberIdAndStudyIdAndStudyMemberStatusNot(ownerId, STUDY_ID,
-          StudyMemberStatus.WITHDRAWN))
-          .thenReturn(ownerMember);
+      when(studyMemberRepository.getByMemberIdAndStudyIdAndStudyMemberStatusIn(ownerId, STUDY_ID,
+          List.of(StudyMemberStatus.APPROVED, StudyMemberStatus.OWNER))).thenReturn(ownerMember);
       when(studyMemberRepository.findByMemberIdAndStudyId(nextOwnerId, STUDY_ID)).thenReturn(
           Optional.of(nextOwner));
       when(studyRepository.getStudyById(STUDY_ID)).thenReturn(study);
@@ -115,9 +115,8 @@ void should_throw_exception_when_owner_withdraws_without_next_owner() {
 
       WithdrawStudyRequest request = new WithdrawStudyRequest(WithdrawReason.FINISHED, null);
 
-      when(studyMemberRepository.getByMemberIdAndStudyIdAndStudyMemberStatusNot(ownerId, STUDY_ID,
-          StudyMemberStatus.WITHDRAWN))
-          .thenReturn(ownerMember);
+      when(studyMemberRepository.getByMemberIdAndStudyIdAndStudyMemberStatusIn(ownerId, STUDY_ID,
+          List.of(StudyMemberStatus.APPROVED, StudyMemberStatus.OWNER))).thenReturn(ownerMember);
       when(studyRepository.getStudyById(STUDY_ID)).thenReturn(study);
 
       // when & then
@@ -139,9 +138,8 @@ void should_throw_exception_when_next_owner_is_from_different_study() {
 
       WithdrawStudyRequest request = new WithdrawStudyRequest(WithdrawReason.FINISHED, nextOwnerId);
 
-      when(studyMemberRepository.getByMemberIdAndStudyIdAndStudyMemberStatusNot(ownerId, STUDY_ID,
-          StudyMemberStatus.WITHDRAWN))
-          .thenReturn(ownerMember);
+      when(studyMemberRepository.getByMemberIdAndStudyIdAndStudyMemberStatusIn(ownerId, STUDY_ID,
+          List.of(StudyMemberStatus.APPROVED, StudyMemberStatus.OWNER))).thenReturn(ownerMember);
       when(studyMemberRepository.findByMemberIdAndStudyId(nextOwnerId, STUDY_ID)).thenReturn(
           Optional.empty());
       when(studyRepository.getStudyById(STUDY_ID)).thenReturn(study);