[#52] feat: UserRepository 메소드 네이밍 VO로 변경

real-world-study · Sep 20, 2021 · 5e55021 · 5e55021
1 parent adb4280
commit 5e55021
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/com/study/realworld/user/domain/UserRepository.java b/src/main/java/com/study/realworld/user/domain/UserRepository.java
@@ -5,7 +5,7 @@
 
 public interface UserRepository extends JpaRepository<User, Long> {
 
-    Optional<User> findByUsername(Username username);
+    Optional<User> findByProfileUsername(Username username);
 
     Optional<User> findByEmail(Email email);
 

diff --git a/src/main/java/com/study/realworld/user/service/ProfileService.java b/src/main/java/com/study/realworld/user/service/ProfileService.java
@@ -33,7 +33,7 @@ public User findById(Long userId) {
 
     @Transactional(readOnly = true)
     public User findByUsername(Username username) {
-        return userRepository.findByUsername(username)
+        return userRepository.findByProfileUsername(username)
             .orElseThrow(() -> new BusinessException(ErrorCode.USER_NOT_FOUND));
     }
 

diff --git a/src/main/java/com/study/realworld/user/service/UserService.java b/src/main/java/com/study/realworld/user/service/UserService.java
@@ -64,7 +64,7 @@ public User update(UserUpdateModel updateUser, Long userId) {
     }
 
     private void checkDuplicatedByUsername(Username username) {
-        userRepository.findByUsername(username).ifPresent(param -> {
+        userRepository.findByProfileUsername(username).ifPresent(param -> {
             throw new BusinessException(ErrorCode.USERNAME_DUPLICATION);
         });
     }

diff --git a/src/test/java/com/study/realworld/user/service/ProfileServiceTest.java b/src/test/java/com/study/realworld/user/service/ProfileServiceTest.java
@@ -75,7 +75,7 @@ void followUsernameNotFoundTest() {
             Long loginId = 1L;
             Username followingUsername = Username.of("followuser");
             when(userRepository.findById(loginId)).thenReturn(Optional.of(loginUser));
-            when(userRepository.findByUsername(followingUsername)).thenReturn(Optional.empty());
+            when(userRepository.findByProfileUsername(followingUsername)).thenReturn(Optional.empty());
 
             // when & then
             assertThatExceptionOfType(BusinessException.class)

diff --git a/src/test/java/com/study/realworld/user/service/UserServiceTest.java b/src/test/java/com/study/realworld/user/service/UserServiceTest.java
@@ -48,7 +48,7 @@ void existUsernameJoinTest() {
         User user = User.Builder()
             .profile(username, null, null)
             .build();
-        when(userRepository.findByUsername(username))
+        when(userRepository.findByProfileUsername(username))
             .thenReturn(Optional.of(user));
 
         // when & then
@@ -68,7 +68,7 @@ void existEmailJoinTest() {
             .profile(username, null, null)
             .email(email)
             .build();
-        when(userRepository.findByUsername(username)).thenReturn(empty());
+        when(userRepository.findByProfileUsername(username)).thenReturn(empty());
         when(userRepository.findByEmail(email)).thenReturn(Optional.of(user));
 
         // when & then
@@ -87,7 +87,7 @@ void successJoinTest() {
         Password password = Password.of("password");
         Bio bio = Bio.of("bio");
         Image image= Image.of("image");
-        when(userRepository.findByUsername(username)).thenReturn(empty());
+        when(userRepository.findByProfileUsername(username)).thenReturn(empty());
         when(userRepository.findByEmail(email)).thenReturn(empty());
         when(passwordEncoder.encode(password.password())).thenReturn("encoded_password");
 
@@ -285,7 +285,7 @@ void updateFailByDuplicatedUsernameTest() {
                 Username username = Username.of("usernameChange");
                 UserUpdateModel userUpdateModel = new UserUpdateModel(username, null,
                     null, null, null);
-                when(userRepository.findByUsername(username))
+                when(userRepository.findByProfileUsername(username))
                     .thenReturn(Optional.ofNullable(User.Builder().build()));
 
                 // when & then
@@ -302,7 +302,7 @@ void updateSuccessByUsernameTest() {
                 Username username = Username.of("usernameChange");
                 UserUpdateModel userUpdateModel = new UserUpdateModel(username, null,
                     null, null, null);
-                when(userRepository.findByUsername(username))
+                when(userRepository.findByProfileUsername(username))
                     .thenReturn(Optional.empty());
 
                 // when