Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void saveThumbnailFile(User user, Bookmark bookmark, String thumbnailUrl)
String fileName = extractFileNameWithExtension(thumbnailUrl);
FileType type = getValidatedFileType(fileName);

String s3UrlResponse = s3UploadService.upload(thumbnailUrl);
String s3UrlResponse = s3UploadService.upload(thumbnailUrl, type);

File file = fileMapper.toThumbnailFile(user, bookmark, fileName, s3UrlResponse, type);
fileSaveService.save(file);
Expand Down Expand Up @@ -86,7 +86,7 @@ public void updateThumbnailImage(User user, Bookmark bookmark, String thumbnailU
String fileName = extractFileNameWithExtension(thumbnailUrl);
FileType type = getValidatedFileType(fileName);

String s3UrlResponse = s3UploadService.upload(thumbnailUrl);
String s3UrlResponse = s3UploadService.upload(thumbnailUrl, type);

fileUpdateService.updateThumbnailImage(file, fileName, s3UrlResponse, type);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package leets.bookmark.domain.file.domain.service;

import leets.bookmark.domain.file.application.exception.S3UploadException;
import leets.bookmark.domain.file.domain.entity.enums.FileType;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -28,15 +29,15 @@ public class S3UploadService {

private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");

public String upload(String fileUrl) {
public String upload(String fileUrl, FileType fileType) {
try {
URL url = URI.create(fileUrl).toURL();
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("GET");

try (InputStream inputStream = connection.getInputStream()) {

String fileName = generateUrl(fileUrl);
String fileName = generateUrl(fileType);

PutObjectRequest putObjectRequest = PutObjectRequest.builder()
.bucket(bucket)
Expand All @@ -54,8 +55,8 @@ public String upload(String fileUrl) {
}
}

private String generateUrl(String fileName) {
String extension = fileName.substring(fileName.lastIndexOf(".") + 1);
return LocalDateTime.now().format(FORMATTER) + UUID.randomUUID().toString() + "." + extension;
private String generateUrl(FileType fileType) {
String extension = fileType.getExtension();
return LocalDateTime.now().format(FORMATTER) + UUID.randomUUID().toString() + extension;
}
}