Merge pull request #89 from prgrms-web-devcourse-final-project/feat/userStatus/2

[fix] LoginId 로 Status 확인하도록 코드 변경

Author: moon-kun-woong

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

@@ -4,6 +4,9 @@
 import lombok.RequiredArgsConstructor;
 import org.dfbf.soundlink.domain.user.dto.response.UserStatusDto;
 import org.dfbf.soundlink.domain.user.dto.response.UserStatusResponseDto;
+import org.dfbf.soundlink.domain.user.entity.User;
+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;
@@ -18,22 +21,33 @@
 public class UserStatusController {
     private final UserStatusService userStatusService;
     private final UserStatusSseService userStatusSseService;
+    private final UserRepository userRepository;
 
     @GetMapping("/subscribe")
-    public SseEmitter subscribe(@RequestParam Long userId) {
+    public SseEmitter subscribe(@RequestParam String loginId) {
+
+        User user = userRepository.findByLoginId(loginId)
+                .orElseThrow(NoUserDataException::new);
+        Long userId = user.getUserId();
+
         return userStatusSseService.subscribe(userId);
     }
 
-    @GetMapping("/{userId}")
-    public ResponseResult getUserStatus(@PathVariable Long userId) {
+    @GetMapping("/{loginId}")
+    public ResponseResult getUserStatus(@PathVariable String loginId) {
+
+        User user = userRepository.findByLoginId(loginId)
+                .orElseThrow(NoUserDataException::new);
+        Long userId = user.getUserId();
+
         UserStatusDto status = userStatusService.getUserStatus(userId);
 
         boolean isOnline = status.isOnline();
         boolean isChatting = status.isChatting();
         long minutesAgo = userStatusService.getMinutesSinceLastActive(userId);
 
         UserStatusResponseDto dto = new UserStatusResponseDto(
-                userId,
+                loginId,
                 isOnline ? "ONLINE" : "OFFLINE",
                 isChatting ? "CHATTING" : "NOT_CHATTING",
                 isOnline

src/main/java/org/dfbf/soundlink/domain/user/dto/response/UserStatusResponseDto.java

@@ -1,7 +1,7 @@
 package org.dfbf.soundlink.domain.user.dto.response;
 
 public record UserStatusResponseDto(
-        Long userId,
+        String loginId,
         String onlineStatus,
         String chatStatus,
         String lastActiveStr