diff --git a/backend/src/main/java/com/coffee/backend/domain/match/service/MatchService.java b/backend/src/main/java/com/coffee/backend/domain/match/service/MatchService.java index 23a1da9981..6ca852e349 100644 --- a/backend/src/main/java/com/coffee/backend/domain/match/service/MatchService.java +++ b/backend/src/main/java/com/coffee/backend/domain/match/service/MatchService.java @@ -394,7 +394,20 @@ private void sendMatchFinishNotification(Long fromUserId, Long toUserId) { public IsMatchingDto isMatching(Long userId) { log.trace("isMatching()"); - Map isMatchingInfo = redisTemplate.opsForHash().entries("userId:" + userId); + Map isMatchingInfo = null; + try { + isMatchingInfo = redisTemplate.opsForHash().entries("userId:" + userId); + } catch (Exception e) { + log.error("isMatching() 에러"); + } + + if (isMatchingInfo == null || isMatchingInfo.isEmpty()) { + log.warn("No matching info found for userId: {}", userId); + IsMatchingDto response = new IsMatchingDto(); + response.setIsMatching("no"); + return response; + } + Long senderId = getLongId(isMatchingInfo.get("senderId")); Long receiverId = getLongId(isMatchingInfo.get("receiverId")); User sender = userRepository.findByUserId(senderId).orElseThrow();