[Fix] : 동일 회원 스터디 참여 요청 예외 처리 기능 수정

study-hub-inu · Jan 23, 2024 · 0146646 · 0146646
1 parent 87a643a
commit 0146646
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/kr/co/studyhubinu/studyhubserver/apply/service/ApplyService.java b/src/main/java/kr/co/studyhubinu/studyhubserver/apply/service/ApplyService.java
@@ -52,6 +52,8 @@ public FindApplyResponse findApply(FindApplyRequest request, final int page, fin
     }
 
     private void validateSameRequest(UserEntity user, StudyEntity study) {
-        applyRepository.findByUserIdAndStudyId(user.getId(), study.getId()).orElseThrow(SameUserRequestException::new);
+        if(applyRepository.findByUserIdAndStudyId(user.getId(), study.getId()).isPresent()) {
+            throw new SameUserRequestException();
+        }
     }
 }
diff --git a/src/test/java/kr/co/studyhubinu/studyhubserver/apply/service/ApplyServiceTest.java b/src/test/java/kr/co/studyhubinu/studyhubserver/apply/service/ApplyServiceTest.java
@@ -61,7 +61,6 @@ class ApplyServiceTest {
 
         when(userRepository.findById(anyLong())).thenReturn(Optional.ofNullable(user));
         when(studyRepository.findById(anyLong())).thenReturn(Optional.ofNullable(study));
-        when(applyRepository.findByUserIdAndStudyId(user.getId(), study.getId())).thenReturn(Optional.ofNullable(ApplyEntity.builder().build()));
         when(applyRepository.save(any())).thenReturn(ApplyEntity.builder()
                 .userId(user.getId())
                 .study(study.getId())