Feat: 방 비밀번호 기능 추가 및 채팅방 나가기

Author: skyeong42

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

@@ -44,13 +44,13 @@ public GlobalResponse<Object> createRoom(
 
     //채팅방 입장
     @PostMapping("/room/join/{roomId}")
-    public GlobalResponse<Object> joinRoom(@PathVariable Long roomId) {
+    public GlobalResponse<Object> joinRoom(@PathVariable Long roomId, @RequestBody ChatRoomRequest chatRoomRequest) {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
         if (authentication instanceof OAuth2AuthenticationToken) {
             CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
             Long userId = principal.getId();  // getId()를 통해 userId를 추출
-            chatRoomService.joinRoom(roomId, userId);  // userId를 전달
+            chatRoomService.joinRoom(roomId, userId, chatRoomRequest);  // userId를 전달
             return GlobalResponse.success("해당 채팅방에 입장하셨습니다");
         } else {
             throw new IllegalArgumentException("로그인 후에 이용해 주세요.");

src/main/java/cmf/commitField/domain/chat/chatRoom/controller/request/ChatRoomRequest.java

@@ -21,5 +21,7 @@ public class ChatRoomRequest {
     @Max(100)
     private Integer userCountMax;
 
+    @Length(min = 4, max = 20)
+    private String password;
 
 }

src/main/java/cmf/commitField/domain/chat/chatRoom/entity/ChatRoom.java

@@ -41,6 +41,10 @@ public class ChatRoom extends BaseEntity {
     @OneToMany(mappedBy = "chatRoom", fetch = FetchType.LAZY)
     private List<Heart> hearts;
 
+    private String password;
+
+    private Boolean isPrivate;
+
     @Override
     public String toString() {
         return "ChatRoom{" +

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

@@ -34,4 +34,5 @@ public interface ChatRoomService {
 
     List<ChatRoomDto> myHeartRoomList(Long userId, Pageable pageable);
 
+    void joinRoom(Long roomId, Long userId, ChatRoomRequest chatRoomRequest);
 }

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

@@ -52,6 +52,7 @@ public void createRoom(ChatRoomRequest chatRoomRequest, Long userId) {
         // 유저정보 조회
         User findUser = userRepository.findById(userId)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
+        String password = chatRoomRequest.getPassword();
 
         // findUser가 null이 아닐 경우, User의 ID를 사용
         if (findUser == null) {
@@ -65,7 +66,12 @@ public void createRoom(ChatRoomRequest chatRoomRequest, Long userId) {
                 .userCountMax(chatRoomRequest.getUserCountMax())
                 .createdAt(LocalDateTime.now())
                 .modifiedAt(LocalDateTime.now())
+                .isPrivate(false)
                 .build();
+        if (password != null) {
+            chatRoom.setPassword(password);
+            chatRoom.setIsPrivate(true);
+        }
         ChatRoom savedChatRoom = chatRoomRepository.save(chatRoom);
 
         // 연관관계 user_chat room 생성
@@ -76,6 +82,11 @@ public void createRoom(ChatRoomRequest chatRoomRequest, Long userId) {
         userChatRoomRepository.save(userChatRoom);
     }
 
+    @Override
+    public void joinRoom(Long roomId, Long userId) {
+
+    }
+
     // 방 조회 DTO 변환 메서드 추출
     private static List<ChatRoomDto> getChatRoomDtos(Page<ChatRoom> all) {
         return all.stream()
@@ -111,7 +122,7 @@ public List<ChatRoomDto> getUserByRoomPartList(Long userId, Pageable pageable) {
 
     @Override
     @Transactional
-    public void joinRoom(Long roomId, Long userId) {
+    public void joinRoom(Long roomId, Long userId, ChatRoomRequest chatRoomRequest) {
         RLock lock = redissonClient.getLock("joinRoomLock:" + roomId);
         try {
             boolean available = lock.tryLock(1, TimeUnit.SECONDS);
@@ -129,6 +140,15 @@ public void joinRoom(Long roomId, Long userId) {
             // user_chatroom 현재 인원 카운트 (비즈니스 로직)
             Long currentUserCount = userChatRoomRepository.countNonLockByChatRoomId(roomId); // lock (기존)
 
+            if (chatRoom.getIsPrivate() && chatRoomRequest.getPassword() == null) {
+                throw new CustomException(ErrorCode.NEED_TO_PASSWORD);
+
+
+
+            }
+            if (chatRoom.getIsPrivate() && !chatRoomRequest.getPassword().equals(chatRoom.getPassword())) {
+                throw new CustomException(ErrorCode.ROOM_PASSWORD_MISMATCH);
+            }
             List<Long> userChatRoomByChatRoomId = userChatRoomRepository
                     .findUserChatRoomByChatRoom_Id(roomId);
 
@@ -160,6 +180,17 @@ public void joinRoom(Long roomId, Long userId) {
     @Transactional
     public void outRoom(Long userId, Long roomId) {
         ChatRoom room = getChatRoom(roomId);
+        List<UserChatRoom> userByChatRoomId = userChatRoomRepository
+                .findUserByChatRoomId(roomId);
+        List<Long> userIds = new ArrayList<>();
+        for (UserChatRoom userChatRoom : userByChatRoomId) {
+            Long id = userChatRoom.getUser().getId();
+            userIds.add(id);
+        }
+        // 만약 방에 없는데 나가기를 시도한 경우
+        if (!userIds.contains(userId)) {
+            throw new CustomException(ErrorCode.METHOD_NOT_ALLOWED);
+        }
         // 방장이 아니라면
         if (!Objects.equals(room.getRoomCreator(), userId)) {
             userChatRoomRepository.deleteUserChatRoomByChatRoom_IdAndUserId(roomId, userId);

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

@@ -32,6 +32,7 @@ public interface UserChatRoomRepository extends JpaRepository<UserChatRoom, Long
     List<Long> findUserChatRoomByChatRoom_Id(Long chatRoomId);
 
     List<UserChatRoom> findUserChatRoomByChatRoomId(Long roomId);
-
+    //out room 조회
+    List<UserChatRoom> findUserByChatRoomId(Long roomId);
 
 }

src/main/java/cmf/commitField/global/error/ErrorCode.java

@@ -32,8 +32,10 @@ public enum ErrorCode {
 
     TOKEN_EXPIRED(HttpStatus.BAD_REQUEST, "토큰이 만료되었습니다."),
 
-    // member
+    // user_room
     MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "사용자를 찾을 수 없습니다"),
+    NEED_TO_PASSWORD(HttpStatus.BAD_REQUEST, "비밀번호를 입력해야 합니다."),
+    ROOM_PASSWORD_MISMATCH(HttpStatus.BAD_REQUEST, "방 비밀번호가 일치하지 않습니다."),
 
     // season
     NOT_FOUND_SEASON(HttpStatus.NOT_FOUND, "시즌을 찾을 수 없습니다."),
@@ -57,6 +59,7 @@ public enum ErrorCode {
     NOT_EXIST_CLIENT(HttpStatus.NOT_FOUND, "채팅방에 사용자가 존재하지 않습니다."),
     NOT_ROOM_MEMBER(HttpStatus.FORBIDDEN, "채팅방에 속한 유저가 아닙니다."),
 
+
     //chatMessage
     EMPTY_MESSAGE(HttpStatus.BAD_REQUEST, "채팅 메시지는 공백으로 보낼 수 없습니다."),
     CHAT_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 채팅방의 메시지들을 찾지 못했습니다."),