refactor: 비동기 처리용 Executor 분리, Firebase ThreadPool 커스텀, 알림 재전송 실패 로직 …

…추가, 콜백 메소드를 활용한 Non-Blocking 처리 (#501) * chore: 테스트 메서드 주석 해제 * fix: 이벤트 발행 인자 객체 수정 * feat: Listener를 이용해 블락킹 요소 제거 * feat: 알림 실패 시 재시도 로직 추가 * feat: firebase SDK 내부에서 사용하는 스레드 풀 설정 * feat: 스레드 풀 분리에 따른 빈 이름 명시 * style: 컨벤션에 맞도록 코드 수정 * chore: CustomThreadManager 패키지 분리 * chore: 테스트 API 비공개 처리 * docs: fcm docs java doc 추가 --------- Co-authored-by: DongUk <[email protected]>
woowacourse-teams · May 27, 2024 · 3ad217b · 3ad217b
1 parent 04f7066
commit 3ad217b
Show file tree

Hide file tree

Showing 44 changed files with 267 additions and 168 deletions.
diff --git a/backend/pium/src/main/java/com/official/pium/admin/service/AdminService.java b/backend/pium/src/main/java/com/official/pium/admin/service/AdminService.java
@@ -1,7 +1,7 @@
 package com.official.pium.admin.service;
 
-import com.official.pium.admin.mapper.AdminMapper;
 import com.official.pium.admin.domain.Admin;
+import com.official.pium.admin.mapper.AdminMapper;
 import com.official.pium.admin.service.dto.AdminLoginRequest;
 import jakarta.servlet.http.HttpSession;
 import org.springframework.beans.factory.annotation.Value;

diff --git a/backend/pium/src/main/java/com/official/pium/admin/service/RegistrationService.java b/backend/pium/src/main/java/com/official/pium/admin/service/RegistrationService.java
@@ -1,14 +1,14 @@
 package com.official.pium.admin.service;
 
+import com.official.pium.admin.domain.Admin;
 import com.official.pium.admin.domain.Registration;
-import com.official.pium.admin.service.dto.RegistrationRequest;
-import com.official.pium.admin.service.dto.RegistrationResponse;
 import com.official.pium.admin.mapper.RegistrationMapper;
 import com.official.pium.admin.repository.RegistrationRepository;
-import com.official.pium.admin.domain.Admin;
+import com.official.pium.admin.service.dto.RegistrationRequest;
+import com.official.pium.admin.service.dto.RegistrationResponse;
+import com.official.pium.common.dto.DataResponse;
 import com.official.pium.common.exception.AuthorizationException;
 import com.official.pium.common.util.PhotoManager;
-import com.official.pium.common.dto.DataResponse;
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;

diff --git a/backend/pium/src/main/java/com/official/pium/admin/service/TestService.java b/backend/pium/src/main/java/com/official/pium/admin/service/TestService.java
@@ -1,6 +1,9 @@
 package com.official.pium.admin.service;
 
+import com.official.pium.petPlant.domain.PetPlant;
+import com.official.pium.petPlant.event.notification.NotificationEvent;
 import com.official.pium.petPlant.repository.PetPlantRepository;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEventPublisher;
@@ -16,63 +19,49 @@ public class TestService {
     private final PetPlantRepository petPlantRepository;
     private final ApplicationEventPublisher publisher;
 
-//    public void sendWaterNotificationTest() {
-//        List<PetPlant> petPlants = petPlantRepository.findAllByMemberId(7L);
-//        List<NotificationEvent> events = petPlants.stream()
-//                .map(plant -> NotificationEvent.builder()
-//                        .title(plant.getNickname())
-//                        .body("(테스트 중) 물을 줄 시간이에요!")
-//                        .deviceToken(plant.getMember().getDeviceToken())
-//                        .build()
-//                ).toList();
-//        log.info("동기 알림 테스트 시작. Thread: " + Thread.currentThread().getId() + " " + Thread.currentThread().getName());
-//        publisher.publishEvent(NotificationEvents.from(events));
-//        log.info("동기 알림 테스트 종료. Thread: " + Thread.currentThread().getId() + " " + Thread.currentThread().getName());
-//    }
+    public void sendWaterNotificationAsyncRampTest() {
+        List<PetPlant> petPlants = petPlantRepository.findAllByMemberId(7L);
+        List<NotificationEvent> events = petPlants.stream()
+                .map(plant -> NotificationEvent.builder()
+                        .title(plant.getNickname())
+                        .body("(테스트 중) 물을 줄 시간이에요!")
+                        .deviceToken(plant.getMember().getDeviceToken())
+                        .build()
+                ).toList();
 
-//    public void sendWaterNotificationAsyncRampTest() {
-//        List<PetPlant> petPlants = petPlantRepository.findAllByMemberId(7L);
-//        List<NotificationEvent> events = petPlants.stream()
-//                .map(plant -> NotificationEvent.builder()
-//                        .title(plant.getNickname())
-//                        .body("(테스트 중) 물을 줄 시간이에요!")
-//                        .deviceToken(plant.getMember().getDeviceToken())
-//                        .build()
-//                ).toList();
+        for (int i = 0; i < 100; i++) {
+            PetPlant petPlant = petPlants.get(i);
+            NotificationEvent event = NotificationEvent.builder()
+                    .title(petPlant.getNickname())
+                    .body("물줘")
+                    .deviceToken(petPlant.getMember().getDeviceToken())
+                    .build();
+            publisher.publishEvent(event);
+        }
 
-//        for (int i = 0; i < 100; i++) {
-//            PetPlant petPlant = petPlants.get(i);
-//            NotificationEvent event = NotificationEvent.builder()
-//                    .title(petPlant.getNickname())
-//                    .body("물줘")
-//                    .deviceToken(petPlant.getMember().getDeviceToken())
-//                    .build();
-//            publisher.publishEvent(event);
-//        }
+        log.info("비동기 테스트 램프업 시작");
+        for (int i = 0; i < 100; i++) {
+            NotificationEvent notificationEvent = events.get(i);
+            publisher.publishEvent(notificationEvent);
+        }
+    }
 
-//        log.info("비동기 테스트 램프업 시작");
-//        for (int i = 0; i < 100; i++) {
-//            NotificationEvent notificationEvent = events.get(i);
-//            publisher.publishEvent(notificationEvent);
-//        }
-//    }
+    public void sendWaterNotificationAsyncTest() {
+        List<PetPlant> petPlants = petPlantRepository.findAllByMemberId(7L);
+        List<NotificationEvent> events = petPlants.stream()
+                .map(plant -> NotificationEvent.builder()
+                        .title(plant.getNickname())
+                        .body("(테스트 중) 물을 줄 시간이에요!")
+                        .deviceToken(plant.getMember().getDeviceToken())
+                        .build()
+                ).toList();
 
-//    public void sendWaterNotificationAsyncTest() {
-//        List<PetPlant> petPlants = petPlantRepository.findAllByMemberId(7L);
-//        List<NotificationEvent> events = petPlants.stream()
-//                .map(plant -> NotificationEvent.builder()
-//                        .title(plant.getNickname())
-//                        .body("(테스트 중) 물을 줄 시간이에요!")
-//                        .deviceToken(plant.getMember().getDeviceToken())
-//                        .build()
-//                ).toList();
-//
-//        int i = 1;
-//        log.info("비동기 알림 테스트 시작. Thread: " + Thread.currentThread().getId() + " " + Thread.currentThread().getName());
-//        for (NotificationEvent event : events) {
-//            log.info(i++ + "번째 알림 이벤트");
-//            publisher.publishEvent(event);
-//        }
-//        log.info("비동기 알림 테스트 종료. Thread: " + Thread.currentThread().getId() + " " + Thread.currentThread().getName());
-//    }
+        int i = 1;
+        log.info("비동기 알림 테스트 시작. Thread: " + Thread.currentThread().getId() + " " + Thread.currentThread().getName());
+        for (NotificationEvent event : events) {
+            log.info(i++ + "번째 알림 이벤트");
+            publisher.publishEvent(event);
+        }
+        log.info("비동기 알림 테스트 종료. Thread: " + Thread.currentThread().getId() + " " + Thread.currentThread().getName());
+    }
 }
diff --git a/backend/pium/src/main/java/com/official/pium/admin/ui/RegistrationController.java b/backend/pium/src/main/java/com/official/pium/admin/ui/RegistrationController.java
@@ -1,11 +1,11 @@
 package com.official.pium.admin.ui;
 
+import com.official.pium.admin.domain.Admin;
+import com.official.pium.admin.service.RegistrationService;
 import com.official.pium.admin.service.dto.RegistrationRequest;
 import com.official.pium.admin.service.dto.RegistrationResponse;
-import com.official.pium.admin.service.RegistrationService;
-import com.official.pium.admin.domain.Admin;
-import com.official.pium.member.ui.Auth;
 import com.official.pium.common.dto.DataResponse;
+import com.official.pium.member.ui.Auth;
 import jakarta.validation.constraints.Positive;
 import java.net.URI;
 import java.util.List;

diff --git a/backend/pium/src/main/java/com/official/pium/common/ui/MemberArgumentResolver.java b/backend/pium/src/main/java/com/official/pium/common/ui/MemberArgumentResolver.java
@@ -1,9 +1,9 @@
 package com.official.pium.common.ui;
 
-import com.official.pium.member.ui.Auth;
-import com.official.pium.member.domain.Member;
 import com.official.pium.common.exception.AuthenticationException;
+import com.official.pium.member.domain.Member;
 import com.official.pium.member.repository.MemberRepository;
+import com.official.pium.member.ui.Auth;
 import com.official.pium.sessionGroup.application.SessionGroupService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.MethodParameter;

diff --git a/backend/pium/src/main/java/com/official/pium/common/util/PhotoLocalManager.java b/backend/pium/src/main/java/com/official/pium/common/util/PhotoLocalManager.java
@@ -1,12 +1,11 @@
 package com.official.pium.common.util;
 
+import java.io.File;
+import java.io.IOException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.io.IOException;
-
 @Component
 public class PhotoLocalManager implements PhotoManager {
 

diff --git a/backend/pium/src/main/java/com/official/pium/config/AsyncConfig.java b/backend/pium/src/main/java/com/official/pium/config/AsyncConfig.java
@@ -1,21 +1,30 @@
 package com.official.pium.config;
 
-import java.util.concurrent.Executor;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 @Configuration
 @EnableAsync
-public class AsyncConfig implements AsyncConfigurer {
+public class AsyncConfig {
 
-    @Override
-    public Executor getAsyncExecutor() {
+    @Bean("notificationAsyncExecutor")
+    public TaskExecutor getAsyncExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.setCorePoolSize(40);
         executor.setThreadNamePrefix("2024-Pium-Thread: ");
         executor.initialize();
         return executor;
     }
+
+    @Bean("notificationCallBackExecutor")
+    public TaskExecutor getCallBackExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(10);
+        executor.setThreadNamePrefix("2024-Pium-Call-Back-Thread: ");
+        executor.initialize();
+        return executor;
+    }
 }
diff --git a/...m/src/main/java/com/official/pium/dictionaryPlant/application/DictionaryPlantService.java b/...m/src/main/java/com/official/pium/dictionaryPlant/application/DictionaryPlantService.java
@@ -1,13 +1,13 @@
 package com.official.pium.dictionaryPlant.application;
 
-import com.official.pium.dictionaryPlant.domain.DictionaryPlant;
-import com.official.pium.dictionaryPlant.repository.DictionaryPlantRepository;
-import com.official.pium.petPlant.repository.PetPlantRepository;
 import com.official.pium.common.dto.DataResponse;
 import com.official.pium.dictionaryPlant.application.dto.DictionaryPlantCreateRequest;
 import com.official.pium.dictionaryPlant.application.dto.DictionaryPlantResponse;
 import com.official.pium.dictionaryPlant.application.dto.DictionaryPlantSearchResponse;
 import com.official.pium.dictionaryPlant.application.dto.DictionaryPlantUpdateRequest;
+import com.official.pium.dictionaryPlant.domain.DictionaryPlant;
+import com.official.pium.dictionaryPlant.repository.DictionaryPlantRepository;
+import com.official.pium.petPlant.repository.PetPlantRepository;
 import java.util.List;
 import java.util.NoSuchElementException;
 import lombok.RequiredArgsConstructor;

diff --git a/.../java/com/official/pium/dictionaryPlant/application/dto/DictionaryPlantCreateRequest.java b/.../java/com/official/pium/dictionaryPlant/application/dto/DictionaryPlantCreateRequest.java
@@ -1,11 +1,11 @@
 package com.official.pium.dictionaryPlant.application.dto;
 
 import com.official.pium.dictionaryPlant.domain.DictionaryPlant;
-import com.official.pium.petPlant.domain.vo.WaterCycle;
 import com.official.pium.dictionaryPlant.domain.vo.CareDetail;
 import com.official.pium.dictionaryPlant.domain.vo.Classification;
 import com.official.pium.dictionaryPlant.domain.vo.Property;
 import com.official.pium.petPlant.domain.vo.Temperature;
+import com.official.pium.petPlant.domain.vo.WaterCycle;
 import jakarta.validation.constraints.NotNull;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

diff --git a/.../java/com/official/pium/dictionaryPlant/application/dto/DictionaryPlantUpdateRequest.java b/.../java/com/official/pium/dictionaryPlant/application/dto/DictionaryPlantUpdateRequest.java
@@ -1,10 +1,10 @@
 package com.official.pium.dictionaryPlant.application.dto;
 
-import com.official.pium.petPlant.domain.vo.WaterCycle;
 import com.official.pium.dictionaryPlant.domain.vo.CareDetail;
 import com.official.pium.dictionaryPlant.domain.vo.Classification;
 import com.official.pium.dictionaryPlant.domain.vo.Property;
 import com.official.pium.petPlant.domain.vo.Temperature;
+import com.official.pium.petPlant.domain.vo.WaterCycle;
 import jakarta.validation.constraints.NotNull;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

diff --git a/...nd/pium/src/main/java/com/official/pium/dictionaryPlant/ui/DictionaryPlantController.java b/...nd/pium/src/main/java/com/official/pium/dictionaryPlant/ui/DictionaryPlantController.java
@@ -3,8 +3,8 @@
 
 import com.official.pium.admin.domain.Admin;
 import com.official.pium.admin.ui.AdminAuth;
-import com.official.pium.dictionaryPlant.application.DictionaryPlantService;
 import com.official.pium.common.dto.DataResponse;
+import com.official.pium.dictionaryPlant.application.DictionaryPlantService;
 import com.official.pium.dictionaryPlant.application.dto.DictionaryPlantCreateRequest;
 import com.official.pium.dictionaryPlant.application.dto.DictionaryPlantResponse;
 import com.official.pium.dictionaryPlant.application.dto.DictionaryPlantSearchResponse;

diff --git a/backend/pium/src/main/java/com/official/pium/garden/application/GardenService.java b/backend/pium/src/main/java/com/official/pium/garden/application/GardenService.java
@@ -1,13 +1,13 @@
 package com.official.pium.garden.application;
 
+import com.official.pium.garden.application.dto.GardenCreateRequest;
+import com.official.pium.garden.application.dto.GardenResponse;
 import com.official.pium.garden.domain.Garden;
-import com.official.pium.member.domain.Member;
-import com.official.pium.petPlant.domain.PetPlant;
 import com.official.pium.garden.domain.vo.GardenPlantState;
 import com.official.pium.garden.repository.GardenRepository;
+import com.official.pium.member.domain.Member;
+import com.official.pium.petPlant.domain.PetPlant;
 import com.official.pium.petPlant.repository.PetPlantRepository;
-import com.official.pium.garden.application.dto.GardenCreateRequest;
-import com.official.pium.garden.application.dto.GardenResponse;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.NoSuchElementException;

diff --git a/backend/pium/src/main/java/com/official/pium/garden/application/dto/GardenCreateRequest.java b/backend/pium/src/main/java/com/official/pium/garden/application/dto/GardenCreateRequest.java
@@ -1,8 +1,8 @@
 package com.official.pium.garden.application.dto;
 
 import com.official.pium.garden.domain.Garden;
-import com.official.pium.petPlant.domain.PetPlant;
 import com.official.pium.garden.domain.vo.GardenPlantState;
+import com.official.pium.petPlant.domain.PetPlant;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;

diff --git a/backend/pium/src/main/java/com/official/pium/garden/domain/Garden.java b/backend/pium/src/main/java/com/official/pium/garden/domain/Garden.java
@@ -2,8 +2,8 @@
 
 import com.official.pium.common.domain.BaseEntity;
 import com.official.pium.dictionaryPlant.domain.DictionaryPlant;
-import com.official.pium.member.domain.Member;
 import com.official.pium.garden.domain.vo.GardenPlantState;
+import com.official.pium.member.domain.Member;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;

diff --git a/backend/pium/src/main/java/com/official/pium/garden/ui/GardenController.java b/backend/pium/src/main/java/com/official/pium/garden/ui/GardenController.java
@@ -1,10 +1,10 @@
 package com.official.pium.garden.ui;
 
-import com.official.pium.member.ui.Auth;
-import com.official.pium.member.domain.Member;
 import com.official.pium.garden.application.GardenService;
 import com.official.pium.garden.application.dto.GardenCreateRequest;
 import com.official.pium.garden.application.dto.GardenResponse;
+import com.official.pium.member.domain.Member;
+import com.official.pium.member.ui.Auth;
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;

diff --git a/backend/pium/src/main/java/com/official/pium/history/application/HistoryEventListener.java b/backend/pium/src/main/java/com/official/pium/history/application/HistoryEventListener.java
@@ -1,15 +1,15 @@
 package com.official.pium.history.application;
 
-import com.official.pium.petPlant.event.history.HistoryEvent;
-import com.official.pium.petPlant.event.history.HistoryEvents;
-import com.official.pium.petPlant.event.history.LastWaterDateEvent;
 import com.official.pium.history.domain.History;
 import com.official.pium.history.domain.HistoryCategory;
-import com.official.pium.history.domain.vo.HistoryContent;
 import com.official.pium.history.domain.HistoryType;
-import com.official.pium.petPlant.domain.PetPlant;
+import com.official.pium.history.domain.vo.HistoryContent;
 import com.official.pium.history.repository.HistoryCategoryRepository;
 import com.official.pium.history.repository.HistoryRepository;
+import com.official.pium.petPlant.domain.PetPlant;
+import com.official.pium.petPlant.event.history.HistoryEvent;
+import com.official.pium.petPlant.event.history.HistoryEvents;
+import com.official.pium.petPlant.event.history.LastWaterDateEvent;
 import com.official.pium.petPlant.repository.PetPlantRepository;
 import java.util.List;
 import java.util.NoSuchElementException;

diff --git a/backend/pium/src/main/java/com/official/pium/history/application/HistoryService.java b/backend/pium/src/main/java/com/official/pium/history/application/HistoryService.java
@@ -1,12 +1,12 @@
 package com.official.pium.history.application;
 
+import com.official.pium.history.application.dto.HistoryResponse;
 import com.official.pium.history.domain.History;
 import com.official.pium.history.domain.HistoryType;
+import com.official.pium.history.repository.HistoryRepository;
 import com.official.pium.member.domain.Member;
 import com.official.pium.petPlant.domain.PetPlant;
-import com.official.pium.history.repository.HistoryRepository;
 import com.official.pium.petPlant.repository.PetPlantRepository;
-import com.official.pium.history.application.dto.HistoryResponse;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;

diff --git a/backend/pium/src/main/java/com/official/pium/history/domain/History.java b/backend/pium/src/main/java/com/official/pium/history/domain/History.java
@@ -1,8 +1,8 @@
 package com.official.pium.history.domain;
 
 import com.official.pium.common.domain.BaseEntity;
-import com.official.pium.petPlant.domain.PetPlant;
 import com.official.pium.history.domain.vo.HistoryContent;
+import com.official.pium.petPlant.domain.PetPlant;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;

diff --git a/backend/pium/src/main/java/com/official/pium/history/ui/HistoryController.java b/backend/pium/src/main/java/com/official/pium/history/ui/HistoryController.java
@@ -2,10 +2,10 @@
 
 import static org.springframework.data.domain.Sort.Direction.DESC;
 
-import com.official.pium.member.ui.Auth;
-import com.official.pium.member.domain.Member;
 import com.official.pium.history.application.HistoryService;
 import com.official.pium.history.application.dto.HistoryResponse;
+import com.official.pium.member.domain.Member;
+import com.official.pium.member.ui.Auth;
 import jakarta.validation.constraints.Positive;
 import java.util.List;
 import lombok.RequiredArgsConstructor;

diff --git a/backend/pium/src/main/java/com/official/pium/member/application/AuthService.java b/backend/pium/src/main/java/com/official/pium/member/application/AuthService.java
@@ -1,10 +1,10 @@
 package com.official.pium.member.application;
 
-import com.official.pium.member.domain.Member;
-import com.official.pium.member.repository.MemberRepository;
 import com.official.pium.member.application.dto.KaKaoAccessTokenResponse;
 import com.official.pium.member.application.dto.KakaoMemberResponse;
 import com.official.pium.member.application.dto.OAuthProvider;
+import com.official.pium.member.domain.Member;
+import com.official.pium.member.repository.MemberRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;