feat: #126 앱 내의 특정뷰로 이동을 위한 원격알림 데이터 추가

Team-Capple · Sep 12, 2024 · 9a48f05 · 9a48f05
1 parent d87a6c4
commit 9a48f05
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 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
@@ -11,9 +11,13 @@ public class ApnsClientRequest {
     @ToString
     public static class SimplePushBody {
         private Aps aps;
+        private String boardId;
+        private String boardCommentId;
         @Builder
-        public SimplePushBody(String title, String subTitle, String body, Integer badge, String sound, String threadId, String targetContentId) {
+        public SimplePushBody(String title, String subTitle, String body, Integer badge, String sound, String threadId, String targetContentId, String boardId, String boardCommentId) {
             this.aps = new Aps(new Aps.Alert(title, subTitle, body), badge, sound, threadId, targetContentId);
+            this.boardId = boardId;
+            this.boardCommentId = boardCommentId;
         }
 
         @ToString

diff --git a/src/main/java/com/server/capple/domain/notifiaction/service/NotificationServiceImpl.java b/src/main/java/com/server/capple/domain/notifiaction/service/NotificationServiceImpl.java
@@ -27,6 +27,7 @@ public void sendBoardHeartNotification(Long actorId, Board board) {
             .body(board.getContent())
             .threadId("board-" + board.getId())
             .sound("default")
+            .boardId(board.getId().toString())
             .build(), board.getWriter().getId());
         // TODO 알림 데이터베이스 저장
     }
@@ -46,6 +47,8 @@ public void sendBoardCommentNotification(Long actorId, Board board, BoardComment
                         .body(board.getContent())
                         .threadId("board-" + board.getId())
                         .sound("default")
+                        .boardId(board.getId().toString())
+                        .boardCommentId(boardComment.getId().toString())
                         .build(), subscriberId);
                 }
             })
@@ -57,6 +60,8 @@ public void sendBoardCommentNotification(Long actorId, Board board, BoardComment
             .body(board.getContent())
             .threadId("board-" + board.getId())
             .sound("default")
+            .boardId(board.getId().toString())
+            .boardCommentId(boardComment.getId().toString())
             .build();
         apnsService.sendApnsToMembers(simplePushBody, subscriberIds);
         // TODO 알림 데이터베이스 저장
@@ -70,6 +75,8 @@ public void sendBoardCommentHeartNotification(Long actorId, Board board, BoardCo
             .body(board.getContent())
             .threadId("board-" + board.getId())
             .sound("default")
+            .boardId(board.getId().toString())
+            .boardCommentId(boardComment.getId().toString())
             .build(), boardComment.getMember().getId());
         // TODO 알림 데이터베이스 저장
     }

diff --git a/src/test/java/com/server/capple/config/apns/service/ApnsServiceImplTest.java b/src/test/java/com/server/capple/config/apns/service/ApnsServiceImplTest.java
@@ -34,7 +34,7 @@ void sendApns() {
         String targetContentId = "targetContentId";
 
         //when
-        Boolean result = apnsService.sendApns(new SimplePushBody(title, subTitle, body, null, "default", threadId, targetContentId), List.of(simulatorDeviceToken));
+        Boolean result = apnsService.sendApns(SimplePushBody.builder().title(title).subTitle(subTitle).body(body).sound("default").threadId(threadId).targetContentId(targetContentId).build(), List.of(simulatorDeviceToken));
 
         //then
         assertTrue(result);
@@ -55,7 +55,7 @@ void sendApnsMessages() {
         for (int i = 0; i < 100; i++) deviceTokens.add(simulatorDeviceToken);
 
         //when
-        Boolean result = apnsService.sendApns(new SimplePushBody(title, subTitle, body, null, "default", threadId, targetContentId), deviceTokens);
+        Boolean result = apnsService.sendApns(SimplePushBody.builder().title(title).subTitle(subTitle).body(body).sound("default").threadId(threadId).targetContentId(targetContentId).build(), deviceTokens);
 
         //then
         assertTrue(result);