[FEAT/#76] PreSigned URL 획득 API 구현

build.gradle

@@ -52,10 +52,10 @@ dependencies {
     annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3'
     testAnnotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3'
 
-    // TODO: 버전 확인하기
     // Google
-    implementation 'com.google.api-client:google-api-client:2.7.0'
+    implementation 'com.google.api-client:google-api-client:2.7.1'
 
+    // TODO: 0.12.6으로 버전업 하기
     // JWT
     implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5'
     implementation group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5'
@@ -66,10 +66,13 @@ dependencies {
 
     // PostGIS
     implementation 'org.hibernate:hibernate-spatial:6.6.4.Final'
-    implementation 'org.locationtech.jts:jts-core:1.19.0' // TODO: 버전 확인하기
+    implementation 'org.locationtech.jts:jts-core:1.20.0'
 
     // Spring Security
     implementation 'org.springframework.boot:spring-boot-starter-security'
+
+    // AWS
+    implementation 'io.awspring.cloud:spring-cloud-starter-aws:2.4.4'
 }
 
 tasks.named('test') {

src/main/java/com/acon/server/global/exception/ErrorType.java

@@ -47,9 +47,11 @@ public enum ErrorType {
     INVALID_FAVORITE_SPOT_ERROR(HttpStatus.BAD_REQUEST, 40017, "유효하지 않은 favoriteSpot입니다."),
     INVALID_FAVORITE_SPOT_RANK_SIZE_ERROR(HttpStatus.BAD_REQUEST, 40030, "favoriteSpotRank의 사이즈가 잘못되었습니다."),
     INVALID_FAVORITE_CUISINE_RANK_SIZE_ERROR(HttpStatus.BAD_REQUEST, 40031, "favoriteCuisineRank의 사이즈가 잘못되었습니다."),
+    INVALID_IMAGE_TYPE_ERROR(HttpStatus.BAD_REQUEST, 40045, "유효하지 않은 imageType입니다."),
 
     /* 500 Internal Server Error */
     FAILED_DOWNLOAD_GOOGLE_PUBLIC_KEY_ERROR(HttpStatus.BAD_REQUEST, 50002, "구글 공개키 다운로드에 실패하였습니다."),
+    FAILED_GET_PRE_SIGNED_URL_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, 50005, "PreSigned URL 획득에 실패하였습니다."),
 
     /* Review Error */
     /* 400 Bad Request */

src/main/java/com/acon/server/global/external/GeoCodingResponse.java → src/main/java/com/acon/server/global/external/maps/GeoCodingResponse.java

@@ -1,4 +1,4 @@
-package com.acon.server.global.external;
+package com.acon.server.global.external.maps;
 
 public record GeoCodingResponse(
         String latitude,

src/main/java/com/acon/server/global/external/NaverMapsAdapter.java → src/main/java/com/acon/server/global/external/maps/NaverMapsAdapter.java

@@ -1,4 +1,4 @@
-package com.acon.server.global.external;
+package com.acon.server.global.external.maps;
 
 import com.acon.server.global.exception.BusinessException;
 import com.acon.server.global.exception.ErrorType;

src/main/java/com/acon/server/global/external/NaverMapsClient.java → src/main/java/com/acon/server/global/external/maps/NaverMapsClient.java

@@ -1,4 +1,4 @@
-package com.acon.server.global.external;
+package com.acon.server.global.external.maps;
 
 import java.util.Map;
 import org.springframework.cloud.openfeign.FeignClient;

src/main/java/com/acon/server/global/external/NaverMapsFeignConfig.java → src/main/java/com/acon/server/global/external/maps/NaverMapsFeignConfig.java

@@ -1,4 +1,4 @@
-package com.acon.server.global.external;
+package com.acon.server.global.external.maps;
 
 import com.acon.server.global.config.properties.NaverMapsProperties;
 import feign.RequestInterceptor;

src/main/java/com/acon/server/global/external/s3/S3Adapter.java

@@ -0,0 +1,90 @@
+package com.acon.server.global.external.s3;
+
+import com.acon.server.global.exception.BusinessException;
+import com.acon.server.global.exception.ErrorType;
+import com.amazonaws.HttpMethod;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.Headers;
+import com.amazonaws.services.s3.model.CannedAccessControlList;
+import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
+import java.net.URL;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Date;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+// TODO: 추후 AWS SDK v2를 사용하는 방식으로 변경
+public class S3Adapter {
+
+    @Value("${cloud.aws.s3.bucket}")
+    private String bucket;
+
+    @Value("${cloud.aws.s3.path.profileImage}")
+    private String profileImagePath;
+
+    @Value("${cloud.aws.s3.path.reviewImage}")
+    private String reviewImagePath;
+
+    @Value("${cloud.aws.s3.path.spotImage}")
+    private String spotImagePath;
+
+    private final AmazonS3 amazonS3;
+
+    public String getPreSignedUrlForProfileImage(String fileName) {
+        return getPreSignedUrl(profileImagePath, fileName);
+    }
+
+    // TODO: spotId 별로 directory 구분하도록 path 수정
+    public String getPreSignedUrlForReviewImage(String fileName) {
+        return getPreSignedUrl(reviewImagePath, fileName);
+    }
+
+    public String getPreSignedUrlForSpotImage(String fileName) {
+        return getPreSignedUrl(spotImagePath, fileName);
+    }
+
+    private String getPreSignedUrl(String path, String fileName) {
+        if (!path.isEmpty()) {
+            fileName = path + "/" + fileName;
+        }
+
+        try {
+            GeneratePresignedUrlRequest generatePresignedUrlRequest = getGeneratePresignedUrlRequest(fileName);
+            URL url = amazonS3.generatePresignedUrl(generatePresignedUrlRequest);
+
+            return url.toString();
+        } catch (Exception e) {
+            throw new BusinessException(ErrorType.FAILED_GET_PRE_SIGNED_URL_ERROR);
+        }
+    }
+
+    private GeneratePresignedUrlRequest getGeneratePresignedUrlRequest(String fileName) {
+        GeneratePresignedUrlRequest generatePresignedUrlRequest = new GeneratePresignedUrlRequest(bucket, fileName)
+                .withMethod(HttpMethod.PUT)
+                .withExpiration(getPreSignedUrlExpTime());
+
+        generatePresignedUrlRequest.addRequestParameter(
+                Headers.S3_CANNED_ACL,
+                CannedAccessControlList.PublicRead.toString()
+        );
+
+        return generatePresignedUrlRequest;
+    }
+
+    private Date getPreSignedUrlExpTime() {
+        // TODO: 매직 넘버 yml 처리
+        Instant expirationTime = Instant.now().plus(Duration.ofMinutes(2));
+
+        return Date.from(expirationTime);
+    }
+
+    public String getImageUrl(String fileName) {
+        return amazonS3.getUrl(bucket, profileImagePath + "/" + fileName).toString();
+    }
+
+    // TODO: S3에서 파일 삭제하는 로직 추가
+}

src/main/java/com/acon/server/global/external/s3/S3Config.java

@@ -0,0 +1,32 @@
+package com.acon.server.global.external.s3;
+
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.s3.AmazonS3;
+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;
+
+@Configuration
+public class S3Config {
+
+    @Value("${cloud.aws.region.static}")
+    private String region;
+
+    @Value("${cloud.aws.credentials.accessKey}")
+    private String accessKey;
+
+    @Value("${cloud.aws.credentials.secretKey}")
+    private String secretKey;
+
+    @Bean
+    public AmazonS3 amazonS3() {
+        BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
+
+        return AmazonS3ClientBuilder.standard()
+                .withRegion(region)
+                .withCredentials(new AWSStaticCredentialsProvider(credentials))
+                .build();
+    }
+}

src/main/java/com/acon/server/member/api/controller/MemberController.java

@@ -7,10 +7,12 @@
 import com.acon.server.member.api.response.AcornCountResponse;
 import com.acon.server.member.api.response.LoginResponse;
 import com.acon.server.member.api.response.MemberAreaResponse;
+import com.acon.server.member.api.response.PreSignedUrlResponse;
 import com.acon.server.member.application.service.MemberService;
 import com.acon.server.member.domain.enums.Cuisine;
 import com.acon.server.member.domain.enums.DislikeFood;
 import com.acon.server.member.domain.enums.FavoriteSpot;
+import com.acon.server.member.domain.enums.ImageType;
 import com.acon.server.member.domain.enums.SocialType;
 import com.acon.server.member.domain.enums.SpotStyle;
 import com.acon.server.spot.domain.enums.SpotType;
@@ -109,4 +111,15 @@ public ResponseEntity<AcornCountResponse> getAcornCount() {
                 memberService.fetchAcornCount()
         );
     }
+
+    @GetMapping(path = "/images/presigned-url", produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<PreSignedUrlResponse> getPreSignedUrl(
+            @RequestParam(name = "imageType") final String imageTypeString
+    ) {
+        ImageType imageType = ImageType.fromValue(imageTypeString);
+
+        return ResponseEntity.ok(
+                memberService.fetchPreSignedUrl(imageType)
+        );
+    }
 }

src/main/java/com/acon/server/member/api/response/PreSignedUrlResponse.java

@@ -0,0 +1,11 @@
+package com.acon.server.member.api.response;
+
+public record PreSignedUrlResponse(
+        String fileName,
+        String preSignedUrl
+) {
+
+    public static PreSignedUrlResponse of(String fileName, String preSignedUrl) {
+        return new PreSignedUrlResponse(fileName, preSignedUrl);
+    }
+}

src/main/java/com/acon/server/member/application/service/MemberService.java

@@ -5,9 +5,11 @@
 import com.acon.server.global.auth.jwt.JwtTokenProvider;
 import com.acon.server.global.exception.BusinessException;
 import com.acon.server.global.exception.ErrorType;
-import com.acon.server.global.external.NaverMapsAdapter;
+import com.acon.server.global.external.maps.NaverMapsAdapter;
+import com.acon.server.global.external.s3.S3Adapter;
 import com.acon.server.member.api.response.AcornCountResponse;
 import com.acon.server.member.api.response.LoginResponse;
+import com.acon.server.member.api.response.PreSignedUrlResponse;
 import com.acon.server.member.application.mapper.GuidedSpotMapper;
 import com.acon.server.member.application.mapper.MemberMapper;
 import com.acon.server.member.application.mapper.PreferenceMapper;
@@ -19,6 +21,7 @@
 import com.acon.server.member.domain.enums.Cuisine;
 import com.acon.server.member.domain.enums.DislikeFood;
 import com.acon.server.member.domain.enums.FavoriteSpot;
+import com.acon.server.member.domain.enums.ImageType;
 import com.acon.server.member.domain.enums.SocialType;
 import com.acon.server.member.domain.enums.SpotStyle;
 import com.acon.server.member.infra.entity.GuidedSpotEntity;
@@ -37,6 +40,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -58,11 +62,14 @@ public class MemberService {
 
     private final JwtTokenProvider jwtTokenProvider;
     private final PrincipalHandler principalHandler;
+    // TODO: 네이밍 변경
     private final GoogleSocialService googleSocialService;
     private final AppleAuthAdapter appleAuthService;
 
     private final NaverMapsAdapter naverMapsAdapter;
 
+    private final S3Adapter s3Adapter;
+
     // TODO: 메서드 순서 정리, TRANSACTION 설정, mapper 사용
     // TODO: @Valid 거친 건 원시타입으로 받기
 
@@ -216,5 +223,19 @@ public AcornCountResponse fetchAcornCount() {
         return new AcornCountResponse(acornCount);
     }
 
+    public PreSignedUrlResponse fetchPreSignedUrl(ImageType imageType) {
+        // TODO: 확장자 방식 고민하기
+        String fileName = UUID.randomUUID() + ".jpg";
+
+        String preSignedUrl = switch (imageType) {
+            case PROFILE -> s3Adapter.getPreSignedUrlForProfileImage(fileName);
+//            case REVIEW -> s3Adapter.getPreSignedUrlForReviewImage(fileName);
+//            case SPOT -> s3Adapter.getPreSignedUrlForSpotImage(fileName);
+            default -> throw new BusinessException(ErrorType.INVALID_IMAGE_TYPE_ERROR);
+        };
+
+        return PreSignedUrlResponse.of(fileName, preSignedUrl);
+    }
+
     // TODO: 최근 길 안내 장소 지우는 스케줄러 추가
 }

src/main/java/com/acon/server/member/domain/enums/ImageType.java

@@ -0,0 +1,35 @@
+package com.acon.server.member.domain.enums;
+
+import com.acon.server.global.exception.BusinessException;
+import com.acon.server.global.exception.ErrorType;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+public enum ImageType {
+
+    PROFILE,
+    REVIEW,
+    SPOT,
+    ;
+
+    private static final Map<String, ImageType> IMAGE_TYPE_MAP = new HashMap<>();
+
+    static {
+        for (ImageType imageType : ImageType.values()) {
+            IMAGE_TYPE_MAP.put(imageType.name(), imageType);
+        }
+    }
+
+    public static ImageType fromValue(String value) {
+        ImageType imageType = IMAGE_TYPE_MAP.get(value);
+
+        if (imageType == null) {
+            throw new BusinessException(ErrorType.INVALID_IMAGE_TYPE_ERROR);
+        }
+
+        return imageType;
+    }
+}

src/main/java/com/acon/server/spot/application/service/SpotService.java

@@ -7,8 +7,8 @@
 import com.acon.server.global.auth.PrincipalHandler;
 import com.acon.server.global.exception.BusinessException;
 import com.acon.server.global.exception.ErrorType;
-import com.acon.server.global.external.GeoCodingResponse;
-import com.acon.server.global.external.NaverMapsAdapter;
+import com.acon.server.global.external.maps.GeoCodingResponse;
+import com.acon.server.global.external.maps.NaverMapsAdapter;
 import com.acon.server.member.domain.enums.Cuisine;
 import com.acon.server.member.domain.enums.DislikeFood;
 import com.acon.server.member.domain.enums.FavoriteSpot;

src/main/java/com/acon/server/spot/domain/enums/FilterCategory.java

@@ -33,5 +33,4 @@ public static FilterCategory fromValue(String value) {
 
         return category;
     }
-
 }