test(volunteer-apply): 봉사자 조회 기능 변경에 따른 봉사 지원 조회 기능 리팩토링 테스트

Author: leebs0521

src/test/java/com/somemore/domains/volunteerapply/repository/VolunteerApplyRepositoryImplTest.java

@@ -18,8 +18,7 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import static com.somemore.domains.volunteerapply.domain.ApplyStatus.APPROVED;
-import static com.somemore.domains.volunteerapply.domain.ApplyStatus.REJECTED;
+import static com.somemore.domains.volunteerapply.domain.ApplyStatus.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Transactional
@@ -30,12 +29,11 @@ class VolunteerApplyRepositoryImplTest extends IntegrationTestSupport {
 
     @BeforeEach
     void setUp() {
-        // Given
         for (int i = 1; i <= 15; i++) {
             VolunteerApply apply = VolunteerApply.builder()
                     .volunteerId(UUID.randomUUID())
                     .recruitBoardId(1L)
-                    .status(ApplyStatus.WAITING)
+                    .status(WAITING)
                     .attended(false)
                     .build();
             volunteerApplyRepository.save(apply);
@@ -55,44 +53,41 @@ void setUp() {
     @DisplayName("봉사 신청 저장 및 조회")
     @Test
     void saveAndFindById() {
-        // Given
+        // given
         VolunteerApply newApply = createApply(UUID.randomUUID(), 1L);
-        VolunteerApply savedApply = volunteerApplyRepository.save(newApply);
+        volunteerApplyRepository.save(newApply);
 
-        // When
-        Optional<VolunteerApply> foundApply = volunteerApplyRepository.findById(savedApply.getId());
+        // when
+        Optional<VolunteerApply> foundApply = volunteerApplyRepository.findById(newApply.getId());
 
-        // Then
+        // then
         assertThat(foundApply).isPresent();
-        assertThat(foundApply.get().getId()).isEqualTo(savedApply.getId());
+        assertThat(foundApply.get().getId()).isEqualTo(newApply.getId());
         assertThat(foundApply.get().getStatus()).isEqualTo(APPROVED);
     }
 
     @DisplayName("모집글 ID 리스트로 봉사자 ID 리스트 조회")
     @Test
     void findVolunteerIdsByRecruitIds() {
-        // When
-        List<UUID> volunteerIds = volunteerApplyRepository.findVolunteerIdsByRecruitIds(
-                List.of(1L, 2L));
+        // when
+        List<UUID> volunteerIds = volunteerApplyRepository.findVolunteerIdsByRecruitIds(List.of(1L, 2L));
 
-        // Then
+        // then
         assertThat(volunteerIds).hasSize(20);
     }
 
     @DisplayName("모집글 ID로 페이징된 봉사 신청 조회")
     @Test
     void findAllByRecruitId() {
-        // Given
+        // given
         PageRequest firstPage = PageRequest.of(0, 10, Sort.by(Sort.Order.asc("created_at")));
         PageRequest secondPage = PageRequest.of(1, 10, Sort.by(Sort.Order.asc("created_at")));
 
-        // When
-        Page<VolunteerApply> firstPageResult = volunteerApplyRepository.findAllByRecruitId(1L,
-                firstPage);
-        Page<VolunteerApply> secondPageResult = volunteerApplyRepository.findAllByRecruitId(1L,
-                secondPage);
+        // when
+        Page<VolunteerApply> firstPageResult = volunteerApplyRepository.findAllByRecruitId(1L, firstPage);
+        Page<VolunteerApply> secondPageResult = volunteerApplyRepository.findAllByRecruitId(1L, secondPage);
 
-        // Then
+        // then
         assertThat(firstPageResult.getContent()).hasSize(10);
         assertThat(firstPageResult.getTotalElements()).isEqualTo(15);
         assertThat(firstPageResult.getTotalPages()).isEqualTo(2);
@@ -115,8 +110,7 @@ void findByRecruitIdAndVolunteerId() {
         volunteerApplyRepository.save(newApply);
 
         // when
-        Optional<VolunteerApply> findApply = volunteerApplyRepository.findByRecruitIdAndVolunteerId(
-                recruitId, volunteerId);
+        Optional<VolunteerApply> findApply = volunteerApplyRepository.findByRecruitIdAndVolunteerId(recruitId, volunteerId);
 
         // then
         assertThat(findApply).isPresent();
@@ -133,8 +127,7 @@ void existsByRecruitIdAndVolunteerId() {
         volunteerApplyRepository.save(newApply);
 
         // when
-        boolean result = volunteerApplyRepository.existsByRecruitIdAndVolunteerId(recruitId,
-                volunteerId);
+        boolean result = volunteerApplyRepository.existsByRecruitIdAndVolunteerId(recruitId, volunteerId);
 
         // then
         assertThat(result).isTrue();
@@ -173,28 +166,27 @@ void findAllByRecruitIdWithCondition() {
                 .build();
 
         // when
-        Page<VolunteerApply> applies = volunteerApplyRepository.findAllByRecruitId(recruitBoardId,
-                condition);
+        Page<VolunteerApply> applies = volunteerApplyRepository.findAllByRecruitId(recruitBoardId, condition);
 
         // then
         assertThat(applies.getTotalElements()).isEqualTo(3);
         assertThat(applies.getContent())
-                .allMatch(apply -> apply.getStatus() == APPROVED && !apply.getAttended());
+                .allMatch(apply -> apply.getStatus() == status && apply.getAttended() == attended);
 
     }
 
     @DisplayName("봉사자 아이디와 조건 - 지원 상태, 참석 여부로 페이징 조회할 수 있다.")
     @Test
     void findAllByVolunteerId() {
         // given
-        UUID centerId = UUID.randomUUID();
+        UUID volunteerId = UUID.randomUUID();
         ApplyStatus status = APPROVED;
         Boolean attended = false;
 
-        volunteerApplyRepository.save(createApply(centerId, status, attended));
-        volunteerApplyRepository.save(createApply(centerId, status, attended));
-        volunteerApplyRepository.save(createApply(centerId, status, attended));
-        volunteerApplyRepository.save(createApply(centerId, REJECTED, !attended));
+        volunteerApplyRepository.save(createApply(volunteerId, status, attended));
+        volunteerApplyRepository.save(createApply(volunteerId, status, attended));
+        volunteerApplyRepository.save(createApply(volunteerId, status, attended));
+        volunteerApplyRepository.save(createApply(volunteerId, REJECTED, !attended));
 
         VolunteerApplySearchCondition condition = VolunteerApplySearchCondition.builder()
                 .status(status)
@@ -203,13 +195,12 @@ void findAllByVolunteerId() {
                 .build();
 
         // when
-        Page<VolunteerApply> applies = volunteerApplyRepository.findAllByVolunteerId(centerId,
-                condition);
+        Page<VolunteerApply> applies = volunteerApplyRepository.findAllByVolunteerId(volunteerId, condition);
 
         // then
         assertThat(applies.getTotalElements()).isEqualTo(3);
         assertThat(applies.getContent())
-                .allMatch(apply -> apply.getStatus() == APPROVED && !apply.getAttended());
+                .allMatch(apply -> apply.getStatus() == status && apply.getAttended() == attended);
 
     }
 
@@ -250,8 +241,7 @@ private static VolunteerApply createApply(UUID volunteerId, Long recruitId) {
                 .build();
     }
 
-    private static VolunteerApply createApply(Long recruitId, ApplyStatus status,
-            Boolean attended) {
+    private static VolunteerApply createApply(Long recruitId, ApplyStatus status, Boolean attended) {
         return VolunteerApply.builder()
                 .volunteerId(UUID.randomUUID())
                 .recruitBoardId(recruitId)
@@ -260,10 +250,9 @@ private static VolunteerApply createApply(Long recruitId, ApplyStatus status,
                 .build();
     }
 
-    private static VolunteerApply createApply(UUID centerId, ApplyStatus status,
-            Boolean attended) {
+    private static VolunteerApply createApply(UUID volunteerId, ApplyStatus status, Boolean attended) {
         return VolunteerApply.builder()
-                .volunteerId(centerId)
+                .volunteerId(volunteerId)
                 .recruitBoardId(101L)
                 .status(status)
                 .attended(attended)

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

@@ -23,6 +23,12 @@
 import com.somemore.support.IntegrationTestSupport;
 import java.util.List;
 import java.util.UUID;
+
+import com.somemore.user.domain.UserCommonAttribute;
+import com.somemore.user.domain.UserRole;
+import com.somemore.user.repository.usercommonattribute.UserCommonAttributeRepository;
+import com.somemore.volunteer.domain.NEWVolunteer;
+import com.somemore.volunteer.repository.NEWVolunteerRepository;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,9 +45,9 @@ class VolunteerApplyQueryFacadeServiceTest extends IntegrationTestSupport {
     @Autowired
     private RecruitBoardRepository recruitBoardRepository;
     @Autowired
-    private VolunteerRepository volunteerRepository;
+    private NEWVolunteerRepository volunteerRepository;
     @Autowired
-    private VolunteerDetailRepository volunteerDetailRepository;
+    private UserCommonAttributeRepository userCommonAttributeRepository;
     @Autowired
     private VolunteerApplyRepository volunteerApplyRepository;
     @Autowired
@@ -60,8 +66,8 @@ void getVolunteerApplyByRecruitIdAndVolunteerId() {
         reviewRepository.save(review);
 
         // when
-        VolunteerApplyWithReviewStatusResponseDto dto = volunteerApplyQueryFacadeService.getVolunteerApplyByRecruitIdAndVolunteerId(
-                recruitBoardId, volunteerId);
+        VolunteerApplyWithReviewStatusResponseDto dto =
+                volunteerApplyQueryFacadeService.getVolunteerApplyByRecruitIdAndVolunteerId(recruitBoardId, volunteerId);
 
         // then
         assertThat(dto.recruitBoardId()).isEqualTo(recruitBoardId);
@@ -77,28 +83,30 @@ void getVolunteerAppliesByRecruitIdAndCenterId() {
         RecruitBoard board = createRecruitBoard(centerId);
         recruitBoardRepository.save(board);
 
-        Volunteer volunteer1 = Volunteer.createDefault(NAVER, "naver");
-        Volunteer volunteer2 = Volunteer.createDefault(NAVER, "naver");
-        volunteerRepository.save(volunteer1);
-        volunteerRepository.save(volunteer2);
+        UUID userIdOne = UUID.randomUUID();
+        UUID userIdTwo = UUID.randomUUID();
+
+        UserCommonAttribute userOne = createUserCommonAttribute(userIdOne);
+        UserCommonAttribute userTwo = createUserCommonAttribute(userIdTwo);
+        userCommonAttributeRepository.save(userOne);
+        userCommonAttributeRepository.save(userTwo);
 
-        VolunteerDetail volunteerDetail1 = createVolunteerDetail(volunteer1.getId());
-        VolunteerDetail volunteerDetail2 = createVolunteerDetail(volunteer2.getId());
-        volunteerDetailRepository.save(volunteerDetail1);
-        volunteerDetailRepository.save(volunteerDetail2);
+        NEWVolunteer volunteerOne = createVolunteer(userIdOne);
+        NEWVolunteer volunteerTwo = createVolunteer(userIdTwo);
+        volunteerRepository.save(volunteerOne);
+        volunteerRepository.save(volunteerTwo);
 
-        VolunteerApply apply1 = createApply(volunteer1.getId(), board.getId());
-        VolunteerApply apply2 = createApply(volunteer2.getId(), board.getId());
+        VolunteerApply apply1 = createApply(volunteerOne.getId(), board.getId());
+        VolunteerApply apply2 = createApply(volunteerTwo.getId(), board.getId());
         volunteerApplyRepository.saveAll(List.of(apply1, apply2));
 
         VolunteerApplySearchCondition condition = VolunteerApplySearchCondition.builder()
                 .pageable(getPageable())
                 .build();
 
         // when
-        Page<VolunteerApplyVolunteerInfoResponseDto> result = volunteerApplyQueryFacadeService.getVolunteerAppliesByRecruitIdAndCenterId(
-                board.getId(),
-                centerId, condition);
+        Page<VolunteerApplyVolunteerInfoResponseDto> result =
+                volunteerApplyQueryFacadeService.getVolunteerAppliesByRecruitIdAndCenterId(board.getId(), centerId, condition);
 
         // then
         assertThat(result).hasSize(2);
@@ -142,23 +150,6 @@ private static Review createReview(Long volunteerApplyId, UUID volunteerId) {
                 .build();
     }
 
-    private static VolunteerDetail createVolunteerDetail(UUID volunteerId) {
-
-        VolunteerRegisterRequestDto volunteerRegisterRequestDto =
-                new VolunteerRegisterRequestDto(
-                        NAVER,
-                        "example-oauth-id",
-                        "making",
-                        "[email protected]",
-                        "male",
-                        "06-08",
-                        "1998",
-                        "010-1234-5678"
-                );
-
-        return VolunteerDetail.of(volunteerRegisterRequestDto, volunteerId);
-    }
-
     private static VolunteerApply createApply(UUID volunteerId, Long recruitId) {
         return VolunteerApply.builder()
                 .volunteerId(volunteerId)
@@ -168,6 +159,14 @@ private static VolunteerApply createApply(UUID volunteerId, Long recruitId) {
                 .build();
     }
 
+    private static NEWVolunteer createVolunteer(UUID userIdOne) {
+        return NEWVolunteer.createDefault(userIdOne);
+    }
+
+    private static UserCommonAttribute createUserCommonAttribute(UUID userIdOne) {
+        return UserCommonAttribute.createDefault(userIdOne, UserRole.VOLUNTEER);
+    }
+
     private Pageable getPageable() {
         return PageRequest.of(0, 4);
     }