Skip to content
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.

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

이미지 업로드 수정 #721

Merged
merged 3 commits into from
Oct 19, 2023
Merged
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion backend/src/main/java/hanglog/trip/service/ImageService.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@

import hanglog.global.exception.ImageException;
import hanglog.image.domain.ImageFile;
import hanglog.image.domain.S3ImageEvent;
import hanglog.image.infrastructure.ImageUploader;
import hanglog.trip.dto.response.ImagesResponse;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

Expand All @@ -20,16 +22,26 @@ public class ImageService {
private static final int EMPTY_LIST_SIZE = 0;

private final ImageUploader imageUploader;
private final ApplicationEventPublisher publisher;

public ImagesResponse save(final List<MultipartFile> images) {
validateSizeOfImages(images);
final List<ImageFile> imageFiles = images.stream()
.map(ImageFile::new)
.toList();
final List<String> imageNames = imageUploader.uploadImages(imageFiles);
final List<String> imageNames = uploadImages(imageFiles);
return new ImagesResponse(imageNames);
}

private List<String> uploadImages(final List<ImageFile> imageFiles) {
try {
return imageUploader.uploadImages(imageFiles);
} catch (final ImageException e) {
imageFiles.forEach(imageFile -> publisher.publishEvent(new S3ImageEvent(imageFile.getHashedName())));
throw e;
}
}

private void validateSizeOfImages(final List<MultipartFile> images) {
if (images.size() > MAX_IMAGE_LIST_SIZE) {
throw new ImageException(EXCEED_IMAGE_LIST_SIZE);
Expand Down