[DEV-000]: presignedUrl contentType 지정 (#94)

COW-dev · Aug 31, 2024 · 2c8e4f4 · 2c8e4f4
1 parent 0441ec3
commit 2c8e4f4
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 42 deletions.
diff --git a/...main/java/ddingdong/ddingdongBE/domain/club/controller/dto/request/UpdateClubRequest.java b/...main/java/ddingdong/ddingdongBE/domain/club/controller/dto/request/UpdateClubRequest.java
@@ -26,7 +26,7 @@ public record UpdateClubRequest(
         String tag,
         @Schema(description = "동아리 회장", example = "홍길동")
         @NotNull(message = "동아리 회장은 필수입니다.")
-        String clubLeader,
+        String leader,
         @Schema(description = "회장 전화번호", example = "010-1234-5678")
         @NotNull(message = "전화번호는 필수입니다.")
         String phoneNumber,
@@ -61,7 +61,7 @@ public UpdateClubCommand toCommand() {
                 .name(name)
                 .category(category)
                 .tag(tag)
-                .clubLeader(clubLeader)
+                .clubLeader(leader)
                 .phoneNumber(phoneNumber)
                 .location(location)
                 .startRecruitPeriod(startRecruitPeriod)

diff --git a/src/main/java/ddingdong/ddingdongBE/file/api/S3FileApi.java b/src/main/java/ddingdong/ddingdongBE/file/api/S3FileApi.java
@@ -53,6 +53,6 @@ public interface S3FileApi {
     @ResponseStatus(HttpStatus.OK)
     @SecurityRequirement(name = "AccessToken")
     @GetMapping("/upload-url")
-    UploadUrlResponse getUploadUrl(@RequestParam("fileName") String fileName);
+    UploadUrlResponse getUploadUrl(@RequestParam String fileName, @RequestParam String contentType);
 
 }
diff --git a/src/main/java/ddingdong/ddingdongBE/file/controller/S3FileController.java b/src/main/java/ddingdong/ddingdongBE/file/controller/S3FileController.java
@@ -13,7 +13,7 @@ public class S3FileController implements S3FileApi {
     private final S3FileService s3FileService;
 
     @Override
-    public UploadUrlResponse getUploadUrl(String fileName) {
-        return s3FileService.generatePreSignedUrl(fileName);
+    public UploadUrlResponse getUploadUrl(String fileName, String contentType) {
+        return s3FileService.generatePreSignedUrl(fileName, contentType);
     }
 }
diff --git a/src/main/java/ddingdong/ddingdongBE/file/service/S3FileService.java b/src/main/java/ddingdong/ddingdongBE/file/service/S3FileService.java
@@ -30,7 +30,7 @@ public class S3FileService {
 
     private final AmazonS3Client amazonS3Client;
 
-    public UploadUrlResponse generatePreSignedUrl(String fileName) {
+    public UploadUrlResponse generatePreSignedUrl(String fileName, String contentType) {
         UUID fileId = UuidCreator.getTimeOrderedEpoch();
         String s3FilePath = createFilePath(fileName, fileId);
 
@@ -39,6 +39,7 @@ public UploadUrlResponse generatePreSignedUrl(String fileName) {
             GeneratePresignedUrlRequest generatePresignedUrlRequest = new GeneratePresignedUrlRequest(bucketName,
                     s3FilePath)
                     .withMethod(HttpMethod.PUT)
+                    .withContentType(contentType)
                     .withExpiration(expiration);
 
             URL uploadUrl = amazonS3Client.generatePresignedUrl(generatePresignedUrlRequest);

diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
@@ -2,38 +2,38 @@ insert into users(name, password, role, userid)
 values ('ddingdong', '$2a$12$9BIi3IGc79rU3Xgbnxq/X.T37Hlfrf/lSc2/g0HLeM1g7HmFXE8v.', 'ADMIN', 'ddingdong11'),
        ('cow', '$2a$12$9BIi3IGc79rU3Xgbnxq/X.T37Hlfrf/lSc2/g0HLeM1g7HmFXE8v.', 'CLUB', 'cow11');
 
-# INSERT INTO club(name,
-#                  category,
-#                  leader,
-#                  tag,
-#                  score,
-#                  phone_number,
-#                  location,
-#                  user_id,
-#                  start_recruit_period,
-#                  end_recruit_period,
-#                  regular_meeting,
-#                  introduction,
-#                  activity,
-#                  ideal,
-#                  form_url,
-#                  profile_image_url,
-#                  introduction_image_url)
-# VALUES ('카우',
-#         '학술',
-#         '김세빈',
-#         'IT',
-#         0,
-#         '010-0000-0000',
-#         'S1350',
-#         2,
-#         NULL,
-#         NULL,
-#         '매주 월요일 18:00시',
-#         '동아리 소개입니다.',
-#         '동아리 활동내용입니다.',
-#         NULL,
-#         NULL,
-#         NULL,
-#         NULL
-#        );
+INSERT INTO club(name,
+                 category,
+                 leader,
+                 tag,
+                 score,
+                 phone_number,
+                 location,
+                 user_id,
+                 start_recruit_period,
+                 end_recruit_period,
+                 regular_meeting,
+                 introduction,
+                 activity,
+                 ideal,
+                 form_url,
+                 profile_image_url,
+                 introduction_image_url)
+VALUES ('카우',
+        '학술',
+        '김세빈',
+        'IT',
+        0,
+        '010-0000-0000',
+        'S1350',
+        2,
+        NULL,
+        NULL,
+        '매주 월요일 18:00시',
+        '동아리 소개입니다.',
+        '동아리 활동내용입니다.',
+        NULL,
+        NULL,
+        NULL,
+        NULL
+       );
diff --git a/src/test/java/ddingdong/ddingdongBE/file/service/S3FileServiceTest.java b/src/test/java/ddingdong/ddingdongBE/file/service/S3FileServiceTest.java
@@ -38,12 +38,13 @@ class S3FileServiceTest {
     void generatePreSignedUrl() throws MalformedURLException {
         //given
         String fileName = "image.jpg";
+        String contentType = "image/jpg";
 
         URL expectedUrl = new URL("https://test-bucket.s3.amazonaws.com/test/jpg/image.jpg");
         given(amazonS3Client.generatePresignedUrl(any(GeneratePresignedUrlRequest.class))).willReturn(expectedUrl);
 
         //when
-        UploadUrlResponse uploadUrlResponse = s3FileService.generatePreSignedUrl(fileName);
+        UploadUrlResponse uploadUrlResponse = s3FileService.generatePreSignedUrl(fileName, contentType);
 
         //then
         Pattern UUID7_PATTERN = Pattern.compile(