refactor: 알림 기능 로직 개선 및 알림 테스트 추가 #497
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| 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; | ||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| @Service | ||
| @Transactional(readOnly = true) | ||
| @RequiredArgsConstructor | ||
| @Slf4j | ||
| 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(6L); | ||
| // 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); | ||
| } | ||
|
|
||
| // 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(6L); | ||
| 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()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package com.official.pium.admin.ui; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
| @RestController | ||
| @RequiredArgsConstructor | ||
| @RequestMapping("/test") | ||
| public class TestController { | ||
|
|
||
| // private final TestService testService; | ||
|
|
||
| // @GetMapping("/notifications") | ||
| // public ResponseEntity<String> notificationTest() { | ||
| // testService.sendWaterNotificationTest(); | ||
| // return ResponseEntity.ok("알림 기능 테스트 성공"); | ||
| // } | ||
|
|
||
| // @GetMapping("/notifications/ramp") | ||
| // public ResponseEntity<String> notificationRampTest() { | ||
| // testService.sendWaterNotificationAsyncRampTest(); | ||
| // return ResponseEntity.ok("비동기 알림 기능 테스트 램프업 성공"); | ||
| // } | ||
| // | ||
| // @GetMapping("/notifications/async") | ||
| // public ResponseEntity<String> notificationAsyncTest() { | ||
| // testService.sendWaterNotificationAsyncTest(); | ||
| // return ResponseEntity.ok("비동기 알림 기능 테스트 성공"); | ||
| // } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package com.official.pium.config; | ||
|
|
||
| import java.util.concurrent.Executor; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.scheduling.annotation.AsyncConfigurer; | ||
| import org.springframework.scheduling.annotation.EnableAsync; | ||
| import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; | ||
|
|
||
| @Configuration | ||
| @EnableAsync | ||
| public class AsyncConfig implements AsyncConfigurer { | ||
|
|
||
| @Override | ||
| public Executor getAsyncExecutor() { | ||
| ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); | ||
| executor.setCorePoolSize(40); | ||
| executor.setThreadNamePrefix("2024-Pium-Thread: "); | ||
|
|
||
| executor.initialize(); | ||
| return executor; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A
오 비동기 설정을 별도로 분리했군요! 👍