Merge pull request #130 from Dugout-Developers/feat/#129

[FEAT] 채팅방 단일 정보 조회 기능 구현

Author: jjeongdong

src/main/java/com/back/catchmate/domain/chat/controller/ChatRoomController.java

@@ -40,6 +40,13 @@ public ChatResponse.PagedChatRoomInfo getChatRoomList(@JwtValidation Long userId
         return chatRoomService.getChatRoomList(userId, pageable);
     }
 
+    @GetMapping("/{chatRoomId}}")
+    @Operation(summary = "채팅방 정보 조회 API", description = "체팅방 정보를 조회하는 API 입니다.")
+    public ChatResponse.ChatRoomInfo getChatRoom(@JwtValidation Long userId,
+                                                 @PathVariable Long chatRoomId) {
+        return chatRoomService.getChatRoom(userId, chatRoomId);
+    }
+
     @DeleteMapping("/{chatRoomId}")
     @Operation(summary = "내가 속한 채팅방 나가기 API", description = "내가 속해있는 채팅방을 나가는 API 입니다.")
     public StateResponse leaveChatRoom(@JwtValidation Long userId,

src/main/java/com/back/catchmate/domain/chat/repository/ChatRoomRepository.java

@@ -6,7 +6,9 @@
 import java.util.Optional;
 
 public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
-    Optional<ChatRoom> findByBoardId(Long boardId);
+    Optional<ChatRoom> findByIdAndDeletedAtIsNull(Long chatRoomId);
+
+    Optional<ChatRoom> findByBoardIdAndDeletedAtIsNull(Long boardId);
 
     boolean existsByBoardId(Long boardId);
 }

src/main/java/com/back/catchmate/domain/chat/service/ChatRoomService.java

@@ -1,5 +1,6 @@
 package com.back.catchmate.domain.chat.service;
 
+import com.back.catchmate.domain.chat.dto.ChatResponse.ChatRoomInfo;
 import com.back.catchmate.domain.chat.dto.ChatResponse.PagedChatRoomInfo;
 import com.back.catchmate.global.dto.StateResponse;
 import org.springframework.data.domain.Pageable;
@@ -12,6 +13,8 @@ public interface ChatRoomService {
 
     PagedChatRoomInfo getChatRoomList(Long userId, Pageable pageable);
 
+    ChatRoomInfo getChatRoom(Long userId, Long chatRoomId);
+
     StateResponse updateChatRoomImage(Long userId, Long chatRoomId, MultipartFile image) throws IOException;
 
     StateResponse kickUserFromChatRoom(Long adminId, Long chatRoomId, Long userId);

src/main/java/com/back/catchmate/domain/chat/service/ChatRoomServiceImpl.java

@@ -2,6 +2,8 @@
 
 import com.back.catchmate.domain.chat.converter.ChatRoomConverter;
 import com.back.catchmate.domain.chat.dto.ChatResponse;
+import com.back.catchmate.domain.chat.dto.ChatResponse.ChatRoomInfo;
+import com.back.catchmate.domain.chat.dto.ChatResponse.PagedChatRoomInfo;
 import com.back.catchmate.domain.chat.entity.ChatRoom;
 import com.back.catchmate.domain.chat.entity.UserChatRoom;
 import com.back.catchmate.domain.chat.repository.ChatRoomRepository;
@@ -35,19 +37,32 @@ public class ChatRoomServiceImpl implements ChatRoomService {
 
     @Override
     @Transactional(readOnly = true)
-    public ChatResponse.PagedChatRoomInfo getChatRoomList(Long userId, Pageable pageable) {
+    public PagedChatRoomInfo getChatRoomList(Long userId, Pageable pageable) {
         Page<UserChatRoom> userChatRoomList = userChatRoomRepository.findAllByUserId(userId, pageable);
         return chatRoomConverter.toPagedChatRoomInfo(userChatRoomList);
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public ChatRoomInfo getChatRoom(Long userId, Long chatRoomId) {
+        ChatRoom chatRoom = chatRoomRepository.findByIdAndDeletedAtIsNull(chatRoomId)
+                .orElseThrow(() -> new BaseException(ErrorCode.CHATROOM_NOT_FOUND));
+
+        if (!userChatRoomRepository.existsByUserIdAndChatRoomIdAndDeletedAtIsNull(userId, chatRoomId)) {
+            throw new BaseException(ErrorCode.USER_CHATROOM_NOT_FOUND);
+        }
+
+        return chatRoomConverter.toChatRoomInfo(chatRoom, chatRoom.getBoard());
+    }
+
     @Override
     @Transactional
     public StateResponse leaveChatRoom(Long userId, Long chatRoomId) {
         // 채팅방과 사용자 정보 조회
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new BaseException(ErrorCode.USER_NOT_FOUND));
 
-        ChatRoom chatRoom = chatRoomRepository.findById(chatRoomId)
+        ChatRoom chatRoom = chatRoomRepository.findByIdAndDeletedAtIsNull(chatRoomId)
                 .orElseThrow(() -> new BaseException(ErrorCode.CHATROOM_NOT_FOUND));
 
         // UserChatRoom 엔티티를 찾아서 나가기

src/main/java/com/back/catchmate/domain/enroll/service/EnrollServiceImpl.java

@@ -195,7 +195,7 @@ public UpdateEnrollInfo acceptEnroll(Long enrollId, Long userId) throws IOExcept
     }
 
     private void enterChatRoom(User user, Board board) {
-        ChatRoom chatRoom = chatRoomRepository.findByBoardId(board.getId())
+        ChatRoom chatRoom = chatRoomRepository.findByBoardIdAndDeletedAtIsNull(board.getId())
                 .orElseThrow(() -> new BaseException(ErrorCode.CHATROOM_NOT_FOUND));
 
         chatRoom.incrementParticipantCount();