Merge pull request #179 from Team-Capple/feat/#178/notificationContent

feat: #178 원격 알림 양식 변경
Team-Capple · Sep 24, 2024 · 5b8940c · 5b8940c
2 parents edf5e35 + 48a934c
commit 5b8940c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/main/java/com/server/capple/config/apns/dto/ApnsClientRequest.java b/src/main/java/com/server/capple/config/apns/dto/ApnsClientRequest.java
@@ -102,8 +102,7 @@ public BoardCommentNotificationBody(NotificationType type, Board board, BoardCom
             this.aps = Aps.builder().threadId("board-" + board.getId())
                 .alert(Aps.Alert.builder()
                     .title(type.getTitle())
-                    .subtitle(boardComment.getContent())
-                    .body(board.getContent())
+                    .body(boardComment.getContent())
                     .build())
                 .build();
             this.boardId = board.getId().toString();

diff --git a/src/main/java/com/server/capple/domain/notifiaction/entity/NotificationType.java b/src/main/java/com/server/capple/domain/notifiaction/entity/NotificationType.java
@@ -6,10 +6,10 @@
 @Getter
 @RequiredArgsConstructor
 public enum NotificationType {
-    BOARD_HEART("누군가 내 게시글을 좋아했어요"),
+    BOARD_HEART("누군가 내 게시글에 좋아요를 눌렀어요"),
     BOARD_COMMENT("누군가 내 게시글에 댓글을 달았어요"),
-    BOARD_COMMENT_DUPLICATE("누군가 같은 게시글에 댓글을 달았어요"),
-    BOARD_COMMENT_HEART("누군가 내 댓글을 좋아했어요"),
+    BOARD_COMMENT_DUPLICATE("누군가 댓글을 달았어요"),
+    BOARD_COMMENT_HEART("누군가 내 댓글에 좋아요를 눌렀어요"),
     TODAY_QUESTION_PUBLISHED("오늘의 질문 준비 완료!"),
     TODAY_QUESTION_CLOSED("오늘의 질문 답변 마감!"),
     ;

diff --git a/src/main/java/com/server/capple/domain/notifiaction/mapper/NotificationMapper.java b/src/main/java/com/server/capple/domain/notifiaction/mapper/NotificationMapper.java
@@ -39,8 +39,7 @@ public NotificationLog toNotificationLog(Board board) {
 
     public NotificationLog toNotificationLog(Board board, BoardComment boardComment) {
         return NotificationLog.builder()
-            .subtitle(boardComment.getContent())
-            .body(board.getContent())
+            .body(boardComment.getContent())
             .boardId(board.getId())
             .boardCommentId(boardComment.getId())
             .build();
@@ -78,7 +77,6 @@ private NotificationInfo toBoardNotificationInfo(Notification notification) {
     private NotificationInfo toBoardCommentNotificationInfo(Notification notification) {
         return NotificationInfo.builder()
             .title(notification.getType().getTitle())
-            .subtitle(notification.getNotificationLog().getSubtitle())
             .content(notification.getNotificationLog().getBody())
             .boardId(notification.getNotificationLog().getBoardId().toString())
             .boardCommentId(notification.getNotificationLog().getBoardCommentId().toString())