From 01f65cadb950ce0ffcbb7e9a19d77b63703a92e0 Mon Sep 17 00:00:00 2001 From: hyeonjeongs Date: Wed, 28 Feb 2024 10:39:11 +0900 Subject: [PATCH] =?UTF-8?q?YEL-214=20[feat]=20=EC=B6=94=EC=B2=9C=EC=9D=B8?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EA=B0=80=EC=9E=85=EC=8B=9C=20=EC=97=B4?= =?UTF-8?q?=EB=9E=8C=EA=B6=8C=20=EC=A7=80=EA=B8=89=20=ED=91=B8=EC=8B=9C?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/authorization/service/AuthService.java | 1 + .../firebase/dto/request/NotificationMessage.java | 2 +- .../firebase/service/NotificationFcmService.java | 12 ++++++++++++ .../firebase/service/NotificationService.java | 2 ++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yello/server/domain/authorization/service/AuthService.java b/src/main/java/com/yello/server/domain/authorization/service/AuthService.java index 40140383..709ec931 100644 --- a/src/main/java/com/yello/server/domain/authorization/service/AuthService.java +++ b/src/main/java/com/yello/server/domain/authorization/service/AuthService.java @@ -127,6 +127,7 @@ public void recommendUser(String recommendYelloId, String userYelloId) { ZonedDateTime.now(GlobalZoneId).format(ISO_OFFSET_DATE_TIME), recommendedUser )); + notificationService.sendRecommendSignupNotification(recommendedUser); } notificationService.sendRecommendNotification(user, recommendedUser); diff --git a/src/main/java/com/yello/server/infrastructure/firebase/dto/request/NotificationMessage.java b/src/main/java/com/yello/server/infrastructure/firebase/dto/request/NotificationMessage.java index 7eca37a3..44f0ccdc 100644 --- a/src/main/java/com/yello/server/infrastructure/firebase/dto/request/NotificationMessage.java +++ b/src/main/java/com/yello/server/infrastructure/firebase/dto/request/NotificationMessage.java @@ -64,7 +64,7 @@ public static NotificationMessage toUserAndFriendRecommendSignupNotificationCont return NotificationMessage.builder() .title(MessageFormat.format("{0}님이 나를 추천인으로 가입해 열람권이 지급됐어요!", user.getName())) .message("지금이다! 날 짝사랑 하는 사람 보러가기") - .type(NotificationType.OPEN_VOTE) + .type(NotificationType.RECOMMEND) .build(); } diff --git a/src/main/java/com/yello/server/infrastructure/firebase/service/NotificationFcmService.java b/src/main/java/com/yello/server/infrastructure/firebase/service/NotificationFcmService.java index 9295d2de..f6939020 100644 --- a/src/main/java/com/yello/server/infrastructure/firebase/service/NotificationFcmService.java +++ b/src/main/java/com/yello/server/infrastructure/firebase/service/NotificationFcmService.java @@ -145,4 +145,16 @@ public void sendOpenVoteNotification(User user) { fcmManager.send(message); } } + + @Override + public void sendRecommendSignupNotification(User recommendUser) { + NotificationMessage notificationMessage = + NotificationMessage.toUserAndFriendRecommendSignupNotificationContent(recommendUser); + + if (recommendUser.getDeviceToken() != null && !Objects.equals(recommendUser.getDeviceToken(), "")) { + final Message message = + fcmManager.createMessage(recommendUser.getDeviceToken(), notificationMessage); + fcmManager.send(message); + } + } } diff --git a/src/main/java/com/yello/server/infrastructure/firebase/service/NotificationService.java b/src/main/java/com/yello/server/infrastructure/firebase/service/NotificationService.java index 040c2889..83a5bd07 100644 --- a/src/main/java/com/yello/server/infrastructure/firebase/service/NotificationService.java +++ b/src/main/java/com/yello/server/infrastructure/firebase/service/NotificationService.java @@ -24,4 +24,6 @@ public interface NotificationService { void sendLunchEventNotification(User userList); void sendOpenVoteNotification(User user); + + void sendRecommendSignupNotification(User user); }