Refact: join 관련 기능 보완

Author: skyeong42

src/main/java/cmf/commitField/domain/chat/chatMessage/controller/response/ChatMsgResponse.java

@@ -10,7 +10,7 @@
 @AllArgsConstructor
 @Builder
 public class ChatMsgResponse {
-    private Long chatMsgId;
+    //채팅방 ID
     private Long roomId;
     //사용자(user)
     private String from;

src/main/java/cmf/commitField/domain/chat/chatMessage/service/ChatMessageServiceImpl.java

@@ -51,21 +51,22 @@ public ChatMsgResponse sendMessage(ChatMsgRequest message, Long userId, Long roo
                 .chatRoom(chatRoom)
                 .build();
 
-        // 메시지 저장
-        ChatMsg savedMsg = chatMessageRepository.save(chatMsg);
+        // Response message
+        // 응답 값으로 변환
 
-        // Response - 메시지 ID 추가
         ChatMsgResponse response = ChatMsgResponse.builder()
-                .chatMsgId(savedMsg.getId()) // 저장된 메시지의 ID 추가
+
                 .roomId(roomId)
                 .from(findUser.getNickname())
                 .message(message.getMessage())
                 .sendAt(chatMsg.getCreatedAt())
                 .build();
-
+        chatMessageRepository.save(chatMsg);
         return response;
+
     }
 
+
     @Transactional(readOnly = true)
     @Override
     public List<ChatMsgDto> getRoomChatMsgList(Long roomId, Long userId, Long lastId) {

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

@@ -1,6 +1,7 @@
 package cmf.commitField.domain.chat.chatRoom.controller;
 
 import cmf.commitField.domain.File.service.FileService;
+import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomJoinRequest;
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomRequest;
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomUpdateRequest;
 import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomDto;
@@ -62,13 +63,13 @@ public GlobalResponse<Object> createRoom(
 
     //채팅방 입장
     @PostMapping("/room/join/{roomId}")
-    public GlobalResponse<Object> joinRoom(@PathVariable Long roomId, @RequestBody ChatRoomRequest chatRoomRequest) {
+    public GlobalResponse<Object> joinRoom(@PathVariable Long roomId, @RequestBody ChatRoomJoinRequest chatRoomJoinRequest) {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
         if (authentication instanceof OAuth2AuthenticationToken) {
             CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
             Long userId = principal.getId();  // getId()를 통해 userId를 추출
-            chatRoomService.joinRoom(roomId, userId, chatRoomRequest);  // userId를 전달
+            chatRoomService.joinRoom(roomId, userId, chatRoomJoinRequest);  // userId를 전달
             return GlobalResponse.success("해당 채팅방에 입장하셨습니다");
         } else {
             throw new IllegalArgumentException("로그인 후에 이용해 주세요.");

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

@@ -0,0 +1,22 @@
+package cmf.commitField.domain.chat.chatRoom.controller.request;
+
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.Length;
+
+@Getter
+@Setter
+public class ChatRoomJoinRequest {
+    @NotNull
+    @Length(min = 2, max = 20)
+    private String title;
+
+    @NotNull
+    @Max(100)
+    private Integer userCountMax;
+
+    @Length(min = 4, max = 20)
+    private String password;
+}

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

@@ -28,8 +28,8 @@ public class ChatRoomRequest {
 
     private MultipartFile file;  // 파일을 받기 위한 필드
 
-    public boolean isFileSizeValid() {
-        return file == null || file.getSize() <= 5 * 1024 * 1024;  // 5MB
-    }
+//    public boolean isFileSizeValid() {
+//        return file == null || file.getSize() <= 5 * 1024 * 1024;  // 5MB
+//    }
 
 }

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

@@ -1,5 +1,6 @@
 package cmf.commitField.domain.chat.chatRoom.service;
 
+import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomJoinRequest;
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomRequest;
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomUpdateRequest;
 import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomDto;
@@ -34,7 +35,7 @@ public interface ChatRoomService {
 
     List<ChatRoomDto> myHeartRoomList(Long userId, Pageable pageable);
 
-    void joinRoom(Long roomId, Long userId, ChatRoomRequest chatRoomRequest);
+    void joinRoom(Long roomId, Long userId, ChatRoomJoinRequest chatRoomJoinRequest);
 
     List<ChatRoomDto> searchRoomByTitle(String roomName, Long userId, Pageable pageable);
 }

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

@@ -1,6 +1,7 @@
 package cmf.commitField.domain.chat.chatRoom.service;
 
 import cmf.commitField.domain.chat.chatMessage.repository.ChatMessageRepository;
+import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomJoinRequest;
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomRequest;
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomUpdateRequest;
 import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomDto;
@@ -72,6 +73,7 @@ public void createRoom(ChatRoomRequest chatRoomRequest, Long userId, String imag
                 .imageUrl(imageUrl)  // 이미지 URL 추가
                 .build();
         if (password != null) {
+            System.out.println("Setting password: " + password);
             chatRoom.setPassword(password);
             chatRoom.setIsPrivate(true);
         }
@@ -127,7 +129,7 @@ public List<ChatRoomDto> getUserByRoomPartList(Long userId, Pageable pageable) {
 
     @Override
     @Transactional
-    public void joinRoom(Long roomId, Long userId, ChatRoomRequest chatRoomRequest) {
+    public void joinRoom(Long roomId, Long userId, ChatRoomJoinRequest chatRoomJoinRequest) {
         RLock lock = redissonClient.getLock("joinRoomLock:" + roomId);
         try {
             boolean available = lock.tryLock(1, TimeUnit.SECONDS);
@@ -145,13 +147,13 @@ public void joinRoom(Long roomId, Long userId, ChatRoomRequest chatRoomRequest)
             // user_chatroom 현재 인원 카운트 (비즈니스 로직)
             Long currentUserCount = userChatRoomRepository.countNonLockByChatRoomId(roomId); // lock (기존)
 
-            if (chatRoom.getIsPrivate() && chatRoomRequest.getPassword() == null) {
+            if (chatRoom.getIsPrivate() && chatRoomJoinRequest.getPassword() == null) {
                 throw new CustomException(ErrorCode.NEED_TO_PASSWORD);
 
 
 
             }
-            if (chatRoom.getIsPrivate() && !chatRoomRequest.getPassword().equals(chatRoom.getPassword())) {
+            if (chatRoom.getIsPrivate() && !chatRoomJoinRequest.getPassword().equals(chatRoom.getPassword())) {
                 throw new CustomException(ErrorCode.ROOM_PASSWORD_MISMATCH);
             }
             List<Long> userChatRoomByChatRoomId = userChatRoomRepository