Merge pull request #47 from Nexters/dev

Author: Jeongminyooa

.github/workflows/cd.yml

@@ -46,8 +46,8 @@ jobs:
       - name: Add FCM service account JSON key
         run: |
           cd ./src/main/resources
-          touch ./donmani-5d3f6-firebase-adminsdk-fbsvc-22a01911fd.json
-          echo "${{ secrets.FCM_SERVICE_ACCOUNT_JSON }}" > ./donmani-5d3f6-firebase-adminsdk-fbsvc-22a01911fd.json
+          touch ./bbsofficial-firebase-adminsdk.json
+          echo "${{ secrets.FCM_SERVICE_ACCOUNT_JSON }}" > ./bbsofficial-firebase-adminsdk.json
 
       #test를 제외한 프로젝트 빌드
       - name: Build With Gradle

build.gradle

@@ -27,6 +27,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 	compileOnly 'org.projectlombok:lombok'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	runtimeOnly 'com.mysql:mysql-connector-j'

src/main/java/donmani/donmani_server/common/config/FirebaseConfig.java

@@ -14,7 +14,7 @@ public class FirebaseConfig {
     @PostConstruct
     public void init() {
         try {
-            InputStream serviceAccount = new ClassPathResource("donmani-5d3f6-firebase-adminsdk-fbsvc-22a01911fd.json").getInputStream();
+            InputStream serviceAccount = new ClassPathResource("bbsofficial-firebase-adminsdk.json").getInputStream();
             FirebaseOptions options = new FirebaseOptions.Builder()
                     .setCredentials(GoogleCredentials.fromStream(serviceAccount))
                     .build();

src/main/java/donmani/donmani_server/fcm/contorller/FCMController.java

@@ -18,4 +18,10 @@ public ResponseEntity<String> saveOrUpdateToken(@PathVariable String userKey,
         fcmService.saveOrUpdateToken(userKey, token);
         return ResponseEntity.ok("SUCCESS"); // TODO : 응답 포맷팅 작업에서 수정 필요
     }
+
+    @PostMapping("/send-messages/{userKey}")
+    public ResponseEntity<String> saveOrUpdateToken(@PathVariable String userKey) {
+        fcmService.sendMessageTest(userKey);
+        return ResponseEntity.ok("SUCCESS"); // TODO : 응답 포맷팅 작업에서 수정 필요
+    }
 }

src/main/java/donmani/donmani_server/fcm/service/FCMService.java

@@ -52,14 +52,22 @@ public void sendMessage(String targetToken, String title, String body) {
                         .setBody(body)
                         .build())
                 .build();
-
+        System.out.println();
         try {
             FirebaseMessaging.getInstance().send(message);
         } catch (FirebaseMessagingException e) {
             e.printStackTrace();
         }
     }
 
+    public void sendMessageTest(String userKey) {
+        User user = userRepository.findByUserKey(userKey).orElseThrow(() -> new RuntimeException("USER NOT FOUND"));
+        FCMToken token = fcmTokenRepository.findByUser(user).orElseThrow();
+
+        String title = "Test Title";
+        String message = "Test Message, User : " + user.getName();
+        sendMessage(token.getToken(), title, message);
+    }
     @Transactional
     public List<String> getTokenNoExpenseToday() {
         return expenseRepository.findTokensWithoutExpenseToday();