Feat: 사용자가 참여한 방 조회

Author: skyeong42

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

@@ -79,4 +79,54 @@ public ResponseEntity<Object> getByUserRoomList(Pageable pageable) {
         }
     }
 
+    // 사용자(자신)가 들어가 있는 방 리스트 조회
+    @GetMapping("/room/part")
+    @LoginCheck
+    public ResponseEntity<Object> getByUserRoomPartList(Pageable pageable) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        if (authentication instanceof OAuth2AuthenticationToken) {
+            CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
+            Long userId = principal.getId();  // getId()를 통해 userId를 추출
+            List<ChatRoomDto> userByRoomPartList = chatRoomService.getUserByRoomPartList(userId, pageable);
+            return ResponseEntity.ok().body(userByRoomPartList);
+        } else {
+            throw new IllegalArgumentException("User not logged in.");
+        }
+    }
+
+//    // 채팅방 나가기
+//    @DeleteMapping("/room/out/{roomId}")
+//    @LoginCheck
+//    public ResponseEntity<Object> outRoom(
+//            @PathVariable Long roomId) {
+//        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+//
+//        if (authentication instanceof OAuth2AuthenticationToken) {
+//            CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
+//            Long userId = principal.getId();  // getId()를 통해 userId를 추출
+//            chatRoomService.outRoom(userId, roomId);
+//            return ResponseEntity.ok().body("success");
+//        } else {
+//            throw new IllegalArgumentException("User not logged in.");
+//        }
+//    }
+//
+//    // 채팅방 삭제
+//    @DeleteMapping("/room/delete/{roomId}")
+//    @LoginCheck
+//    public ResponseEntity<Object> deleteRoom(
+//            @PathVariable Long roomId) {
+//        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+//
+//        if (authentication instanceof OAuth2AuthenticationToken) {
+//            CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
+//            Long userId = principal.getId();  // getId()를 통해 userId를 추출
+//            chatRoomService.deleteRoom(userId, roomId);
+//            return ResponseEntity.ok().body("success");
+//        } else {
+//            throw new IllegalArgumentException("User not logged in.");
+//        }
+//    }
+
 }

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

@@ -24,7 +24,7 @@ public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
     @Query("select c from ChatRoom c where c.roomCreator=:userId")
     Page<ChatRoom> findAllByUserId(@Param("userId")Long userId,Pageable pageable);
 
-//    Page<ChatRoom> findAllByUserChatRoomsUserId(Long userId,Pageable pageable);
+    Page<ChatRoom> findAllByUserChatRoomsUserId(Long userId,Pageable pageable);
 
 //    @Query(value = "SELECT ROOM_CREATOR FROM chat_room WHERE CHAT_ROOM_ID = ?", nativeQuery = true)
 //    Long findChatRoomByRoomCreator(Long roomId);

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

@@ -18,7 +18,7 @@ public interface ChatRoomService {
     // 자신이 생성한 방 리스트 조회
     List<ChatRoomDto> getUserByRoomList(Long userId, org.springframework.data.domain.Pageable pageable);
 
-//    List<ChatRoomDto> getUserByRoomPartList(Long userId, Pageable pageable);
+    List<ChatRoomDto> getUserByRoomPartList(Long userId, Pageable pageable);
 //
 //    void outRoom(Long userId, Long roomId);
 //

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

@@ -110,13 +110,22 @@ public List<ChatRoomDto> getRoomList(Pageable pageable) {
         return getChatRoomDtos(all);
     }
 
-//    // 자신이 참여한 방 리스트 조회
-//    @Override
-//    public List<ChatRoomDto> getUserByRoomPartList(Long userId, Pageable pageable) {
-//        Page<ChatRoom> allByUserIdAndUserChatRooms = chatRoomRepository
-//                .findAllByUserChatRoomsUserId(userId, pageable);
-//        return getChatRoomDtos(allByUserIdAndUserChatRooms);
-//    }
+    // 자신이 생성한 방 리스트 조회
+    @Override
+    @Transactional(readOnly = true)
+    public List<ChatRoomDto> getUserByRoomList(Long userId, Pageable pageable) {
+        Page<ChatRoom> all = chatRoomRepository.findAllByUserId(userId, pageable);
+        return getChatRoomDtos(all);
+    }
+
+    // 자신이 참여한 방 리스트 조회
+    @Override
+    @Transactional(readOnly = true)
+    public List<ChatRoomDto> getUserByRoomPartList(Long userId, Pageable pageable) {
+        Page<ChatRoom> allByUserIdAndUserChatRooms = chatRoomRepository
+                .findAllByUserChatRoomsUserId(userId, pageable);
+        return getChatRoomDtos(allByUserIdAndUserChatRooms);
+    }
 
 //    @Override
 //    @Transactional
@@ -143,15 +152,9 @@ public List<ChatRoomDto> getRoomList(Pageable pageable) {
 //        }
 //        userChatRoomRepository.deleteUserChatRoomByChatRoom_Id(roomId);
 //        chatRoomRepository.deleteById(roomId);
-//        // todo : 채팅 메시지 구현 시, 방 삭제할 때 메시지도 같이 삭제되는 메서드 구현
+    // 채팅 메시지 구현 시, 방 삭제할 때 메시지도 같이 삭제되는 메서드 구현
+
 
-    // 자신이 생성한 방 리스트 조회
-    @Override
-    @Transactional(readOnly = true)
-    public List<ChatRoomDto> getUserByRoomList(Long userId, Pageable pageable) {
-        Page<ChatRoom> all = chatRoomRepository.findAllByUserId(userId, pageable);
-        return getChatRoomDtos(all);
-    }
 
 
 }