Merge pull request #93 from KUIT-MAPU/fix/bookmark-anonymous

fix: 이미지파일 null 허용
KUIT-MAPU · Aug 19, 2024 · d8ccb37 · d8ccb37
2 parents 9215b87 + bc802fb
commit d8ccb37
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 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
@@ -76,8 +76,8 @@ public BaseResponse<UserInfoResponseDTO> 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
@@ -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);