feat: 채팅 이미지 전송 구현 (#475)

lsy1307 · whqtker · web-flow · commit 6da42bd888fd · 2025-09-01T15:53:27.000+09:00
* chore: 토픽 주소 변경

- topic/{roomId} -&gt; topic/chat/{roomId}
- 의미적 명확성을 위해

* feat: 메시지 전송 DTO 작성

* feat: 메시지 전송 Service 작성

* feat: 메시지 전송 Controller 작성

* chore: 메시지 전송에 대한 컨트롤러 어노테이션을 RestController에서 Controller로 변경

* chore: WebSocket 초기 연결을 위한 HTTP 핸드셰이크에서 인증을 수행하도록

* fix: 핸드셰이크 후 Principal을 WebSocket 세션에 전달하도록 수정

- 이에 컨트롤러 인자로 siteUserId를 받도록 하고, DTO에 senderId를 삭제한다.

* fix: 컨트롤러 파라미터 인자로 Principal를 받고, 이후 SiteUserDetails에서 siteUserId를 추출하도록 변경

* fix: DTO를 통해 순환참조 문제 해결

* chore: 실제 구독 권한 TODO 구현

- 검증 로직이 핸들러에서 사용됨에 따라 발생하는 순환 참조를 막기 위해 Lazy 어노테이션을 사용한 생성자를 직접 작성

* chore: 코드 리포매팅

* chore: 미사용 SiteUserPrincipal 제거 외

- 정규표현식을 사용하여 채팅방 ID 추출
- DTO 검증 추가
- 구체화 클래스가 아닌 인터페이스 사용하도록 (DIP)
- senderId가 siteUserId가 아니라 chatParticipantId로 설정되도록 변경

* feat: 이미지 업로드를 위한 S3 Controller 및 Service 추가, ImgType수정

* feat: DTO 추가, 수정 및 MessageType 추가

* feat: Controller, Service 구현

* feat: Test 코드 추가

* fix: 서브 모듈 커밋해시 수정

* refactor: addAttachment 메서드 추가

* refactor: 코드 포매팅

* refactor: 테스트 코드 컨벤션 수정

* refactor: setChatMessage 메서드 수정

---------

Co-authored-by: seonghyeok &lt;chosh2001@naver.com&gt;
diff --git a/src/main/java/com/example/solidconnection/chat/controller/ChatMessageController.java b/src/main/java/com/example/solidconnection/chat/controller/ChatMessageController.java
@@ -1,5 +1,6 @@
 package com.example.solidconnection.chat.controller;
 
+import com.example.solidconnection.chat.dto.ChatImageSendRequest;
 import com.example.solidconnection.chat.dto.ChatMessageSendRequest;
 import com.example.solidconnection.chat.service.ChatService;
 import com.example.solidconnection.security.authentication.TokenAuthentication;
@@ -29,4 +30,16 @@ public void sendChatMessage(
 
         chatService.sendChatMessage(chatMessageSendRequest, siteUserDetails.getSiteUser().getId(), roomId);
     }
+
+    @MessageMapping("/chat/{roomId}/image")
+    public void sendChatImage(
+            @DestinationVariable Long roomId,
+            @Valid @Payload ChatImageSendRequest chatImageSendRequest,
+            Principal principal
+    ) {
+        TokenAuthentication tokenAuthentication = (TokenAuthentication) principal;
+        SiteUserDetails siteUserDetails = (SiteUserDetails) tokenAuthentication.getPrincipal();
+
+        chatService.sendChatImage(chatImageSendRequest, siteUserDetails.getSiteUser().getId(), roomId);
+    }
 }
diff --git a/src/main/java/com/example/solidconnection/chat/domain/ChatAttachment.java b/src/main/java/com/example/solidconnection/chat/domain/ChatAttachment.java
@@ -7,6 +7,7 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -30,7 +31,7 @@ public class ChatAttachment extends BaseEntity {
     @Column(length = 500)
     private String thumbnailUrl;
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
     private ChatMessage chatMessage;
 
     public ChatAttachment(boolean isImage, String url, String thumbnailUrl, ChatMessage chatMessage) {
@@ -42,4 +43,17 @@ public ChatAttachment(boolean isImage, String url, String thumbnailUrl, ChatMess
             chatMessage.getChatAttachments().add(this);
         }
     }
+
+    protected void setChatMessage(ChatMessage chatMessage) {
+        if (this.chatMessage == chatMessage) return;
+
+        if (this.chatMessage != null) {
+            this.chatMessage.getChatAttachments().remove(this);
+        }
+
+        this.chatMessage = chatMessage;
+        if (chatMessage != null && !chatMessage.getChatAttachments().contains(this)) {
+            chatMessage.getChatAttachments().add(this);
+        }
+    }
 }
diff --git a/src/main/java/com/example/solidconnection/chat/domain/ChatMessage.java b/src/main/java/com/example/solidconnection/chat/domain/ChatMessage.java
@@ -33,7 +33,7 @@ public class ChatMessage extends BaseEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     private ChatRoom chatRoom;
 
-    @OneToMany(mappedBy = "chatMessage", cascade = CascadeType.ALL)
+    @OneToMany(mappedBy = "chatMessage", cascade = CascadeType.ALL, orphanRemoval = true)
     private final List<ChatAttachment> chatAttachments = new ArrayList<>();
 
     public ChatMessage(String content, long senderId, ChatRoom chatRoom) {
@@ -44,4 +44,9 @@ public ChatMessage(String content, long senderId, ChatRoom chatRoom) {
             chatRoom.getChatMessages().add(this);
         }
     }
+
+    public void addAttachment(ChatAttachment attachment) {
+        this.chatAttachments.add(attachment);
+        attachment.setChatMessage(this);
+    }
 }
diff --git a/src/main/java/com/example/solidconnection/chat/domain/MessageType.java b/src/main/java/com/example/solidconnection/chat/domain/MessageType.java
@@ -0,0 +1,6 @@
+package com.example.solidconnection.chat.domain;
+
+public enum MessageType {
+    TEXT,
+    IMAGE,
+}
diff --git a/src/main/java/com/example/solidconnection/chat/dto/ChatImageSendRequest.java b/src/main/java/com/example/solidconnection/chat/dto/ChatImageSendRequest.java
@@ -0,0 +1,14 @@
+package com.example.solidconnection.chat.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import java.util.List;
+
+public record ChatImageSendRequest(
+        @NotNull(message = "이미지 URL 목록은 필수입니다")
+        @Size(min = 1, max = 10, message = "이미지는 1~10개까지 가능합니다")
+        List<@NotBlank(message = "이미지 URL은 필수입니다") String> imageUrls
+) {
+
+}
diff --git a/src/main/java/com/example/solidconnection/chat/dto/ChatMessageSendResponse.java b/src/main/java/com/example/solidconnection/chat/dto/ChatMessageSendResponse.java
@@ -1,19 +1,38 @@
 package com.example.solidconnection.chat.dto;
 
 import com.example.solidconnection.chat.domain.ChatMessage;
+import com.example.solidconnection.chat.domain.MessageType;
+import java.util.List;
 
 public record ChatMessageSendResponse(
         long messageId,
         String content,
-        long senderId
+        long senderId,
+        MessageType messageType,
+        List<ChatAttachmentResponse> attachments
 ) {
 
     public static ChatMessageSendResponse from(ChatMessage chatMessage) {
+        MessageType messageType = chatMessage.getChatAttachments().isEmpty()
+                ? MessageType.TEXT
+                : MessageType.IMAGE;
+
+        List<ChatAttachmentResponse> attachments = chatMessage.getChatAttachments().stream()
+                .map(attachment -> ChatAttachmentResponse.of(
+                        attachment.getId(),
+                        attachment.getIsImage(),
+                        attachment.getUrl(),
+                        attachment.getThumbnailUrl(),
+                        attachment.getCreatedAt()
+                ))
+                .toList();
+
         return new ChatMessageSendResponse(
                 chatMessage.getId(),
                 chatMessage.getContent(),
-                chatMessage.getSenderId()
+                chatMessage.getSenderId(),
+                messageType,
+                attachments
         );
     }
-
 }
diff --git a/src/main/java/com/example/solidconnection/chat/service/ChatService.java b/src/main/java/com/example/solidconnection/chat/service/ChatService.java
@@ -5,10 +5,12 @@
 import static com.example.solidconnection.common.exception.ErrorCode.INVALID_CHAT_ROOM_STATE;
 import static com.example.solidconnection.common.exception.ErrorCode.USER_NOT_FOUND;
 
+import com.example.solidconnection.chat.domain.ChatAttachment;
 import com.example.solidconnection.chat.domain.ChatMessage;
 import com.example.solidconnection.chat.domain.ChatParticipant;
 import com.example.solidconnection.chat.domain.ChatRoom;
 import com.example.solidconnection.chat.dto.ChatAttachmentResponse;
+import com.example.solidconnection.chat.dto.ChatImageSendRequest;
 import com.example.solidconnection.chat.dto.ChatMessageResponse;
 import com.example.solidconnection.chat.dto.ChatMessageSendRequest;
 import com.example.solidconnection.chat.dto.ChatMessageSendResponse;
@@ -195,6 +197,53 @@ public void sendChatMessage(ChatMessageSendRequest chatMessageSendRequest, long
         simpMessageSendingOperations.convertAndSend("/topic/chat/" + roomId, chatMessageResponse);
     }
 
+    @Transactional
+    public void sendChatImage(ChatImageSendRequest chatImageSendRequest, long siteUserId, long roomId) {
+        long senderId = chatParticipantRepository.findByChatRoomIdAndSiteUserId(roomId, siteUserId)
+                .orElseThrow(() -> new CustomException(CHAT_PARTICIPANT_NOT_FOUND))
+                .getId();
+
+        ChatRoom chatRoom = chatRoomRepository.findById(roomId)
+                .orElseThrow(() -> new CustomException(INVALID_CHAT_ROOM_STATE));
+
+        ChatMessage chatMessage = new ChatMessage(
+                "",
+                senderId,
+                chatRoom
+        );
+
+        for (String imageUrl : chatImageSendRequest.imageUrls()) {
+            String thumbnailUrl = generateThumbnailUrl(imageUrl);
+
+            ChatAttachment attachment = new ChatAttachment(true, imageUrl, thumbnailUrl, null);
+            chatMessage.addAttachment(attachment);
+        }
+
+        chatMessageRepository.save(chatMessage);
+
+        ChatMessageSendResponse chatMessageResponse = ChatMessageSendResponse.from(chatMessage);
+        simpMessageSendingOperations.convertAndSend("/topic/chat/" + roomId, chatMessageResponse);
+    }
+
+    private String generateThumbnailUrl(String originalUrl) {
+        try {
+            String fileName = originalUrl.substring(originalUrl.lastIndexOf('/') + 1);
+
+            String nameWithoutExt = fileName.substring(0, fileName.lastIndexOf('.'));
+            String extension = fileName.substring(fileName.lastIndexOf('.'));
+
+            String thumbnailFileName = nameWithoutExt + "_thumb" + extension;
+
+            String thumbnailUrl = originalUrl.replace("chat/images/", "chat/thumbnails/")
+                    .replace(fileName, thumbnailFileName);
+
+            return thumbnailUrl;
+
+        } catch (Exception e) {
+            return originalUrl;
+        }
+    }
+
     @Transactional
     public Long createMentoringChatRoom(Long mentoringId, Long mentorId, Long menteeId) {
         ChatRoom existingChatRoom = chatRoomRepository.findByMentoringId(mentoringId);
diff --git a/src/main/java/com/example/solidconnection/s3/controller/S3Controller.java b/src/main/java/com/example/solidconnection/s3/controller/S3Controller.java
@@ -5,6 +5,7 @@
 import com.example.solidconnection.s3.dto.UploadedFileUrlResponse;
 import com.example.solidconnection.s3.dto.urlPrefixResponse;
 import com.example.solidconnection.s3.service.S3Service;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
@@ -68,6 +69,14 @@ public ResponseEntity<UploadedFileUrlResponse> uploadLanguageImage(
         return ResponseEntity.ok(profileImageUrl);
     }
 
+    @PostMapping("/chat")
+    public ResponseEntity<List<UploadedFileUrlResponse>> uploadChatImage(
+            @RequestParam("files") List<MultipartFile> imageFiles
+    ) {
+        List<UploadedFileUrlResponse> chatImageUrls = s3Service.uploadFiles(imageFiles, ImgType.CHAT);
+        return ResponseEntity.ok(chatImageUrls);
+    }
+
     @GetMapping("/s3-url-prefix")
     public ResponseEntity<urlPrefixResponse> getS3UrlPrefix() {
         return ResponseEntity.ok(new urlPrefixResponse(s3Default, s3Uploaded, cloudFrontDefault, cloudFrontUploaded));
diff --git a/src/main/java/com/example/solidconnection/s3/domain/ImgType.java b/src/main/java/com/example/solidconnection/s3/domain/ImgType.java
@@ -4,7 +4,7 @@
 
 @Getter
 public enum ImgType {
-    PROFILE("profile"), GPA("gpa"), LANGUAGE_TEST("language"), COMMUNITY("community"), NEWS("news");
+    PROFILE("profile"), GPA("gpa"), LANGUAGE_TEST("language"), COMMUNITY("community"), NEWS("news"), CHAT("chat");
 
     private final String type;
 
diff --git a/src/main/java/com/example/solidconnection/s3/service/S3Service.java b/src/main/java/com/example/solidconnection/s3/service/S3Service.java
@@ -35,7 +35,7 @@
 public class S3Service {
 
     private static final Logger log = LoggerFactory.getLogger(S3Service.class);
-    private static final long MAX_FILE_SIZE_MB = 1024 * 1024 * 3;
+    private static final long MAX_FILE_SIZE_MB = 1024 * 1024 * 5;
 
     private final AmazonS3Client amazonS3;
     private final SiteUserRepository siteUserRepository;
@@ -52,8 +52,8 @@ public class S3Service {
      * - 파일에 대한 메타 데이터를 생성한다.
      * - 임의의 랜덤한 문자열로 파일 이름을 생성한다.
      * - S3에 파일을 업로드한다.
-     * - 3mb 이상의 파일은 /origin/ 경로로 업로드하여 lambda 함수로 리사이징 진행한다.
-     * - 3mb 미만의 파일은 바로 업로드한다.
+     * - 5mb 이상의 파일은 /origin/ 경로로 업로드하여 lambda 함수로 리사이징 진행한다.
+     * - 5mb 미만의 파일은 바로 업로드한다.
      * */
     public UploadedFileUrlResponse uploadFile(MultipartFile multipartFile, ImgType imageFile) {
         // 파일 검증
diff --git a/src/main/resources/secret b/src/main/resources/secret
@@ -1 +1 @@
-Subproject commit fd0d80ad28d28698e3e27160d9d27bf4e5462238
+Subproject commit bb3bf0f4122d10ddacab279a368cf9f06d6f6dbd
diff --git a/src/test/java/com/example/solidconnection/chat/service/ChatServiceTest.java b/src/test/java/com/example/solidconnection/chat/service/ChatServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class ChatMessage extends BaseEntity {`
`33`	`33`	`@ManyToOne(fetch = FetchType.LAZY)`
`34`	`34`	`private ChatRoom chatRoom;`
`35`	`35`
`36`		`- @OneToMany(mappedBy = "chatMessage", cascade = CascadeType.ALL)`
	`36`	`+ @OneToMany(mappedBy = "chatMessage", cascade = CascadeType.ALL, orphanRemoval = true)`
`37`	`37`	`private final List<ChatAttachment> chatAttachments = new ArrayList<>();`
`38`	`38`
`39`	`39`	`public ChatMessage(String content, long senderId, ChatRoom chatRoom) {`
`@@ -44,4 +44,9 @@ public ChatMessage(String content, long senderId, ChatRoom chatRoom) {`
`44`	`44`	`chatRoom.getChatMessages().add(this);`
`45`	`45`	`}`
`46`	`46`	`}`
	`47`	`+`
	`48`	`+ public void addAttachment(ChatAttachment attachment) {`
	`49`	`+ this.chatAttachments.add(attachment);`
	`50`	`+ attachment.setChatMessage(this);`
	`51`	`+ }`
`47`	`52`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +package com.example.solidconnection.chat.domain;
++
 +public enum MessageType {
 +    TEXT,
 +    IMAGE,
 +}