Merge pull request #137 from EFUB5-RoomListener/revert-132-develop

Revert "[Deploy] 방 내부 사용자 조회 반영"

Author: kim-gyurin

mavve/src/main/java/com/efub/mavve/room/controller/RoomController.java

@@ -111,13 +111,6 @@ public ResponseEntity<RoomEnterResponse> getRoomEnterInfo(@PathVariable("roomId"
         return ResponseEntity.ok(response);
     }
 
-    // 방 내부 사용자 조회
-    @GetMapping("/{roomId}/users")
-    public ResponseEntity<RoomUserResponse> getUserInRoom(@PathVariable("roomId") Long roomId){
-        RoomUserResponse response = roomService.getUserInRoom(roomId);
-        return ResponseEntity.ok(response);
-    }
-
     // 방에 플레이리스트 추가
     @PostMapping("/{roomId}/playlists")
     public void addPlaylistInRoom(@PathVariable("roomId") Long roomId,

mavve/src/main/java/com/efub/mavve/room/dto/response/RoomUserResponse.java

@@ -1,7 +1,6 @@
 package com.efub.mavve.room.service;
 
 import com.efub.mavve.auth.domain.User;
-import com.efub.mavve.auth.repository.UserRepository;
 import com.efub.mavve.global.exception.ExceptionCode;
 import com.efub.mavve.global.exception.MavveException;
 import com.efub.mavve.room.domain.Room;
@@ -12,8 +11,6 @@
 import com.efub.mavve.room.dto.response.RoomEnterResponse;
 import com.efub.mavve.room.dto.response.RoomListResponse;
 import com.efub.mavve.room.dto.response.RoomResponse;
-import com.efub.mavve.room.dto.response.RoomUserResponse;
-import com.efub.mavve.room.dto.summary.RoomUserSummary;
 import com.efub.mavve.room.payload.summary.CurrentSongSummary;
 import com.efub.mavve.room.payload.summary.SongRedis;
 import com.efub.mavve.room.repository.RoomRepository;
@@ -41,7 +38,6 @@ public class RoomService {
     private final RoomSongService roomSongService;
     private final RoomPlaylistService roomPlaylistService;
     private final RoomLikeRepository roomLikeRepository;
-    private final UserRepository userRepository;
 
     // 방 생성
     @Transactional
@@ -226,14 +222,4 @@ private String getTotalDurationTime(List<SongRedis> songs){
         else if (minutes > 0) return String.format("%d분 %d초", minutes, seconds);
         else return String.format("%d초", seconds);
     }
-
-    public RoomUserResponse getUserInRoom(Long roomId) {
-        List<String> userIds = roomUserRedisService.getAllUsers(roomId);
-        List<RoomUserSummary> users = userIds.stream().map(userId -> {
-            User user = userRepository.findByUserId(Long.parseLong(userId))
-                    .orElseThrow(() -> new MavveException(ExceptionCode.USER_NOT_FOUND));
-            return RoomUserSummary.from(user);
-        }).collect(Collectors.toList());
-        return RoomUserResponse.from(users);
-    }
 }

mavve/src/main/java/com/efub/mavve/room/dto/summary/RoomUserSummary.java

@@ -40,11 +40,11 @@ public boolean hasUsers(Long roomCode){
     }
 
     // 현재 방에 남이있는 사용자 전체 조회
-    public List<String> getAllUsers(Long roomCode) {
+    private List<String> getAllUsers(Long roomCode) {
         String key = RoomRedisKeyUtils.getUserListKey(roomCode);
         List<String> userList = stringRedisTemplate.opsForList().range(key, 0, -1);
 
-        if(userList == null || userList.isEmpty()) return Collections.emptyList();
+        if(userList == null) return Collections.emptyList();
         return userList;
     }