refactor: #73 service 코드 로직 수정 및 코드 수정

tinon1004 · tinon1004 · commit 484f529219d9 · 2024-03-24T04:41:08.000+09:00
diff --git a/src/main/java/com/ajou/hertz/common/file/dto/FileDto.java b/src/main/java/com/ajou/hertz/common/file/dto/FileDto.java
@@ -23,7 +23,6 @@ public static FileDto create(
 	}
 
 	public String getStoredFileUrl() {
-		return url + "/" + storedName;
+		return url;
 	}
-
 }
diff --git a/src/main/java/com/ajou/hertz/domain/user/controller/UserController.java b/src/main/java/com/ajou/hertz/domain/user/controller/UserController.java
@@ -14,10 +14,12 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.ajou.hertz.common.auth.UserPrincipal;
+import com.ajou.hertz.common.file.dto.FileDto;
 import com.ajou.hertz.common.validator.PhoneNumber;
 import com.ajou.hertz.domain.user.dto.UserDto;
 import com.ajou.hertz.domain.user.dto.request.SignUpRequest;
@@ -27,6 +29,7 @@
 import com.ajou.hertz.domain.user.dto.response.UserResponse;
 import com.ajou.hertz.domain.user.dto.response.UserWithLinkedAccountInfoResponse;
 import com.ajou.hertz.domain.user.service.UserCommandService;
+import com.ajou.hertz.domain.user.service.UserProfileImageCommandService;
 import com.ajou.hertz.domain.user.service.UserQueryService;
 
 import io.swagger.v3.oas.annotations.Operation;
@@ -49,6 +52,7 @@
 public class UserController {
 
 	private final UserCommandService userCommandService;
+	private final UserProfileImageCommandService userProfileImageCommandService;
 	private final UserQueryService userQueryService;
 
 	@Operation(
@@ -125,15 +129,17 @@ public ResponseEntity<UserResponse> signUpV1(
 		security = @SecurityRequirement(name = "access-token")
 	)
 	@PutMapping(
-		value = "/me/profile-image",
+		value = "/me/profile-images",
 		headers = API_VERSION_HEADER_NAME + "=" + 1,
 		consumes = MediaType.MULTIPART_FORM_DATA_VALUE
 	)
-	public UserResponse updateProfileImageUrlV1(
+	public UserResponse updateProfileImageV1(
 		@AuthenticationPrincipal UserPrincipal userPrincipal,
-		@RequestParam("profileImage") MultipartFile profileImage
+		@RequestPart("profileImage") MultipartFile profileImage
 	) {
-		UserDto userUpdated = userCommandService.updateProfileImageUrl(userPrincipal.getUserId(), profileImage);
+		FileDto uploadedFile = userProfileImageCommandService.uploadProfileImage(userPrincipal.getUserId(),
+			profileImage);
+		UserDto userUpdated = userCommandService.updateProfileImage(userPrincipal.getUserId(), uploadedFile);
 		return UserResponse.from(userUpdated);
 	}
 
diff --git a/src/main/java/com/ajou/hertz/domain/user/entity/User.java b/src/main/java/com/ajou/hertz/domain/user/entity/User.java
@@ -105,10 +105,6 @@ public void changeProfileImageUrl(String profileImageUrl) {
 		this.profileImageUrl = profileImageUrl;
 	}
 
-	public UserProfileImage getProfileImage() {
-		return UserProfileImage.of(profileImageUrl);
-	}
-
 	public void changeContactLink(String contactLink) {
 		this.contactLink = contactLink;
 	}
diff --git a/src/main/java/com/ajou/hertz/domain/user/entity/UserProfileImage.java b/src/main/java/com/ajou/hertz/domain/user/entity/UserProfileImage.java
@@ -24,7 +24,7 @@ public class UserProfileImage extends FileEntity {
 	@Column(name = "user_profile_image_id", nullable = false)
 	private Long id;
 
-	@JoinColumn(name = "user_id", nullable = false)
+	@JoinColumn(name = "user_id", nullable = false, unique = true)
 	@OneToOne(fetch = FetchType.LAZY)
 	private User user;
 
@@ -34,7 +34,13 @@ private UserProfileImage(Long id, User user, String originalName, String storedN
 		this.user = user;
 	}
 
-	public static UserProfileImage of(String profileImageUrl) {
-		return new UserProfileImage(null, null, null, null, profileImageUrl);
+	public static UserProfileImage create(
+		User user,
+		String originalName,
+		String storedName,
+		String url
+	) {
+		return new UserProfileImage(null, user, originalName, storedName, url);
 	}
+
 }
diff --git a/src/main/java/com/ajou/hertz/domain/user/repository/UserProfileImageRepository.java b/src/main/java/com/ajou/hertz/domain/user/repository/UserProfileImageRepository.java
@@ -0,0 +1,11 @@
+package com.ajou.hertz.domain.user.repository;
+
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.ajou.hertz.domain.user.entity.UserProfileImage;
+
+public interface UserProfileImageRepository extends JpaRepository<UserProfileImage, Long> {
+	Optional<UserProfileImage> findById(Long userId);
+}
diff --git a/src/main/java/com/ajou/hertz/domain/user/service/UserCommandService.java b/src/main/java/com/ajou/hertz/domain/user/service/UserCommandService.java
@@ -6,10 +6,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
-import org.springframework.web.multipart.MultipartFile;
 
 import com.ajou.hertz.common.file.dto.FileDto;
-import com.ajou.hertz.common.file.service.FileService;
 import com.ajou.hertz.common.kakao.dto.response.KakaoUserInfoResponse;
 import com.ajou.hertz.common.properties.HertzProperties;
 import com.ajou.hertz.domain.user.constant.Gender;
@@ -19,6 +17,7 @@
 import com.ajou.hertz.domain.user.exception.UserEmailDuplicationException;
 import com.ajou.hertz.domain.user.exception.UserKakaoUidDuplicationException;
 import com.ajou.hertz.domain.user.exception.UserPhoneDuplicationException;
+import com.ajou.hertz.domain.user.repository.UserProfileImageRepository;
 import com.ajou.hertz.domain.user.repository.UserRepository;
 
 import lombok.RequiredArgsConstructor;
@@ -32,7 +31,7 @@ public class UserCommandService {
 	private final UserRepository userRepository;
 	private final PasswordEncoder passwordEncoder;
 	private final HertzProperties hertzProperties;
-	private final FileService fileService;
+	private final UserProfileImageRepository userProfileImageRepository;
 
 	/**
 	 * 새로운 회원을 등록한다.
@@ -135,31 +134,21 @@ private String generateRandom16CharString() {
 	}
 
 	/**
-	 * 유저의 프로필 이미지를 업데이트한다.
+	 * 전달된 이미지로 프로필 이미지 url을 변경한다.
 	 *
-	 * @param userId 유저 id
-	 * @param newProfileImage 새로운 프로필 이미지
-   *
-	 * @return 업데이트된 유저 정보
+	 * @param userId 유저의 ID
+	 * @param uploadedFile 변경할 이미지 파일
+	 *
+	 * @return 변경된 유저 정보
 	 */
-	public UserDto updateProfileImageUrl(Long userId, MultipartFile newProfileImage) {
+	public UserDto updateProfileImage(Long userId, FileDto uploadedFile) {
 		User user = userQueryService.getById(userId);
-		String uploadPath = "user-profile-image/";
-
-		FileDto uploadedFile = fileService.uploadFile(newProfileImage, uploadPath);
 		String newProfileImageUrl = uploadedFile.getStoredFileUrl();
-
-		String oldProfileImageUrl = user.getProfileImageUrl();
-
-		String oldFileName = oldProfileImageUrl.substring(oldProfileImageUrl.lastIndexOf('/') + 1);
-		String fullPathToDelete = uploadPath + oldFileName;
-		fileService.deleteFile(fullPathToDelete);
-
 		user.changeProfileImageUrl(newProfileImageUrl);
-    return UserDto.from(user);
-   }
+		return UserDto.from(user);
+	}
 
-  /**
+	/**
 	 *연락 수단을 변경합니다.
 	 *
 	 * @param userId 유저의 ID
diff --git a/src/main/java/com/ajou/hertz/domain/user/service/UserProfileImageCommandService.java b/src/main/java/com/ajou/hertz/domain/user/service/UserProfileImageCommandService.java
@@ -0,0 +1,54 @@
+package com.ajou.hertz.domain.user.service;
+
+import java.util.Optional;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.ajou.hertz.common.file.dto.FileDto;
+import com.ajou.hertz.common.file.service.FileService;
+import com.ajou.hertz.domain.user.entity.User;
+import com.ajou.hertz.domain.user.entity.UserProfileImage;
+import com.ajou.hertz.domain.user.repository.UserProfileImageRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Transactional
+@Service
+public class UserProfileImageCommandService {
+
+	private final UserQueryService userQueryService;
+	private final FileService fileService;
+	private final UserProfileImageRepository userProfileImageRepository;
+
+	/**
+	 * 유저의 프로필 이미지를 업데이트한다.
+	 *
+	 * @param userId 유저 id
+	 * @param newProfileImage 새로운 프로필 이미지
+	 *
+	 * @return 업로드된 파일 정보가 담긴 dto
+	 */
+	public FileDto uploadProfileImage(Long userId, MultipartFile newProfileImage) {
+		User user = userQueryService.getById(userId);
+
+		Optional<UserProfileImage> optionalOldProfileImage = userProfileImageRepository.findById(userId);
+		if (optionalOldProfileImage.isPresent()) {
+			UserProfileImage oldProfileImage = optionalOldProfileImage.get();
+			userProfileImageRepository.delete(oldProfileImage);
+			userProfileImageRepository.flush();
+			fileService.deleteFile(oldProfileImage.getStoredName());
+		}
+
+		String uploadPath = "user-profile-images/";
+		FileDto uploadedFile = fileService.uploadFile(newProfileImage, uploadPath);
+
+		UserProfileImage newUserProfileImage = UserProfileImage.create(
+			user, uploadedFile.getOriginalName(), uploadedFile.getStoredName(), uploadedFile.getStoredFileUrl());
+		userProfileImageRepository.save(newUserProfileImage);
+
+		return uploadedFile;
+	}
+}
diff --git a/src/test/java/com/ajou/hertz/unit/domain/user/controller/UserControllerTest.java b/src/test/java/com/ajou/hertz/unit/domain/user/controller/UserControllerTest.java
@@ -31,12 +31,14 @@
 import com.ajou.hertz.common.auth.JwtTokenProvider;
 import com.ajou.hertz.common.auth.UserPrincipal;
 import com.ajou.hertz.common.config.SecurityConfig;
+import com.ajou.hertz.common.file.dto.FileDto;
 import com.ajou.hertz.domain.user.constant.Gender;
 import com.ajou.hertz.domain.user.constant.RoleType;
 import com.ajou.hertz.domain.user.controller.UserController;
 import com.ajou.hertz.domain.user.dto.UserDto;
 import com.ajou.hertz.domain.user.dto.request.SignUpRequest;
 import com.ajou.hertz.domain.user.service.UserCommandService;
+import com.ajou.hertz.domain.user.service.UserProfileImageCommandService;
 import com.ajou.hertz.domain.user.service.UserQueryService;
 import com.ajou.hertz.util.ReflectionUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -61,6 +63,9 @@ class UserControllerTest {
 	@MockBean
 	private UserQueryService userQueryService;
 
+	@MockBean
+	private UserProfileImageCommandService userProfileImageCommandService;
+
 	private final MockMvc mvc;
 
 	private final ObjectMapper objectMapper;
@@ -224,12 +229,16 @@ public void securitySetUp() throws Exception {
 			"test".getBytes()
 		);
 		UserDetails userDetails = createTestUser(userId);
+		FileDto uploadedFile = createFileDto();
 		UserDto expectedResult = createUserDto(userId);
-		given(userCommandService.updateProfileImageUrl(userId, profileImage)).willReturn(expectedResult);
+
+		given(userProfileImageCommandService.uploadProfileImage(userId, profileImage)).willReturn(
+			uploadedFile);
+		given(userCommandService.updateProfileImage(userId, uploadedFile)).willReturn(expectedResult);
 
 		// when & then
 		mvc.perform(
-				multipart("/api/users/me/profile-image")
+				multipart("/api/users/me/profile-images")
 					.file(profileImage)
 					.header(API_VERSION_HEADER_NAME, 1)
 					.with(user(userDetails))
@@ -240,7 +249,8 @@ public void securitySetUp() throws Exception {
 			)
 			.andExpect(status().isOk())
 			.andExpect(jsonPath("$.profileImageUrl").value(expectedResult.getProfileImageUrl()));
-		then(userCommandService).should().updateProfileImageUrl(userId, profileImage);
+		then(userProfileImageCommandService).should().uploadProfileImage(userId, profileImage);
+		then(userCommandService).should().updateProfileImage(userId, uploadedFile);
 		verifyEveryMocksShouldHaveNoMoreInteractions();
 	}
 
@@ -270,6 +280,7 @@ public void securitySetUp() throws Exception {
 	private void verifyEveryMocksShouldHaveNoMoreInteractions() {
 		then(userCommandService).shouldHaveNoMoreInteractions();
 		then(userQueryService).shouldHaveNoMoreInteractions();
+		then(userProfileImageCommandService).shouldHaveNoMoreInteractions();
 	}
 
 	private SignUpRequest createSignUpRequest(String email, String password, String phone) throws Exception {
@@ -314,4 +325,11 @@ private UserDetails createTestUser(Long userId) throws Exception {
 		return new UserPrincipal(createUserDto(userId));
 	}
 
+	private FileDto createFileDto() throws Exception {
+		return ReflectionUtils.createFileDto(
+			"test.jpg",
+			"test-stored.jpg",
+			"https://example.com/user-profile-images/storedFileName.jpg");
+	}
+
 }
diff --git a/src/test/java/com/ajou/hertz/unit/domain/user/service/UserCommandServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/user/service/UserCommandServiceTest.java
diff --git a/src/test/java/com/ajou/hertz/unit/domain/user/service/UserProfileImageCommandServiceTest.java b/src/test/java/com/ajou/hertz/unit/domain/user/service/UserProfileImageCommandServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ public static FileDto create(`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public String getStoredFileUrl() {`
`26`		`- return url + "/" + storedName;`
	`26`	`+ return url;`
`27`	`27`	`}`
`28`		`-`
`29`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,10 +105,6 @@ public void changeProfileImageUrl(String profileImageUrl) {`
`105`	`105`	`this.profileImageUrl = profileImageUrl;`
`106`	`106`	`}`
`107`	`107`
`108`		`- public UserProfileImage getProfileImage() {`
`109`		`- return UserProfileImage.of(profileImageUrl);`
`110`		`- }`
`111`		`-`
`112`	`108`	`public void changeContactLink(String contactLink) {`
`113`	`109`	`this.contactLink = contactLink;`
`114`	`110`	`}`