Fix: ChatRoom 관련 코드 변경

Author: skyeong42

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

@@ -1,5 +1,6 @@
 package cmf.commitField.domain.chat.chatRoom.controller;
 
+import cmf.commitField.domain.File.service.FileService;
 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;
@@ -12,30 +13,45 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
+import org.springframework.http.MediaType;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/chat")
 public class ChatRoomController {
     private final ChatRoomService chatRoomService;
+    private final FileService fileService;
 
-    //채팅방 생성
-    @PostMapping("/room")
+    // 채팅방 생성 (파일 업로드 포함)
+    @PostMapping(value = "/room", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public GlobalResponse<Object> createRoom(
-            @RequestBody @Valid ChatRoomRequest chatRoomRequest) {
+            @ModelAttribute @Valid ChatRoomRequest chatRoomRequest) throws IOException {
+
+
+        // 인증 확인
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
         if (authentication instanceof OAuth2AuthenticationToken) {
             CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
             Long userId = principal.getId();  // getId()를 통해 userId를 추출
-            chatRoomService.createRoom(chatRoomRequest, userId);  // userId를 전달
+
+            // 파일 업로드 처리
+            String imageUrl = null;
+            if (chatRoomRequest.getFile() != null && !chatRoomRequest.getFile().isEmpty()) {
+                imageUrl = fileService.saveFile(chatRoomRequest.getFile());  // 파일 저장
+            }
+
+            // 채팅방 생성 서비스 호출 (이미지 URL 포함)
+            chatRoomService.createRoom(chatRoomRequest, userId, imageUrl);
+
             return GlobalResponse.success("채팅방을 생성하였습니다.");
         } else {
             throw new IllegalArgumentException("로그인 후에 이용해 주세요.");

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

@@ -1,19 +1,21 @@
 package cmf.commitField.domain.chat.chatRoom.controller.request;
 
 import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.web.multipart.MultipartFile;
 
+@Setter
 @Getter
 @AllArgsConstructor
 @NoArgsConstructor
 public class ChatRoomRequest {
 
-    @NotEmpty
+    @NotNull
     @Length(min = 2, max = 20)
     private String title;
 
@@ -24,4 +26,10 @@ public class ChatRoomRequest {
     @Length(min = 4, max = 20)
     private String password;
 
+    private MultipartFile file;  // 파일을 받기 위한 필드
+
+    public boolean isFileSizeValid() {
+        return file == null || file.getSize() <= 5 * 1024 * 1024;  // 5MB
+    }
+
 }

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

@@ -45,6 +45,9 @@ public class ChatRoom extends BaseEntity {
 
     private Boolean isPrivate;
 
+    //채팅방 이미지 URL
+    private String imageUrl;
+
     @Override
     public String toString() {
         return "ChatRoom{" +