Merge pull request #109 from CommitField/Feature/89

Feature/89

Author: ces0135-hub

src/main/java/cmf/commitField/domain/File/service/FileProperties.java

@@ -0,0 +1,19 @@
+package cmf.commitField.domain.File.service;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+//@Configuration
+@Component
+@ConfigurationProperties(prefix = "custom.file")
+public class FileProperties {
+    private String uploadDir;
+
+    public String getUploadDir() {
+        return uploadDir;
+    }
+
+    public void setUploadDir(String uploadDir) {
+        this.uploadDir = uploadDir;
+    }
+}

src/main/java/cmf/commitField/domain/File/service/FileService.java

@@ -0,0 +1,36 @@
+package cmf.commitField.domain.File.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+@Service
+public class FileService {
+
+    // resources/static/uploads 폴더 경로
+    private final String UPLOAD_DIR = "src/main/resources/static/uploads";  // 상대 경로
+
+    // 파일 저장 메소드
+    public String saveFile(MultipartFile file) throws IOException {
+        // 파일 이름을 유니크하게 생성
+        String filename = System.currentTimeMillis() + "_" + file.getOriginalFilename();
+
+        // 파일 경로 생성
+        Path path = Paths.get(UPLOAD_DIR, filename);  // static/uploads 폴더에 저장
+
+        // 디렉토리가 존재하지 않으면 생성
+        Files.createDirectories(path.getParent());
+
+        // 파일 저장
+        Files.copy(file.getInputStream(), path, StandardCopyOption.REPLACE_EXISTING);
+
+        // 저장된 파일의 URL 반환 (웹에서 접근할 수 있는 경로)
+        return "/uploads/" + filename;  // 클라이언트가 접근할 수 있는 URL 반환
+    }
+}
+

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

@@ -34,7 +34,7 @@ public class ChatMessageServiceImpl implements ChatMessageService {
     private final UserChatRoomRepository userChatRoomRepository;
 
     @Override
-//    @Transactional
+    @Transactional
     public ChatMsgResponse sendMessage(ChatMsgRequest message, Long userId, Long roomId) {
         User findUser = userRepository.findById(userId)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));

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/dto/ChatRoomDto.java

@@ -19,13 +19,17 @@ public class ChatRoomDto {
 
     private Integer heartCount;
 
+    // 이미지 URL 필드 추가
+    private String imageUrl;
+
     public static ChatRoomDto of(ChatRoom chatRoom) {
         return ChatRoomDto.builder()
                 .id(chatRoom.getId())
                 .title(chatRoom.getTitle())
                 .currentUserCount((long) chatRoom.getUserChatRooms().size())
                 .userCountMax(chatRoom.getUserCountMax())
                 .heartCount(chatRoom.getHearts().size())
+                .imageUrl(chatRoom.getImageUrl())  // ChatRoom에서 imageUrl을 가져오기
                 .build();
     }
 }

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{" +

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

@@ -10,7 +10,7 @@
 
 public interface ChatRoomService {
 
-    void createRoom(ChatRoomRequest chatRoomRequest, Long userId);  // userId를 받도록 수정
+    void createRoom(ChatRoomRequest chatRoomRequest, Long userId, String imageUrl);  // userId를 받도록 수정
 
     void joinRoom(Long roomId, Long userId);  // userId를 받도록 수정
 

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

@@ -50,7 +50,7 @@ public class ChatRoomServiceImpl implements ChatRoomService {
 
     @Override
     @Transactional
-    public void createRoom(ChatRoomRequest chatRoomRequest, Long userId) {
+    public void createRoom(ChatRoomRequest chatRoomRequest, Long userId, String imageUrl) {
         // 유저정보 조회
         User findUser = userRepository.findById(userId)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
@@ -69,6 +69,7 @@ public void createRoom(ChatRoomRequest chatRoomRequest, Long userId) {
                 .createdAt(now())
                 .modifiedAt(now())
                 .isPrivate(false)
+                .imageUrl(imageUrl)  // 이미지 URL 추가
                 .build();
         if (password != null) {
             chatRoom.setPassword(password);

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

@@ -47,6 +47,7 @@ public enum ErrorCode {
     CHAT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "채팅 전송에 오류가 있습니다."),
     NO_ROOM_FOUND(HttpStatus.NOT_FOUND, "채팅방이 없습니다."),
     NO_ROOM(HttpStatus.NOT_FOUND, "존재하지 않는 채팅방입니다."),
+    FILE_UPLOAD_FAILED(HttpStatus.BAD_REQUEST, "이미지 파일의 크기는 5MB 이하이어야 합니다."),
 
     //chatroom_title
     REQUEST_SAME_AS_CURRENT_TITLE(HttpStatus.BAD_REQUEST, "현재 제목과 바꾸려는 제목이 같습니다."),