Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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();
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/org/terning/message/domain/Message.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) {
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/org/terning/message/domain/enums/ViewType.java
Original file line number Diff line number Diff line change
@@ -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;
};
}
}