From a5388833cd9b081099f072e03ba959bf76f6697f Mon Sep 17 00:00:00 2001 From: minwoo0419 Date: Sun, 9 Jun 2024 15:58:51 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[feat]=20#111=20emotion=20=ED=8A=B9?= =?UTF-8?q?=EC=A0=95=20=EC=A0=90=EC=88=98=20=EB=B0=8F=EC=9D=B4=EB=A9=B4=20?= =?UTF-8?q?fcm=EC=95=8C=EB=A6=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/telepigeon/server/dto/type/FcmContent.java | 1 + .../telepigeon/server/service/answer/AnswerService.java | 9 +++++++++ .../server/service/profile/ProfileService.java | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/telepigeon/server/dto/type/FcmContent.java b/src/main/java/com/telepigeon/server/dto/type/FcmContent.java index fed1c68..080fa79 100644 --- a/src/main/java/com/telepigeon/server/dto/type/FcmContent.java +++ b/src/main/java/com/telepigeon/server/dto/type/FcmContent.java @@ -9,6 +9,7 @@ public enum FcmContent { QUESTION("질문이 도착했습니다.", "오늘의 질문을 확인하세요!", "ROOM_CLICK", "question"), ANSWER("답변이 도착했습니다.", "상대방의 답변을 확인하세요!", "ROOM_CLICK", "answer"), HURRY("재촉하기가 도착했습니다.", "상대방에게 답변을 보내보세요!", "ROOM_CLICK", "hurry"), + EMOTION("상대의 감정이 심상치 않습니다.", "상대방에게 주의를 기울여주세요!", "ROOM_CLICK", "emotion"), ; private final String title; diff --git a/src/main/java/com/telepigeon/server/service/answer/AnswerService.java b/src/main/java/com/telepigeon/server/service/answer/AnswerService.java index df6b277..935f0fb 100644 --- a/src/main/java/com/telepigeon/server/service/answer/AnswerService.java +++ b/src/main/java/com/telepigeon/server/service/answer/AnswerService.java @@ -82,6 +82,15 @@ public Answer create( ) ); Profile receiver = profileRetriever.findByUserNotAndRoom(user, room); + if (profile.getEmotion() < -0.5){ + fcmService.send( + receiver.getUser().getFcmToken(), + FcmMessageDto.of( + FcmContent.EMOTION, + roomId + ) + ); + } fcmService.send( receiver.getUser().getFcmToken(), FcmMessageDto.of( diff --git a/src/main/java/com/telepigeon/server/service/profile/ProfileService.java b/src/main/java/com/telepigeon/server/service/profile/ProfileService.java index 07c4bec..20b1328 100644 --- a/src/main/java/com/telepigeon/server/service/profile/ProfileService.java +++ b/src/main/java/com/telepigeon/server/service/profile/ProfileService.java @@ -26,7 +26,6 @@ public class ProfileService { private final UserRetriever userRetriever; private final ProfileRetriever profileRetriever; private final ProfileUpdater profileUpdater; - private final ProfileSaver profileSaver; @Transactional(readOnly = true) public ProfileKeywordsDto getProfileKeywords(final Long roomId, final Long userId) { From bae059a73be020cd03fe1f2cf95062f7a270ac5a Mon Sep 17 00:00:00 2001 From: minwoo0419 Date: Thu, 13 Jun 2024 00:23:34 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[feat]=20#111=20=EA=B0=90=EC=A0=95=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/telepigeon/server/dto/type/FcmContent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/telepigeon/server/dto/type/FcmContent.java b/src/main/java/com/telepigeon/server/dto/type/FcmContent.java index 080fa79..dd8e3c0 100644 --- a/src/main/java/com/telepigeon/server/dto/type/FcmContent.java +++ b/src/main/java/com/telepigeon/server/dto/type/FcmContent.java @@ -9,7 +9,7 @@ public enum FcmContent { QUESTION("질문이 도착했습니다.", "오늘의 질문을 확인하세요!", "ROOM_CLICK", "question"), ANSWER("답변이 도착했습니다.", "상대방의 답변을 확인하세요!", "ROOM_CLICK", "answer"), HURRY("재촉하기가 도착했습니다.", "상대방에게 답변을 보내보세요!", "ROOM_CLICK", "hurry"), - EMOTION("상대의 감정이 심상치 않습니다.", "상대방에게 주의를 기울여주세요!", "ROOM_CLICK", "emotion"), + EMOTION("상대방에게 먼저 연락을 해보세요.", "상대의 기분이 좋지 않은 것 같아요!", "ROOM_CLICK", "emotion"), ; private final String title; From fc1d767aa0ec6047b94fb83a71a7dbbe11408b1d Mon Sep 17 00:00:00 2001 From: Minwoo Cho <103352114+minwoo0419@users.noreply.github.com> Date: Thu, 13 Jun 2024 02:15:56 +0900 Subject: [PATCH 3/3] Update AnswerService.java --- .../java/com/telepigeon/server/service/answer/AnswerService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/telepigeon/server/service/answer/AnswerService.java b/src/main/java/com/telepigeon/server/service/answer/AnswerService.java index 099cef5..3cde697 100644 --- a/src/main/java/com/telepigeon/server/service/answer/AnswerService.java +++ b/src/main/java/com/telepigeon/server/service/answer/AnswerService.java @@ -87,7 +87,6 @@ public Answer create( emotion ) ); - Profile receiver = profileRetriever.findByUserNotAndRoom(user, room); if (profile.getEmotion() < -0.5){ fcmService.send( receiver.getUser().getFcmToken(),