Merge pull request #98 from MODU-TAXI/MS-192-fcm-exception

[MS-192] Feat: fcm exception

Author: tjdgns8439

config

@@ -11,13 +11,21 @@ public final class ServerConstants {
     @Value("${cloud.aws.s3.basic-profile-image}")
     private String basicProfileImageUrl;
 
+    @Value("${fcm.default_token}")
+    private String fcmDefaultToken;
+
     public static String BASIC_PROFILE_IMAGE_URL;
     public static final int REPORT_STANDARD = 5;
     public static final int FULL_MEMBER = 4;
 
+    public static String FCM_DEFAULT_TOKEN;
+
     @PostConstruct
     private void init() {
         BASIC_PROFILE_IMAGE_URL = basicProfileImageUrl;
+        FCM_DEFAULT_TOKEN = fcmDefaultToken;
     }
 
+
+
 }

src/main/java/com/modutaxi/api/common/constants/ServerConstants.java

@@ -16,6 +16,7 @@ public enum ParticipateErrorCode implements ErrorCode {
     ROOM_IS_FULL("PRT_006", "방의 정원이 꽉 찬 상태입니다.", HttpStatus.CONFLICT),
     USER_NOT_IN_ROOM("PRT_007", "사용자가 해당 채팅방에 없습니다.", HttpStatus.BAD_REQUEST),
     USER_ALREADY_IN_OTHER_ROOM("PRT_008", "해당 사용자가 다른 방에 참여한 상태입니다.", HttpStatus.BAD_REQUEST),
+    USER_ALONE_IN_ROOM("PRT_009", "혼자 있는 방은 매칭완료할 수 없습니다.", HttpStatus.BAD_REQUEST),
     ;
 
     private final String errorCode;

src/main/java/com/modutaxi/api/common/exception/errorcode/ParticipateErrorCode.java

@@ -1,9 +1,11 @@
 package com.modutaxi.api.common.fcm;
 
+import static com.modutaxi.api.common.constants.ServerConstants.FCM_DEFAULT_TOKEN;
+
+import com.google.firebase.FirebaseException;
 import com.google.firebase.messaging.ApnsConfig;
 import com.google.firebase.messaging.Aps;
 import com.google.firebase.messaging.FirebaseMessaging;
-import com.google.firebase.messaging.FirebaseMessagingException;
 import com.google.firebase.messaging.Message;
 import com.google.firebase.messaging.Notification;
 import com.google.gson.Gson;
@@ -36,12 +38,20 @@ public class FcmService {
     @Transactional
     public void subscribe(Long memberId, Long roomId) {
         String fcmToken = validateAndGetFcmToken(memberId);
+        if (!(fcmToken == null || Objects.equals(fcmToken, "") || fcmToken.isEmpty()
+            || fcmToken.isBlank())){
+            fcmToken = FCM_DEFAULT_TOKEN;
+            Member member = memberRepository.findById(memberId).orElseThrow(
+                () -> new BaseException(MemberErrorCode.EMPTY_MEMBER)
+            );
+            member.changeFcmToken(fcmToken);
+        }
         try {
             FirebaseMessaging.getInstance()
                 .subscribeToTopic(
                     Collections.singletonList(fcmToken), Long.toString(roomId));
             log.info("FCM SUBSCRIBE");
-        } catch (FirebaseMessagingException e) {
+        } catch (FirebaseException e) {
             log.error("FAIL FCM SUBSCRIBE");
             throw new BaseException(ChatErrorCode.FAIL_FCM_SUBSCRIBE);
         }
@@ -53,7 +63,7 @@ public void unsubscribe(Long memberId, Long roomId) {
             FirebaseMessaging.getInstance()
                 .unsubscribeFromTopic(
                     Collections.singletonList(fcmToken), Long.toString(roomId));
-        } catch (FirebaseMessagingException e) {
+        } catch (FirebaseException e) {
             throw new BaseException(ChatErrorCode.FAIL_FCM_UNSUBSCRIBE);
         }
     }
@@ -64,8 +74,9 @@ public void send(Message message) {
             Gson gson = new Gson();
             String fcmMessageJson = gson.toJson(message);
             log.info("FCM 메시지: " + fcmMessageJson);
-        } catch (FirebaseMessagingException e) {
-            throw new BaseException(ChatErrorCode.FAIL_SEND_MESSAGE);
+        } catch (FirebaseException e) {
+            log.error(ChatErrorCode.FAIL_SEND_MESSAGE.getMessage());
+//            throw new BaseException(ChatErrorCode.FAIL_SEND_MESSAGE);
         }
     }
 

src/main/java/com/modutaxi/api/common/fcm/FcmService.java

@@ -1,5 +1,7 @@
 package com.modutaxi.api.domain.member.service;
 
+import static com.modutaxi.api.common.constants.ServerConstants.FCM_DEFAULT_TOKEN;
+
 import com.modutaxi.api.common.auth.jwt.JwtTokenProvider;
 import com.modutaxi.api.common.auth.oauth.SocialLoginService;
 import com.modutaxi.api.common.auth.oauth.SocialLoginType;
@@ -38,8 +40,7 @@ public class RegisterMemberService {
      * 회원 가입
      */
     public TokenAndMemberResponse registerMember(String key, String name, Gender gender,
-        String phoneNumber,
-        String fcmToken) {
+        String phoneNumber, String fcmToken) {
         // key를 이용하여 redis 에서 snsId 추출, 삭제
         String snsId = checkSnsIdKey(key);
         // DB에 가입 이력 있는지 중복 확인
@@ -134,6 +135,9 @@ private TokenAndMemberResponse generateMemberToken(Member member) {
      */
     @Transactional
     public void saveFcmToken(Member member, String fcmToken) {
+        if (fcmToken.isBlank() || fcmToken.isEmpty()) {
+            fcmToken = FCM_DEFAULT_TOKEN;
+        }
         // db 저장
         member.changeFcmToken(fcmToken);
         // redis 캐싱

src/main/java/com/modutaxi/api/domain/member/service/RegisterMemberService.java

@@ -7,6 +7,7 @@
 import com.modutaxi.api.common.converter.NaverMapConverter;
 import com.modutaxi.api.common.converter.RoomTagBitMaskConverter;
 import com.modutaxi.api.common.exception.BaseException;
+import com.modutaxi.api.common.exception.errorcode.ParticipateErrorCode;
 import com.modutaxi.api.common.exception.errorcode.RoomErrorCode;
 import com.modutaxi.api.common.exception.errorcode.SpotError;
 import com.modutaxi.api.common.exception.errorcode.TaxiInfoErrorCode;
@@ -269,6 +270,10 @@ public UpdateRoomResponse finishMatching(Member manager, Long roomId) {
 
         checkManager(room.getRoomManager().getId(), manager.getId());
 
+        if (participantRepository.findAllByRoom(room).size() == 1) {
+            throw new BaseException(ParticipateErrorCode.USER_ALONE_IN_ROOM);
+        }
+
         if (!room.getRoomStatus().equals(RoomStatus.BEFORE_MATCHING)) {
             throw new BaseException(RoomErrorCode.ALREADY_MATCHING_COMPLETE);
         }