Merge pull request #105 from Begin-Vegan/develop

[DEPLOY]
Begin-Vegan · Sep 27, 2024 · 0f78553 · 0f78553
2 parents e30af43 + c144c3a
commit 0f78553
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/src/main/java/com/beginvegan/domain/auth/application/AuthService.java b/src/main/java/com/beginvegan/domain/auth/application/AuthService.java
@@ -124,7 +124,7 @@ public ResponseEntity<?> addSignUpUserInfo(UserPrincipal userPrincipal, AddUserI
 
         // 웰컴 메세지 전송
         String msg = "비긴, 비건에 오신 것을 환영해요. 비거너의 여정으로 함께 떠나요!";
-        FcmSendDto fcmSendDto = fcmService.makeFcmSendDto(user, AlarmType.INFORMATION, null, msg, null, null);
+        FcmSendDto fcmSendDto = fcmService.makeFcmSendDto(user.getFcmToken(), AlarmType.INFORMATION, null, msg, null, null);
         fcmService.sendMessageTo(fcmSendDto);
 
         return ResponseEntity.ok(apiResponse);

diff --git a/src/main/java/com/beginvegan/domain/fcm/application/FcmService.java b/src/main/java/com/beginvegan/domain/fcm/application/FcmService.java
@@ -50,10 +50,10 @@ public class FcmService {
 
     @Transactional
     public ResponseEntity<?> sendMessageTo(FcmSendDto fcmSendDto) throws IOException {
-        User user = validateUserById(fcmSendDto.getUserId());
-        String msg = "메세지 전송에 실패했습니다(FCM 토큰이 존재하지 않음)";
+        String fcmToken = fcmSendDto.getToken();
+        User user = validateUserByToken(fcmToken);
 
-        String fcmToken = user.getFcmToken();
+        String msg = "메세지 전송에 실패했습니다(FCM 토큰이 존재하지 않음)";
         if (fcmToken != null) {
             if (user.getAlarmSetting()) {
                 sendCombinedMessage(fcmToken, fcmSendDto);
@@ -179,11 +179,10 @@ private String getAccessToken() throws IOException {
         return googleCredentials.getAccessToken().getTokenValue();
     }
 
-    public FcmSendDto makeFcmSendDto(User user, AlarmType alarmType, Long itemId, String body, MessageType messageType, UserLevel userLevel) {
+    public FcmSendDto makeFcmSendDto(String token, AlarmType alarmType, Long itemId, String body, MessageType messageType, UserLevel userLevel) {
          return FcmSendDto.builder()
-                .userId(user.getId())
+                .token(token)
                 .alarmType(alarmType)
-
                 .itemId(itemId)
                 .title("비긴, 비건")
                 .body(body)
@@ -194,7 +193,7 @@ public FcmSendDto makeFcmSendDto(User user, AlarmType alarmType, Long itemId, St
 
     @Transactional
     public void saveAlarmHistory(FcmSendDto fcmSendDto) {
-        User user = validateUserById(fcmSendDto.getUserId());
+        User user = validateUserByToken(fcmSendDto.getToken());
 
         Alarm alarm = Alarm.builder()
                 .alarmType(fcmSendDto.getAlarmType())
@@ -206,8 +205,8 @@ public void saveAlarmHistory(FcmSendDto fcmSendDto) {
         alarmRepository.save(alarm);
     }
 
-    private User validateUserById(Long userId) {
-        Optional<User> findUser = userRepository.findById(userId);
+    private User validateUserByToken(String token) {
+        Optional<User> findUser = userRepository.findByFcmToken(token);
         DefaultAssert.isTrue(findUser.isPresent(), "유저 정보가 올바르지 않습니다.");
         return findUser.get();
     }

diff --git a/src/main/java/com/beginvegan/domain/fcm/dto/FcmSendDto.java b/src/main/java/com/beginvegan/domain/fcm/dto/FcmSendDto.java
@@ -18,8 +18,8 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class FcmSendDto {
 
-    @Schema(type = "Long", example = "1", description = "유저의 고유 id입니다.")
-    private Long userId;
+    @Schema(type = "String", example = "dNFDkmL3R04:APA91bH5XrLbje0cbjkPv8jSDFg9v4hdOcf6rLtWfFzCqH8zqG7NhrS8Dp", description = "유저의 fcmToken입니다.")
+    private String token;
 
     @Schema(type = "String", example = "비긴, 비건", description = "알림의 제목입니다.")
     private String title;
@@ -40,8 +40,8 @@ public class FcmSendDto {
     private UserLevel userLevel;
 
     @Builder
-    public FcmSendDto(Long userId, String title, String body, AlarmType alarmType, Long itemId, MessageType messageType, UserLevel userLevel) {
-        this.userId = userId;
+    public FcmSendDto(String token, String title, String body, AlarmType alarmType, Long itemId, MessageType messageType, UserLevel userLevel) {
+        this.token = token;
         this.title = title;
         this.body = body;
         this.alarmType = alarmType;

diff --git a/src/main/java/com/beginvegan/domain/review/application/ReviewService.java b/src/main/java/com/beginvegan/domain/review/application/ReviewService.java
@@ -202,7 +202,7 @@ public ResponseEntity<?> recommendReviews(UserPrincipal userPrincipal, Long revi
                 userService.checkUserLevel(user);
                 // 푸시알림
                 String msg = "'" + user.getNickname() + "'" + "님의 리뷰가 추천을 받았어요.";
-                FcmSendDto fcmSendDto = fcmService.makeFcmSendDto(review.getUser(), AlarmType.MAP, reviewId, msg, MessageType.REVIEW_RECOMMEND, null);
+                FcmSendDto fcmSendDto = fcmService.makeFcmSendDto(review.getUser().getFcmToken(), AlarmType.MAP, reviewId, msg, MessageType.REVIEW_RECOMMEND, null);
                 fcmService.sendMessageTo(fcmSendDto);
             }
         }
@@ -307,7 +307,7 @@ public ResponseEntity<?> reportReview(UserPrincipal userPrincipal, Long reviewId
 
         // 푸시알림 생성
         String msg = "리뷰 신고가 정상적으로 접수되었어요. 운영자의 검토 후 조치를 취할 예정이에요.";
-        FcmSendDto fcmSendDto = fcmService.makeFcmSendDto(user, AlarmType.MAP, reviewId, msg, MessageType.REVIEW_REPORT, null);
+        FcmSendDto fcmSendDto = fcmService.makeFcmSendDto(user.getFcmToken(), AlarmType.MAP, reviewId, msg, MessageType.REVIEW_REPORT, null);
         fcmService.sendMessageTo(fcmSendDto);
 
         ApiResponse apiResponse = ApiResponse.builder()

diff --git a/src/main/java/com/beginvegan/domain/user/application/UserService.java b/src/main/java/com/beginvegan/domain/user/application/UserService.java
@@ -254,7 +254,7 @@ public void checkUserLevel(User user) throws IOException {
         if (originalLevel != newLevel) {
             if (newLevel.getOrder() > originalLevel.getOrder()) {
                 String msg = "나만의 식물이 성장했어요. mypage에서 확인해 보세요!";
-                FcmSendDto fcmSendDto = fcmService.makeFcmSendDto(user, AlarmType.MYPAGE, null, msg, MessageType.LEVEL_UP, newLevel);
+                FcmSendDto fcmSendDto = fcmService.makeFcmSendDto(user.getFcmToken(), AlarmType.MYPAGE, null, msg, MessageType.LEVEL_UP, newLevel);
                 fcmService.sendMessageTo(fcmSendDto);
             }
             user.updateUserLevel(newLevel);