Merge pull request #191 from Re-4aliens/fix/#189_fcm

Fix/#189 fcm전송 방식 변경

src/main/java/com/aliens/backend/board/service/CommentService.java

@@ -15,62 +15,80 @@
 import com.aliens.backend.global.exception.RestApiException;
 import com.aliens.backend.global.response.error.BoardError;
 import com.aliens.backend.global.response.error.MemberError;
+import com.aliens.backend.notification.controller.dto.NotificationRequest;
+import com.aliens.backend.notification.service.FcmSender;
+import com.aliens.backend.notification.service.NotificationService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 public class CommentService {
     private final CommentRepository commentRepository;
     private final MemberRepository memberRepository;
     private final BoardRepository boardRepository;
     private final CommentCustomRepository commentCustomRepository;
-    private final CommentEventPublisher eventPublisher;
+    private final FcmSender fcmSender;
+    private final NotificationService notificationService;
 
 
     public CommentService(final CommentRepository commentRepository,
                           final MemberRepository memberRepository,
                           final BoardRepository boardRepository,
                           final CommentCustomRepository commentCustomRepository,
-                          final CommentEventPublisher eventPublisher) {
+                          final FcmSender fcmSender, NotificationService notificationService) {
         this.commentRepository = commentRepository;
         this.memberRepository = memberRepository;
         this.boardRepository = boardRepository;
         this.commentCustomRepository = commentCustomRepository;
-        this.eventPublisher = eventPublisher;
+        this.fcmSender = fcmSender;
+        this.notificationService = notificationService;
     }
 
     @Transactional
     public void postParentComment(final ParentCommentCreateRequest request,
                                   final LoginMember loginMember) {
-        Member member = getMember(loginMember);
+        Member member = getMember(loginMember.memberId());
         Board board = findBoard(request.boardId());
 
         Comment comment = Comment.parentOf(request.content(), board, member);
         board.addComment(comment);
 
         commentRepository.save(comment);
+        sendNotification(comment, board);
+    }
 
-        if(!comment.isWriter(board.getWriterId())) {
-            eventPublisher.sendParentCommentNotification(board, request);
-        }
+    private void sendNotification(Comment comment, Board board) {
+        if(comment.isWriter(board.getWriterId())) return;
+
+        Member writer = getMember(board.getWriterId());
+
+        NotificationRequest request = makeNotificationRequest(board, comment, List.of(writer));
+        notificationService.saveNotification(request);
+
+        fcmSender.sendBoardNotification(comment, writer);
+    }
+
+    private NotificationRequest makeNotificationRequest(Board board, Comment comment, List<Member> members) {
+        return new NotificationRequest(board.getCategory(),board.getId(),comment.getContent(), members);
     }
 
     private Board findBoard(final Long boardId) {
         return boardRepository.findById(boardId).orElseThrow(() -> new RestApiException(BoardError.INVALID_BOARD_ID));
     }
 
-    private Member getMember(final LoginMember loginMember) {
-        return memberRepository.findById(loginMember.memberId()).orElseThrow(() -> new RestApiException(MemberError.NULL_MEMBER));
+    private Member getMember(final Long memberId) {
+        return memberRepository.findById(memberId).orElseThrow(() -> new RestApiException(MemberError.NULL_MEMBER));
     }
 
     @Transactional
     public void postChildComment(final ChildCommentCreateRequest request,
                                  final LoginMember loginMember) {
-        Member member = getMember(loginMember);
+        Member member = getMember(loginMember.memberId());
         Board board = findBoard(request.boardId());
         Comment parentComment = findComment(request);
 
@@ -79,9 +97,21 @@ public void postChildComment(final ChildCommentCreateRequest request,
 
         commentRepository.save(childComment);
 
-        if(!parentComment.isWriter(member.getId())) {
-            eventPublisher.sendChildCommentNotification(board, request, parentComment.getWriterId());
-        }
+        sendNotification(childComment, board, parentComment);
+    }
+
+    private void sendNotification(Comment child, Board board, Comment parent) {
+        if(child.isWriter(board.getWriterId())) return;
+        if(Objects.equals(parent.getWriterId(), child.getWriterId())) return;
+
+        Member boardWriter = getMember(board.getWriterId());
+        Member parentWriter = getMember(parent.getWriterId());
+        List<Member> writers = List.of(boardWriter, parentWriter);
+
+        NotificationRequest request = makeNotificationRequest(board, child, writers);
+        notificationService.saveNotification(request);
+
+        fcmSender.sendBoardNotification(child, writers);
     }
 
     private Comment findComment(ChildCommentCreateRequest request) {

src/main/java/com/aliens/backend/board/service/GreatService.java

@@ -17,7 +17,6 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Optional;
 
 @Service
 public class GreatService {

src/main/java/com/aliens/backend/member/controller/dto/response/MemberResponse.java

@@ -1,7 +1,7 @@
 package com.aliens.backend.member.controller.dto.response;
 
 public enum MemberResponse {
-
+    ALREADY_SIGN_UP("이미 회원 가입되어 있습니다."),
     SIGN_UP_SUCCESS("회원가입이 완료되었습니다."),
     WITHDRAW_SUCCESS("회원 탈퇴되었습니다."),
     TEMPORARY_PASSWORD_GENERATED_SUCCESS("임시 비밀번호가 발급되었습니다. 이메일을 확인해주세요."),

src/main/java/com/aliens/backend/member/sevice/MemberInfoService.java

@@ -62,7 +62,8 @@ public MemberInfoService(final AwsS3Uploader uploader,
 
     @Transactional
     public String signUp(final SignUpRequest request, final MultipartFile profileImage) {
-        checkEmail(request.email());
+        String result = checkEmail(request.email());
+        if(result.equals(MemberResponse.ALREADY_SIGN_UP.getMessage())) return MemberResponse.SIGN_UP_SUCCESS.getMessage();
 
         MemberImage memberImage = saveImageToS3(profileImage);
 
@@ -77,14 +78,20 @@ public String signUp(final SignUpRequest request, final MultipartFile profileIma
         return MemberResponse.SIGN_UP_SUCCESS.getMessage();
     }
 
-    private void checkEmail(final String email) {
+    private String checkEmail(final String email) {
         Optional<EmailAuthentication> emailEntity = emailAuthenticationRepository.findByEmail(email);
         if (emailEntity.isEmpty()) {
             throw new RestApiException(EmailError.NULL_EMAIL);
         }
         if (!emailEntity.get().isAuthenticated()) {
             throw new RestApiException(EmailError.NOT_AUTHENTICATED_EMAIL);
         }
+
+        if(memberRepository.findByEmail(email).isPresent()) {
+            return MemberResponse.ALREADY_SIGN_UP.getMessage();
+        }
+
+        return MemberResponse.SIGN_UP_SUCCESS.getMessage();
     }
 
     private MemberImage saveImageToS3(final MultipartFile profileImage) {

src/main/java/com/aliens/backend/notification/controller/dto/NotificationRequest.java

@@ -1,11 +1,12 @@
 package com.aliens.backend.notification.controller.dto;
 
+import com.aliens.backend.auth.domain.Member;
 import com.aliens.backend.board.domain.enums.BoardCategory;
 
 import java.util.List;
 
 public record NotificationRequest(BoardCategory boardCategory,
                                   Long boardId,
                                   String content,
-                                  List<Long> memberIds) {
+                                  List<Member> members) {
 }

src/main/java/com/aliens/backend/notification/service/FcmSender.java

@@ -2,19 +2,17 @@
 
 import com.aliens.backend.auth.domain.Member;
 import com.aliens.backend.auth.domain.repository.MemberRepository;
+import com.aliens.backend.board.domain.Comment;
 import com.aliens.backend.global.response.error.CommonError;
 import com.aliens.backend.global.exception.RestApiException;
 import com.aliens.backend.global.response.error.MemberError;
-import com.aliens.backend.notification.controller.dto.NotificationRequest;
 import com.aliens.backend.notification.domain.repository.FcmTokenRepository;
 import com.google.firebase.messaging.*;
 import com.aliens.backend.global.response.log.InfoLogResponse;
 import com.aliens.backend.global.response.success.NotificationSuccess;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.Message;
-import com.google.firebase.messaging.MulticastMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -24,8 +22,9 @@
 
 @Component
 public class FcmSender {
-    private final static String MATCHING_SUCCESS_MESSAGE_TITLE = "매칭이 완료되었습니다!";
-    private final static String MATCHING_SUCCESS_MESSAGE_BODY = "파트너를 확인해보세요!";
+    private final static String COMMENT_BODY = "새로운 댓글이 달렸어요 : ";
+    private final static String FRIENDSHIP_TITLE = "Friendship";
+    private final static String MATCHING_SUCCESS_MESSAGE_BODY = "Friendship 매칭이 완료되었습니다. 파트너를 확인해보세요!";
     private final MemberRepository memberRepository;
     private final FcmTokenRepository fcmTokenRepository;
     private final ObjectMapper objectMapper;
@@ -40,38 +39,33 @@ public FcmSender(MemberRepository memberRepository,
         this.objectMapper = objectMapper;
     }
 
-    public void sendBoardNotification(NotificationRequest request, List<String> tokens) {
-        MulticastMessage message = makeMessage(request, tokens);
-        sendMultiFcm(message);
-    }
-
-    private MulticastMessage makeMessage(NotificationRequest request,
-                                         List<String> tokens) {
-        var notification = com.google.firebase.messaging.Notification.builder()
-                .setTitle(String.valueOf(request.boardCategory()))
-                .setBody(request.content()).
-                build();
+    public void sendBoardNotification(Comment comment, Member writer) {
+        Notification notification = Notification.builder()
+                .setTitle(FRIENDSHIP_TITLE)
+                .setBody(COMMENT_BODY + comment.getContent())
+                .build();
 
-        return MulticastMessage.builder()
+        String token = findFcmTokenByMember(writer);
+        Message message = Message.builder()
+                .setToken(token)
                 .setNotification(notification)
-                .addAllTokens(tokens)
                 .build();
-
+        sendSingleFcm(message);
     }
 
-    private void sendMultiFcm(MulticastMessage message) {
-        try {
-            FirebaseMessaging.getInstance().sendMulticastAsync(message);
-            InfoLogResponse response = InfoLogResponse.from(NotificationSuccess.SEND_MULTI_NOTIFICATION_SUCCESS);
-            log.info(objectMapper.writeValueAsString(response));
-        } catch (Exception e) {
-            InfoLogResponse response = InfoLogResponse.from(CommonError.FCM_MESSAGING_ERROR);
-            try {
-                log.error(objectMapper.writeValueAsString(response));
-            } catch (JsonProcessingException ex) {
-                throw new RuntimeException(ex);
-            }
-            throw new RestApiException(CommonError.FCM_MESSAGING_ERROR);
+    public void sendBoardNotification(Comment comment, List<Member> writers) {
+        Notification notification = Notification.builder()
+                .setTitle(FRIENDSHIP_TITLE)
+                .setBody(COMMENT_BODY + comment.getContent())
+                .build();
+
+        for(Member writer : writers) {
+            String token = findFcmTokenByMember(writer);
+            Message message = Message.builder()
+                    .setToken(token)
+                    .setNotification(notification)
+                    .build();
+            sendSingleFcm(message);
         }
     }
 
@@ -114,7 +108,7 @@ private void sendSingleFcm(Message message) {
     public void sendMatchedNotification(Set<Member> members) {
         List<String> tokens = members.stream().map(this::findFcmTokenByMember).toList();
         Notification notification = Notification.builder()
-                .setTitle(MATCHING_SUCCESS_MESSAGE_TITLE)
+                .setTitle(FRIENDSHIP_TITLE)
                 .setBody(MATCHING_SUCCESS_MESSAGE_BODY)
                 .build();
 

src/main/java/com/aliens/backend/notification/service/NotificationService.java

@@ -42,18 +42,23 @@ public NotificationService(final NotificationRepository notificationRepository,
     @Transactional
     public void registerFcmToken(final LoginMember loginMember, final String fcmToken) {
         Member member = getMember(loginMember.memberId());
+        String parsedFcmToken = parseFcmToken(fcmToken);
         Optional<FcmToken> optionalFcmToken = fcmTokenRepository.findByMember(member);
 
         if (optionalFcmToken.isPresent()) {
             FcmToken fcmTokenEntity = optionalFcmToken.get();
-            fcmTokenEntity.changeToken(fcmToken);
+            fcmTokenEntity.changeToken(parsedFcmToken);
             return;
         }
 
-        FcmToken fcmTokenEntity = FcmToken.of(member, fcmToken);
+        FcmToken fcmTokenEntity = FcmToken.of(member, parsedFcmToken);
         fcmTokenRepository.save(fcmTokenEntity);
     }
 
+    private String parseFcmToken(final String fcmToken) {
+        return fcmToken.substring(13, fcmToken.length()-2);
+    }
+
     @Transactional(readOnly = true)
     public List<NotificationResponse> getNotifications(final LoginMember loginMember) {
         List<Notification> notifications = notificationRepository.findNotificationsByMemberId(loginMember.memberId());
@@ -79,24 +84,12 @@ private Member getMember(final Long memberId) {
         return memberRepository.findById(memberId).orElseThrow(() -> new RestApiException(MemberError.NULL_MEMBER));
     }
 
-    @EventListener
+    @Transactional
     public void saveNotification(NotificationRequest request) {
-        List<String> tokens = new ArrayList<>();
-
-        for(Long memberId : request.memberIds()) {
-            Member member = getMember(memberId);
+        for(Member member : request.members()) {
             Notification notification = Notification.of(request, member);
-
             notificationRepository.save(notification);
-
-            FcmToken fcmToken = getFcmTokenByMember(member);
-
-            if(fcmToken.isAccepted()) {
-                tokens.add(fcmToken.getToken());
-            }
         }
-
-        fcmSender.sendBoardNotification(request,tokens);
     }
 
     private FcmToken getFcmTokenByMember(final Member member) {