Skip to content

[FEAT] 이미지 기능 재수정 #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LimdaeIl merged 6 commits into from
Dec 8, 2025
Merged

[FEAT] 이미지 기능 재수정 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ec4ea9
♻️refactor: 공통 응답 타입 재수정[#37]
LimdaeIl Dec 8, 2025
a38e531
✨️feat: AWS S3 및 이미지에 대한 구성 속성을 추가[#37]
LimdaeIl Dec 8, 2025
f5a2450
♻️refactor: 유연성을 위해 이미지 업로드 서비스를 리팩토링[#37]
LimdaeIl Dec 8, 2025
7c97c16
♻️refactor: 이미지 업로드 및 삭제 엔드포인트 리팩터링[#37]
LimdaeIl Dec 8, 2025
fbbaeaa
♻️refactor: 이미지 컨트롤러 테스트 .http 재작성[#37]
LimdaeIl Dec 8, 2025
eb922b2
♻️refactor: 이미지 컨트롤러 테스트 .http 코드 정리[#37]
LimdaeIl Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/team/wego/wegobackend/common/response/ApiResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ public record ApiResponse<T>(
) {

public static <T> ApiResponse<T> success(T data) {
return new ApiResponse<>(Boolean.TRUE, data);
return new ApiResponse<>(true, data);
}

public static <T> ApiResponse<T> success(boolean isSuccess, T data) {
return new ApiResponse<>(isSuccess, data);
}

public static <T> ApiResponse<T> success(String message) {
return new ApiResponse<>(Boolean.TRUE, null);
return new ApiResponse<>(true, null);
}

public static <T> ApiResponse<T> error(String message) {
Expand Down
128 changes: 61 additions & 67 deletions src/main/java/team/wego/wegobackend/image/application/service/ImageUploadService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@
import javax.imageio.ImageIO;
import lombok.RequiredArgsConstructor;
import net.coobird.thumbnailator.Thumbnails;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
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.ObjectCannedACL;
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
import team.wego.wegobackend.image.config.AwsS3Properties;
import team.wego.wegobackend.image.config.ImageProperties;
import team.wego.wegobackend.image.domain.ImageFile;
import team.wego.wegobackend.image.domain.ImageSize;
import team.wego.wegobackend.image.domain.exception.ImageException;
import team.wego.wegobackend.image.domain.exception.ImageExceptionCode;

Expand All @@ -40,27 +42,8 @@ public class ImageUploadService {
);

private final S3Client s3Client;

@Value("${aws.s3.bucket}")
private String bucket;

@Value("${aws.s3.public-endpoint}")
private String publicEndpoint;

@Value("${image.max-size-bytes}")
private long maxSizeBytes;

@Value("${image.max-width}")
private int maxWidth;

@Value("${image.max-height}")
private int maxHeight;

@Value("${image.thumb-max-width}")
private int thumbMaxWidth;

@Value("${image.thumb-max-height}")
private int thumbMaxHeight;
private final AwsS3Properties awsS3Properties;
private final ImageProperties imageProperties;

public ImageFile uploadOriginal(String dir, MultipartFile file, int index) {
validateDir(dir);
Expand All @@ -74,7 +57,7 @@ public ImageFile uploadOriginal(String dir, MultipartFile file, int index) {
byte[] bytes = resizeIfNeededKeepFormat(file);

putToS3(key, bytes, file.getContentType());
String url = publicEndpoint + "/" + key;
String url = awsS3Properties.getPublicEndpoint() + "/" + key;

return new ImageFile(key, url);
}
Expand All @@ -88,51 +71,60 @@ public List<ImageFile> uploadAllOriginal(String dir, List<MultipartFile> files)
return result;
}

public ImageFile uploadAsWebp(String dir, MultipartFile file, int index) {
public ImageFile uploadAsWebpWithSize(
String dir,
MultipartFile file,
int index,
ImageSize size
) {
validateDir(dir);
validateImageSize(file);
validateImageContentType(file);
validateExtension(file.getOriginalFilename());

String baseName = buildBaseName(index);
String key = dir + "/" + baseName + ".webp";
String key = dir + "/" + baseName + "_" + size.width() + "x" + size.height() + ".webp";

byte[] bytes = convertToWebp(file);
byte[] bytes = convertToWebpWithSize(file, size);

putToS3(key, bytes, "image/webp");
String url = publicEndpoint + "/" + key;
String url = awsS3Properties.getPublicEndpoint() + "/" + key;

return new ImageFile(key, url);
}

public List<ImageFile> uploadAllAsWebp(String dir, List<MultipartFile> files) {
List<ImageFile> result = new ArrayList<>();
for (int i = 0; i < files.size(); i++) {
MultipartFile file = files.get(i);
result.add(uploadAsWebp(dir, file, i));
}
return result;
}

public ImageFile uploadThumb(String dir, MultipartFile file, int index) {
public List<ImageFile> uploadAsWebpWithSizes(
String dir,
MultipartFile file,
int index,
List<ImageSize> sizes
) {
validateDir(dir);
validateImageSize(file);
validateImageContentType(file);
validateExtension(file.getOriginalFilename());

String originalFilename = file.getOriginalFilename();
String key = buildKey(dir, originalFilename, index);
String baseName = buildBaseName(index);
List<ImageFile> result = new ArrayList<>();

byte[] bytes = resizeToThumb(file);
for (ImageSize size : sizes) {
String key = dir + "/" + baseName + "_" + size.width() + "x" + size.height() + ".webp";
byte[] bytes = convertToWebpWithSize(file, size);

putToS3(key, bytes, file.getContentType());
String url = publicEndpoint + "/" + key;
putToS3(key, bytes, "image/webp");
String url = awsS3Properties.getPublicEndpoint() + "/" + key;

return new ImageFile(key, url);
result.add(new ImageFile(key, url));
}

return result;
}

public void delete(String key) {
s3Client.deleteObject(builder -> builder.bucket(bucket).key(key));
s3Client.deleteObject(builder -> builder
.bucket(awsS3Properties.getBucket())
.key(key)
);
}

public void deleteAll(List<String> keys) {
Expand All @@ -141,7 +133,25 @@ public void deleteAll(List<String> keys) {
}
}

private byte[] convertToWebpWithSize(MultipartFile file, ImageSize size) {
try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
Thumbnails.of(file.getInputStream())
.size(size.width(), size.height())
.outputFormat("webp")
.toOutputStream(byteArrayOutputStream);
Comment on lines +136 to +141
Copy link

Copilot AI Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The convertToWebpWithSize method lacks documentation explaining its behavior. Specifically, it should document that Thumbnails.size() maintains aspect ratio by default, which may not produce exact dimensions if the source image has a different aspect ratio. This could lead to unexpected results when precise dimensions are required.

Copilot uses AI. Check for mistakes.

if (byteArrayOutputStream.size() == 0) {
throw new ImageException(ImageExceptionCode.WEBP_CONVERT_FAILED);
}

return byteArrayOutputStream.toByteArray();
} catch (IOException e) {
throw new ImageException(ImageExceptionCode.IMAGE_IO_ERROR, e, "WebP 변환");
}
}

private void validateImageSize(MultipartFile file) {
long maxSizeBytes = imageProperties.getMaxSizeBytes();
if (file.getSize() > maxSizeBytes) {
throw new ImageException(ImageExceptionCode.INVALID_IMAGE_SIZE, maxSizeBytes);
}
Expand Down Expand Up @@ -212,29 +222,13 @@ private String buildBaseName(int index) {
return timestamp + "_" + index + "_" + uuid;
}

private byte[] convertToWebp(MultipartFile file) {
try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
Thumbnails.of(file.getInputStream())
.size(maxWidth, maxHeight)
.outputFormat("webp")
.toOutputStream(byteArrayOutputStream);

if (byteArrayOutputStream.size() == 0) {
throw new ImageException(ImageExceptionCode.WEBP_CONVERT_FAILED);
}

return byteArrayOutputStream.toByteArray();
} catch (IOException e) {
throw new ImageException(ImageExceptionCode.IMAGE_IO_ERROR, e, "WebP 변환");
}
}

private byte[] resizeIfNeededKeepFormat(MultipartFile file) {
return resizeToBox(file, maxWidth, maxHeight, "이미지 리사이즈");
}

private byte[] resizeToThumb(MultipartFile file) {
return resizeToBox(file, thumbMaxWidth, thumbMaxHeight, "썸네일 생성");
return resizeToBox(
file,
imageProperties.getMaxWidth(),
imageProperties.getMaxHeight(),
"이미지 리사이즈"
);
}

private byte[] resizeToBox(
Expand Down Expand Up @@ -297,7 +291,7 @@ private String getFormatName(String originalFilename) {

private void putToS3(String key, byte[] bytes, String contentType) {
PutObjectRequest putObjectRequest = PutObjectRequest.builder()
.bucket(bucket)
.bucket(awsS3Properties.getBucket())
.key(key)
.contentType(contentType)
.acl(ObjectCannedACL.PUBLIC_READ)
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/team/wego/wegobackend/image/config/AwsS3Properties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package team.wego.wegobackend.image.config;

import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

@Data
Comment on lines +3 to +7
Copy link

Copilot AI Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using Lombok's @DaTa on a configuration properties class can expose setters unnecessarily. Consider using @Getter instead to make the configuration immutable after initial binding.

Suggested change
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@Data
import lombok.Getter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@Getter

Copilot uses AI. Check for mistakes.
@Component
@ConfigurationProperties(prefix = "aws.s3")
public class AwsS3Properties {

private String bucket;

private String publicEndpoint;
}
15 changes: 15 additions & 0 deletions src/main/java/team/wego/wegobackend/image/config/ImageProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package team.wego.wegobackend.image.config;

import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

@Data
Comment on lines +3 to +7
Copy link

Copilot AI Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using Lombok's @DaTa on a configuration properties class can expose setters unnecessarily. Consider using @Getter instead, or the more specific @ConfigurationProperties annotations pattern. Configuration properties should typically be immutable after binding.

Suggested change
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@Data
import lombok.Getter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@Getter

Copilot uses AI. Check for mistakes.
@Component
@ConfigurationProperties(prefix = "image")
public class ImageProperties {

private long maxSizeBytes;
private int maxWidth;
private int maxHeight;
}
4 changes: 4 additions & 0 deletions src/main/java/team/wego/wegobackend/image/domain/ImageSize.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package team.wego.wegobackend.image.domain;

public record ImageSize(int width, int height) {
Copy link

Copilot AI Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ImageSize record lacks validation for width and height parameters. Consider adding a compact constructor to validate that width and height are positive values to prevent invalid image dimensions.

Suggested change
public record ImageSize(int width, int height) {
public record ImageSize(int width, int height) {
public ImageSize {
if (width <= 0) {
throw new IllegalArgumentException("Width must be positive, got: " + width);
}
if (height <= 0) {
throw new IllegalArgumentException("Height must be positive, got: " + height);
}
}

Copilot uses AI. Check for mistakes.
}
Loading
Loading