From 8d8be53cfa35ca794b3a70d8ebba0b3ffd3c9d66 Mon Sep 17 00:00:00 2001 From: Willy Date: Sat, 26 Apr 2025 01:38:00 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[=E2=99=BB=EF=B8=8F=20refactor]=20MessageTe?= =?UTF-8?q?mplateType=EB=B3=84=EB=A1=9C=20=EB=B7=B0=20=ED=83=80=EC=9E=85?= =?UTF-8?q?=20=EC=BD=94=EB=93=9C(calendar,=20home,=20search)=20=EB=A7=A4?= =?UTF-8?q?=ED=95=91=EC=9D=84=20=EC=9C=84=ED=95=9C=20Enum=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terning/message/domain/enums/ViewType.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/main/java/org/terning/message/domain/enums/ViewType.java diff --git a/src/main/java/org/terning/message/domain/enums/ViewType.java b/src/main/java/org/terning/message/domain/enums/ViewType.java new file mode 100644 index 0000000..96682ea --- /dev/null +++ b/src/main/java/org/terning/message/domain/enums/ViewType.java @@ -0,0 +1,15 @@ +package org.terning.message.domain.enums; + +public enum ViewType { + CALENDAR, + HOME, + SEARCH; + + public static ViewType fromTemplate(MessageTemplateType tmpl) { + return switch (tmpl) { + case INTERESTED_ANNOUNCEMENT_REMINDER -> CALENDAR; + case RECENTLY_POSTED_INTERNSHIP_RECOMMENDATION -> HOME; + case TRENDING_INTERNSHIP_ALERT -> SEARCH; + }; + } +} From 117190de406335911ec6b4d0835e21465819c983 Mon Sep 17 00:00:00 2001 From: Willy Date: Sat, 26 Apr 2025 01:38:54 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[=E2=99=BB=EF=B8=8F=20refactor]=20MessageTe?= =?UTF-8?q?mplateType=EB=B3=84=EB=A1=9C=20=EB=B7=B0=20=ED=83=80=EC=9E=85?= =?UTF-8?q?=20=EC=BD=94=EB=93=9C(calendar,=20home,=20search)=20=EB=A7=A4?= =?UTF-8?q?=ED=95=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/terning/message/domain/Message.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/terning/message/domain/Message.java b/src/main/java/org/terning/message/domain/Message.java index c58cfbb..39db0c3 100644 --- a/src/main/java/org/terning/message/domain/Message.java +++ b/src/main/java/org/terning/message/domain/Message.java @@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; import org.terning.global.entity.BaseEntity; import org.terning.message.domain.enums.MessageTemplateType; +import org.terning.message.domain.enums.ViewType; @Entity @Getter @@ -23,14 +24,17 @@ public class Message extends BaseEntity { private String sub; - private Message(MessageTemplateType messageTemplateType, String main, String sub) { + private String viewType; + + private Message(MessageTemplateType messageTemplateType, String main, String sub, String viewType) { this.messageTemplateType = messageTemplateType; this.main = main; this.sub = sub; + this.viewType = viewType; } public static Message of(MessageTemplateType messageTemplateType, String main, String sub) { - return new Message(messageTemplateType, main, sub); + return new Message(messageTemplateType, main, sub, ViewType.fromTemplate(messageTemplateType).name()); } public boolean isSameType(MessageTemplateType other) { From 65974d83b870e0b93b6265684cd3de2d0b4af955 Mon Sep 17 00:00:00 2001 From: Willy Date: Sat, 26 Apr 2025 01:39:12 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[=E2=99=BB=EF=B8=8F=20refactor]=20FcmPushSe?= =?UTF-8?q?nderImpl=EC=97=90=EC=84=9C=20FCM=20=EB=A9=94=EC=8B=9C=EC=A7=80?= =?UTF-8?q?=20=EB=B9=8C=EB=8D=94=EC=97=90=20token,=20type,=20title,=20body?= =?UTF-8?q?=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=ED=95=84=EB=93=9C=20=ED=8F=AC?= =?UTF-8?q?=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/terning/fcm/application/FcmPushSenderImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/terning/fcm/application/FcmPushSenderImpl.java b/src/main/java/org/terning/fcm/application/FcmPushSenderImpl.java index 068369a..79539af 100644 --- a/src/main/java/org/terning/fcm/application/FcmPushSenderImpl.java +++ b/src/main/java/org/terning/fcm/application/FcmPushSenderImpl.java @@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.terning.message.domain.enums.ViewType; import org.terning.notification.domain.Notification; import org.terning.user.domain.User; @@ -20,8 +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()) .build();