refactor(volunteer): 불필요한 기능 제거

Author: leebs0521

src/main/java/com/somemore/domains/volunteer/dto/response/VolunteerSimpleInfoResponseDto.java

@@ -2,7 +2,6 @@
 
 import com.somemore.domains.volunteer.domain.Volunteer;
 import com.somemore.domains.volunteer.repository.mapper.VolunteerOverviewForRankingByHours;
-import com.somemore.domains.volunteer.repository.mapper.VolunteerSimpleInfo;
 
 import java.util.List;
 import java.util.Optional;
@@ -24,8 +23,6 @@ public interface VolunteerRepository {
 
     List<Volunteer> findAllByIds(List<UUID> volunteerIds);
 
-    List<VolunteerSimpleInfo> findSimpleInfoByIds(List<UUID> ids);
-
     boolean existsByVolunteerId(UUID volunteerId);
 
     default boolean doesNotExistsByVolunteerId(UUID volunteerId) {

src/main/java/com/somemore/domains/volunteer/repository/VolunteerRepository.java

@@ -5,10 +5,8 @@
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import com.somemore.domains.volunteer.domain.QVolunteer;
-import com.somemore.domains.volunteer.domain.QVolunteerDetail;
 import com.somemore.domains.volunteer.domain.Volunteer;
 import com.somemore.domains.volunteer.repository.mapper.VolunteerOverviewForRankingByHours;
-import com.somemore.domains.volunteer.repository.mapper.VolunteerSimpleInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
@@ -24,7 +22,6 @@ public class VolunteerRepositoryImpl implements VolunteerRepository {
     private final JPAQueryFactory queryFactory;
 
     private static final QVolunteer volunteer = QVolunteer.volunteer;
-    private static final QVolunteerDetail volunteerDetail = QVolunteerDetail.volunteerDetail;
 
     @Override
     public Volunteer save(Volunteer volunteer) {
@@ -75,25 +72,6 @@ public List<Volunteer> findAllByIds(List<UUID> volunteerIds) {
         return volunteerJpaRepository.findAllByIdInAndDeletedFalse(volunteerIds);
     }
 
-    @Override
-    public List<VolunteerSimpleInfo> findSimpleInfoByIds(List<UUID> ids) {
-        BooleanExpression exp = volunteer.id.in(ids)
-                .and(isNotDeleted());
-
-        return queryFactory
-                .select(Projections.constructor(VolunteerSimpleInfo.class,
-                        volunteer.id,
-                        volunteerDetail.name,
-                        volunteer.nickname,
-                        volunteerDetail.email,
-                        volunteer.imgUrl,
-                        volunteer.tier))
-                .from(volunteer)
-                .join(volunteerDetail).on(volunteer.id.eq(volunteerDetail.volunteerId))
-                .where(exp)
-                .fetch();
-    }
-
     private Optional<Volunteer> findOne(BooleanExpression condition) {
 
         return Optional.ofNullable(

src/main/java/com/somemore/domains/volunteer/repository/VolunteerRepositoryImpl.java

@@ -2,12 +2,9 @@
 
 import com.somemore.domains.volunteer.domain.Volunteer;
 import com.somemore.domains.volunteer.dto.response.VolunteerRankingResponseDto;
-import com.somemore.domains.volunteer.repository.VolunteerDetailRepository;
 import com.somemore.domains.volunteer.repository.VolunteerRepository;
 import com.somemore.domains.volunteer.repository.mapper.VolunteerOverviewForRankingByHours;
-import com.somemore.domains.volunteer.repository.mapper.VolunteerSimpleInfo;
 import com.somemore.domains.volunteer.usecase.VolunteerQueryUseCase;
-import com.somemore.domains.volunteer.validator.VolunteerDetailAccessValidator;
 import com.somemore.global.exception.BadRequestException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -26,8 +23,6 @@
 public class VolunteerQueryService implements VolunteerQueryUseCase {
 
     private final VolunteerRepository volunteerRepository;
-    private final VolunteerDetailRepository volunteerDetailRepository;
-    private final VolunteerDetailAccessValidator volunteerDetailAccessValidator;
 
     @Override
     public UUID getVolunteerIdByOAuthId(String oAuthId) {
@@ -58,11 +53,6 @@ public List<Volunteer> getAllByIds(List<UUID> volunteerIds) {
         return volunteerRepository.findAllByIds(volunteerIds);
     }
 
-    @Override
-    public List<VolunteerSimpleInfo> getVolunteerSimpleInfosByIds(List<UUID> ids) {
-        return volunteerRepository.findSimpleInfoByIds(ids);
-    }
-
     @Override
     public void validateVolunteerExists(UUID volunteerId) {
         if (volunteerRepository.doesNotExistsByVolunteerId(volunteerId)) {

src/main/java/com/somemore/domains/volunteer/repository/mapper/VolunteerSimpleInfo.java

@@ -2,7 +2,6 @@
 
 import com.somemore.domains.volunteer.domain.Volunteer;
 import com.somemore.domains.volunteer.dto.response.VolunteerRankingResponseDto;
-import com.somemore.domains.volunteer.repository.mapper.VolunteerSimpleInfo;
 
 import java.util.List;
 import java.util.UUID;
@@ -17,7 +16,5 @@ public interface VolunteerQueryUseCase {
 
     List<Volunteer> getAllByIds(List<UUID> volunteerIds);
 
-    List<VolunteerSimpleInfo> getVolunteerSimpleInfosByIds(List<UUID> ids);
-
     void validateVolunteerExists(UUID volunteerId);
 }

src/main/java/com/somemore/domains/volunteer/service/VolunteerQueryService.java

@@ -1,18 +1,15 @@
 package com.somemore.domains.volunteer.repository;
 
 import com.somemore.domains.volunteer.domain.Volunteer;
-import com.somemore.domains.volunteer.domain.VolunteerDetail;
 import com.somemore.domains.volunteer.dto.request.VolunteerRegisterRequestDto;
 import com.somemore.domains.volunteer.repository.mapper.VolunteerOverviewForRankingByHours;
-import com.somemore.domains.volunteer.repository.mapper.VolunteerSimpleInfo;
 import com.somemore.support.IntegrationTestSupport;
 import org.assertj.core.api.AssertionsForClassTypes;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -26,9 +23,6 @@ class VolunteerRepositoryImplTest extends IntegrationTestSupport {
     @Autowired
     private VolunteerRepository volunteerRepository;
 
-    @Autowired
-    private VolunteerDetailRepository volunteerDetailRepository;
-
     @DisplayName("봉사자의 id로 닉네임을 조회한다.")
     @Test
     void findNicknameById() {
@@ -160,27 +154,6 @@ void findAllByIds() {
         assertThat(volunteers).hasSize(3);
     }
 
-    @DisplayName("아이디 리스트로 봉사자 간단 정보를 조회할 수 있다.")
-    @Test
-    void findSimpleInfoByIds() {
-        // given
-        List<UUID> ids = new ArrayList<>();
-
-        for (int i = 0; i < 4; i++) {
-            Volunteer volunteerTest = volunteerRepository.save(Volunteer.createDefault(NAVER, "naver"));
-            String name = "name" + i;
-            VolunteerRegisterRequestDto dto = createVolunteerRegisterRequestDto(name);
-            volunteerDetailRepository.save(VolunteerDetail.of(dto, volunteerTest.getId()));
-            ids.add(volunteerTest.getId());
-        }
-
-        // when
-        List<VolunteerSimpleInfo> simpleInfo = volunteerRepository.findSimpleInfoByIds(ids);
-
-        // then
-        assertThat(simpleInfo).hasSize(4);
-    }
-
     @DisplayName("봉사자 ID로 봉사자가 존재하는지 확인할 수 있다.")
     @Test
     void existsVolunteerById() {

src/main/java/com/somemore/domains/volunteer/usecase/VolunteerQueryUseCase.java

@@ -4,9 +4,7 @@
 import com.somemore.domains.volunteer.domain.VolunteerDetail;
 import com.somemore.domains.volunteer.dto.request.VolunteerRegisterRequestDto;
 import com.somemore.domains.volunteer.dto.response.VolunteerRankingResponseDto;
-import com.somemore.domains.volunteer.repository.VolunteerDetailRepository;
 import com.somemore.domains.volunteer.repository.VolunteerRepository;
-import com.somemore.domains.volunteer.repository.mapper.VolunteerSimpleInfo;
 import com.somemore.global.auth.oauth.domain.OAuthProvider;
 import com.somemore.global.exception.BadRequestException;
 import com.somemore.support.IntegrationTestSupport;
@@ -22,9 +20,7 @@
 import static com.somemore.global.exception.ExceptionMessage.NOT_EXISTS_VOLUNTEER;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
 @Transactional
 class VolunteerQueryServiceTest extends IntegrationTestSupport {
@@ -35,9 +31,6 @@ class VolunteerQueryServiceTest extends IntegrationTestSupport {
     @Autowired
     private VolunteerRepository volunteerRepository;
 
-    @Autowired
-    private VolunteerDetailRepository volunteerDetailRepository;
-
     final String oAuthId = "example-oauth-id";
     final OAuthProvider oAuthProvider = OAuthProvider.NAVER;
 
@@ -158,30 +151,6 @@ void findAllByIds() {
         assertThat(volunteers).hasSize(2);
     }
 
-    @DisplayName("아이디 리스트로 봉사자 간단 정보를 조회할 수 있다")
-    @Test
-    void getVolunteerSimpleInfosByIds() {
-        // given
-        Volunteer volunteer1 = Volunteer.createDefault(OAuthProvider.NAVER, "1234");
-        Volunteer volunteer2 = Volunteer.createDefault(OAuthProvider.NAVER, "1234");
-
-        volunteerRepository.save(volunteer1);
-        volunteerRepository.save(volunteer2);
-
-        VolunteerDetail detail1 = createVolunteerDetail(volunteer1.getId());
-        VolunteerDetail detail2 = createVolunteerDetail(volunteer1.getId());
-
-        volunteerDetailRepository.save(detail1);
-        volunteerDetailRepository.save(detail2);
-
-        // when
-        List<VolunteerSimpleInfo> volunteers = volunteerQueryService.getVolunteerSimpleInfosByIds(
-                List.of(volunteer1.getId(), volunteer2.getId(), UUID.randomUUID()));
-
-        // then
-        assertThat(volunteers).hasSize(2);
-    }
-
     @DisplayName("봉사자 ID로 봉사자가 존재하는지 확인할 수 있다 (service)")
     @Test
     void validateVolunteerExists() {