#333 feat: 종목 지정가 알림 로직 변경

- 알림 발송 -> 알림 저장이 아닌 알림 저장 -> 알림 발송으로 변경
- 알림 발송에 실패해도 알림 저장이 되도록 변경

src/main/java/codesquad/fineants/domain/notification/service/NotificationService.java

@@ -3,11 +3,13 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -195,7 +197,7 @@ public TargetPriceNotifyMessageResponse notifyTargetPriceBy(List<String> tickerS
 			.map(StockTargetPrice::getTargetPriceNotifications)
 			.flatMap(Collection::stream)
 			.collect(Collectors.toList());
-		Function<TargetPriceNotifyMessageItem, TargetPriceNotifyMessageItem> sentFunction = item -> {
+		Function<TargetPriceNotificationResponse, TargetPriceNotificationResponse> sentFunction = item -> {
 			sentManager.addTargetPriceSendHistory(item.getTargetPriceNotificationId());
 			return item;
 		};
@@ -215,7 +217,7 @@ public TargetPriceNotifyMessageResponse notifyTargetPriceBy(Long memberId) {
 			.flatMap(Collection::stream)
 			.collect(Collectors.toList());
 
-		Function<TargetPriceNotifyMessageItem, TargetPriceNotifyMessageItem> sentFunction = item -> {
+		Function<TargetPriceNotificationResponse, TargetPriceNotificationResponse> sentFunction = item -> {
 			sentManager.addTargetPriceSendHistory(item.getTargetPriceNotificationId());
 			return item;
 		};
@@ -229,7 +231,7 @@ public TargetPriceNotifyMessageResponse notifyTargetPriceBy(Long memberId) {
 	private TargetPriceNotifyMessageResponse notifyTargetPrice(
 		List<TargetPriceNotification> targetPrices,
 		NotificationPolicy<TargetPriceNotification> policy,
-		Function<TargetPriceNotifyMessageItem, TargetPriceNotifyMessageItem> sentFunction) {
+		Function<TargetPriceNotificationResponse, TargetPriceNotificationResponse> sentFunction) {
 		log.debug("종목 지정가 알림 발송 서비스 시작, targetPrices={}", targetPrices);
 
 		// 지정가 알림별 FCM 토큰 리스트맵 생성
@@ -249,30 +251,39 @@ private TargetPriceNotifyMessageResponse notifyTargetPrice(
 		}
 		log.debug("notifyMessage : {}", notifyMessages);
 
+		// 알림 저장
+		List<TargetPriceNotificationResponse> notificationSaveResponse = notifyMessages.stream()
+			.distinct()
+			// 알림 저장
+			.map(message -> this.saveNotification(StockNotificationRequest.from(message)))
+			// 발송 이력 저장
+			.map(sentFunction)
+			.sorted(Comparator.comparing(TargetPriceNotificationResponse::getReferenceId))
+			.collect(Collectors.toList());
+		log.debug("종목 지정가 알림 발송 서비스 결과, notificationSaveResponse={}", notificationSaveResponse);
+
 		// 알림 전송
+		Map<String, String> messageIdMap = new HashMap<>();
 		List<SentNotifyMessage> sentNotifyMessages = new ArrayList<>();
 		for (NotifyMessage notifyMessage : notifyMessages) {
 			firebaseMessagingService.send(notifyMessage.toMessage())
 				.ifPresentOrElse(
-					messageId -> sentNotifyMessages.add(SentNotifyMessage.create(notifyMessage, messageId)),
+					messageId -> {
+						messageIdMap.put(notifyMessage.getReferenceId(), messageId);
+						sentNotifyMessages.add(SentNotifyMessage.create(notifyMessage, messageId));
+					},
 					() -> fcmService.deleteToken(notifyMessage.getToken()));
 		}
+		log.info("종목 지정가 FCM 알림 발송 결과, sentNotifyMessage={}", sentNotifyMessages);
 
-		// 알림 저장
-		List<TargetPriceNotifyMessageItem> items = sentNotifyMessages.stream()
-			.distinct()
-			// 알림 저장
-			.map(message -> {
-				TargetPriceNotificationResponse response = this.saveNotification(
-					StockNotificationRequest.from(message.getNotifyMessage()));
-				String messageId = message.getMessageId();
+		// 응답 리스폰스 생성
+		List<TargetPriceNotifyMessageItem> items = notificationSaveResponse.stream()
+			.map(response -> {
+				String messageId = messageIdMap.getOrDefault(response.getReferenceId(), Strings.EMPTY);
 				return TargetPriceNotifyMessageItem.from(response, messageId);
 			})
-			// 발송 이력 저장
-			.map(sentFunction)
-			.sorted(Comparator.comparing(TargetPriceNotifyMessageItem::getReferenceId))
 			.collect(Collectors.toList());
-		log.debug("종목 지정가 알림 발송 서비스 결과, items={}", items);
+
 		return TargetPriceNotifyMessageResponse.from(items);
 	}
 

src/main/java/codesquad/fineants/domain/stock_target_price/domain/dto/response/TargetPriceNotifyMessageItem.java

@@ -1,8 +1,8 @@
 package codesquad.fineants.domain.stock_target_price.domain.dto.response;
 
 import codesquad.fineants.domain.common.money.Money;
-import codesquad.fineants.domain.notification.domain.entity.type.NotificationType;
 import codesquad.fineants.domain.notification.domain.dto.response.TargetPriceNotificationResponse;
+import codesquad.fineants.domain.notification.domain.entity.type.NotificationType;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/resources/application-test.yml

@@ -2,6 +2,7 @@ spring:
   datasource:
     hikari:
       leak-detection-threshold: 2000
+      connection-timeout: 30000
   jpa:
     database: mysql
     database-platform: org.hibernate.dialect.MySQL8Dialect

src/test/java/codesquad/fineants/domain/notification/service/NotificationServiceTest.java

@@ -29,6 +29,7 @@
 import codesquad.fineants.domain.fcm_token.domain.entity.FcmToken;
 import codesquad.fineants.domain.fcm_token.repository.FcmRepository;
 import codesquad.fineants.domain.fcm_token.service.FirebaseMessagingService;
+import codesquad.fineants.domain.kis.aop.AccessTokenAspect;
 import codesquad.fineants.domain.kis.client.KisCurrentPrice;
 import codesquad.fineants.domain.kis.repository.CurrentPriceRepository;
 import codesquad.fineants.domain.kis.service.KisService;
@@ -111,6 +112,9 @@ class NotificationServiceTest extends AbstractContainerBaseTest {
 	@MockBean
 	private FirebaseMessagingService firebaseMessagingService;
 
+	@MockBean
+	private AccessTokenAspect accessTokenAspect;
+
 	@AfterEach
 	void tearDown() {
 		notificationRepository.deleteAllInBatch();
@@ -564,9 +568,9 @@ void notifyTargetPrice_whenExistNotification_thenNotSentNotification() {
 			.hasSize(2);
 	}
 
-	@DisplayName("종목 지정가 도달 알림을 보내는데 실패하면 알림을 저장하지 않아야 한다")
+	@DisplayName("종목 지정가 도달 알림을 보내는데 실패해도 알림은 저장되어야 한다")
 	@Test
-	void notifyTargetPrice_whenFailSendingNotification_thenNotSaveNotification() {
+	void notifyTargetPrice_whenFailSendingNotification_thenSaveNotification() {
 		// given
 		Member member = memberRepository.save(createMember());
 		notificationPreferenceRepository.save(NotificationPreference.builder()
@@ -591,13 +595,12 @@ void notifyTargetPrice_whenFailSendingNotification_thenNotSaveNotification() {
 			List.of(stock.getTickerSymbol()));
 
 		// then
-		NotificationType type = NotificationType.STOCK_TARGET_PRICE;
 		assertThat(response.getNotifications())
 			.asList()
-			.isEmpty();
+			.hasSize(1);
 		assertThat(notificationRepository.findAllByMemberId(member.getId()))
 			.asList()
-			.hasSize(0);
+			.hasSize(1);
 	}
 
 	@DisplayName("티커 심볼을 기준으로 종목 지정가 알림을 발송한다")

src/test/java/codesquad/fineants/domain/portfolio_holding/service/PortfolioHoldingServiceTest.java

@@ -24,6 +24,7 @@
 import codesquad.fineants.domain.common.money.Money;
 import codesquad.fineants.domain.common.money.Percentage;
 import codesquad.fineants.domain.common.money.RateDivision;
+import codesquad.fineants.domain.kis.aop.AccessTokenAspect;
 import codesquad.fineants.domain.kis.client.KisCurrentPrice;
 import codesquad.fineants.domain.kis.repository.ClosingPriceRepository;
 import codesquad.fineants.domain.kis.repository.CurrentPriceRepository;
@@ -92,6 +93,10 @@ class PortfolioHoldingServiceTest extends AbstractContainerBaseTest {
 	@MockBean
 	private PortfolioHoldingEventPublisher publisher;
 
+	// CurrentPriceRepository AccessToken 모킹
+	@MockBean
+	private AccessTokenAspect accessTokenAspect;
+
 	@AfterEach
 	void tearDown() {
 		purchaseHistoryRepository.deleteAllInBatch();