Merge pull request #51 from Nexters/dev

Dev

Author: Jeongminyooa

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

@@ -14,13 +14,21 @@ public class FirebaseConfig {
     @PostConstruct
     public void init() {
         try {
-            InputStream serviceAccount = new ClassPathResource("bbsofficial-firebase-adminsdk.json").getInputStream();
-            FirebaseOptions options = new FirebaseOptions.Builder()
+            InputStream serviceAccount = getClass()
+                    .getClassLoader()
+                    .getResourceAsStream("bbsofficial-firebase-adminsdk.json");
+
+            if (serviceAccount == null) {
+                throw new IllegalStateException("Firebase 인증 JSON 파일을 classpath에서 찾을 수 없습니다.");
+            }
+
+            FirebaseOptions options = FirebaseOptions.builder()
                     .setCredentials(GoogleCredentials.fromStream(serviceAccount))
                     .build();
 
             if (FirebaseApp.getApps().isEmpty()) { // FirebaseApp이 이미 초기화되어 있지 않은 경우에만 초기화 실행
                 FirebaseApp.initializeApp(options);
+                System.out.println("Firebase 초기화 완료");
             }
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -1,5 +1,6 @@
 package donmani.donmani_server.common.config;
 
+import io.swagger.v3.oas.models.servers.Server;
 import org.springframework.context.annotation.Bean;
 
 import io.swagger.v3.oas.models.Components;
@@ -17,8 +18,11 @@ public OpenAPI openAPI() {
 			.title("swagger 테스트")
 			.version("1.0")
 			.description("API에 대한 설명 부분");
+
+		Server server = new Server();
+		server.setUrl("https://www.donmani.kr");
 		return new OpenAPI()
 			.components(new Components())
-			.info(info);
+			.info(info).addServersItem(server);
 	}
 }

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

@@ -31,19 +31,25 @@ public class FCMService {
     public void saveOrUpdateToken(String userKey, String token) {
         User user = userRepository.findByUserKey(userKey).orElseThrow(() -> new RuntimeException("USER NOT FOUND"));
 
+        String removeQuotesToken = removeQuotes(token);
         FCMToken fcmToken = fcmTokenRepository.findByUser(user)
                 .map(existingToken -> {
-                    existingToken.setToken(token);
+                    existingToken.setToken(removeQuotesToken);
                     return existingToken;
                 }).orElseGet(() -> FCMToken.builder()
                         .user(user)
-                        .token(token)
+                        .token(removeQuotesToken)
                         .build()
                 );
 
         fcmTokenRepository.save(fcmToken);
     }
 
+    private String removeQuotes(String input) {
+        return (input.startsWith("\"") && input.endsWith("\"")) ?
+                input.substring(1, input.length() - 1) : input;
+    }
+
     public void sendMessage(String targetToken, String title, String body) {
         Message message = Message.builder()
                 .setToken(targetToken)