From 523d2fff682443874517879075a61ddce8dd2420 Mon Sep 17 00:00:00 2001
From: hig1002 <hig7463@naver.com>
Date: Tue, 28 Jan 2025 14:31:41 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20fireBaseConfig=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/connectCo/config/FireBaseConfig.java |  9 +++++++++
 .../com/connectCo/domain/fcm/service/FcmService.java   | 10 ++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/connectCo/config/FireBaseConfig.java b/src/main/java/com/connectCo/config/FireBaseConfig.java
index d51aa45..c86e8f4 100644
--- a/src/main/java/com/connectCo/config/FireBaseConfig.java
+++ b/src/main/java/com/connectCo/config/FireBaseConfig.java
@@ -8,7 +8,9 @@
 import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
 import org.springframework.core.io.Resource;
 
 import java.io.IOException;
@@ -16,6 +18,7 @@
 
 @Slf4j
 @Configuration
+@Order(1)
 public class FireBaseConfig {
 
     @Value("${fcm.file_path}")
@@ -38,4 +41,10 @@ public void init(){
             throw new CustomApiException(ErrorCode.FIREBASE_INIT_FAILED);
         }
     }
+
+    //빈 이름 명시적으로 설정
+    @Bean(name = "firebaseConfig")
+    public FireBaseConfig firebaseConfig() {
+        return new FireBaseConfig();
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/connectCo/domain/fcm/service/FcmService.java b/src/main/java/com/connectCo/domain/fcm/service/FcmService.java
index 34ab581..6bb1405 100644
--- a/src/main/java/com/connectCo/domain/fcm/service/FcmService.java
+++ b/src/main/java/com/connectCo/domain/fcm/service/FcmService.java
@@ -1,7 +1,5 @@
 package com.connectCo.domain.fcm.service;
 
-import com.connectCo.domain.Member.entity.Member;
-import com.connectCo.domain.Member.repository.MemberRepository;
 import com.connectCo.domain.fcm.mapper.FcmMapper;
 import com.connectCo.global.exception.CustomApiException;
 import com.connectCo.global.exception.ErrorCode;
@@ -9,21 +7,21 @@
 import com.google.firebase.messaging.FirebaseMessagingException;
 import com.google.firebase.messaging.Message;
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Service;
 
-import java.io.IOException;
-
 @Service
 @RequiredArgsConstructor
+@DependsOn("firebaseConfig")
 public class FcmService {
 
     private final FcmMapper fcmMapper;
 
-    public String sendPushNotification(String targetToken, String title, String body) {
+    public void sendPushNotification(String targetToken, String title, String body) {
 
         try {
             Message message = fcmMapper.ToMessage(targetToken, title, body);//fcm 메세지 객체 빌드
-            return FirebaseMessaging.getInstance().send(message);
+            FirebaseMessaging.getInstance().send(message);
         } catch (FirebaseMessagingException e) {
             throw new CustomApiException(ErrorCode.FIREBASE_PUSH_FAILED);
         }