From 89a5056d3724573250aff0c4a346e494dfc951ce Mon Sep 17 00:00:00 2001 From: Willy Date: Sat, 26 Apr 2025 14:39:38 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[=E2=99=BB=EF=B8=8F=20refactor]=20Message?= =?UTF-8?q?=20Entity=EC=97=90=20imageUrl=20=EC=A0=80=EC=9E=A5=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/domain/enums/MessageTemplateType.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/org/terning/message/domain/enums/MessageTemplateType.java b/src/main/java/org/terning/message/domain/enums/MessageTemplateType.java index 00ea67c..e1516f3 100644 --- a/src/main/java/org/terning/message/domain/enums/MessageTemplateType.java +++ b/src/main/java/org/terning/message/domain/enums/MessageTemplateType.java @@ -42,6 +42,17 @@ public static MessageTemplateType from(String template) { .orElseThrow(() -> new NotificationException(NotificationErrorCode.INVALID_TEMPLATE_TYPE)); } + public String getImageUrl() { + return switch (this) { + case INTERESTED_ANNOUNCEMENT_REMINDER -> + "https://your-cdn.com/images/interested_announcement.png"; + case RECENTLY_POSTED_INTERNSHIP_RECOMMENDATION -> + "https://your-cdn.com/images/recently_posted_internship.png"; + case TRENDING_INTERNSHIP_ALERT -> + "https://your-cdn.com/images/trending_internship.png"; + }; + } + public String main(Map params) { return mainMessage.format(params); } From cec5eebadd9a491be68a0757552c931357c694a0 Mon Sep 17 00:00:00 2001 From: Willy Date: Sat, 26 Apr 2025 14:39:54 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[=E2=99=BB=EF=B8=8F=20refactor]=20Message?= =?UTF-8?q?=20Entity=EC=97=90=20imageUrl=20=EC=A0=80=EC=9E=A5=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/terning/message/domain/Message.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/terning/message/domain/Message.java b/src/main/java/org/terning/message/domain/Message.java index 39db0c3..e32be05 100644 --- a/src/main/java/org/terning/message/domain/Message.java +++ b/src/main/java/org/terning/message/domain/Message.java @@ -26,15 +26,20 @@ public class Message extends BaseEntity { private String viewType; - private Message(MessageTemplateType messageTemplateType, String main, String sub, String viewType) { + private String imageUrl; + + private Message(MessageTemplateType messageTemplateType, String main, String sub, + String viewType, String imageUrl) { this.messageTemplateType = messageTemplateType; this.main = main; this.sub = sub; this.viewType = viewType; + this.imageUrl = imageUrl; } - public static Message of(MessageTemplateType messageTemplateType, String main, String sub) { - return new Message(messageTemplateType, main, sub, ViewType.fromTemplate(messageTemplateType).name()); + public static Message of(MessageTemplateType messageTemplateType, String main, String sub, String imageUrl) { + return new Message(messageTemplateType, main, sub, + ViewType.fromTemplate(messageTemplateType).name(), imageUrl); } public boolean isSameType(MessageTemplateType other) { From c7f7d44f474137b9c48f9d393f258595c7704e6d Mon Sep 17 00:00:00 2001 From: Willy Date: Sat, 26 Apr 2025 14:40:06 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[=E2=99=BB=EF=B8=8F=20refactor]=20createNot?= =?UTF-8?q?ification=20=EC=8B=9C=20=ED=83=80=EC=9E=85=EB=B3=84=20imageUrl?= =?UTF-8?q?=20=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/writer/NotificationWriterImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/terning/notification/application/writer/NotificationWriterImpl.java b/src/main/java/org/terning/notification/application/writer/NotificationWriterImpl.java index 6897995..e3bb3d8 100644 --- a/src/main/java/org/terning/notification/application/writer/NotificationWriterImpl.java +++ b/src/main/java/org/terning/notification/application/writer/NotificationWriterImpl.java @@ -69,7 +69,8 @@ private Message createMessage(MessageTemplateType template, Map return Message.of( template, template.main(context), - template.sub(context) + template.sub(context), + template.getImageUrl() ); } From a827005ced49d861d0adef939d9042157e3c6ea6 Mon Sep 17 00:00:00 2001 From: Willy Date: Sat, 26 Apr 2025 14:40:17 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[=E2=99=BB=EF=B8=8F=20refactor]=20sendAllPu?= =?UTF-8?q?shNotifications=20=EC=8B=9C=20image=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=ED=8F=AC=ED=95=A8=20=EC=A0=84=EC=86=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/terning/fcm/application/FcmPushSenderImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/terning/fcm/application/FcmPushSenderImpl.java b/src/main/java/org/terning/fcm/application/FcmPushSenderImpl.java index 79539af..4fc78fd 100644 --- a/src/main/java/org/terning/fcm/application/FcmPushSenderImpl.java +++ b/src/main/java/org/terning/fcm/application/FcmPushSenderImpl.java @@ -21,14 +21,12 @@ public boolean send(Notification notification) { User user = notification.getUser(); String token = user.getToken().value(); - ViewType viewType = ViewType.fromTemplate(notification.getMessage().getMessageTemplateType()); - Message fcmMessage = Message.builder() .setToken(token) - .putData("token", token) .putData("type", notification.getMessage().getViewType()) .putData("title", notification.getMessage().getMain()) .putData("body", notification.getMessage().getSub()) + .putData("imageUrl", notification.getMessage().getImageUrl()) .build(); String response = FirebaseMessaging.getInstance().send(fcmMessage);