fix: require filename and filetype

Author: creatingweb123

src/main/java/com/_oormthon/seasonthon/domain/s3/controller/S3Controller.java

@@ -6,6 +6,7 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 
 import com._oormthon.seasonthon.domain.member.entity.User;
+import com._oormthon.seasonthon.domain.s3.dto.PresignedUrlResponse;
 import com._oormthon.seasonthon.domain.s3.service.S3Service;
 
 @RestController
@@ -19,19 +20,22 @@ public class S3Controller {
      * 업로드용 Presigned URL 발급
      * 프론트에서 파일 업로드 전에 요청
      */
-    @GetMapping("/presigned-upload")
-    public ResponseEntity<String> getPresignedUploadUrl(
-            @AuthenticationPrincipal User user) {
-        String presignedUrl = s3Service.generateUploadPresignedUrl(user.getUserId());
-        return ResponseEntity.ok(presignedUrl);
+    @PostMapping("/presigned")
+    public ResponseEntity<PresignedUrlResponse> getPresignedUploadUrl(
+            @AuthenticationPrincipal User user,
+            @RequestParam String fileName,
+            @RequestParam String fileType) {
+
+        PresignedUrlResponse response = s3Service.generateUploadPresignedUrl(user.getUserId(), fileName, fileType);
+        return ResponseEntity.ok(response);
     }
 
     /**
      * 이미지 삭제 (서버가 직접 삭제 요청)
      */
     @DeleteMapping("/file")
-    public ResponseEntity<Void> deleteImage(@RequestParam Long userId) {
-        s3Service.deleteFile(userId);
+    public ResponseEntity<Void> deleteImage(@AuthenticationPrincipal User user, @RequestParam String fileName) {
+        s3Service.deleteFile(user.getUserId(), fileName);
         return ResponseEntity.noContent().build();
     }
 }

src/main/java/com/_oormthon/seasonthon/domain/s3/dto/FileDownloadRequest.java

@@ -0,0 +1,11 @@
+package com._oormthon.seasonthon.domain.s3.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class PresignedUrlResponse {
+        private String uploadUrl;
+        private String key;
+}

src/main/java/com/_oormthon/seasonthon/domain/s3/dto/PresignedUrlResponse.java

@@ -6,6 +6,7 @@
 
 import com._oormthon.seasonthon.domain.member.dto.res.UserResponse;
 import com._oormthon.seasonthon.domain.member.service.UserService;
+import com._oormthon.seasonthon.domain.s3.dto.PresignedUrlResponse;
 
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
@@ -30,42 +31,34 @@ public class S3Service {
     /**
      * S3 Presigned URL (PUT) 발급
      */
-    public String generateUploadPresignedUrl(Long userId) {
+    public PresignedUrlResponse generateUploadPresignedUrl(Long userId, String fileName, String fileType) {
         UserResponse user = userService.getUserById(userId);
 
-        // URL에서 파일명만 추출
-        String profileImageName = extractFileNameFromUrl(user.profileImage());
-
         // 고유한 S3 키 생성 (닉네임/UUID-파일명)
-        String key = user.nickname() + "/" + UUID.randomUUID() + "-" + profileImageName;
-
-        // 확장자 기반 Content-Type 결정
-        String contentType = determineContentTypeFromKey(profileImageName);
+        String key = user.nickname() + "/" + UUID.randomUUID() + "-" + fileName;
 
         // Presigned URL 발급용 요청 생성
         PutObjectRequest objectRequest = PutObjectRequest.builder()
                 .bucket(bucket)
                 .key(key)
-                .contentType(contentType)
+                .contentType(fileType)
                 .build();
 
         // Presigned URL 생성
         PresignedPutObjectRequest presignedRequest = s3Presigner.presignPutObject(
                 r -> r.putObjectRequest(objectRequest)
                         .signatureDuration(Duration.ofMinutes(10)));
 
-        return presignedRequest.url().toString();
+        // JSON 형태로 리턴
+        return new PresignedUrlResponse(presignedRequest.url().toString(), key);
     }
 
     /**
      * S3 객체 삭제
      */
-    public void deleteFile(Long userId) {
-        UserResponse user = userService.getUserById(userId);
+    public void deleteFile(Long userId, String fileName) {
 
-        // URL에서 파일명만 추출
-        String profileImageName = extractFileNameFromUrl(user.profileImage());
-        String key = user.nickname() + "/" + profileImageName;
+        String key = userService.getUserById(userId).nickname() + "/" + fileName;
 
         S3Client s3 = S3Client.builder()
                 .region(Region.AP_NORTHEAST_2)
@@ -81,37 +74,37 @@ public void deleteFile(Long userId) {
     /**
      * 파일명에서 Content-Type 추론
      */
-    private String determineContentTypeFromKey(String key) {
-        if (key == null)
-            return "application/octet-stream"; // 기본값
-
-        String lowerKey = key.toLowerCase();
-
-        if (lowerKey.endsWith(".jpg") || lowerKey.endsWith(".jpeg"))
-            return "image/jpeg";
-        if (lowerKey.endsWith(".png"))
-            return "image/png";
-        if (lowerKey.endsWith(".gif"))
-            return "image/gif";
-        if (lowerKey.endsWith(".webp"))
-            return "image/webp";
-        if (lowerKey.endsWith(".svg"))
-            return "image/svg+xml";
-
-        return "application/octet-stream"; // 모르는 확장자일 경우
-    }
+    // private String determineContentTypeFromKey(String key) {
+    // if (key == null)
+    // return "application/octet-stream"; // 기본값
+
+    // String lowerKey = key.toLowerCase();
+
+    // if (lowerKey.endsWith(".jpg") || lowerKey.endsWith(".jpeg"))
+    // return "image/jpeg";
+    // if (lowerKey.endsWith(".png"))
+    // return "image/png";
+    // if (lowerKey.endsWith(".gif"))
+    // return "image/gif";
+    // if (lowerKey.endsWith(".webp"))
+    // return "image/webp";
+    // if (lowerKey.endsWith(".svg"))
+    // return "image/svg+xml";
+
+    // return "application/octet-stream"; // 모르는 확장자일 경우
+    // }
 
     /**
      * URL에서 파일명만 추출
      * 예: https://t1.kakaocdn.net/account_images/default_profile.jpeg →
      * default_profile.jpeg
      */
-    private String extractFileNameFromUrl(String url) {
-        if (url == null)
-            return "unknown";
-        int lastSlash = url.lastIndexOf('/');
-        if (lastSlash == -1 || lastSlash == url.length() - 1)
-            return "unknown";
-        return url.substring(lastSlash + 1);
-    }
+    // private String extractFileNameFromUrl(String url) {
+    // if (url == null)
+    // return "unknown";
+    // int lastSlash = url.lastIndexOf('/');
+    // if (lastSlash == -1 || lastSlash == url.length() - 1)
+    // return "unknown";
+    // return url.substring(lastSlash + 1);
+    // }
 }