임시

lee1684 · May 27, 2024 · 4adf573 · 4adf573
1 parent 003bc51
commit 4adf573
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/back-end/src/main/java/kr/co/ssalon/domain/service/ChatService.java b/back-end/src/main/java/kr/co/ssalon/domain/service/ChatService.java
@@ -16,13 +16,8 @@
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
+import java.util.Base64;
 import java.util.List;
-import java.util.UUID;
 
 @Service
 @Transactional(readOnly = true)
@@ -55,7 +50,7 @@ public List<MessageResponseDTO> getMyChatHistory(Long memberId) {
         return messageRepository.findAllByMemberId(memberId).stream().map(MessageResponseDTO::new).toList();
     }
 
-    public String changeImageBytesToUrl(byte[] imageBytes, String fileName, Long roomId) {
+    public String changeImageBytesToUrl(String imageCode, String fileName, Long roomId) {
         String imageUrl = "";
 
         String[] parts = fileName.split("\\.");
@@ -70,7 +65,8 @@ public String changeImageBytesToUrl(byte[] imageBytes, String fileName, Long roo
                 .build();
 
         // Use RequestBody to create the request body from the byte array
-        RequestBody requestBody = RequestBody.fromBytes(imageBytes);
+        byte[] bytes = Base64.getDecoder().decode(imageCode);
+        RequestBody requestBody = RequestBody.fromBytes(bytes);
 
         // Put the object in S3
         s3Client.putObject(putObjectRequest, requestBody);

diff --git a/back-end/src/main/java/kr/co/ssalon/web/controller/ChatController.java b/back-end/src/main/java/kr/co/ssalon/web/controller/ChatController.java
@@ -51,8 +51,8 @@ public MessageResponseDTO chat(SimpMessageHeaderAccessor accessor, @DestinationV
         Meeting meeting = meetingService.findMeeting(roomId);
 
         String imageUrl = "";
-        if (messageRequestDTO.getImageBytes() != null && messageRequestDTO.getFileName() != null) {
-            imageUrl = chatService.changeImageBytesToUrl(messageRequestDTO.getImageBytes(), messageRequestDTO.getFileName(), roomId);
+        if (messageRequestDTO.getImageCode() != null && messageRequestDTO.getFileName() != null) {
+            imageUrl = chatService.changeImageBytesToUrl(messageRequestDTO.getImageCode(), messageRequestDTO.getFileName(), roomId);
         }
 
         // 채팅 메시지 저장

diff --git a/back-end/src/main/java/kr/co/ssalon/web/dto/MessageRequestDTO.java b/back-end/src/main/java/kr/co/ssalon/web/dto/MessageRequestDTO.java
@@ -11,6 +11,6 @@
 @Builder
 public class MessageRequestDTO {
     private String message;
-    private byte[] imageBytes;
+    private String imageCode;
     private String fileName;
 }