-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
201 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
.../main/java/com/dontbe/www/DontBeServer/api/member/dto/request/ProfilePatchRequestDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package com.dontbe.www.DontBeServer.api.member.dto.request; | ||
|
|
||
| import org.springframework.web.multipart.MultipartFile; | ||
|
|
||
| public record ProfilePatchRequestDto ( | ||
| String nickname, | ||
| Boolean isAlarmAllowed, | ||
| String memberIntro | ||
| ){ | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
DontBeServer/src/main/java/com/dontbe/www/DontBeServer/external/s3/config/AWSConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package com.dontbe.www.DontBeServer.external.s3.config; | ||
|
|
||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import software.amazon.awssdk.auth.credentials.SystemPropertyCredentialsProvider; | ||
| import software.amazon.awssdk.regions.Region; | ||
| import software.amazon.awssdk.services.s3.S3Client; | ||
|
|
||
| @Configuration | ||
| public class AWSConfig { | ||
|
|
||
| private static final String AWS_ACCESS_KEY_ID = "aws.accessKeyId"; | ||
| private static final String AWS_SECRET_ACCESS_KEY = "aws.secretAccessKey"; | ||
|
|
||
| private final String accessKey; | ||
| private final String secretKey; | ||
| private final String regionString; | ||
|
|
||
| public AWSConfig(@Value("${aws-property.access-key}") final String accessKey, | ||
| @Value("${aws-property.secret-key}") final String secretKey, | ||
| @Value("${aws-property.aws-region}") final String regionString) { | ||
| this.accessKey = accessKey; | ||
| this.secretKey = secretKey; | ||
| this.regionString = regionString; | ||
| } | ||
|
|
||
| @Bean | ||
| public SystemPropertyCredentialsProvider systemPropertyCredentialsProvider() { | ||
| System.setProperty(AWS_ACCESS_KEY_ID, accessKey); | ||
| System.setProperty(AWS_SECRET_ACCESS_KEY, secretKey); | ||
| return SystemPropertyCredentialsProvider.create(); | ||
| } | ||
|
|
||
| @Bean | ||
| public Region getRegion() { | ||
| return Region.of(regionString); | ||
| } | ||
|
|
||
| @Bean | ||
| public S3Client getS3Client() { | ||
| return S3Client.builder() | ||
| .region(getRegion()) | ||
| .credentialsProvider(systemPropertyCredentialsProvider()) | ||
| .build(); | ||
| } | ||
| } |
80 changes: 80 additions & 0 deletions
80
DontBeServer/src/main/java/com/dontbe/www/DontBeServer/external/s3/service/S3Service.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package com.dontbe.www.DontBeServer.external.s3.service; | ||
|
|
||
| import com.dontbe.www.DontBeServer.external.s3.config.AWSConfig; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.stereotype.Component; | ||
| import org.springframework.web.multipart.MultipartFile; | ||
| import software.amazon.awssdk.core.sync.RequestBody; | ||
| import software.amazon.awssdk.services.s3.S3Client; | ||
| import software.amazon.awssdk.services.s3.model.DeleteObjectRequest; | ||
| import software.amazon.awssdk.services.s3.model.PutObjectRequest; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.UUID; | ||
|
|
||
| @Component | ||
| public class S3Service { | ||
|
|
||
| private static final String S3_URL = "https://dontbe-s3.s3.ap-northeast-2.amazonaws.com/"; | ||
| private static final List<String> IMAGE_EXTENSIONS = Arrays.asList("image/jpeg", "image/png", "image/jpg", "image/webp"); | ||
| private static final Long MAX_FILE_SIZE = 5 * 1024 * 1024L; | ||
|
|
||
| private final String bucketName; | ||
| private final AWSConfig awsConfig; | ||
|
|
||
| public S3Service(@Value("${aws-property.s3-bucket-name}") final String bucketName, AWSConfig awsConfig) { | ||
| this.bucketName = bucketName; | ||
| this.awsConfig = awsConfig; | ||
| } | ||
|
|
||
|
|
||
| public String uploadImage(String directoryPath, MultipartFile image) throws IOException { | ||
| validateExtension(image); | ||
| validateFileSize(image); | ||
|
|
||
| final String key = "ProfileImage/" + directoryPath + "/" + generateImageFileName(); | ||
| final S3Client s3Client = awsConfig.getS3Client(); | ||
|
|
||
| PutObjectRequest request = PutObjectRequest.builder() | ||
| .bucket(bucketName) | ||
| .key(key) | ||
| .contentType(image.getContentType()) | ||
| .contentDisposition("inline") | ||
| .build(); | ||
|
|
||
| RequestBody requestBody = RequestBody.fromBytes(image.getBytes()); | ||
| s3Client.putObject(request, requestBody); | ||
| return S3_URL + key; | ||
| } | ||
|
|
||
| public void deleteImage(String key) { | ||
| final S3Client s3Client = awsConfig.getS3Client(); | ||
|
|
||
| s3Client.deleteObject((DeleteObjectRequest.Builder builder) -> | ||
| builder.bucket(bucketName) | ||
| .key(key) | ||
| .build() | ||
| ); | ||
| } | ||
|
|
||
|
|
||
| private String generateImageFileName() { | ||
| return UUID.randomUUID().toString() + ".jpg"; | ||
| } | ||
|
|
||
| private void validateExtension(MultipartFile image) { | ||
| String contentType = image.getContentType(); | ||
| if (!IMAGE_EXTENSIONS.contains(contentType)) { | ||
| throw new RuntimeException("이미지 확장자는 jpg, png, webp만 가능합니다."); | ||
| } | ||
| } | ||
|
|
||
| private void validateFileSize(MultipartFile image) { | ||
| if (image.getSize() > MAX_FILE_SIZE) { | ||
| throw new RuntimeException("이미지 사이즈는 5MB를 넘을 수 없습니다."); | ||
| } | ||
| } | ||
|
|
||
| } |