From 6945ecf36422676dedb2192f66bfb54a836a8660 Mon Sep 17 00:00:00 2001 From: ybchar Date: Fri, 11 Oct 2024 20:49:55 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EC=95=8C=EB=A6=BC=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=ED=95=84=ED=84=B0=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discord/application/DiscordNotificationService.java | 3 ++- .../domain/fcm/application/FcmNotificationService.java | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/depromeet/stonebed/domain/discord/application/DiscordNotificationService.java b/src/main/java/com/depromeet/stonebed/domain/discord/application/DiscordNotificationService.java index 43f1452c..363d2d90 100644 --- a/src/main/java/com/depromeet/stonebed/domain/discord/application/DiscordNotificationService.java +++ b/src/main/java/com/depromeet/stonebed/domain/discord/application/DiscordNotificationService.java @@ -5,6 +5,7 @@ import com.depromeet.stonebed.infra.properties.DiscordProperties; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpHeaders; @@ -42,7 +43,7 @@ public void sendDiscordMessage(String message) { ErrorCode.DISCORD_NOTIFICATION_FAILED); } log.info("Discord 알림 전송 성공: {}", message); - return response.bodyTo(String.class); + return Objects.requireNonNull(response.bodyTo(String.class)); }); } catch (Exception e) { diff --git a/src/main/java/com/depromeet/stonebed/domain/fcm/application/FcmNotificationService.java b/src/main/java/com/depromeet/stonebed/domain/fcm/application/FcmNotificationService.java index 6ed35700..8471b0ae 100644 --- a/src/main/java/com/depromeet/stonebed/domain/fcm/application/FcmNotificationService.java +++ b/src/main/java/com/depromeet/stonebed/domain/fcm/application/FcmNotificationService.java @@ -90,14 +90,9 @@ private Pageable createPageable(int limit) { } private List convertToNotificationDto(List notifications) { - List targetIds = - notifications.stream() - .filter( - notification -> - notification.getType() == FcmNotificationType.BOOSTER) - .map(FcmNotification::getTargetId) - .toList(); + List targetIds = notifications.stream().map(FcmNotification::getTargetId).toList(); + System.out.println("targetIds: " + targetIds); Map missionRecordMap = missionRecordRepository.findByIdIn(targetIds).stream() .collect( From d8c0cb4c4d6965e70fe8e00b132a0b7269b24d34 Mon Sep 17 00:00:00 2001 From: ybchar Date: Fri, 11 Oct 2024 20:51:26 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EC=B6=9C=EB=A0=A5=EB=AC=B8=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stonebed/domain/fcm/application/FcmNotificationService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/depromeet/stonebed/domain/fcm/application/FcmNotificationService.java b/src/main/java/com/depromeet/stonebed/domain/fcm/application/FcmNotificationService.java index 8471b0ae..1741f0a4 100644 --- a/src/main/java/com/depromeet/stonebed/domain/fcm/application/FcmNotificationService.java +++ b/src/main/java/com/depromeet/stonebed/domain/fcm/application/FcmNotificationService.java @@ -92,7 +92,6 @@ private Pageable createPageable(int limit) { private List convertToNotificationDto(List notifications) { List targetIds = notifications.stream().map(FcmNotification::getTargetId).toList(); - System.out.println("targetIds: " + targetIds); Map missionRecordMap = missionRecordRepository.findByIdIn(targetIds).stream() .collect(