refactor: s3 버전 업그레이드 및 로직 수정

build.gradle

@@ -65,8 +65,9 @@ dependencies {
     testImplementation 'org.awaitility:awaitility:4.2.0'
 
     // Etc
+    implementation platform('software.amazon.awssdk:bom:2.41.4')
+    implementation 'software.amazon.awssdk:s3'
     implementation 'org.hibernate.validator:hibernate-validator'
-    implementation 'com.amazonaws:aws-java-sdk-s3:1.12.782'
     implementation 'org.springframework.boot:spring-boot-starter-websocket'
 }
 

src/main/java/com/example/solidconnection/chat/service/ChatService.java

@@ -27,6 +27,7 @@
 import com.example.solidconnection.mentor.repository.MentorRepository;
 import com.example.solidconnection.siteuser.domain.SiteUser;
 import com.example.solidconnection.siteuser.repository.SiteUserRepository;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -39,6 +40,7 @@
 import org.springframework.messaging.simp.SimpMessageSendingOperations;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 @Service
 public class ChatService {
@@ -240,16 +242,19 @@ public void sendChatImage(ChatImageSendRequest chatImageSendRequest, long siteUs
         ChatRoom chatRoom = chatRoomRepository.findById(roomId)
                 .orElseThrow(() -> new CustomException(INVALID_CHAT_ROOM_STATE));
 
-        ChatMessage chatMessage = new ChatMessage(
-                "",
-                senderId,
-                chatRoom
-        );
+        ChatMessage chatMessage = new ChatMessage("", senderId, chatRoom);
+
+        // 이미지 판별을 위한 확장자 리스트
+        List<String> imageExtensions = Arrays.asList("jpg", "jpeg", "png", "webp");
 
         for (String imageUrl : chatImageSendRequest.imageUrls()) {
-            String thumbnailUrl = generateThumbnailUrl(imageUrl);
+            String extension = StringUtils.getFilenameExtension(imageUrl);
 
-            ChatAttachment attachment = new ChatAttachment(true, imageUrl, thumbnailUrl, null);
+            boolean isImage = extension != null && imageExtensions.contains(extension.toLowerCase());
+
+            String thumbnailUrl = isImage ? generateThumbnailUrl(imageUrl) : null;
+
+            ChatAttachment attachment = new ChatAttachment(isImage, imageUrl, thumbnailUrl, null);
             chatMessage.addAttachment(attachment);
         }
 
@@ -268,11 +273,9 @@ private String generateThumbnailUrl(String originalUrl) {
 
             String thumbnailFileName = nameWithoutExt + "_thumb" + extension;
 
-            String thumbnailUrl = originalUrl.replace("chat/images/", "chat/thumbnails/")
+            return originalUrl.replace("chat/files/", "chat/thumbnails/")
                     .replace(fileName, thumbnailFileName);
 
-            return thumbnailUrl;
-
         } catch (Exception e) {
             return originalUrl;
         }

src/main/java/com/example/solidconnection/common/constant/FileConstants.java

@@ -0,0 +1,25 @@
+package com.example.solidconnection.common.constant;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+public final class FileConstants {
+    private FileConstants() {}
+
+    public static final List<String> IMAGE_EXTENSIONS = List.of(
+            "jpg", "jpeg", "png", "webp", "avif", "heic", "heif", "tiff"
+    );
+
+    public static final List<String> DOCUMENT_EXTENSIONS = List.of(
+            "doc", "docx", "xls", "xlsx", "ppt", "pptx", "hwp", "hwpx", "pdf", "txt"
+    );
+
+    public static final List<String> ARCHIVE_EXTENSIONS = List.of(
+            "zip", "7z", "rar"
+    );
+
+    public static final List<String> ALL_ALLOWED_EXTENSIONS = Stream.of(
+                    IMAGE_EXTENSIONS, DOCUMENT_EXTENSIONS, ARCHIVE_EXTENSIONS)
+            .flatMap(List::stream)
+            .toList();
+}

src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java

@@ -18,7 +18,7 @@
 import com.example.solidconnection.community.post.dto.PostUpdateRequest;
 import com.example.solidconnection.community.post.dto.PostUpdateResponse;
 import com.example.solidconnection.community.post.repository.PostRepository;
-import com.example.solidconnection.s3.domain.ImgType;
+import com.example.solidconnection.s3.domain.UploadPath;
 import com.example.solidconnection.s3.dto.UploadedFileUrlResponse;
 import com.example.solidconnection.s3.service.S3Service;
 import com.example.solidconnection.siteuser.domain.SiteUser;
@@ -88,7 +88,7 @@ private void savePostImages(List<MultipartFile> imageFile, Post post) {
         if (imageFile.isEmpty()) {
             return;
         }
-        List<UploadedFileUrlResponse> uploadedFileUrlResponseList = s3Service.uploadFiles(imageFile, ImgType.COMMUNITY);
+        List<UploadedFileUrlResponse> uploadedFileUrlResponseList = s3Service.uploadFiles(imageFile, UploadPath.COMMUNITY);
         for (UploadedFileUrlResponse uploadedFileUrlResponse : uploadedFileUrlResponseList) {
             PostImage postImage = new PostImage(uploadedFileUrlResponse.fileUrl());
             postImage.setPost(post);

src/main/java/com/example/solidconnection/mentor/service/MentorApplicationService.java

@@ -5,7 +5,7 @@
 import com.example.solidconnection.mentor.domain.MentorApplicationStatus;
 import com.example.solidconnection.mentor.dto.MentorApplicationRequest;
 import com.example.solidconnection.mentor.repository.MentorApplicationRepository;
-import com.example.solidconnection.s3.domain.ImgType;
+import com.example.solidconnection.s3.domain.UploadPath;
 import com.example.solidconnection.s3.dto.UploadedFileUrlResponse;
 import com.example.solidconnection.s3.service.S3Service;
 import com.example.solidconnection.siteuser.domain.SiteUser;
@@ -45,7 +45,7 @@ public void submitMentorApplication(
                 .orElseThrow(() -> new CustomException(USER_NOT_FOUND));
         Term term = termRepository.findByName(mentorApplicationRequest.term())
                 .orElseThrow(() -> new CustomException(TERM_NOT_FOUND));
-        UploadedFileUrlResponse uploadedFile = s3Service.uploadFile(file, ImgType.MENTOR_PROOF);
+        UploadedFileUrlResponse uploadedFile = s3Service.uploadFile(file, UploadPath.MENTOR_PROOF);
         MentorApplication mentorApplication = new MentorApplication(
                 siteUser.getId(),
                 mentorApplicationRequest.country(),

src/main/java/com/example/solidconnection/news/service/NewsCommandService.java

@@ -11,7 +11,7 @@
 import com.example.solidconnection.news.dto.NewsCreateRequest;
 import com.example.solidconnection.news.dto.NewsUpdateRequest;
 import com.example.solidconnection.news.repository.NewsRepository;
-import com.example.solidconnection.s3.domain.ImgType;
+import com.example.solidconnection.s3.domain.UploadPath;
 import com.example.solidconnection.s3.dto.UploadedFileUrlResponse;
 import com.example.solidconnection.s3.service.S3Service;
 import com.example.solidconnection.siteuser.domain.Role;
@@ -41,7 +41,7 @@ public NewsCommandResponse createNews(long siteUserId, NewsCreateRequest newsCre
 
     private String getImageUrl(MultipartFile imageFile) {
         if (imageFile != null && !imageFile.isEmpty()) {
-            UploadedFileUrlResponse uploadedFile = s3Service.uploadFile(imageFile, ImgType.NEWS);
+            UploadedFileUrlResponse uploadedFile = s3Service.uploadFile(imageFile, UploadPath.NEWS);
             return uploadedFile.fileUrl();
         }
         return newsProperties.defaultThumbnailUrl();
@@ -73,7 +73,7 @@ private void updateThumbnail(News news, MultipartFile imageFile, Boolean resetTo
             deleteCustomImage(news.getThumbnailUrl());
             news.updateThumbnailUrl(newsProperties.defaultThumbnailUrl());
         } else if (imageFile != null && !imageFile.isEmpty()) {
-            UploadedFileUrlResponse uploadedFile = s3Service.uploadFile(imageFile, ImgType.NEWS);
+            UploadedFileUrlResponse uploadedFile = s3Service.uploadFile(imageFile, UploadPath.NEWS);
             deleteCustomImage(news.getThumbnailUrl());
             news.updateThumbnailUrl(uploadedFile.fileUrl());
         }

src/main/java/com/example/solidconnection/s3/config/AmazonS3Config.java

@@ -1,12 +1,12 @@
 package com.example.solidconnection.s3.config;
 
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.s3.AmazonS3Client;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
 
 @Configuration
 public class AmazonS3Config {
@@ -21,12 +21,12 @@ public class AmazonS3Config {
     private String region;
 
     @Bean
-    public AmazonS3Client amazonS3Client() {
-        BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
-        return (AmazonS3Client) AmazonS3ClientBuilder
-                .standard()
-                .withRegion(region)
-                .withCredentials(new AWSStaticCredentialsProvider(credentials))
+    public S3Client s3Client() {
+        AwsBasicCredentials credentials = AwsBasicCredentials.create(accessKey, secretKey);
+
+        return S3Client.builder()
+                .region(Region.of(region))
+                .credentialsProvider(StaticCredentialsProvider.create(credentials))
                 .build();
     }
 }

src/main/java/com/example/solidconnection/s3/controller/S3Controller.java

@@ -1,9 +1,9 @@
 package com.example.solidconnection.s3.controller;
 
 import com.example.solidconnection.common.resolver.AuthorizedUser;
-import com.example.solidconnection.s3.domain.ImgType;
+import com.example.solidconnection.s3.domain.UploadPath;
 import com.example.solidconnection.s3.dto.UploadedFileUrlResponse;
-import com.example.solidconnection.s3.dto.urlPrefixResponse;
+import com.example.solidconnection.s3.dto.UrlPrefixResponse;
 import com.example.solidconnection.s3.service.S3Service;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -39,7 +39,7 @@ public class S3Controller {
     public ResponseEntity<UploadedFileUrlResponse> uploadPreProfileImage(
             @RequestParam("file") MultipartFile imageFile
     ) {
-        UploadedFileUrlResponse profileImageUrl = s3Service.uploadFile(imageFile, ImgType.PROFILE);
+        UploadedFileUrlResponse profileImageUrl = s3Service.uploadFile(imageFile, UploadPath.PROFILE);
         return ResponseEntity.ok(profileImageUrl);
     }
 
@@ -48,7 +48,7 @@ public ResponseEntity<UploadedFileUrlResponse> uploadPostProfileImage(
             @AuthorizedUser long siteUserId,
             @RequestParam("file") MultipartFile imageFile
     ) {
-        UploadedFileUrlResponse profileImageUrl = s3Service.uploadFile(imageFile, ImgType.PROFILE);
+        UploadedFileUrlResponse profileImageUrl = s3Service.uploadFile(imageFile, UploadPath.PROFILE);
         s3Service.deleteExProfile(siteUserId);
         return ResponseEntity.ok(profileImageUrl);
     }
@@ -57,28 +57,28 @@ public ResponseEntity<UploadedFileUrlResponse> uploadPostProfileImage(
     public ResponseEntity<UploadedFileUrlResponse> uploadGpaImage(
             @RequestParam("file") MultipartFile imageFile
     ) {
-        UploadedFileUrlResponse profileImageUrl = s3Service.uploadFile(imageFile, ImgType.GPA);
+        UploadedFileUrlResponse profileImageUrl = s3Service.uploadFile(imageFile, UploadPath.GPA);
         return ResponseEntity.ok(profileImageUrl);
     }
 
     @PostMapping("/language-test")
     public ResponseEntity<UploadedFileUrlResponse> uploadLanguageImage(
             @RequestParam("file") MultipartFile imageFile
     ) {
-        UploadedFileUrlResponse profileImageUrl = s3Service.uploadFile(imageFile, ImgType.LANGUAGE_TEST);
+        UploadedFileUrlResponse profileImageUrl = s3Service.uploadFile(imageFile, UploadPath.LANGUAGE_TEST);
         return ResponseEntity.ok(profileImageUrl);
     }
 
     @PostMapping("/chat")
-    public ResponseEntity<List<UploadedFileUrlResponse>> uploadChatImage(
-            @RequestParam("files") List<MultipartFile> imageFiles
+    public ResponseEntity<List<UploadedFileUrlResponse>> uploadChatFile(
+            @RequestParam("files") List<MultipartFile> files
     ) {
-        List<UploadedFileUrlResponse> chatImageUrls = s3Service.uploadFiles(imageFiles, ImgType.CHAT);
+        List<UploadedFileUrlResponse> chatImageUrls = s3Service.uploadFiles(files, UploadPath.CHAT);
         return ResponseEntity.ok(chatImageUrls);
     }
 
     @GetMapping("/s3-url-prefix")
-    public ResponseEntity<urlPrefixResponse> getS3UrlPrefix() {
-        return ResponseEntity.ok(new urlPrefixResponse(s3Default, s3Uploaded, cloudFrontDefault, cloudFrontUploaded));
+    public ResponseEntity<UrlPrefixResponse> getS3UrlPrefix() {
+        return ResponseEntity.ok(new UrlPrefixResponse(s3Default, s3Uploaded, cloudFrontDefault, cloudFrontUploaded));
     }
 }

src/main/java/com/example/solidconnection/s3/domain/UploadPath.java

@@ -0,0 +1,46 @@
+package com.example.solidconnection.s3.domain;
+
+import com.example.solidconnection.common.constant.FileConstants;
+import com.example.solidconnection.common.exception.CustomException;
+import com.example.solidconnection.common.exception.ErrorCode;
+import lombok.Getter;
+
+@Getter
+public enum UploadPath {
+    PROFILE("profile"),
+    GPA("gpa"),
+    LANGUAGE_TEST("language"),
+    COMMUNITY("community"),
+    NEWS("news"),
+    CHAT("chat/files"),
+    MENTOR_PROOF("mentor-proof"),
+    ;
+
+    private final String type;
+
+    UploadPath(String type) {
+        this.type = type;
+    }
+
+    public boolean isResizable(long fileSize, String extension, long maxSizeBytes) {
+        if (!isImage(extension)) return false;
+
+        if (this == CHAT) return false;
+
+        return fileSize >= maxSizeBytes;
+    }
+    public void validateExtension(String extension) {
+        if (extension == null || !FileConstants.ALL_ALLOWED_EXTENSIONS.contains(extension.toLowerCase())) {
+            throw new CustomException(ErrorCode.NOT_ALLOWED_FILE_EXTENSIONS,
+                                      "허용된 형식: " + getAllowedExtensionsMessage());
+        }
+    }
+
+    public boolean isImage(String extension) {
+        return extension != null && FileConstants.IMAGE_EXTENSIONS.contains(extension.toLowerCase());
+    }
+
+    public String getAllowedExtensionsMessage() {
+        return String.join(", ", FileConstants.ALL_ALLOWED_EXTENSIONS);
+    }
+}

src/main/java/com/example/solidconnection/s3/dto/urlPrefixResponse.java → src/main/java/com/example/solidconnection/s3/dto/UrlPrefixResponse.java

@@ -1,6 +1,6 @@
 package com.example.solidconnection.s3.dto;
 
-public record urlPrefixResponse(
+public record UrlPrefixResponse(
         String s3Default,
         String s3Uploaded,
         String cloudFrontDefault,