Feat: 채팅방 전체 조회, 생성 조회

skyeong42 · skyeong42 · commit 8941fdf75f60 · 2025-02-24T15:50:22.000+09:00
diff --git a/src/main/java/cmf/commitField/domain/chat/chatRoom/controller/ChatRoomController.java b/src/main/java/cmf/commitField/domain/chat/chatRoom/controller/ChatRoomController.java
@@ -1,16 +1,22 @@
 package cmf.commitField.domain.chat.chatRoom.controller;
 
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomRequest;
+import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomDto;
 import cmf.commitField.domain.chat.chatRoom.service.ChatRoomService;
 import cmf.commitField.domain.user.entity.CustomOAuth2User;
 import cmf.commitField.global.globalDto.GlobalResponse;
+import cmf.commitField.global.security.LoginCheck;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/chat")
@@ -47,4 +53,30 @@ public GlobalResponse<Object> joinRoom(@PathVariable Long roomId) {
             throw new IllegalArgumentException("User not logged in.");
         }
     }
+
+    // 전체 리스트
+    @GetMapping("/room")
+    @LoginCheck
+    public ResponseEntity<Object> roomList(Pageable pageable) {
+        List<ChatRoomDto> roomList = chatRoomService.getRoomList(pageable);
+        return ResponseEntity.ok().body(roomList);
+    }
+
+    // 사용자(자신)가 생성한 방 리스트 조회
+    @GetMapping("/room/creator")
+    @LoginCheck
+    public ResponseEntity<Object> getByUserRoomList(Pageable pageable) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        if (authentication instanceof OAuth2AuthenticationToken) {
+            CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
+            Long userId = principal.getId();  // getId()를 통해 userId를 추출
+
+            List<ChatRoomDto> userByRoomList = chatRoomService.getUserByRoomList(userId, pageable);
+            return ResponseEntity.ok().body(userByRoomList);
+        } else {
+            throw new IllegalArgumentException("User not logged in.");
+        }
+    }
+
 }
diff --git a/src/main/java/cmf/commitField/domain/chat/chatRoom/controller/response/ChatRoomResponse.java b/src/main/java/cmf/commitField/domain/chat/chatRoom/controller/response/ChatRoomResponse.java
@@ -1,4 +1,4 @@
-package cmf.commitField.domain.chat.chatRoom.controller.response;
-
-public class ChatRoomResponse {
-}
+//package cmf.commitField.domain.chat.chatRoom.controller.response;
+//
+//public class ChatRoomResponse {
+//}
diff --git a/src/main/java/cmf/commitField/domain/chat/chatRoom/dto/ChatRoomDto.java b/src/main/java/cmf/commitField/domain/chat/chatRoom/dto/ChatRoomDto.java
@@ -0,0 +1,18 @@
+package cmf.commitField.domain.chat.chatRoom.dto;
+
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ChatRoomDto {
+    private Long id;
+
+    private String title;
+
+    private Long currentUserCount;
+
+    private Integer userCountMax;
+}
diff --git a/src/main/java/cmf/commitField/domain/chat/chatRoom/entity/ChatRoom.java b/src/main/java/cmf/commitField/domain/chat/chatRoom/entity/ChatRoom.java
@@ -35,4 +35,18 @@ public class ChatRoom extends BaseEntity {
 
     @OneToMany(mappedBy = "chatRoom", fetch = FetchType.LAZY)
     private List<ChatMessage> chatMessages;
+
+    @Override
+    public String toString() {
+        return "ChatRoom{" +
+                // BaseEntity에서 상속받은 id 사용
+                "id=" + getId() +
+                ", title='" + title + '\'' +
+                ", tier='" + tier + '\'' +
+                ", roomCreator=" + roomCreator +
+                ", userCountMax=" + userCountMax +
+                ", user=" + (user != null ? user.getId() : "null") +  // user가 null일 수 있기 때문에 체크
+                ", userChatRooms=" + (userChatRooms != null ? userChatRooms.size() : 0) + // userChatRooms 리스트가 null일 수 있기 때문에 체크
+                '}';
+    }
 }
diff --git a/src/main/java/cmf/commitField/domain/chat/chatRoom/repository/ChatRoomRepository.java b/src/main/java/cmf/commitField/domain/chat/chatRoom/repository/ChatRoomRepository.java
@@ -3,9 +3,13 @@
 import cmf.commitField.domain.chat.chatRoom.entity.ChatRoom;
 import jakarta.persistence.LockModeType;
 import jakarta.persistence.QueryHint;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Lock;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.QueryHints;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
@@ -16,4 +20,12 @@ public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
     @Lock(LockModeType.PESSIMISTIC_WRITE)
     @QueryHints({@QueryHint(name = "javax.persistence.lock.timeout", value ="1000")})
     Optional<ChatRoom> findById(Long aLong);
+
+    @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);
+
+//    @Query(value = "SELECT ROOM_CREATOR FROM chat_room WHERE CHAT_ROOM_ID = ?", nativeQuery = true)
+//    Long findChatRoomByRoomCreator(Long roomId);
 }
diff --git a/src/main/java/cmf/commitField/domain/chat/chatRoom/service/ChatRoomService.java b/src/main/java/cmf/commitField/domain/chat/chatRoom/service/ChatRoomService.java
@@ -1,10 +1,26 @@
 package cmf.commitField.domain.chat.chatRoom.service;
 
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomRequest;
+import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomDto;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
 
 public interface ChatRoomService {
 
     void createRoom(ChatRoomRequest chatRoomRequest, Long userId);  // userId를 받도록 수정
 
     void joinRoom(Long roomId, Long userId);  // userId를 받도록 수정
+
+    // 채팅방 전체 조회
+    List<ChatRoomDto> getRoomList(Pageable pageable);
+
+    // 자신이 생성한 방 리스트 조회
+    List<ChatRoomDto> getUserByRoomList(Long userId, org.springframework.data.domain.Pageable pageable);
+
+//    List<ChatRoomDto> getUserByRoomPartList(Long userId, Pageable pageable);
+//
+//    void outRoom(Long userId, Long roomId);
+//
+//    void deleteRoom(Long userId, Long roomId);
 }
diff --git a/src/main/java/cmf/commitField/domain/chat/chatRoom/service/ChatRoomServiceImpl.java b/src/main/java/cmf/commitField/domain/chat/chatRoom/service/ChatRoomServiceImpl.java
@@ -1,6 +1,8 @@
 package cmf.commitField.domain.chat.chatRoom.service;
 
+import cmf.commitField.domain.chat.chatMessage.repository.ChatMessageRepository;
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomRequest;
+import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomDto;
 import cmf.commitField.domain.chat.chatRoom.entity.ChatRoom;
 import cmf.commitField.domain.chat.chatRoom.repository.ChatRoomRepository;
 import cmf.commitField.domain.chat.userChatRoom.entity.UserChatRoom;
@@ -9,11 +11,15 @@
 import cmf.commitField.domain.user.repository.UserRepository;
 import cmf.commitField.global.error.ErrorCode;
 import cmf.commitField.global.exception.CustomException;
-import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @Service
 @RequiredArgsConstructor
@@ -22,6 +28,7 @@ public class ChatRoomServiceImpl implements ChatRoomService {
     private final ChatRoomRepository chatRoomRepository;
     private final UserRepository userRepository;
     private final UserChatRoomRepository userChatRoomRepository;
+    private final ChatMessageRepository chatMessageRepository;
 
     @Override
     @Transactional
@@ -74,4 +81,77 @@ public void joinRoom(Long roomId, Long userId) {
                 .build();
         userChatRoomRepository.save(userChatRoom);
     }
+
+////    chatMsgRepository.deleteById(roomId); 방 삭제 시 채팅도 다 삭제 되어야 함.
+//    }
+//
+    // 방 조회 DTO 변환 메서드 추출
+    private static List<ChatRoomDto> getChatRoomDtos(Page<ChatRoom> all) {
+        List<ChatRoomDto> chatRoomList = new ArrayList<>();
+
+        for (ChatRoom list : all) {
+            ChatRoomDto dto = ChatRoomDto.builder()
+                    .id(list.getId())
+                    .title(list.getTitle())
+                    .currentUserCount((long) list.getUserChatRooms().size())
+                    .userCountMax(list.getUserCountMax())
+                    .build();
+
+            chatRoomList.add(dto);
+        }
+        return chatRoomList;
+    }
+
+    // 채팅방 전체 조회
+    @Override
+//    @Transactional(readOnly = true)
+    public List<ChatRoomDto> getRoomList(Pageable pageable) {
+        Page<ChatRoom> all = chatRoomRepository.findAll(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
+//    public void outRoom(Long userId, Long roomId) {
+//        Long roomCreatorId = chatRoomRepository
+//                .findChatRoomByRoomCreator(roomId);
+//        // 방장이 아니라면
+//        if (!Objects.equals(roomCreatorId, userId)) {
+//            userChatRoomRepository.deleteUserChatRoomByUserId(userId);
+//            return;
+//        }
+//        // 방장이라면 방 삭제
+//        userChatRoomRepository.deleteUserChatRoomByChatRoom_Id(roomId);
+//        chatRoomRepository.deleteById(roomId);
+//    }
+//
+//    @Override
+//    @Transactional
+//    public void deleteRoom(Long userId, Long roomId) {
+//        Long roomCreatorId = chatRoomRepository
+//                .findChatRoomByRoomCreator(roomId);
+//        if (!Objects.equals(roomCreatorId, userId)) {
+//            throw new CustomException(ErrorCode.NOT_ROOM_CREATOR);
+//        }
+//        userChatRoomRepository.deleteUserChatRoomByChatRoom_Id(roomId);
+//        chatRoomRepository.deleteById(roomId);
+//        // todo : 채팅 메시지 구현 시, 방 삭제할 때 메시지도 같이 삭제되는 메서드 구현
+
+    // 자신이 생성한 방 리스트 조회
+    @Override
+//
+    public List<ChatRoomDto> getUserByRoomList(Long userId, Pageable pageable) {
+        Page<ChatRoom> all = chatRoomRepository.findAllByUserId(userId, pageable);
+        return getChatRoomDtos(all);
+    }
+
+
 }
diff --git a/src/main/java/cmf/commitField/domain/chat/userChatRoom/repository/UserChatRoomRepository.java b/src/main/java/cmf/commitField/domain/chat/userChatRoom/repository/UserChatRoomRepository.java
@@ -7,6 +7,7 @@
 import org.springframework.data.jpa.repository.Lock;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.QueryHints;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -16,6 +17,12 @@ public interface UserChatRoomRepository extends JpaRepository<UserChatRoom, Long
     @QueryHints({@QueryHint(name = "javax.persistence.lock.timeout", value = "1000")})
     Long countByChatRoomId(Long roomId); // 비관적 락
 
-    @Query("select count(*) from UserChatRoom u where u.chatRoom.id = ?1 ")
-    Long countNonLockByChatRoomId(Long roomId); // test 용도
+//    @Query("select count(*) from UserChatRoom u where u.chatRoom.id = ?1 ")
+//    Long countNonLockByChatRoomId(Long roomId); // test 용도
+    @Query("select count(*) from UserChatRoom u where u.chatRoom.id = :roomId")
+    Long countNonLockByChatRoomId(@Param("roomId")Long roomId); // test 용도
+
+    void deleteUserChatRoomByChatRoom_Id(Long chatRoomId);
+
+    void deleteUserChatRoomByUserId(Long userId);
 }
diff --git a/src/main/java/cmf/commitField/global/error/ErrorCode.java b/src/main/java/cmf/commitField/global/error/ErrorCode.java
@@ -35,7 +35,10 @@ public enum ErrorCode {
 
     //chatroom
     NOT_FOUND_ROOM(HttpStatus.NOT_FOUND, "이미 삭제된 방이거나 방을 찾을 수 없습니다."),
-    ROOM_USER_FULL(HttpStatus.BAD_REQUEST, "방에 사용자가 다 차 있습니다.");
+    ROOM_USER_FULL(HttpStatus.BAD_REQUEST, "방에 사용자가 다 차 있습니다."),
+    NONE_ROOM(HttpStatus.NOT_FOUND, "현재 방이 없습니다."),
+    CHAT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "채팅 전송에 오류가 있습니다."),
+    NOT_ROOM_CREATOR(HttpStatus.FORBIDDEN, "방 생성자가 아닙니다.");
 
     private final HttpStatus httpStatus;
     private final String message;
diff --git a/src/main/java/cmf/commitField/global/security/LoginCheck.java b/src/main/java/cmf/commitField/global/security/LoginCheck.java
@@ -0,0 +1,11 @@
+package cmf.commitField.global.security;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)  // 메서드에 적용
+@Retention(RetentionPolicy.RUNTIME)  // 런타임 시에 적용
+public @interface LoginCheck {
+}
diff --git a/src/main/java/cmf/commitField/global/security/LoginCheckInterceptor.java b/src/main/java/cmf/commitField/global/security/LoginCheckInterceptor.java
@@ -0,0 +1,28 @@
+package cmf.commitField.global.security;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.messaging.handler.HandlerMethod;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+@Component
+public class LoginCheckInterceptor implements HandlerInterceptor {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        if (handler instanceof HandlerMethod) {
+            HandlerMethod handlerMethod = (HandlerMethod) handler;
+            LoginCheck loginCheck = handlerMethod.getMethodAnnotation(LoginCheck.class);
+
+            if (loginCheck != null) {
+                if (SecurityContextHolder.getContext().getAuthentication() == null) {
+                    response.sendRedirect("/login");
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+}
diff --git a/src/main/java/cmf/commitField/global/security/WebConfig.java b/src/main/java/cmf/commitField/global/security/WebConfig.java
@@ -0,0 +1,22 @@
+package cmf.commitField.global.security;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    private final LoginCheckInterceptor loginCheckInterceptor;
+
+    public WebConfig(LoginCheckInterceptor loginCheckInterceptor) {
+        this.loginCheckInterceptor = loginCheckInterceptor;
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        // @LoginCheck가 붙은 메서드에 대해 인터셉터를 적용
+        registry.addInterceptor(loginCheckInterceptor)
+                .addPathPatterns("/chat/**");  // /chat 경로에만 인터셉터 적용
+    }
+}
