test(volunteer-apply): 특정 모집글에 대한 봉사자의 지원 조회 필드 추가 test

 - 리뷰 작성 여부 추가

Author: leebs0521

src/test/java/com/somemore/domains/volunteerapply/controller/VolunteerApplyQueryApiControllerTest.java

@@ -2,7 +2,7 @@
 
 import com.somemore.domains.volunteerapply.dto.condition.VolunteerApplySearchCondition;
 import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyRecruitInfoResponseDto;
-import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyResponseDto;
+import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyWithReviewStatusResponseDto;
 import com.somemore.domains.volunteerapply.dto.response.VolunteerApplySummaryResponseDto;
 import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyVolunteerInfoResponseDto;
 import com.somemore.domains.volunteerapply.usecase.VolunteerApplyQueryFacadeUseCase;
@@ -44,15 +44,15 @@ void getVolunteerApplyByRecruitIdAndVolunteerId() throws Exception {
         Long recruitBoardId = 1L;
         UUID volunteerId = UUID.randomUUID();
 
-        VolunteerApplyResponseDto response = VolunteerApplyResponseDto.builder()
+        VolunteerApplyWithReviewStatusResponseDto response = VolunteerApplyWithReviewStatusResponseDto.builder()
                 .id(1L)
                 .volunteerId(volunteerId)
                 .recruitBoardId(recruitBoardId)
                 .status(WAITING)
                 .attended(false)
                 .build();
 
-        given(volunteerApplyQueryUseCase.getVolunteerApplyByRecruitIdAndVolunteerId(recruitBoardId,
+        given(volunteerApplyQueryFacadeUseCase.getVolunteerApplyByRecruitIdAndVolunteerId(recruitBoardId,
                 volunteerId))
                 .willReturn(response);
 
@@ -78,7 +78,7 @@ void getVolunteerApplyByRecruitIdAndVolunteerIdWhenDoesNotExist() throws Excepti
         Long recruitBoardId = 1L;
         UUID volunteerId = UUID.randomUUID();
 
-        given(volunteerApplyQueryUseCase.getVolunteerApplyByRecruitIdAndVolunteerId(recruitBoardId,
+        given(volunteerApplyQueryFacadeUseCase.getVolunteerApplyByRecruitIdAndVolunteerId(recruitBoardId,
                 volunteerId))
                 .willThrow(new NoSuchElementException(NOT_EXISTS_VOLUNTEER_APPLY));
 

src/test/java/com/somemore/domains/volunteerapply/service/VolunteerApplyQueryFacadeServiceTest.java

@@ -2,6 +2,8 @@
 
 import com.somemore.domains.recruitboard.domain.RecruitBoard;
 import com.somemore.domains.recruitboard.repository.RecruitBoardRepository;
+import com.somemore.domains.review.domain.Review;
+import com.somemore.domains.review.repository.ReviewRepository;
 import com.somemore.domains.volunteer.domain.Volunteer;
 import com.somemore.domains.volunteer.domain.VolunteerDetail;
 import com.somemore.domains.volunteer.dto.request.VolunteerRegisterRequestDto;
@@ -11,6 +13,7 @@
 import com.somemore.domains.volunteerapply.dto.condition.VolunteerApplySearchCondition;
 import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyRecruitInfoResponseDto;
 import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyVolunteerInfoResponseDto;
+import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyWithReviewStatusResponseDto;
 import com.somemore.domains.volunteerapply.repository.VolunteerApplyRepository;
 import com.somemore.support.IntegrationTestSupport;
 import org.junit.jupiter.api.DisplayName;
@@ -42,7 +45,30 @@ class VolunteerApplyQueryFacadeServiceTest extends IntegrationTestSupport {
     private VolunteerDetailRepository volunteerDetailRepository;
     @Autowired
     private VolunteerApplyRepository volunteerApplyRepository;
+    @Autowired
+    private ReviewRepository reviewRepository;
+
+    @DisplayName("모집글 아이디와 봉사자 아이디로 지원 응답 값을 조회할 수 있다.")
+    @Test
+    void getVolunteerApplyByRecruitIdAndVolunteerId() {
+        // given
+        Long recruitBoardId = 1234L;
+        UUID volunteerId = UUID.randomUUID();
+        VolunteerApply apply = createApply(volunteerId, recruitBoardId);
+        volunteerApplyRepository.save(apply);
+
+        Review review = createReview(apply.getId(), volunteerId);
+        reviewRepository.save(review);
+
+        // when
+        VolunteerApplyWithReviewStatusResponseDto dto = volunteerApplyQueryFacadeService.getVolunteerApplyByRecruitIdAndVolunteerId(
+                recruitBoardId, volunteerId);
 
+        // then
+        assertThat(dto.recruitBoardId()).isEqualTo(recruitBoardId);
+        assertThat(dto.volunteerId()).isEqualTo(volunteerId);
+        assertThat(dto.isReviewed()).isTrue();
+    }
 
     @DisplayName("모집글 아이디와 기관 아이디로 필터에 맞는 지원자 간단 정보를 조회할 수 있다.")
     @Test
@@ -108,6 +134,16 @@ void getVolunteerAppliesByVolunteerId() {
         assertThat(result).hasSize(3);
     }
 
+    private static Review createReview(Long volunteerApplyId, UUID volunteerId) {
+        return Review.builder()
+                .volunteerApplyId(volunteerApplyId)
+                .volunteerId(volunteerId)
+                .title("리뷰 제목")
+                .content("리뷰 내용")
+                .imgUrl("리뷰 이미지")
+                .build();
+    }
+
     private static VolunteerDetail createVolunteerDetail(UUID volunteerId) {
 
         VolunteerRegisterRequestDto volunteerRegisterRequestDto =
@@ -130,7 +166,7 @@ private static VolunteerApply createApply(UUID volunteerId, Long recruitId) {
                 .volunteerId(volunteerId)
                 .recruitBoardId(recruitId)
                 .status(APPROVED)
-                .attended(false)
+                .attended(true)
                 .build();
     }
 

src/test/java/com/somemore/domains/volunteerapply/service/VolunteerApplyQueryServiceTest.java

@@ -3,7 +3,6 @@
 import com.somemore.domains.volunteerapply.domain.ApplyStatus;
 import com.somemore.domains.volunteerapply.domain.VolunteerApply;
 import com.somemore.domains.volunteerapply.dto.condition.VolunteerApplySearchCondition;
-import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyResponseDto;
 import com.somemore.domains.volunteerapply.dto.response.VolunteerApplySummaryResponseDto;
 import com.somemore.domains.volunteerapply.repository.VolunteerApplyRepository;
 import com.somemore.global.exception.NoSuchElementException;
@@ -131,19 +130,6 @@ void getSummaryByRecruitBoardId() {
         assertThat(dto.reject()).isEqualTo(rejectCount);
     }
 
-    @DisplayName("모집글 아이디와 봉사자 아이디로 지원 응답 값을 조회할 수 있다.")
-    @Test
-    void getVolunteerApplyByRecruitIdAndVolunteerId() {
-        // given
-        // when
-        VolunteerApplyResponseDto dto = volunteerApplyQueryService.getVolunteerApplyByRecruitIdAndVolunteerId(
-                recruitBoardId, volunteerId);
-
-        // then
-        assertThat(dto.recruitBoardId()).isEqualTo(recruitBoardId);
-        assertThat(dto.volunteerId()).isEqualTo(volunteerId);
-    }
-
     @DisplayName("모집글 아이디로 지원 리스트를 페이징 조회할 수 있다.")
     @Test
     void getAllByRecruitId() {