From f0f4bb81fa6fb33222d967c578ee744d79a41054 Mon Sep 17 00:00:00 2001 From: sye1101 Date: Fri, 31 May 2024 11:18:35 +0900 Subject: [PATCH] =?UTF-8?q?[UPDATE]:=20=ED=94=84=EC=82=AC=20=EC=97=85?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/user/controller/MemberRestController.java | 8 ++------ .../domain/user/service/mypage/UserImgService.java | 7 ++----- .../domain/user/service/mypage/UserImgServiceImpl.java | 8 ++++---- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/main/java/KGUcapstone/OutDecision/domain/user/controller/MemberRestController.java b/src/main/java/KGUcapstone/OutDecision/domain/user/controller/MemberRestController.java index 3776c00..8c5f569 100644 --- a/src/main/java/KGUcapstone/OutDecision/domain/user/controller/MemberRestController.java +++ b/src/main/java/KGUcapstone/OutDecision/domain/user/controller/MemberRestController.java @@ -97,17 +97,13 @@ public ApiResponse updatePassword(@RequestBody @Valid UpdatePasswordDTO @PatchMapping(value = "/edit/profile", consumes = "multipart/form-data") @Operation(summary = "마이페이지 프로필 사진 변경", description = "프로필 사진을 변경합니다.") public ApiResponse updateUserImg(@RequestPart(value = "userImg") MultipartFile userImg) { - boolean success = userImgService.updateUserImg(userImg); - if (success) return ApiResponse.onSuccess("프로필 사진이 성공적으로 변경되었습니다."); - else return ApiResponse.onFailure("400", "프로필 사진 변경에 실패하였습니다.", null); + return ApiResponse.onSuccess(userImgService.updateUserImg(userImg)); } @PatchMapping("/delete/profile") @Operation(summary = "마이페이지 프로필 사진 삭제", description = "프로필 사진을 삭제합니다.") public ApiResponse deleteUserImg() { - boolean success = userImgService.deleteUserImg(); - if (success) return ApiResponse.onSuccess("프로필 사진이 성공적으로 삭제되었습니다."); - else return ApiResponse.onFailure("400", "프로필 사진 삭제에 실패하였습니다.", null); + return ApiResponse.onSuccess(userImgService.deleteUserImg()); } @GetMapping() diff --git a/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/UserImgService.java b/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/UserImgService.java index 13edc4a..a26f8b3 100644 --- a/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/UserImgService.java +++ b/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/UserImgService.java @@ -3,9 +3,6 @@ import org.springframework.web.multipart.MultipartFile; public interface UserImgService { - - boolean updateUserImg(MultipartFile userImg); - - // 프로필 사진 삭제 -> 기본 이미지 변경 - boolean deleteUserImg(); + String updateUserImg(MultipartFile userImg); + String deleteUserImg(); } diff --git a/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/UserImgServiceImpl.java b/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/UserImgServiceImpl.java index 71a3cae..206ce18 100644 --- a/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/UserImgServiceImpl.java +++ b/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/UserImgServiceImpl.java @@ -27,7 +27,7 @@ public class UserImgServiceImpl implements UserImgService{ // 프로필 사진 변경 @Override - public boolean updateUserImg(MultipartFile userImg) { + public String updateUserImg(MultipartFile userImg) { Optional memberOptional = findMemberService.findLoginMember(); Member member; if(memberOptional.isPresent()) member = memberOptional.get(); @@ -43,12 +43,12 @@ public boolean updateUserImg(MultipartFile userImg) { member.updateUserImg(profileImage); memberRepository.save(member); - return true; + return profileImage; } // 프로필 사진 삭제 -> 기본 이미지 변경 @Override - public boolean deleteUserImg() { + public String deleteUserImg() { Optional memberOptional = findMemberService.findLoginMember(); Member member; // 로그인 체크 @@ -63,6 +63,6 @@ public boolean deleteUserImg() { member.updateUserImg(defaultImg); memberRepository.save(member); - return true; + return defaultImg; } }