Fix/remove processed email tasks (#71)

* refactor : 데이터 합산 로직 DTO에서 `MemberAttendanceAggregator`로 분리

* refactor : MemberService에서 단순 조회 로직 Finder로 분리, Aggregator 로직 적용 및 리팩토링

* refactor : controller의 request를 service 레이어에서 사용하는 Command로 변환하여 전달하도록 변경

* test : MemberControllerTest에서 Command를 전달하도록 수정

* test : MemberServiceTest에서 Finder로직 적용

* test : MemberFinderTest 작성

* refactor : 메소드 이름 변경, 파라매터 수정

* test : `EmailService`메소드 이름 변경 테스트코드에 반영

* feat : 이메일 task 삭제 로직 변경

* test : 테스트코드 변경 반영

* refactor : 메소드 이름 변경, 파라매터 수정

* test : `EmailService`메소드 이름 변경 테스트코드에 반영

* feat : 이메일 task 삭제 로직 변경

* test : 테스트코드 변경 반영

Author: ekgns33

src/main/java/gdsc/konkuk/platformcore/application/email/EmailService.java

@@ -26,8 +26,11 @@ public class EmailService {
     public List<EmailTask> getAllTaskAsList() {
         return emailTaskRepository.findAll();
     }
+    public List<EmailTask> getTasksInIds(List<Long> emailIds) {
+        return emailTaskRepository.findAllById(emailIds);
+    }
 
-    public EmailTask getTaskDetails(Long taskId) {
+    public EmailTask findById(Long taskId) {
         return findEmailTaskById(emailTaskRepository, taskId);
     }
 
@@ -68,9 +71,8 @@ public void delete(Long emailId) {
     }
 
     @Transactional
-    public void deleteAll(List<Long> emailIds) {
-        List<EmailTask> tasks = emailTaskRepository.findAllById(emailIds);
-        emailTaskRepository.deleteAllInBatch(tasks);
+    public void deleteAll(List<EmailTask> emailTasks) {
+        emailTaskRepository.deleteAllInBatch(emailTasks);
     }
 
     private void validateEmailTaskAlreadySent(EmailTask emailTask) {

src/main/java/gdsc/konkuk/platformcore/application/email/EmailTaskFacade.java

@@ -10,6 +10,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import static org.hibernate.internal.util.collections.ArrayHelper.forEach;
+
 @Service
 @RequiredArgsConstructor
 @Transactional
@@ -32,13 +34,26 @@ public void update(Long emailId, EmailSendRequest request) {
     }
 
     public void cancel(Long emailId) {
-        emailTaskScheduler.cancelTask(String.valueOf(emailId));
+        EmailTask savedTask = emailService.findById(emailId);
+        cancelIfTaskNotProcessed(savedTask);
         emailService.delete(emailId);
     }
 
     public void cancelAll(List<Long> emailIds) {
-        emailIds.forEach(emailId -> emailTaskScheduler.cancelTask(String.valueOf(emailId)));
-        emailService.deleteAll(emailIds);
+        List<EmailTask> taskList = emailService.getTasksInIds(emailIds);
+        cancelUnProcessedTasks(taskList);
+        emailService.deleteAll(taskList);
+    }
+
+    private void cancelIfTaskNotProcessed(EmailTask emailTask) {
+        if(emailTask.isSent()) return;
+        emailTaskScheduler.cancelTask(String.valueOf(emailTask.getId()));
+    }
+
+    private void cancelUnProcessedTasks(List<EmailTask> taskList) {
+        for(EmailTask task : taskList) {
+            cancelIfTaskNotProcessed(task);
+        }
     }
 
     private long getWaitingPeriod(EmailTask emailTask) {

src/main/java/gdsc/konkuk/platformcore/application/email/EmailTaskScheduler.java

@@ -44,7 +44,7 @@ public void scheduleSyncTask(Object emailTask, long delay) {
                 () -> {
                     transactionTemplate.execute(status -> {
                         try {
-                            EmailTask sendingTask = emailService.getTaskDetails(id);
+                            EmailTask sendingTask = emailService.findById(id);
                             emailClient.sendEmailToReceivers(sendingTask);
                             emailService.markAsCompleted(id);
                         } catch (Exception e) {

src/main/java/gdsc/konkuk/platformcore/controller/email/EmailController.java

@@ -41,7 +41,7 @@ public ResponseEntity<SuccessResponse> getAllEmailTask() {
     @GetMapping("/{taskId}")
     public ResponseEntity<SuccessResponse> getEmailTask(@PathVariable Long taskId) {
         EmailTaskDetailResponse emailTask = EmailTaskMapper.mapToEmailTaskDetailsResponse(
-                emailService.getTaskDetails(taskId));
+                emailService.findById(taskId));
         return ResponseEntity.ok(SuccessResponse.of(emailTask));
     }
 

src/test/java/gdsc/konkuk/platformcore/application/email/EmailIntegrationTest.java

@@ -161,27 +161,6 @@ void should_cancel_task() {
                 () -> taskInMemoryRepository.getTask(emailTask.getId().toString()));
     }
 
-    @Test
-    @DisplayName("이미 처리된 작업 취소 시도 시 예외 발생")
-    void should_fail_when_cancel_already_processed_task() throws Exception {
-        //given
-        EmailSendRequest emailRequest = EmailSendRequestFixture.builder()
-                .sendAt(LocalDateTime.now().plusSeconds(1)).build()
-                .getFixture();
-
-        //when
-        EmailTask scheduledTask = emailTaskFacade.register(emailRequest);
-        sleep(2_000);
-
-        //then
-        try {
-            emailTaskFacade.cancel(scheduledTask.getId());
-            fail("`TaskNotFoundException` or `EmailAlreadyProcessedException` should be thrown");
-        } catch (TaskNotFoundException | EmailAlreadyProcessedException e) {
-            // pass
-        }
-    }
-
     @Test
     void should_send_discord_message_when_email_sending_error() throws InterruptedException {
         //given

src/test/java/gdsc/konkuk/platformcore/application/email/EmailServiceTest.java

@@ -60,14 +60,14 @@ void should_success_when_getAllTaskAsList() {
 
     @Test
     @DisplayName("getTaskDetails : 특정 이메일 전송 작업 조회 성공")
-    void should_success_when_getTaskDetails() {
+    void should_success_when_findById() {
         // given
         EmailTask emailTaskToFind = EmailTaskFixture.builder().build().getFixture();
         given(emailTaskRepository.findById(emailTaskToFind.getId()))
                 .willReturn(java.util.Optional.of(emailTaskToFind));
 
         // when
-        EmailTask actual = subject.getTaskDetails(emailTaskToFind.getId());
+        EmailTask actual = subject.findById(emailTaskToFind.getId());
 
         // then
         assertEquals(emailTaskToFind.getId(), actual.getId());

src/test/java/gdsc/konkuk/platformcore/application/email/EmailTaskFacadeTest.java

@@ -1,8 +1,10 @@
 package gdsc.konkuk.platformcore.application.email;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.willDoNothing;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.openMocks;
 
 import gdsc.konkuk.platformcore.controller.email.dtos.EmailSendRequest;
@@ -70,6 +72,7 @@ void should_success_when_cancel_task() {
         EmailTask emailTaskToCancel = EmailTaskFixture.builder().build().getFixture();
         willDoNothing().given(emailTaskScheduler).cancelTask(emailTaskToCancel.getId().toString());
         willDoNothing().given(emailService).delete(emailTaskToCancel.getId());
+        when(emailService.findById(any())).thenReturn(emailTaskToCancel);
 
         //when
         subject.cancel(emailTaskToCancel.getId());

src/test/java/gdsc/konkuk/platformcore/controller/email/EmailControllerTest.java

@@ -222,7 +222,7 @@ void should_success_when_get_specific_task() throws Exception {
         String jwt = jwtTokenProvider.createToken(member);
         EmailTask emailTaskToSee = EmailTaskFixture.builder()
                 .id(1L).build().getFixture();
-        given(emailService.getTaskDetails(emailTaskToSee.getId()))
+        given(emailService.findById(emailTaskToSee.getId()))
                 .willReturn(emailTaskToSee);
 
         //when