Skip to content

[FIX] 알림 목록 조회 API 수정 #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChaeAg merged 2 commits into from
Feb 11, 2025
Merged

[FIX] 알림 목록 조회 API 수정 #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47ebfc9
[FIX] 공지 알림 유형 확인 로직을 메서드로 변경
ChaeAg Feb 10, 2025
c2ffd95
[CHORE] FCM 멀티캐스트 푸시 전송 결과 로깅 추가
ChaeAg Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/main/java/org/websoso/WSSServer/dto/notification/NotificationInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package org.websoso.WSSServer.dto.notification;

import static org.websoso.WSSServer.domain.common.NotificationTypeGroup.NOTICE;

import java.time.Duration;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Set;
import org.websoso.WSSServer.domain.Notification;
import org.websoso.WSSServer.domain.common.NotificationTypeGroup;

public record NotificationInfo(
Long notificationId,
Expand All @@ -23,15 +25,15 @@ public record NotificationInfo(
private static final String DATE_PATTERN = "yyyy.MM.dd";

static public NotificationInfo of(Notification notification, Boolean isRead) {
Set<String> validNoticeTypes = Set.of("공지", "이벤트");
return new NotificationInfo(
notification.getNotificationId(),
notification.getNotificationType().getNotificationTypeImage(),
notification.getNotificationTitle(),
notification.getNotificationBody(),
formatCreatedDate(notification.getCreatedDate()),
isRead,
validNoticeTypes.contains(notification.getNotificationType().getNotificationTypeName()),
NotificationTypeGroup.isTypeInGroup(notification.getNotificationType().getNotificationTypeName(),
NOTICE),
notification.getFeedId()
);
}
Expand Down
14 changes: 13 additions & 1 deletion src/main/java/org/websoso/WSSServer/notification/FCMService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
import com.google.firebase.messaging.ApnsConfig;
import com.google.firebase.messaging.Aps;
import com.google.firebase.messaging.ApsAlert;
import com.google.firebase.messaging.BatchResponse;
import com.google.firebase.messaging.FirebaseMessaging;
import com.google.firebase.messaging.FirebaseMessagingException;
import com.google.firebase.messaging.Message;
import com.google.firebase.messaging.MulticastMessage;
import com.google.firebase.messaging.SendResponse;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -55,7 +57,17 @@ private Message createMessage(String targetFCMToken, FCMMessageRequest fcmMessag
public void sendMulticastPushMessage(List<String> targetFCMTokens, FCMMessageRequest fcmMessageRequest) {
MulticastMessage multicastMessage = createMulticastMessage(targetFCMTokens, fcmMessageRequest);
try {
firebaseMessaging.sendEachForMulticast(multicastMessage);
BatchResponse batchResponse = firebaseMessaging.sendEachForMulticast(multicastMessage);
// 푸시알림 전송 실패한 메시지 로그 기록
List<SendResponse> responses = batchResponse.getResponses();
for (int i = 0; i < responses.size(); i++) {
if (responses.get(i).isSuccessful()) {
log.info("[FCM 전송 성공] Token: {}", targetFCMTokens.get(i));
} else {
log.error("[FCM 전송 실패] Token: {} - Error: {}", targetFCMTokens.get(i),
responses.get(i).getException().getMessage());
}
}
} catch (Exception e) {
log.error("[FirebaseMessagingException] exception ", e);
// TODO: discord로 알림 추가 혹은 후속 작업 논의 후 추가
Expand Down
Loading