Merge pull request #123 from TelePigeon/chore/122

[chore] 시연 영상 및 공모전 위한 로깅 추가
TelePigeon · Aug 26, 2024 · b6324e2 · b6324e2
2 parents 17ed7ce + 06a6b01
commit b6324e2
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 2 deletions.
diff --git a/src/main/java/com/telepigeon/server/domain/Worry.java b/src/main/java/com/telepigeon/server/domain/Worry.java
@@ -56,6 +56,7 @@ public static Worry create(
 
     public FcmMessageDto toFcmMessageDto() {
         return FcmMessageDto.builder()
+                .receiverName(this.profile.getUser().getName())
                 .title(this.name)
                 .body(this.content)
                 .type("worry")

diff --git a/src/main/java/com/telepigeon/server/dto/fcm/FcmMessageDto.java b/src/main/java/com/telepigeon/server/dto/fcm/FcmMessageDto.java
@@ -5,14 +5,18 @@
 
 @Builder
 public record FcmMessageDto(
+        String senderName,
+        String receiverName,
         String title,
         String body,
         String clickAction,
         String type,
         Long id
 ){
-    public static FcmMessageDto of(FcmContent fcmContent, Long id){
+    public static FcmMessageDto of(String senderName, String receiverName, FcmContent fcmContent, Long id){
         return FcmMessageDto.builder()
+                .senderName(senderName)
+                .receiverName(receiverName)
                 .title(fcmContent.getTitle())
                 .body(fcmContent.getBody())
                 .clickAction(fcmContent.getBody())

diff --git a/src/main/java/com/telepigeon/server/service/answer/AnswerService.java b/src/main/java/com/telepigeon/server/service/answer/AnswerService.java
@@ -23,6 +23,7 @@
 import com.telepigeon.server.service.question.QuestionRetriever;
 import com.telepigeon.server.service.room.RoomRetriever;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.util.Pair;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +37,7 @@
 
 import static java.time.temporal.ChronoUnit.DAYS;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class AnswerService {
@@ -80,7 +82,7 @@ public Answer create(
                         question,
                         profile)
         );
-
+        Double preEmotion = profile.getEmotion();
         profile.updateEmotion(
                 CalculateEmotion(
                         profile.getEmotion(),
@@ -91,6 +93,8 @@ public Answer create(
             fcmService.send(
                     receiver.getUser().getFcmToken(),
                     FcmMessageDto.of(
+                            null,
+                            user.getName(),
                             FcmContent.EMOTION,
                             roomId
                     )
@@ -101,10 +105,13 @@ public Answer create(
         fcmService.send(
                 receiver.getUser().getFcmToken(),
                 FcmMessageDto.of(
+                        user.getName(),
+                        receiver.getUser().getName(),
                         FcmContent.ANSWER,
                         roomId
                 )
         );
+        log.info("답장 생성 완료.\n내용 : {}\n감정 점수 : {}\n이전 평균 감정 점수 : {}\n현재 평균 감정 점수 : {}", answer.getContent(), answer.getEmotion(), preEmotion, profile.getEmotion());
         return answer;
     }
 

diff --git a/src/main/java/com/telepigeon/server/service/external/FcmService.java b/src/main/java/com/telepigeon/server/service/external/FcmService.java
@@ -19,6 +19,7 @@ public void send(
         Message message = createMessage(fcmToken, fcmMessageDto);
         try{
             FirebaseMessaging.getInstance().send(message);
+            log.info("{} 사용자 -> {} 사용자 푸시 알림 성공.\n알림 유형 : {}\n내용 : {}", fcmMessageDto.senderName(), fcmMessageDto.receiverName(), fcmMessageDto.type(), fcmMessageDto.body());
         } catch (FirebaseMessagingException e){
             log.error("Failed to send message. fcm Token : {}", fcmToken);
         }

diff --git a/src/main/java/com/telepigeon/server/service/hurry/HurryService.java b/src/main/java/com/telepigeon/server/service/hurry/HurryService.java
@@ -43,6 +43,8 @@ public void create(
         fcmService.send(
                 receiver.getUser().getFcmToken(),
                 FcmMessageDto.of(
+                        user.getName(),
+                        receiver.getUser().getName(),
                         FcmContent.HURRY,
                         roomId
                 )

diff --git a/src/main/java/com/telepigeon/server/service/question/QuestionService.java b/src/main/java/com/telepigeon/server/service/question/QuestionService.java
@@ -75,6 +75,8 @@ public Question create(final Profile profile){
         fcmService.send(
                 receiver.getUser().getFcmToken(),
                 FcmMessageDto.of(
+                        profile.getUser().getName(),
+                        receiver.getUser().getName(),
                         FcmContent.QUESTION,
                         profile.getRoom().getId()
                 )

diff --git a/src/main/java/com/telepigeon/server/service/room/RoomService.java b/src/main/java/com/telepigeon/server/service/room/RoomService.java
@@ -144,6 +144,8 @@ public Profile enterRoom(final RoomEnterDto roomEnterDto, final Long userId) {
         fcmService.send(
                 receiver.getUser().getFcmToken(),
                 FcmMessageDto.of(
+                        profile.getUser().getName(),
+                        receiver.getUser().getName(),
                         FcmContent.ROOM_ENTER,
                         room.getId()
                 )
@@ -169,6 +171,8 @@ public void deleteRoom(final Long roomId, final Long userId) {
                 fcmService.send(
                         opponentProfile.getUser().getFcmToken(),
                         FcmMessageDto.of(
+                                profile.getUser().getName(),
+                                opponentProfile.getUser().getName(),
                                 FcmContent.ROOM_LEAVE,
                                 room.getId()
                         )
@@ -204,6 +208,8 @@ private void sendQuestionFirst(Profile profile, Profile receiver){
         fcmService.send(
                 receiver.getUser().getFcmToken(),
                 FcmMessageDto.of(
+                        profile.getUser().getName(),
+                        receiver.getUser().getName(),
                         FcmContent.QUESTION,
                         profile.getRoom().getId()
                 )