#106 [RESTRUCTURING] : 이벤트를 활용한 fcm push 알림 구현

src/main/java/com/wakeUpTogetUp/togetUp/api/notification/NotificationEventHandler.java

@@ -0,0 +1,21 @@
+package com.wakeUpTogetUp.togetUp.api.notification;
+
+import com.wakeUpTogetUp.togetUp.api.notification.vo.NotificationSendVo;
+import com.wakeUpTogetUp.togetUp.infra.fcm.FcmService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+
+@Component
+@RequiredArgsConstructor
+public class NotificationEventHandler {
+    private final FcmService fcmService;
+
+    @Async()
+    @EventListener(NotificationSendVo.class)
+    public void handleSendPushEvent(NotificationSendVo event) {
+        fcmService.sendMessageToTokens(event);
+    }
+}

src/main/java/com/wakeUpTogetUp/togetUp/api/notification/NotificationEventPublisher.java

@@ -0,0 +1,17 @@
+package com.wakeUpTogetUp.togetUp.api.notification;
+
+import com.wakeUpTogetUp.togetUp.api.notification.vo.NotificationSendVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class NotificationEventPublisher {
+    private final ApplicationEventPublisher eventPublisher;
+
+    public void publishNotificationSendEvent(NotificationSendVo notificationSendVo) {
+        eventPublisher.publishEvent(notificationSendVo);
+    }
+}
+

src/main/java/com/wakeUpTogetUp/togetUp/api/notification/PushLogService.java → src/main/java/com/wakeUpTogetUp/togetUp/api/notification/NotificationLogService.java

@@ -7,6 +7,6 @@
 @Service
 
 @RequiredArgsConstructor
-public class PushLogService {
+public class NotificationLogService {
 
 }

src/main/java/com/wakeUpTogetUp/togetUp/api/notification/NotificationService.java

@@ -11,10 +11,12 @@
 import com.wakeUpTogetUp.togetUp.api.users.model.User;
 import com.wakeUpTogetUp.togetUp.common.Status;
 import com.wakeUpTogetUp.togetUp.exception.BaseException;
-import com.wakeUpTogetUp.togetUp.infra.google.fcm.FcmService;
+import com.wakeUpTogetUp.togetUp.infra.fcm.FcmService;
+
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -26,16 +28,16 @@ public class NotificationService {
     private final RoomRepository roomRepository;
     private final UserRepository userRepository;
     private final FcmTokenRepository fcmTokenRepository;
+    private final NotificationEventPublisher notificationEventPublisher;
 
     public void sendNotificationToAllUsers(String title, String body) {
-        fcmService.sendMessageToTokens(
-                new NotificationSendVo(
-                        fcmTokenRepository.findAllByUser_IdIn(userService.getAgreedNotiUsersIds()),
-                        title,
-                        body,
-                        Map.of(DataKeyType.LINK.getKey(), DataValueType.HOME.toString())
-                )
-        );
+        notificationEventPublisher.publishNotificationSendEvent(new NotificationSendVo(
+                fcmTokenRepository.findAllByUser_IdIn(userService.getAgreedNotiUsersIds()),
+                title,
+                body,
+                Map.of(DataKeyType.LINK.getKey(), DataValueType.HOME.toString())
+        ));
+
     }
 
     public void sendNotificationToUsersInRoom(Integer alarmId, Integer missionCompleteUserId) {
@@ -51,13 +53,11 @@ public void sendNotificationToUsersInRoom(Integer alarmId, Integer missionComple
                 .collect(Collectors.toList());
 
         if (userIdsInRoom.size() > 0) {
-            fcmService.sendMessageToTokens(
-                    new RoomMissionLogNotificationVo(
-                            user,
-                            room,
-                            fcmTokenRepository.findAllByUser_IdIn(userIdsInRoom)
-                    )
-            );
+            notificationEventPublisher.publishNotificationSendEvent(new RoomMissionLogNotificationVo(
+                    user,
+                    room,
+                    fcmTokenRepository.findAllByUser_IdIn(userIdsInRoom)
+            ));
         }
     }
 

src/main/java/com/wakeUpTogetUp/togetUp/api/notification/entity/Notification.java

@@ -19,17 +19,9 @@
 public class Notification {
 
 
-    @Builder
-    public Notification(String title, String content, Room room, FcmToken fcmToken) {
-        this.title = title;
-        this.content = content;
-        this.room = room;
-        this.fcmToken = fcmToken;
-    }
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column( columnDefinition = "INT UNSIGNED")
+    @Column(columnDefinition = "INT UNSIGNED")
     private Integer id;
 
     private String title;
@@ -40,10 +32,10 @@ public Notification(String title, String content, Room room, FcmToken fcmToken)
     private String createdAt = TimeFormatter.timestampFormat(new Timestamp(System.currentTimeMillis()));
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "roomId",columnDefinition = "INT UNSIGNED")
+    @JoinColumn(name = "roomId", columnDefinition = "INT UNSIGNED")
     private Room room;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "fcmTokenId",columnDefinition = "INT UNSIGNED")
+    @JoinColumn(name = "fcmTokenId", columnDefinition = "INT UNSIGNED")
     private FcmToken fcmToken;
 }

src/main/java/com/wakeUpTogetUp/togetUp/api/users/UserEventHandler.java

@@ -0,0 +1,26 @@
+package com.wakeUpTogetUp.togetUp.api.users;
+
+
+import com.wakeUpTogetUp.togetUp.api.users.fcmToken.FcmTokenDeleteEvent;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Slf4j
+@Component
+@Transactional
+@RequiredArgsConstructor
+public class UserEventHandler {
+
+    private final UserService userService;
+
+    @EventListener(FcmTokenDeleteEvent.class)
+    public void handlePushTokenDeleteEvent(FcmTokenDeleteEvent event) {
+        userService.deleteFcmTokens(event.getFcmTokens());
+    }
+
+}
+

src/main/java/com/wakeUpTogetUp/togetUp/api/users/UserService.java

@@ -12,9 +12,11 @@
 import com.wakeUpTogetUp.togetUp.api.users.vo.UserProgressResult;
 import com.wakeUpTogetUp.togetUp.common.Status;
 import com.wakeUpTogetUp.togetUp.exception.BaseException;
+
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -68,6 +70,11 @@ private void saveFcmToken(User user, String fcmTokenValue) {
         fcmTokenRepository.save(fcmToken);
     }
 
+    @Transactional
+    public void deleteFcmTokens(List<String> fcmTokenValues) {
+        fcmTokenRepository.deleteByValueIn(fcmTokenValues);
+    }
+
     public void updateAgreePush(Integer userId, boolean agreePush) {
         User user = findExistingUser(userRepository, userId);
         user.changeAgreePush(agreePush);

src/main/java/com/wakeUpTogetUp/togetUp/api/users/fcmToken/FcmTokenDeleteEvent.java

@@ -0,0 +1,12 @@
+package com.wakeUpTogetUp.togetUp.api.users.fcmToken;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@RequiredArgsConstructor
+public class FcmTokenDeleteEvent {
+    private final List<String> fcmTokens;
+}

src/main/java/com/wakeUpTogetUp/togetUp/api/users/fcmToken/FcmTokenRepository.java

@@ -10,7 +10,8 @@
 public interface FcmTokenRepository extends JpaRepository<FcmToken, Integer> {
     List<FcmToken> findAllByUser_IdIn(List<Integer> userIds);
 
-    void deleteAllByValueIn(List<String> values);
+
+    void deleteByValueIn(List<String> fcmTokenValues);
 
     boolean existsByValue(String fcmTokenValue);
 }

src/main/java/com/wakeUpTogetUp/togetUp/api/users/model/User.java

@@ -80,6 +80,7 @@ public class User {
     @Column(name = "is_deleted")
     private boolean isDeleted;
 
+    @JsonIgnore
     @OneToMany(mappedBy = "user")
     private List<FcmToken> fcmToken = new ArrayList<>();
 

src/main/java/com/wakeUpTogetUp/togetUp/infra/google/fcm/FcmService.java → src/main/java/com/wakeUpTogetUp/togetUp/infra/fcm/FcmService.java

@@ -1,47 +1,65 @@
-package com.wakeUpTogetUp.togetUp.infra.google.fcm;
+package com.wakeUpTogetUp.togetUp.infra.fcm;
 
 import com.google.api.core.ApiFuture;
 import com.google.firebase.messaging.*;
 import com.wakeUpTogetUp.togetUp.api.notification.vo.NotificationSendVo;
 import com.wakeUpTogetUp.togetUp.api.users.fcmToken.FcmToken;
-import com.wakeUpTogetUp.togetUp.api.users.fcmToken.FcmTokenRepository;
+import com.wakeUpTogetUp.togetUp.api.users.fcmToken.FcmTokenDeleteEvent;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class FcmService {
     private final FirebaseMessaging firebaseMessaging;
-    private final FcmTokenRepository fcmTokenRepository;
+    private final ApplicationEventPublisher eventPublisher;
 
 
     public void sendMessageToTokens(NotificationSendVo notificationSendVo) {
-        // message 만들기
+
         MulticastMessage message = getPreconfiguredMessageToTokens(notificationSendVo);
         ApiFuture<BatchResponse> response = sendAndGetResponse(message);
-
         deleteInvalidToken(response, notificationSendVo.getFcmTokens().stream()
                 .map(FcmToken::getValue)
                 .collect(Collectors.toList()));
     }
 
+
     public void deleteInvalidToken(ApiFuture<BatchResponse> response, List<String> deviceTokens) {
 
         try {
             if (response.get().getFailureCount() > 0) {
                 List<String> failedDeviceTokens = new ArrayList<>();
                 List<SendResponse> responses = response.get().getResponses();
-
                 IntStream.range(0, responses.size())
                         .filter(idx -> !responses.get(idx).isSuccessful())
-                        .forEach(idx -> failedDeviceTokens.add(deviceTokens.get(idx)));
+                        .forEach(idx -> {
+
+                            String token = deviceTokens.get(idx);
+                            MessagingErrorCode errorCode = responses.get(idx).getException().getMessagingErrorCode();
+                            String errorMessage = responses.get(idx).getException().getMessage();
+
+                            if (errorCode == MessagingErrorCode.UNREGISTERED)
+                                failedDeviceTokens.add(deviceTokens.get(idx));
+
+                            log.warn("[PushException][{}]{} {}",
+                                    token,
+                                    errorCode,
+                                    errorMessage);
+
+
+                        });
 
-                fcmTokenRepository.deleteAllByValueIn(failedDeviceTokens);
+                eventPublisher.publishEvent(new FcmTokenDeleteEvent(failedDeviceTokens));
             }
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
@@ -51,12 +69,11 @@ public void deleteInvalidToken(ApiFuture<BatchResponse> response, List<String> d
     }
 
     private ApiFuture<BatchResponse> sendAndGetResponse(MulticastMessage message) {
-        ApiFuture<BatchResponse> response = FirebaseMessaging.getInstance().sendMulticastAsync(message);
+        ApiFuture<BatchResponse> response = firebaseMessaging.sendMulticastAsync(message);
         return response;
     }
 
 
-    // token 여러 개
     private MulticastMessage getPreconfiguredMessageToTokens(NotificationSendVo notificationSendVo) {
         return getPreconfiguredMulticastMessageBuilder(notificationSendVo).addAllTokens(notificationSendVo.getFcmTokens().stream()
                         .map(FcmToken::getValue)