refactor: 사용자 프로필 필수 해제 (#73)

xxoznge · Jul 24, 2024 · e2ea6bc · e2ea6bc
1 parent ad5953e
commit e2ea6bc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/com/ddabong/ddabongdotchiBE/domain/user/controller/UserController.java b/src/main/java/com/ddabong/ddabongdotchiBE/domain/user/controller/UserController.java
@@ -44,7 +44,7 @@ public class UserController {
 	@PostMapping(value = "/join", consumes = "multipart/form-data")
 	public ApiResponse<UserJoinResponse> join(
 		@RequestPart(value = "request") @Valid UserJoinRequest request,
-		@RequestPart(name = "profileImage") MultipartFile file
+		@RequestPart(name = "profileImage", required = false) MultipartFile file
 	) {
 		return ApiResponse.onSuccess(userService.join(request, file));
 	}
@@ -87,7 +87,7 @@ public ApiResponse<List<MyCardGetResponse>> getMyCards(@UserResolver User user)
 	public ApiResponse<UserUpdateResponse> updateMyUser(
 		@UserResolver User user,
 		@RequestPart @Valid UserUpdateRequest request,
-		@RequestPart(value = "profileImage") MultipartFile file) {
+		@RequestPart(value = "profileImage", required = false) MultipartFile file) {
 		return ApiResponse.onSuccess(userService.updateMyUser(user, request, file));
 	}
 

diff --git a/src/main/java/com/ddabong/ddabongdotchiBE/domain/user/service/UserService.java b/src/main/java/com/ddabong/ddabongdotchiBE/domain/user/service/UserService.java
@@ -31,7 +31,10 @@ public class UserService {
 	private final JwtUtil jwtUtil;
 
 	public UserJoinResponse join(UserJoinRequest request, MultipartFile file) {
-		String imageUrl = s3Service.uploadImage(file);
+		String imageUrl = null;
+		if (file != null && !file.isEmpty()) {
+			imageUrl = s3Service.uploadImage(file);
+		}
 		final User user = request.toEntity(passwordEncoder.encode(request.password()));
 		user.setImageUrl(imageUrl);
 		userRepository.save(user);
@@ -49,7 +52,10 @@ public void updatePassword(User user, PasswordUpdateRequest request) {
 	}
 
 	public UserUpdateResponse updateMyUser(User user, UserUpdateRequest request, MultipartFile file) {
-		String imageUrl = s3Service.uploadImage(file);
+		String imageUrl = null;
+		if (file != null && !file.isEmpty()) {
+			imageUrl = s3Service.uploadImage(file);
+		}
 		user.update(request.nickname(), request.description(), imageUrl);
 		return UserUpdateResponse.from(user);
 	}