Feat: 채팅 로직 수정

Author: skyeong42

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

@@ -78,7 +78,7 @@ public GlobalResponse<Object> getByUserRoomList(Pageable pageable) {
             CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
             Long userId = principal.getId();  // getId()를 통해 userId를 추출
 
-            List<ChatRoomDto> userByRoomList = chatRoomService.getUserByRoomList(userId, pageable);
+            List<ChatRoomDto> userByRoomList = chatRoomService.roomsByCreatorUser(userId, pageable);
 
             // 방 리스트가 비어 있으면 notFound 응답 반환
             if (userByRoomList.isEmpty()) {

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

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

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

@@ -16,7 +16,7 @@ public interface ChatRoomService {
     List<ChatRoomDto> getRoomList(Pageable pageable);
 
     // 자신이 생성한 방 리스트 조회
-    List<ChatRoomDto> getUserByRoomList(Long userId, Pageable pageable);
+    List<ChatRoomDto> roomsByCreatorUser(Long userId, Pageable pageable);
 
     List<ChatRoomDto> getUserByRoomPartList(Long userId, Pageable pageable);
 

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

@@ -121,7 +121,7 @@ public List<ChatRoomDto> getRoomList(Pageable pageable) {
     // 자신이 생성한 방 리스트 조회
     @Override
     @Transactional(readOnly = true)
-    public List<ChatRoomDto> getUserByRoomList(Long userId, Pageable pageable) {
+    public List<ChatRoomDto> roomsByCreatorUser(Long userId, Pageable pageable) {
         Page<ChatRoom> all = chatRoomRepository.findAllByUserId(userId, pageable);
         return getChatRoomDtos(all);
     }
@@ -138,10 +138,11 @@ public List<ChatRoomDto> getUserByRoomPartList(Long userId, Pageable pageable) {
     @Override
     @Transactional
     public void outRoom(Long userId, Long roomId) {
-        Long roomCreatorId = chatRoomRepository
-                .findChatRoomByRoomCreator(roomId);
+        ChatRoom room = chatRoomRepository
+                .findChatRoomById(roomId)
+                .orElseThrow(() -> new CustomException(ErrorCode.NO_ROOM_FOUND));
         // 방장이 아니라면
-        if (!Objects.equals(roomCreatorId, userId)) {
+        if (!Objects.equals(room.getRoomCreator(), userId)) {
             userChatRoomRepository.deleteUserChatRoomByChatRoom_IdAndUserId(roomId, userId);
             return;
         }
@@ -156,10 +157,11 @@ public void outRoom(Long userId, Long roomId) {
     @Override
     @Transactional
     public void deleteRoom(Long userId, Long roomId) {
-        Long roomCreatorId = chatRoomRepository
-                .findChatRoomByRoomCreator(roomId);
+        ChatRoom room = chatRoomRepository
+                .findChatRoomById(roomId)
+                .orElseThrow(() -> new CustomException(ErrorCode.NONE_ROOM));
         //방장이 아닐 경우, 삭제 불가
-        if (!Objects.equals(roomCreatorId, userId)) {
+        if (!Objects.equals(room.getRoomCreator(), userId)) {
             throw new CustomException(ErrorCode.NOT_ROOM_CREATOR);
         }
         //모든 사용자 제거 후 방 삭제