Skip to content

fix: png 업로드 가능(#219) #220

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
pipi-shortstocking merged 1 commit into from
Nov 30, 2024
Merged

fix: png 업로드 가능(#219) #220

Show file tree
Hide file tree
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
12 changes: 9 additions & 3 deletions src/main/java/com/muji_backend/kw_muji/mypage/service/MypageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ public String uploadUserImage(final MultipartFile[] files, final String userName
if (files.length > 1)
throw new IllegalArgumentException("프로필 이미지가 1개를 초과함");

if (!Objects.equals(files[0].getContentType(), "image/jpeg") && !Objects.equals(files[0].getContentType(), "image/jpeg"))
throw new IllegalArgumentException("프로필 이미지의 타입이 jpg가 아님");
if (!Objects.equals(files[0].getContentType(), "image/jpeg") && !Objects.equals(files[0].getContentType(), "image/jpeg") && !Objects.equals(files[0].getContentType(), "image/png"))
throw new IllegalArgumentException("프로필 이미지의 타입을 확인해주세요");

// 파일 이름 가공
final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
Expand All @@ -122,7 +122,13 @@ public String uploadUserImage(final MultipartFile[] files, final String userName
final String[] fileName = new String[]{Objects.requireNonNull(name).substring(0, name.length() - 4)};

// S3 Key 구성
final String S3Key = userImageBucketFolder + fileName[0] + "\\" + userName + "\\" + dateFormat.format(time) + ".jpg";
String S3Key = null;
if(Objects.equals(files[0].getContentType(), "image/jpeg")) {
S3Key = userImageBucketFolder + fileName[0] + "\\" + userName + "\\" + dateFormat.format(time) + ".jpg";
} else if(Objects.equals(files[0].getContentType(), "image/png")) {
S3Key = userImageBucketFolder + fileName[0] + "\\" + userName + "\\" + dateFormat.format(time) + ".png";
}


final ObjectMetadata metadata = new ObjectMetadata();
metadata.setContentLength(files[0].getSize());
Expand Down
11 changes: 8 additions & 3 deletions src/main/java/com/muji_backend/kw_muji/team/service/MyTeamService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ public String uploadProjectImage(final MultipartFile[] files, final String title
throw new IllegalArgumentException("프로젝트 이미지가 1개를 초과함");
}

if(!Objects.equals(files[0].getContentType(), "image/jpeg") && !Objects.equals(files[0].getContentType(), "image/jpeg")) {
throw new IllegalArgumentException("프로젝트 이미지의 타입이 jpg가 아님");
if(!Objects.equals(files[0].getContentType(), "image/jpeg") && !Objects.equals(files[0].getContentType(), "image/jpeg") && !Objects.equals(files[0].getContentType(), "image/png")) {
throw new IllegalArgumentException("프로젝트 이미지의 타입을 확인해주세요");
}

// 파일 이름 가공
Expand All @@ -173,7 +173,12 @@ public String uploadProjectImage(final MultipartFile[] files, final String title
final String[] fileName = new String[]{Objects.requireNonNull(name).substring(0, name.length() - 4)};

// S3 Key 구성
final String S3Key = projectImageBucketFolder + fileName[0] + "\\" + title + "\\" + dateFormat.format(time) + ".jpg";
String S3Key = null;
if(Objects.equals(files[0].getContentType(), "image/jpeg")) {
S3Key = projectImageBucketFolder + fileName[0] + "\\" + title + "\\" + dateFormat.format(time) + ".jpg";
} else if (Objects.equals(files[0].getContentType(), "image/png")) {
S3Key = projectImageBucketFolder + fileName[0] + "\\" + title + "\\" + dateFormat.format(time) + ".png";
}

final ObjectMetadata metadata = new ObjectMetadata();
metadata.setContentLength(files[0].getSize());
Expand Down