Merge pull request #302 from depromeet/refactor/#301-noti-list

fix: 알림 리스트 필터 제거
depromeet · Oct 11, 2024 · bb8f746 · bb8f746
2 parents ea0df35 + d8c0cb4
commit bb8f746
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/...in/java/com/depromeet/stonebed/domain/discord/application/DiscordNotificationService.java b/...in/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
@@ -90,13 +90,7 @@ private Pageable createPageable(int limit) {
     }
 
     private List<FcmNotificationDto> convertToNotificationDto(List<FcmNotification> notifications) {
-        List<Long> targetIds =
-                notifications.stream()
-                        .filter(
-                                notification ->
-                                        notification.getType() == FcmNotificationType.BOOSTER)
-                        .map(FcmNotification::getTargetId)
-                        .toList();
+        List<Long> targetIds = notifications.stream().map(FcmNotification::getTargetId).toList();
 
         Map<Long, MissionRecord> missionRecordMap =
                 missionRecordRepository.findByIdIn(targetIds).stream()