refactor(VolunteerApplyStatusChangeService): 중복 코드 해결

- approve와 reject usecase를 한 구현체에서 해결

Author: m-a-king

src/main/java/com/somemore/volunteerapply/service/RejectVolunteerApplyService.java

@@ -9,6 +9,7 @@
 import com.somemore.volunteerapply.event.VolunteerApplyStatusChangeEvent;
 import com.somemore.volunteerapply.repository.VolunteerApplyRepository;
 import com.somemore.volunteerapply.usecase.ApproveVolunteerApplyUseCase;
+import com.somemore.volunteerapply.usecase.RejectVolunteerApplyUseCase;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,26 +20,36 @@
 import static com.somemore.global.exception.ExceptionMessage.RECRUIT_BOARD_ALREADY_COMPLETED;
 import static com.somemore.global.exception.ExceptionMessage.UNAUTHORIZED_RECRUIT_BOARD;
 import static com.somemore.volunteerapply.domain.ApplyStatus.APPROVED;
+import static com.somemore.volunteerapply.domain.ApplyStatus.REJECTED;
 
 @RequiredArgsConstructor
 @Transactional
 @Service
-public class ApproveVolunteerApplyService implements ApproveVolunteerApplyUseCase {
+public class VolunteerApplyStatusChangeService implements ApproveVolunteerApplyUseCase, RejectVolunteerApplyUseCase {
 
     private final VolunteerApplyRepository volunteerApplyRepository;
     private final RecruitBoardQueryUseCase recruitBoardQueryUseCase;
     private final ServerEventPublisher serverEventPublisher;
 
     @Override
     public void approve(Long id, UUID centerId) {
+        changeApplyStatus(id, centerId, APPROVED);
+    }
+
+    @Override
+    public void reject(Long id, UUID centerId) {
+        changeApplyStatus(id, centerId, REJECTED);
+    }
+
+    private void changeApplyStatus(Long id, UUID centerId, ApplyStatus newStatus) {
         VolunteerApply apply = getVolunteerApply(id);
         RecruitBoard recruitBoard = recruitBoardQueryUseCase.getById(apply.getRecruitBoardId());
 
         validateWriter(recruitBoard, centerId);
         validateBoardStatus(recruitBoard);
 
         ApplyStatus oldStatus = apply.getStatus();
-        apply.changeStatus(APPROVED);
+        apply.changeStatus(newStatus);
         volunteerApplyRepository.save(apply);
 
         publishVolunteerApplyStatusChangeEvent(apply, recruitBoard, oldStatus);
@@ -66,11 +77,9 @@ private void validateBoardStatus(RecruitBoard recruitBoard) {
     private void publishVolunteerApplyStatusChangeEvent(VolunteerApply apply,
                                                         RecruitBoard recruitBoard,
                                                         ApplyStatus oldStatus) {
-
         if (apply.getStatus() == oldStatus) {
             return;
         }
-
         serverEventPublisher.publish(VolunteerApplyStatusChangeEvent.from(apply, recruitBoard, oldStatus));
     }
-}
+}

src/main/java/com/somemore/volunteerapply/service/ApproveVolunteerApplyService.java renamed to src/main/java/com/somemore/volunteerapply/service/VolunteerApplyStatusChangeService.java

@@ -22,7 +22,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
-class ApplyVolunteerApplyServiceTest extends IntegrationTestSupport {
+class ApplyVolunteerApplyStatusChangeServiceTest extends IntegrationTestSupport {
 
     @Autowired
     private ApplyVolunteerApplyService volunteerApplyCommandService;

src/test/java/com/somemore/volunteerapply/service/ApplyVolunteerApplyServiceTest.java renamed to src/test/java/com/somemore/volunteerapply/service/ApplyVolunteerApplyStatusChangeServiceTest.java

@@ -34,9 +34,9 @@
 import static org.mockito.Mockito.verify;
 
 @Transactional
-class ApproveVolunteerApplyServiceTest extends IntegrationTestSupport {
+class ApproveVolunteerApplyStatusChangeServiceTest extends IntegrationTestSupport {
 
-    private ApproveVolunteerApplyService approveVolunteerApplyService;
+    private VolunteerApplyStatusChangeService volunteerApplyStatusChangeService;
 
     @Autowired
     private VolunteerApplyRepository volunteerApplyRepository;
@@ -53,7 +53,7 @@ class ApproveVolunteerApplyServiceTest extends IntegrationTestSupport {
     @BeforeEach
     void setUp() {
         serverEventPublisher = mock(ServerEventPublisher.class);
-        approveVolunteerApplyService = new ApproveVolunteerApplyService(
+        volunteerApplyStatusChangeService = new VolunteerApplyStatusChangeService(
                 volunteerApplyRepository,
                 recruitBoardQueryUseCase,
                 serverEventPublisher
@@ -73,7 +73,7 @@ void approve() {
         volunteerApplyRepository.save(apply);
 
         // when
-        approveVolunteerApplyService.approve(apply.getId(), centerId);
+        volunteerApplyStatusChangeService.approve(apply.getId(), centerId);
 
         // then
         VolunteerApply approve = volunteerApplyRepository.findById(apply.getId()).orElseThrow();
@@ -97,7 +97,7 @@ void approveWithWrongCenter() {
         // when
         // then
         assertThatThrownBy(
-                () -> approveVolunteerApplyService.approve(id, wrongCenterId)
+                () -> volunteerApplyStatusChangeService.approve(id, wrongCenterId)
         ).isInstanceOf(BadRequestException.class)
                 .hasMessage(UNAUTHORIZED_RECRUIT_BOARD.getMessage());
     }
@@ -117,7 +117,7 @@ void approveWithAlreadyCompletedRecruit() {
         // when
         // then
         assertThatThrownBy(
-                () -> approveVolunteerApplyService.approve(id, centerId)
+                () -> volunteerApplyStatusChangeService.approve(id, centerId)
         ).isInstanceOf(BadRequestException.class)
                 .hasMessage(ExceptionMessage.RECRUIT_BOARD_ALREADY_COMPLETED.getMessage());
     }
@@ -136,7 +136,7 @@ void approveWithSameStatusDoesNotPublishEvent() {
         volunteerApplyRepository.save(apply);
 
         // when
-        approveVolunteerApplyService.approve(apply.getId(), centerId);
+        volunteerApplyStatusChangeService.approve(apply.getId(), centerId);
 
         // then
         verify(serverEventPublisher, never()).publish(any());
@@ -157,7 +157,7 @@ void approveWithDifferentStatusPublishesEvent() {
         volunteerApplyRepository.save(apply);
 
         // when
-        approveVolunteerApplyService.approve(apply.getId(), centerId);
+        volunteerApplyStatusChangeService.approve(apply.getId(), centerId);
 
         // then
         ArgumentCaptor<VolunteerApplyStatusChangeEvent> eventCaptor = ArgumentCaptor.forClass(VolunteerApplyStatusChangeEvent.class);

src/test/java/com/somemore/volunteerapply/service/ApproveVolunteerApplyServiceTest.java renamed to src/test/java/com/somemore/volunteerapply/service/ApproveVolunteerApplyStatusChangeServiceTest.java

@@ -23,7 +23,6 @@
 import static com.somemore.common.fixture.RecruitBoardFixture.createRecruitBoard;
 import static com.somemore.global.exception.ExceptionMessage.UNAUTHORIZED_RECRUIT_BOARD;
 import static com.somemore.recruitboard.domain.VolunteerCategory.OTHER;
-import static com.somemore.volunteerapply.domain.ApplyStatus.APPROVED;
 import static com.somemore.volunteerapply.domain.ApplyStatus.REJECTED;
 import static com.somemore.volunteerapply.domain.ApplyStatus.WAITING;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -35,9 +34,9 @@
 import static org.mockito.Mockito.verify;
 
 @Transactional
-class RejectVolunteerApplyServiceTest extends IntegrationTestSupport {
+class RejectVolunteerApplyStatusChangeServiceTest extends IntegrationTestSupport {
 
-    private RejectVolunteerApplyService rejectVolunteerApplyService;
+    private VolunteerApplyStatusChangeService volunteerApplyStatusChangeService;
 
     @Autowired
     private VolunteerApplyRepository volunteerApplyRepository;
@@ -54,7 +53,7 @@ class RejectVolunteerApplyServiceTest extends IntegrationTestSupport {
     @BeforeEach
     void setUp() {
         serverEventPublisher = mock(ServerEventPublisher.class);
-        rejectVolunteerApplyService = new RejectVolunteerApplyService(
+        volunteerApplyStatusChangeService = new VolunteerApplyStatusChangeService(
                 volunteerApplyRepository,
                 recruitBoardQueryUseCase,
                 serverEventPublisher
@@ -74,7 +73,7 @@ void reject() {
         volunteerApplyRepository.save(apply);
 
         // when
-        rejectVolunteerApplyService.reject(apply.getId(), centerId);
+        volunteerApplyStatusChangeService.reject(apply.getId(), centerId);
 
         // then
         VolunteerApply approve = volunteerApplyRepository.findById(apply.getId()).orElseThrow();
@@ -98,7 +97,7 @@ void rejectWithWrongCenter() {
         // when
         // then
         assertThatThrownBy(
-                () -> rejectVolunteerApplyService.reject(id, wrongCenterId)
+                () -> volunteerApplyStatusChangeService.reject(id, wrongCenterId)
         ).isInstanceOf(BadRequestException.class)
                 .hasMessage(UNAUTHORIZED_RECRUIT_BOARD.getMessage());
     }
@@ -118,7 +117,7 @@ void rejectWithAlreadyCompletedRecruit() {
         // when
         // then
         assertThatThrownBy(
-                () -> rejectVolunteerApplyService.reject(id, centerId)
+                () -> volunteerApplyStatusChangeService.reject(id, centerId)
         ).isInstanceOf(BadRequestException.class)
                 .hasMessage(ExceptionMessage.RECRUIT_BOARD_ALREADY_COMPLETED.getMessage());
     }
@@ -137,7 +136,7 @@ void approveWithSameStatusDoesNotPublishEvent() {
         volunteerApplyRepository.save(apply);
 
         // when
-        rejectVolunteerApplyService.reject(apply.getId(), centerId);
+        volunteerApplyStatusChangeService.reject(apply.getId(), centerId);
 
         // then
         verify(serverEventPublisher, never()).publish(any());
@@ -158,7 +157,7 @@ void approveWithDifferentStatusPublishesEvent() {
         volunteerApplyRepository.save(apply);
 
         // when
-        rejectVolunteerApplyService.reject(apply.getId(), centerId);
+        volunteerApplyStatusChangeService.reject(apply.getId(), centerId);
 
         // then
         ArgumentCaptor<VolunteerApplyStatusChangeEvent> eventCaptor = ArgumentCaptor.forClass(VolunteerApplyStatusChangeEvent.class);