Merge pull request #97 from EWHA-LUX/feature/#72

[Feat] 푸시 알림 페이지 이동을 위한 알림id추가 (#72)
EWHA-LUX · May 25, 2024 · 9b4f03e · 9b4f03e
2 parents 6013be1 + d625fda
commit 9b4f03e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/main/java/ewha/lux/once/domain/home/dto/AnnouncementRequestDto.java b/src/main/java/ewha/lux/once/domain/home/dto/AnnouncementRequestDto.java
@@ -11,4 +11,5 @@ public class AnnouncementRequestDto {
     private String targetToken;
     private String title;
     private String body;
+    private String announceId;
 }
diff --git a/src/main/java/ewha/lux/once/domain/home/service/AnnouncementService.java b/src/main/java/ewha/lux/once/domain/home/service/AnnouncementService.java
@@ -78,7 +78,7 @@ public void cheeringBenefitGoalAnnounce() throws CustomException {
             List<FCMToken> fcmTokens = fcmTokenRepository.findAllByUsers(users);
             for ( FCMToken fcmToken : fcmTokens){
                 String token = fcmToken.getToken();
-                firebaseCloudMessageService.sendNotification(new AnnouncementRequestDto(token,"목표 응원 알림",content));
+                firebaseCloudMessageService.sendNotification(new AnnouncementRequestDto(token,"목표 응원 알림",content,announcement.getId().toString()));
             }
         }
     }
@@ -112,7 +112,7 @@ public void cardPerformanceAnnounce() throws CustomException {
             List<FCMToken> fcmTokens = fcmTokenRepository.findAllByUsers(users);
             for ( FCMToken fcmToken : fcmTokens){
                 String token = fcmToken.getToken();
-                firebaseCloudMessageService.sendNotification(new AnnouncementRequestDto(token,currentDate+"월 실적 알림",content));
+                firebaseCloudMessageService.sendNotification(new AnnouncementRequestDto(token,currentDate+"월 실적 알림",content,announcement.getId().toString()));
             }
 
         }

diff --git a/src/main/java/ewha/lux/once/domain/home/service/FirebaseCloudMessageService.java b/src/main/java/ewha/lux/once/domain/home/service/FirebaseCloudMessageService.java
@@ -29,6 +29,7 @@ public void sendNotification (AnnouncementRequestDto requestDTO) throws CustomEx
         Message message = Message.builder()
                 .setToken(requestDTO.getTargetToken())
                 .setNotification(notification)
+                .putData("announceId",requestDTO.getAnnounceId() )
                 .build();
         try {
             firebaseMessaging.send(message);

diff --git a/src/main/java/ewha/lux/once/domain/home/service/HomeService.java b/src/main/java/ewha/lux/once/domain/home/service/HomeService.java
@@ -20,8 +20,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import java.time.LocalDate;
@@ -45,7 +43,6 @@ public class HomeService {
     private final FCMTokenRepository fcmTokenRepository;
     private final FirebaseCloudMessageService firebaseCloudMessageService;
     private final BeaconRepository beaconRepository;
-    private final CODEFAsyncService codefAsyncService;
 
     // 챗봇 카드 추천
     public ChatDto getHomeChat(Users nowUser, String keyword, int paymentAmount) throws CustomException {
@@ -337,7 +334,7 @@ public void postAnnounceFavorite(AnnounceFavoriteRequestDto dto, Users nowUser)
         }
 
         String contents = dto.getStoreName()+" 근처시군요.\n"+card.getName()+" 사용해 보세요!";
-        String title = dto.getStoreName()+" 근처시군요";
+        String title = dto.getStoreName()+" 근처시군요.";
         String content = card.getName()+" 사용해 보세요!";
         String moreInfo = dto.getLatitude()+", "+dto.getLongitude();
         Announcement announcement = Announcement.builder()
@@ -351,7 +348,7 @@ public void postAnnounceFavorite(AnnounceFavoriteRequestDto dto, Users nowUser)
         for ( FCMToken fcmToken : fcmTokens){
 
             String token = fcmToken.getToken();
-            firebaseCloudMessageService.sendNotification(new AnnouncementRequestDto(token,title,content));
+            firebaseCloudMessageService.sendNotification(new AnnouncementRequestDto(token,title,content,announcement.getId().toString()));
         }
     }
     public void postBeaconAnnouncement(BeaconRequestDto dto, Users nowUser)throws CustomException {
@@ -378,7 +375,7 @@ public void postBeaconAnnouncement(BeaconRequestDto dto, Users nowUser)throws Cu
             throw new CustomException(ResponseCode.FAILED_TO_OPENAI_RECOMMEND);
         }
 
-        String title = beacon.getStore()+" 근처시군요";
+        String title = beacon.getStore()+" 근처시군요.";
         String content = card.getName()+" 사용해 보세요!";
         String contents = beacon.getStore()+" 근처시군요.\n"+card.getName()+" 사용해 보세요!";
 
@@ -393,7 +390,7 @@ public void postBeaconAnnouncement(BeaconRequestDto dto, Users nowUser)throws Cu
         announcementRepository.save(announcement);
         for ( FCMToken fcmToken : fcmTokens){
             String token = fcmToken.getToken();
-            firebaseCloudMessageService.sendNotification(new AnnouncementRequestDto(token,title,content));
+            firebaseCloudMessageService.sendNotification(new AnnouncementRequestDto(token,title,content,announcement.getId().toString()));
         }
 
     }