refactor: MinioProperties 도입 및 Presigned URL Content-Type 제한 추가

Author: howooyeon

src/main/java/com/semosan/api/common/config/MinioConfig.java

@@ -5,29 +5,25 @@
 import io.minio.MakeBucketArgs;
 import io.minio.MinioClient;
 import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Slf4j
 @Configuration
+@RequiredArgsConstructor
+@EnableConfigurationProperties(MinioProperties.class)
 public class MinioConfig {
 
-    @Value("${minio.endpoint}")
-    private String endpoint;
-
-    @Value("${minio.access-key}")
-    private String accessKey;
-
-    @Value("${minio.secret-key}")
-    private String secretKey;
+    private final MinioProperties properties;
 
     @Bean
     public MinioClient minioClient() {
         return MinioClient.builder()
-                .endpoint(endpoint)
-                .credentials(accessKey, secretKey)
+                .endpoint(properties.endpoint())
+                .credentials(properties.accessKey(), properties.secretKey())
                 .build();
     }
 

src/main/java/com/semosan/api/common/config/MinioProperties.java

@@ -0,0 +1,11 @@
+package com.semosan.api.common.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "minio")
+public record MinioProperties(
+        String endpoint,
+        String accessKey,
+        String secretKey,
+        String publicUrl
+) {}

src/main/java/com/semosan/api/domain/image/service/ImageService.java

@@ -1,15 +1,16 @@
 package com.semosan.api.domain.image.service;
 
+import com.semosan.api.common.config.MinioProperties;
 import com.semosan.api.common.exception.GeneralException;
 import com.semosan.api.common.status.ErrorStatus;
 import com.semosan.api.domain.image.dto.response.PresignedUrlResponse;
 import io.minio.GetPresignedObjectUrlArgs;
 import io.minio.MinioClient;
 import io.minio.http.Method;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -20,14 +21,15 @@ public class ImageService {
 
     public static final Set<String> ALLOWED_BUCKETS = Set.of("reviews", "mountains", "restaurants", "posts", "semofeed");
     private static final Set<String> ALLOWED_EXTENSIONS = Set.of(".jpg", ".jpeg", ".png", ".webp");
+    private static final Map<String, String> CONTENT_TYPE_MAP = Map.of(
+            ".jpg", "image/jpeg",
+            ".jpeg", "image/jpeg",
+            ".png", "image/png",
+            ".webp", "image/webp"
+    );
 
     private final MinioClient minioClient;
-
-    @Value("${minio.endpoint}")
-    private String endpoint;
-
-    @Value("${minio.public-url}")
-    private String publicUrl;
+    private final MinioProperties minioProperties;
 
     public PresignedUrlResponse generatePresignedUrl(String bucket, String filename) {
         validateBucket(bucket);
@@ -37,17 +39,19 @@ public PresignedUrlResponse generatePresignedUrl(String bucket, String filename)
         String key = UUID.randomUUID() + extension;
 
         try {
+            String contentType = CONTENT_TYPE_MAP.get(extension.toLowerCase());
             String uploadUrl = minioClient.getPresignedObjectUrl(
                     GetPresignedObjectUrlArgs.builder()
                             .method(Method.PUT)
                             .bucket(bucket)
                             .object(key)
                             .expiry(10, TimeUnit.MINUTES)
+                            .extraHeaders(Map.of("Content-Type", contentType))
                             .build()
             );
 
-            uploadUrl = uploadUrl.replace(endpoint, publicUrl);
-            String imageUrl = publicUrl + "/" + bucket + "/" + key;
+            uploadUrl = uploadUrl.replace(minioProperties.endpoint(), minioProperties.publicUrl());
+            String imageUrl = minioProperties.publicUrl() + "/" + bucket + "/" + key;
 
             return new PresignedUrlResponse(uploadUrl, imageUrl);
         } catch (Exception e) {

src/main/resources/application.yaml

@@ -10,6 +10,10 @@ spring:
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
     driver-class-name: org.postgresql.Driver
+  data:
+    redis:
+      host: ${REDIS_HOST}
+      port: ${REDIS_PORT}
   jpa:
     hibernate:
       ddl-auto: update
@@ -30,11 +34,6 @@ kakao:
   client-secret: ${KAKAO_CLIENT_SECRET}
   admin-key: ${KAKAO_ADMIN_KEY}
 
-  data:
-    redis:
-      host: ${REDIS_HOST}
-      port: ${REDIS_PORT}
-
 tracking:
   stream-key: ${TRACKING_STREAM_KEY}
   consumer-group: ${TRACKING_CONSUMER_GROUP}
@@ -48,3 +47,9 @@ springdoc:
   swagger-ui:
     path: /swagger-ui.html
   default-flat-param-object: true
+
+minio:
+  endpoint: ${MINIO_ENDPOINT}
+  access-key: ${MINIO_ACCESS_KEY}
+  secret-key: ${MINIO_SECRET_KEY}
+  public-url: ${MINIO_PUBLIC_URL}