Merge branch 'develop' into fix/chatRoom/4

Author: Hyeromon

src/main/java/org/dfbf/soundlink/domain/chat/service/ChatRoomService.java

@@ -104,16 +104,18 @@ public ResponseResult saveRequestToRedis(Long requestUserId, Long emotionRecordI
             AlertChatRequest alertChatRequest = new AlertChatRequest(emotionRecordId, requestUser.getNickname());
 //            Alert alert = alertService.createAlert(responseUserId, "alarm", alertChatRequest);
 //            kafkaProducer.send(TOPIC, alert);
-            alertService.send(responseUserId, "alarm", alertChatRequest);
+             alertService.send(responseUserId, "alarm", alertChatRequest);
 
             return new ResponseResult(ErrorCode.SUCCESS);
+        } catch (IllegalArgumentException e) {
+            log.info(e.getMessage());
+            return new ResponseResult(ErrorCode.SUCCESS, "요청은 갔지만, 상대방의 SSE가 없어 알림이 전송되지 않았습니다.");
         } catch (EmotionRecordNotFoundException e) {
-            return new ResponseResult(ErrorCode.FAIL_TO_FIND_EMOTION_RECORD);
+            return new ResponseResult(ErrorCode.FAIL_TO_FIND_EMOTION_RECORD, e.getMessage());
         } catch (UserNotFoundException e) {
-            return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER);
+            return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER, e.getMessage());
         } catch (Exception e) {
-            log.error(e.getMessage());
-            return new ResponseResult(400, "Failed to process chat request.");
+            return new ResponseResult(ErrorCode.CHAT_REQUEST_FAILED, e.getMessage());
         }
     }
 

src/main/java/org/dfbf/soundlink/domain/user/controller/UserStatusController.java

@@ -8,31 +8,18 @@
 import org.dfbf.soundlink.domain.user.exception.NoUserDataException;
 import org.dfbf.soundlink.domain.user.repository.UserRepository;
 import org.dfbf.soundlink.domain.user.service.UserStatusService;
-import org.dfbf.soundlink.domain.user.service.UserStatusSseService;
 import org.dfbf.soundlink.global.exception.ErrorCode;
 import org.dfbf.soundlink.global.exception.ResponseResult;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 @RestController
 @RequestMapping("/api/userStatus")
 @RequiredArgsConstructor
 @Tag(name = "User Status API", description = "유저 상태 관련 API")
 public class UserStatusController {
     private final UserStatusService userStatusService;
-    private final UserStatusSseService userStatusSseService;
     private final UserRepository userRepository;
 
-    @GetMapping("/subscribe")
-    public SseEmitter subscribe(@RequestParam String loginId) {
-
-        User user = userRepository.findByLoginId(loginId)
-                .orElseThrow(NoUserDataException::new);
-        Long userId = user.getUserId();
-
-        return userStatusSseService.subscribe(userId);
-    }
-
     @GetMapping("/{loginId}")
     public ResponseResult getUserStatus(@PathVariable String loginId) {
 

src/main/java/org/dfbf/soundlink/domain/user/service/UserService.java

@@ -51,7 +51,6 @@ public class UserService {
     private final MailService mailService;
     private final RedisService redisService;
     private final UserStatusService userStatusService;
-    private final UserStatusSseService userStatusSseService;
 
     private final JwtProvider jwtProvider;
     private final TokenProperties tokenProperties;

src/main/java/org/dfbf/soundlink/domain/user/service/UserStatusService.java

@@ -13,7 +13,6 @@
 public class UserStatusService {
     private final RedisTemplate<String, String> redisTemplate;
     private final ObjectMapper objectMapper = new ObjectMapper();
-    private final UserStatusSseService userStatusSseService;
 
     // Redis Key Prefix
     private static final String USER_STATUS_KEY_PREFIX = "user:status:";
@@ -25,9 +24,6 @@ public void saveUserStatus(UserStatusDto status) {
             String json = objectMapper.writeValueAsString(status);
             redisTemplate.opsForValue().set(key, json);
 
-            // 이게 SSE로 알림 보냄
-            userStatusSseService.sendUserStatus(status.getUserId(), status);
-
         } catch (JsonProcessingException e) {
             log.error("유저 상태 저장 중 JsonProcessingException 오류: {}", e.getMessage());
         }

src/main/java/org/dfbf/soundlink/domain/user/service/UserStatusSseService.java

@@ -71,7 +71,8 @@ public enum ErrorCode {
     //채팅방 관련 에러
     CHAT_UNAUTHORIZED(HttpStatus.FORBIDDEN,"권한이 없습니다"),
     CHATROOM_NOT_FOUND(HttpStatus.NOT_FOUND,"채팅방을 찾을 수 없습니다."),
-    CHAT_FAILED(HttpStatus.CONFLICT,"서버 내부 에러. 중복된 레코드가 존재합니다.");
+    CHAT_FAILED(HttpStatus.CONFLICT,"서버 내부 에러. 중복된 레코드가 존재합니다."),
+    CHAT_REQUEST_FAILED(HttpStatus.CONFLICT, "채팅 요청 실패");
 
 
     private final HttpStatus status;