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.

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

[BE] fix: 기본 이미지에서 새로운 이미지로 update하는 경우 예외가 발생하는 현상 수정 #509

Merged
merged 1 commit into from
Aug 21, 2024
Merged

[BE] fix: 기본 이미지에서 새로운 이미지로 update하는 경우 예외가 발생하는 현상 수정 #509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 6 additions & 10 deletions backend/src/main/java/com/happy/friendogly/infra/S3StorageManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.io.File;
import java.io.IOException;
import java.util.UUID;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
Expand All @@ -21,6 +22,7 @@
import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
import software.amazon.awssdk.services.s3.model.PutObjectRequest;

@Slf4j
@Component
@Profile("!local")
public class S3StorageManager implements FileStorageManager {
Expand Down Expand Up @@ -59,7 +61,6 @@ public String uploadFile(MultipartFile file) {
ErrorCode.FILE_SIZE_EXCEED,
BAD_REQUEST
);
// throw new FriendoglyException(String.format("%dMB 미만의 사진만 업로드 가능합니다.", FILE_SIZE_LIMIT));
}

// TODO: 실제 파일명에서 확장자 가져오기
Expand Down Expand Up @@ -93,23 +94,18 @@ private File convertMultiPartFileToFile(MultipartFile multipartFile) {

@Override
public void removeFile(String oldImageUrl) {
if (StringUtils.isBlank(oldImageUrl)) {
throw new FriendoglyException("삭제할 이미지의 URL을 입력해 주세요.");
}

if (!oldImageUrl.startsWith(S3_ENDPOINT)) {
throw new FriendoglyException(String.format("(%s)은 삭제할 수 없는 이미지 URL입니다.", oldImageUrl));
if (StringUtils.isBlank(oldImageUrl) || !oldImageUrl.startsWith(S3_ENDPOINT)) {
return;
}

String fileName = oldImageUrl.substring(oldImageUrl.lastIndexOf("/") + 1);

try {
s3Client.deleteObject(DeleteObjectRequest.builder()
.bucket(BUCKET_NAME)
.key(KEY_PREFIX + fileName)
.build());
} catch (SdkException e) {
throw new FriendoglyException("알 수 없는 이유로 이미지 파일 삭제에 실패했습니다.", INTERNAL_SERVER_ERROR);
} catch (SdkException exception) {
log.error(exception.getMessage(), exception);
}
}

Expand Down
Loading