[DDING-000] 지원서 상세조회시 파일 다운로드 수정 (#273)

COW-dev · Feb 20, 2025 · 5c8796d · 5c8796d
1 parent b688661
commit 5c8796d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/src/main/java/ddingdong/ddingdongBE/file/api/S3FileAPi.java b/src/main/java/ddingdong/ddingdongBE/file/api/S3FileAPi.java
@@ -90,5 +90,4 @@ UploadUrlResponse getPreSignedUrl(@AuthenticationPrincipal PrincipalDetails prin
     @ResponseStatus(HttpStatus.OK)
     @GetMapping("/upload-url/form-application")
     UploadUrlResponse getFormApplicationPreSignedUrl(@RequestParam("fileName") String fileName);
-
 }
diff --git a/src/main/java/ddingdong/ddingdongBE/file/controller/S3FileController.java b/src/main/java/ddingdong/ddingdongBE/file/controller/S3FileController.java
@@ -37,7 +37,7 @@ public UploadUrlResponse getFormApplicationPreSignedUrl(String fileName) {
         LocalDateTime now = LocalDateTime.now();
         String decodedFileName = URLDecoder.decode(fileName, StandardCharsets.UTF_8);
         GeneratePreSignedUrlRequestQuery query =
-                s3FileService.generatePresignedUrlRequest(
+                s3FileService.generateDownloadPresignedUrlRequest(
                         new GeneratePreSignedUrlRequestCommand(now, 9999L, decodedFileName));
         URL presingedUrl = s3FileService.getPresignedUrl(query.generatePresignedUrlRequest());
         return UploadUrlResponse.of(query, presingedUrl);

diff --git a/src/main/java/ddingdong/ddingdongBE/file/service/S3FileService.java b/src/main/java/ddingdong/ddingdongBE/file/service/S3FileService.java
@@ -45,15 +45,13 @@ public class S3FileService {
     private final FileMetaDataService fileMetaDataService;
 
     public GeneratePreSignedUrlRequestQuery generatePresignedUrlRequest(GeneratePreSignedUrlRequestCommand command) {
-        UUID id = UuidCreator.getTimeOrderedEpoch();
         ContentType contentType = ContentType.fromExtension(extractFileExtension(command.fileName()));
-        String key = generateKey(contentType, command, id);
-        Date expiration = getExpirationTime();
-
-        fileMetaDataService.create(FileMetaData.createPending(id, key, command.fileName()));
+        return buildPresignedUrlRequest(command, contentType);
+    }
 
-        GeneratePresignedUrlRequest request = createPresignedUrlRequest(key, contentType, expiration);
-        return new GeneratePreSignedUrlRequestQuery(request, id, contentType.getMimeType());
+    public GeneratePreSignedUrlRequestQuery generateDownloadPresignedUrlRequest(GeneratePreSignedUrlRequestCommand command) {
+        ContentType contentType = ContentType.OCTET_STREAM;
+        return buildPresignedUrlRequest(command, contentType);
     }
 
     public URL getPresignedUrl(GeneratePresignedUrlRequest generatePresignedUrlRequest) {
@@ -102,6 +100,17 @@ public UploadedVideoUrlQuery getUploadedVideoUrl(String key) {
         return new UploadedVideoUrlQuery(thumbnailOriginUrl, thumbnailCdnUrl, videoOriginUrl, videoCdnUrl);
     }
 
+    private GeneratePreSignedUrlRequestQuery buildPresignedUrlRequest(GeneratePreSignedUrlRequestCommand command, ContentType contentType) {
+        UUID id = UuidCreator.getTimeOrderedEpoch();
+        String key = generateKey(contentType, command, id);
+        Date expiration = getExpirationTime();
+
+        fileMetaDataService.create(FileMetaData.createPending(id, key, command.fileName()));
+
+        GeneratePresignedUrlRequest request = createPresignedUrlRequest(key, contentType, expiration);
+        return new GeneratePreSignedUrlRequestQuery(request, id, contentType.getMimeType());
+    }
+
     private GeneratePresignedUrlRequest createPresignedUrlRequest(String key, ContentType contentType,
                                                                   Date expiration) {
         return new GeneratePresignedUrlRequest(inputBucket, key)