diff --git a/private-resources b/private-resources index 115309bb..c699bced 160000 --- a/private-resources +++ b/private-resources @@ -1 +1 @@ -Subproject commit 115309bb3f3fff30cd44406c63d526dd7f4fcfcf +Subproject commit c699bced19b89ae8db94a59397f3565376f33df4 diff --git a/src/main/java/peer/backend/controller/board/BoardController.java b/src/main/java/peer/backend/controller/board/BoardController.java index b6e6a6f1..7d4a8a98 100644 --- a/src/main/java/peer/backend/controller/board/BoardController.java +++ b/src/main/java/peer/backend/controller/board/BoardController.java @@ -87,7 +87,7 @@ public void createComment(@RequestBody @Valid PostCommentRequest request, Authen if (post.getUser().isActivated()) this.notificationCreationService.makeNotificationForUser( null, - user.getNickname() + " 님께서 댓글을 다셨습니다 : " + request.getContent(), + user.getNickname() + " 님께서 댓글을 다셨습니다: " + request.getContent(), "", NotificationPriority.IMMEDIATE, NotificationType.SYSTEM, diff --git a/src/main/java/peer/backend/entity/noti/Notification.java b/src/main/java/peer/backend/entity/noti/Notification.java index d252c9ee..d824f4ed 100644 --- a/src/main/java/peer/backend/entity/noti/Notification.java +++ b/src/main/java/peer/backend/entity/noti/Notification.java @@ -22,7 +22,7 @@ @DynamicUpdate @DynamicInsert @Table(name = "notification") -public class Notification extends BaseEntity { +public class Notification extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @@ -33,7 +33,7 @@ public class Notification extends BaseEntity { @Column private String title; - @Column + @Column(length = 1000) private String body; @Column diff --git a/src/main/java/peer/backend/service/PrivateInfoWrappingService.java b/src/main/java/peer/backend/service/PrivateInfoWrappingService.java index 43ae135a..d89f1a9a 100644 --- a/src/main/java/peer/backend/service/PrivateInfoWrappingService.java +++ b/src/main/java/peer/backend/service/PrivateInfoWrappingService.java @@ -238,8 +238,7 @@ public ResponseEntity processDataFromToken (User user, PrivateDataDTO data, H } User target = this.memberService.signUp(newUser); this.notificationCreationService.makeNotificationForUser(null, - "환영합니다! peer에서 스터디, 프로젝트를 찾아보세요." + - "메인 화면부터 상세히 알아볼까요?", + "환영합니다! peer에서 스터디, 프로젝트를 찾아보세요.", "", NotificationPriority.IMMEDIATE, NotificationType.SYSTEM, diff --git a/src/main/java/peer/backend/service/board/recruit/RecruitService.java b/src/main/java/peer/backend/service/board/recruit/RecruitService.java index b8eea7e5..4f8a2889 100644 --- a/src/main/java/peer/backend/service/board/recruit/RecruitService.java +++ b/src/main/java/peer/backend/service/board/recruit/RecruitService.java @@ -135,7 +135,7 @@ public void changeRecruitFavorite(Authentication auth, Long recruitId, if (rawTarget.get().getWriter().isActivated() && likeOrHate.get()) this.notificationCreationService.makeNotificationForUser( null, - user.getNickname() + "님께서 당신의 " + rawTarget.get().getTitle() + " 글에 좋아요를 눌렀습니다", + user.getNickname() + "님께서 당신의 \"" + rawTarget.get().getTitle() + "\" 에 좋아요를 눌렀습니다", "/recruit/" + recruitId, NotificationPriority.IMMEDIATE, NotificationType.SYSTEM, @@ -387,7 +387,7 @@ public Recruit createRecruit(RecruitCreateRequest request, Authentication auth) // 모집글 쓰기를 완료함에 대한 알림 this.notificationCreationService.makeNotificationForUser( null, - "성공적인 글쓰기를 마무리 지었습니다! 이제 팀을 설정해 볼까요? 여러분의 팀을 가꾸고 사람들에게 당신의 꿈과 목표를 소개해보세요!", + "이제 팀을 설정해 볼까요? 여러분의 팀을 가꾸고 사람들에게 당신의 꿈과 목표를 소개해보세요!", "/teams/" + team.getId(), NotificationPriority.IMMEDIATE, NotificationType.TEAM, @@ -465,7 +465,7 @@ public void applyRecruit(Long recruit_id, ApplyRecruitRequest request, Authentic this.notificationCreationService.makeNotificationForUser( null, "축하드립니다! " + team.getName() - + " 팀에 신청을 완료하였습니다. 답변이 올 때까지 기다려볼까요? 궁금한 것은 팀장에게 메시지를 날려보아도 좋습니다!", + + " 팀에 신청을 완료하였습니다. 궁금한 것은 팀장에게 메시지를 날려보아도 좋습니다!", teamList, NotificationPriority.IMMEDIATE, NotificationType.SYSTEM, diff --git a/src/main/java/peer/backend/service/message/MessageMainService.java b/src/main/java/peer/backend/service/message/MessageMainService.java index 7cbbd6f8..42c0b955 100644 --- a/src/main/java/peer/backend/service/message/MessageMainService.java +++ b/src/main/java/peer/backend/service/message/MessageMainService.java @@ -288,14 +288,14 @@ else if (index.getUserIdx2().equals(msgOwner.getId())) targetUser = index.getUser1(); } this.notificationCreationService.makeNotificationForUser( - "메시지가 도착했습니다", - letter.getSenderNickname() + " : " + letter.getText(), + "peer 쪽지", + letter.getSenderNickname() + ": " + letter.getText(), "/my-page/message", NotificationPriority.IMMEDIATE, NotificationType.MESSAGE, null, targetUser.getId(), - targetUser.getImageUrl() + msgOwner.getImageUrl() ); return ret; diff --git a/src/main/java/peer/backend/service/team/TeamService.java b/src/main/java/peer/backend/service/team/TeamService.java index 88179716..6d019c46 100644 --- a/src/main/java/peer/backend/service/team/TeamService.java +++ b/src/main/java/peer/backend/service/team/TeamService.java @@ -359,7 +359,7 @@ public void acceptTeamApplicant(Long teamId, TeamUserJobPK teamUserJobId, User u // 신청자에게 알리기 this.notificationCreationService.makeNotificationForUser( null, - "축하드립니다! 신청하신 팀에서 신청을 수락하였습니다. 팀페이지에서 자세한 내용을 확인해주세요.", + "신청하신 팀에서 신청을 수락하였습니다. 팀페이지에서 자세한 내용을 확인해주세요.", teamList, NotificationPriority.IMMEDIATE, NotificationType.SYSTEM, @@ -407,7 +407,7 @@ public void rejectTeamApplicant(Long teamId, TeamUserJobPK applicantId, User use // 신청자에게 알림 보냄 this.notificationCreationService.makeNotificationForUser( null, - "안타깝게도 " + teamUser.getTeam().getName() +" 팀에 대한 지원이 거절 당했습니다. 팀 페이지에서 자세한 내용을 확인해주세요.", + teamUser.getTeam().getName() +" 팀에 대한 지원이 거절 당했습니다.", teamList, NotificationPriority.IMMEDIATE, NotificationType.SYSTEM,