Feat: 채팅방 유저 조회

Author: skyeong42

src/main/java/cmf/commitField/domain/chat/chatRoom/controller/ChatRoomController.java

@@ -3,6 +3,7 @@
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomRequest;
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomUpdateRequest;
 import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomDto;
+import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomUserDto;
 import cmf.commitField.domain.chat.chatRoom.service.ChatRoomService;
 import cmf.commitField.domain.user.entity.CustomOAuth2User;
 import cmf.commitField.global.error.ErrorCode;
@@ -165,4 +166,23 @@ public GlobalResponse<Object> deleteRoom(
         }
     }
 
+    //채팅방 유저 목록 조회
+    @GetMapping("/room/users/{roomId}")
+    @LoginCheck
+    public GlobalResponse<Object> getRoomUsers(
+            @PathVariable Long roomId) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        if (authentication instanceof OAuth2AuthenticationToken) {
+            CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
+            Long userId = principal.getId();  // Extract userId from the principal
+            List<ChatRoomUserDto> roomUsers = chatRoomService.getRoomUsers(roomId, userId);
+            return GlobalResponse.success(roomUsers);
+        } else {
+            throw new IllegalArgumentException("로그인 후에 이용해 주세요.");
+        }
+    }
+
+
+
 }

src/main/java/cmf/commitField/domain/chat/chatRoom/dto/ChatRoomUserDto.java

@@ -0,0 +1,13 @@
+package cmf.commitField.domain.chat.chatRoom.dto;
+
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ChatRoomUserDto {
+    private String nickname;
+    private Boolean status;
+}

src/main/java/cmf/commitField/domain/chat/chatRoom/repository/ChatRoomRepository.java

@@ -24,7 +24,7 @@ public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
 
     Page<ChatRoom> findAllByUserChatRoomsUserId(Long userId,Pageable pageable);
 
-    @Query(value = "SELECT ROOM_CREATOR FROM chat_room WHERE CHAT_ROOM_ID = ?", nativeQuery = true)
+    @Query(value = "SELECT ROOM_CREATOR FROM chat_room WHERE ID = ?", nativeQuery = true)
     Optional<Long> findChatRoomIdByRoomId(@Param("roomId") Long roomId);
 
 }

src/main/java/cmf/commitField/domain/chat/chatRoom/service/ChatRoomService.java

@@ -3,6 +3,7 @@
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomRequest;
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomUpdateRequest;
 import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomDto;
+import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomUserDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
@@ -26,4 +27,6 @@ public interface ChatRoomService {
     void deleteRoom(Long userId, Long roomId);
     //채팅방 제목 수정
     void updateRoom(Long roomId, ChatRoomUpdateRequest chatRoomUpdateRequest, Long userId);
+
+    List<ChatRoomUserDto> getRoomUsers(Long roomId, Long userId);
 }

src/main/java/cmf/commitField/domain/chat/chatRoom/service/ChatRoomServiceImpl.java

@@ -4,6 +4,7 @@
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomRequest;
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomUpdateRequest;
 import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomDto;
+import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomUserDto;
 import cmf.commitField.domain.chat.chatRoom.entity.ChatRoom;
 import cmf.commitField.domain.chat.chatRoom.repository.ChatRoomRepository;
 import cmf.commitField.domain.chat.userChatRoom.entity.UserChatRoom;
@@ -218,4 +219,35 @@ private ChatRoom getChatRoom(Long roomId) {
 
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public List<ChatRoomUserDto> getRoomUsers(Long roomId, Long userId) {
+        // 방 정보
+        getChatRoom(roomId);
+        // 로그인 유저 정보
+        getUser(userId);
+        // 방에 있는 유저 정보
+        List<UserChatRoom> userIds = userChatRoomRepository
+                .findUserChatRoomByChatRoomId(roomId);
+        // 방에 있지 않은 유저는 볼 수 없음
+        List<Long> userIdList = new ArrayList<>();
+        for (UserChatRoom chatRoom : userIds) {
+            Long id = chatRoom.getUser().getId();
+            userIdList.add(id);
+        }
+        if (!userIdList.contains(userId)) {
+            throw new CustomException(ErrorCode.NOT_ROOM_MEMBER);
+        }
+        // DTO 담기
+        List<ChatRoomUserDto> chatRoomUserDtos = new ArrayList<>();
+        for (UserChatRoom userChatRoom : userIds) {
+            ChatRoomUserDto build = ChatRoomUserDto.builder()
+                    .nickname(userChatRoom.getUser().getNickname())
+                    .status(userChatRoom.getUser().getStatus())
+                    .build();
+            chatRoomUserDtos.add(build);
+        }
+        return chatRoomUserDtos;
+    }
+
 }

src/main/java/cmf/commitField/domain/chat/userChatRoom/dto/UserChatRoomDto.java

@@ -31,5 +31,7 @@ public interface UserChatRoomRepository extends JpaRepository<UserChatRoom, Long
     @Query("select u.user.id from UserChatRoom u where u.chatRoom.id = ?1")
     List<Long> findUserChatRoomByChatRoom_Id(Long chatRoomId);
 
+    List<UserChatRoom> findUserChatRoomByChatRoomId(Long roomId);
+
 
 }

src/main/java/cmf/commitField/domain/chat/userChatRoom/repository/UserChatRoomRepository.java

@@ -25,6 +25,7 @@ public class User extends BaseEntity {
     private String email; // 이메일
     private String nickname; // 닉네임
     private String avatarUrl; //아바타
+    private Boolean status; //로그인 true, 로그아웃 false
 
     @Enumerated(EnumType.STRING)  // DB에 저장될 때 String 형태로 저장됨
     private Role role;

src/main/java/cmf/commitField/domain/user/entity/User.java

@@ -49,7 +49,7 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
         } else {
             //유저 정보가 db에 존재하지 않을 경우 회원가입 시킨다.
             //유저 생성 및 펫 생성
-            user = new User(username, email, name, avatarUrl, User.Role.USER, new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
+            user = new User(username, email, name, avatarUrl,true, User.Role.USER, new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
             userRepository.save(user);
 
             Random random = new Random(); //펫 랜덤 생성

src/main/java/cmf/commitField/domain/user/service/CustomOAuth2UserService.java

@@ -55,6 +55,7 @@ public enum ErrorCode {
     USER_CREATED_ROOM_NOT_FOUND(HttpStatus.NOT_FOUND, "사용자가 생성한 방이 없습니다."),
     ALREADY_JOIN_ROOM(HttpStatus.BAD_REQUEST, "사용자는 이미 해당 방에 참여하고 있습니다."),
     NOT_EXIST_CLIENT(HttpStatus.NOT_FOUND, "채팅방에 사용자가 존재하지 않습니다."),
+    NOT_ROOM_MEMBER(HttpStatus.FORBIDDEN, "채팅방에 속한 유저가 아닙니다."),
 
     //chatMessage
     EMPTY_MESSAGE(HttpStatus.BAD_REQUEST, "채팅 메시지는 공백으로 보낼 수 없습니다."),