From bc802fbdb6868d01cdb59374f610ac01f76bb378 Mon Sep 17 00:00:00 2001 From: kang yeon joo Date: Tue, 20 Aug 2024 06:04:00 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20null=20=ED=97=88=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/mapu/domain/user/api/UserController.java | 4 ++-- .../java/com/mapu/domain/user/application/UserService.java | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/mapu/domain/user/api/UserController.java b/src/main/java/com/mapu/domain/user/api/UserController.java index 0987d89..592ee7a 100644 --- a/src/main/java/com/mapu/domain/user/api/UserController.java +++ b/src/main/java/com/mapu/domain/user/api/UserController.java @@ -76,8 +76,8 @@ public BaseResponse getUserInfo(@AuthenticationPrincipal Jw */ @PatchMapping public BaseResponse updateUserInfo(@AuthenticationPrincipal JwtUserDto jwtUserDto, - @Validated @RequestPart("requestDTO") UserUpdateRequestDTO request, - @RequestPart("imageFile") MultipartFile image) throws IOException { + @Validated @RequestPart("requestDTO") UserUpdateRequestDTO request, + @RequestPart(value = "imageFile", required = false) MultipartFile image) throws IOException { userService.updateUser(Long.parseLong(jwtUserDto.getName()), request, image); return new BaseResponse<>(); } diff --git a/src/main/java/com/mapu/domain/user/application/UserService.java b/src/main/java/com/mapu/domain/user/application/UserService.java index 4107a3b..8cf03e9 100644 --- a/src/main/java/com/mapu/domain/user/application/UserService.java +++ b/src/main/java/com/mapu/domain/user/application/UserService.java @@ -226,7 +226,11 @@ public void updateUser(long userId, UserUpdateRequestDTO request, MultipartFile user.setNickname(request.getNickname()); user.setProfileId(request.getProfileId()); - if(image.isEmpty()) user.setImage(request.getImageUrl()); + if(image==null) { + if(request.getImageUrl()==null) + user.setImage(null); + else user.setImage(request.getImageUrl()); + } else { String imageUrl = uploadImage(image); user.setImage(imageUrl);