Merge branch 'feature/alarm-update' into develop

KOA-TF · Jan 28, 2024 · 6ff303d · 6ff303d
2 parents 3390b63 + c4e1ad2
commit 6ff303d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/core-module/src/main/java/com/koa/coremodule/fcm/application/service/AlarmUseCase.java b/core-module/src/main/java/com/koa/coremodule/fcm/application/service/AlarmUseCase.java
@@ -142,10 +142,11 @@ public void sendReCommentNotification(SendCommentNotificationRequest request) {
         List<Member> members = new ArrayList<>();
 
         Comment comment = commentQueryService.getCommentById(request.commentId());
-        Member noticeMember = findNoticeMember(comment.getWriter().getId());
+        Member noticeMember = findNoticeMember(comment.getNotice().getId());
 
         Comment parentComment = commentQueryService.getCommentById(comment.getParentId());
-        Member commentMember = findCommentMember(parentComment.getWriter().getId());
+        Member commentMember = parentComment.getWriter();
+
         members.add(noticeMember);
         members.add(commentMember);
 
@@ -263,8 +264,8 @@ private List<Member> findAllMember() {
         return alarmQueryService.findAllMember();
     }
 
-    private Member findNoticeMember(Long memberId) {
-        return alarmQueryService.findMember(memberId);
+    private Member findNoticeMember(Long noticeId) {
+        return alarmQueryService.findNoticeMember(noticeId);
     }
 
     private Member findCommentMember(Long memberId) {