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 @@ -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);
Expand Down
11 changes: 8 additions & 3 deletions src/main/java/org/terning/message/domain/Message.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, String> params) {
return mainMessage.format(params);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ private Message createMessage(MessageTemplateType template, Map<String, String>
return Message.of(
template,
template.main(context),
template.sub(context)
template.sub(context),
template.getImageUrl()
);
}

Expand Down