Skip to content

Commit

Permalink
Merge pull request #59 from ConnectCo/fix/#53/firebaseconfig-오류-수정
Browse files Browse the repository at this point in the history
[FIX] fireBaseConfig 오류 수정
  • Loading branch information
hig1002 authored Jan 28, 2025
2 parents d5f9c9d + 523d2ff commit 8dac72c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
9 changes: 9 additions & 0 deletions src/main/java/com/connectCo/config/FireBaseConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@
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;
import java.io.InputStream;

@Slf4j
@Configuration
@Order(1)
public class FireBaseConfig {

@Value("${fcm.file_path}")
Expand All @@ -38,4 +41,10 @@ public void init(){
throw new CustomApiException(ErrorCode.FIREBASE_INIT_FAILED);
}
}

//빈 이름 명시적으로 설정
@Bean(name = "firebaseConfig")
public FireBaseConfig firebaseConfig() {
return new FireBaseConfig();
}
}
10 changes: 4 additions & 6 deletions src/main/java/com/connectCo/domain/fcm/service/FcmService.java
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
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;
import com.google.firebase.messaging.FirebaseMessaging;
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);
}
Expand Down

0 comments on commit 8dac72c

Please sign in to comment.