From ab095f83273bb14fa68bd54a6a345db1388de968 Mon Sep 17 00:00:00 2001 From: pipi-shortstocking Date: Sun, 1 Dec 2024 00:07:14 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20png=20=EC=97=85=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EA=B0=80=EB=8A=A5(#219)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kw_muji/mypage/service/MypageService.java | 12 +++++++++--- .../kw_muji/team/service/MyTeamService.java | 11 ++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/muji_backend/kw_muji/mypage/service/MypageService.java b/src/main/java/com/muji_backend/kw_muji/mypage/service/MypageService.java index 91aec11..7b83a39 100644 --- a/src/main/java/com/muji_backend/kw_muji/mypage/service/MypageService.java +++ b/src/main/java/com/muji_backend/kw_muji/mypage/service/MypageService.java @@ -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"); @@ -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()); diff --git a/src/main/java/com/muji_backend/kw_muji/team/service/MyTeamService.java b/src/main/java/com/muji_backend/kw_muji/team/service/MyTeamService.java index 3cd71a6..5d2f4fe 100644 --- a/src/main/java/com/muji_backend/kw_muji/team/service/MyTeamService.java +++ b/src/main/java/com/muji_backend/kw_muji/team/service/MyTeamService.java @@ -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("프로젝트 이미지의 타입을 확인해주세요"); } // 파일 이름 가공 @@ -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());