[Refactor] UserRepository에서 default method를 제거한다

src/main/java/daybyquest/user/application/DeleteUserImageService.java

@@ -4,29 +4,29 @@
 import daybyquest.image.vo.Image;
 import daybyquest.user.domain.User;
 import daybyquest.user.domain.UserImages;
-import daybyquest.user.domain.UserRepository;
+import daybyquest.user.domain.Users;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class DeleteUserImageService {
 
-    private final UserRepository userRepository;
+    private final Users users;
 
     private final UserImages userImages;
 
     private final BaseImageProperties baseImageProperties;
 
-    public DeleteUserImageService(final UserRepository userRepository, final UserImages userImages,
+    public DeleteUserImageService(final Users users, final UserImages userImages,
             final BaseImageProperties baseImageProperties) {
-        this.userRepository = userRepository;
+        this.users = users;
         this.userImages = userImages;
         this.baseImageProperties = baseImageProperties;
     }
 
     @Transactional
     public void invoke(final Long loginId) {
-        final User user = userRepository.getById(loginId);
+        final User user = users.getById(loginId);
         userImages.remove(user.getImageIdentifier());
         user.updateImage(new Image(baseImageProperties.getUserIdentifier()));
     }

src/main/java/daybyquest/user/application/SaveUserService.java

@@ -3,33 +3,28 @@
 import daybyquest.image.vo.BaseImageProperties;
 import daybyquest.image.vo.Image;
 import daybyquest.user.domain.User;
-import daybyquest.user.domain.UserRepository;
+import daybyquest.user.domain.Users;
 import daybyquest.user.dto.request.SaveUserRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class SaveUserService {
 
-    private final UserRepository userRepository;
-
-    private final UserValidator validator;
+    private final Users users;
 
     private final BaseImageProperties baseImageProperties;
 
-
-    public SaveUserService(final UserRepository userRepository,
-            final UserValidator validator, final BaseImageProperties baseImageProperties) {
-        this.userRepository = userRepository;
-        this.validator = validator;
+    public SaveUserService(final Users users, final BaseImageProperties baseImageProperties) {
+        this.users = users;
         this.baseImageProperties = baseImageProperties;
     }
 
     @Transactional
     public Long invoke(final SaveUserRequest request) {
         final User user = toEntity(request);
-        validator.validateUniqueness(user);
-        final User savedUser = userRepository.save(user);
+        users.validateUniqueness(user);
+        final User savedUser = users.save(user);
         return savedUser.getId();
     }
 

src/main/java/daybyquest/user/application/UpdateUserImageService.java

@@ -4,7 +4,7 @@
 import daybyquest.image.vo.Image;
 import daybyquest.user.domain.User;
 import daybyquest.user.domain.UserImages;
-import daybyquest.user.domain.UserRepository;
+import daybyquest.user.domain.Users;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.UUID;
@@ -17,19 +17,18 @@
 @Slf4j
 public class UpdateUserImageService {
 
-    private final UserRepository userRepository;
+    private final Users users;
 
     private final UserImages userImages;
 
-    public UpdateUserImageService(final UserRepository userRepository,
-            final UserImages userImages) {
-        this.userRepository = userRepository;
+    public UpdateUserImageService(final Users users, final UserImages userImages) {
+        this.users = users;
         this.userImages = userImages;
     }
 
     @Transactional
     public void invoke(final Long loginId, final MultipartFile file) {
-        final User user = userRepository.getById(loginId);
+        final User user = users.getById(loginId);
         final String oldIdentifier = user.getImageIdentifier();
         final String identifier = createIdentifier(file.getOriginalFilename());
         userImages.upload(identifier, getInputStream(file));

src/main/java/daybyquest/user/application/UpdateUserInterestService.java

@@ -2,7 +2,7 @@
 
 import daybyquest.interest.domain.InterestValidator;
 import daybyquest.user.domain.User;
-import daybyquest.user.domain.UserRepository;
+import daybyquest.user.domain.Users;
 import daybyquest.user.dto.request.UpdateUserInterestRequest;
 import java.util.Collection;
 import org.springframework.stereotype.Service;
@@ -11,20 +11,19 @@
 @Service
 public class UpdateUserInterestService {
 
-    private final UserRepository userRepository;
+    private final Users users;
 
 
     private final InterestValidator interestValidator;
 
-    public UpdateUserInterestService(final UserRepository userRepository,
-        final InterestValidator interestValidator) {
-        this.userRepository = userRepository;
+    public UpdateUserInterestService(final Users users, final InterestValidator interestValidator) {
+        this.users = users;
         this.interestValidator = interestValidator;
     }
 
     @Transactional
     public void invoke(final Long loginId, final UpdateUserInterestRequest request) {
-        final User user = userRepository.getById(loginId);
+        final User user = users.getById(loginId);
         final Collection<String> interests = request.getInterests();
         interestValidator.validateInterests(interests);
         user.updateInterests(interests);

src/main/java/daybyquest/user/application/UpdateUserService.java

@@ -1,28 +1,25 @@
 package daybyquest.user.application;
 
 import daybyquest.user.domain.User;
-import daybyquest.user.domain.UserRepository;
+import daybyquest.user.domain.Users;
 import daybyquest.user.dto.request.UpdateUserRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class UpdateUserService {
 
-    private final UserRepository userRepository;
+    private final Users users;
 
-    private final UserValidator validator;
-
-    public UpdateUserService(final UserRepository userRepository, final UserValidator validator) {
-        this.userRepository = userRepository;
-        this.validator = validator;
+    public UpdateUserService(final Users users) {
+        this.users = users;
     }
 
     @Transactional
     public void invoke(final Long loginId, final UpdateUserRequest request) {
-        final User user = userRepository.getById(loginId);
+        final User user = users.getById(loginId);
         if (request.getUsername() != null) {
-            validator.validateUniqueUsername(request.getUsername());
+            users.validateUniqueUsername(request.getUsername());
             user.updateUsername(request.getUsername());
         }
         if (request.getName() != null) {

src/main/java/daybyquest/user/application/UpdateVisibilityService.java

@@ -1,24 +1,24 @@
 package daybyquest.user.application;
 
 import daybyquest.user.domain.User;
-import daybyquest.user.domain.UserRepository;
 import daybyquest.user.domain.UserVisibility;
+import daybyquest.user.domain.Users;
 import daybyquest.user.dto.request.UpdateUserVisibilityRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class UpdateVisibilityService {
 
-    private final UserRepository userRepository;
+    private final Users users;
 
-    public UpdateVisibilityService(final UserRepository userRepository) {
-        this.userRepository = userRepository;
+    public UpdateVisibilityService(final Users users) {
+        this.users = users;
     }
 
     @Transactional
     public void invoke(final Long loginId, final UpdateUserVisibilityRequest visibility) {
-        final User user = userRepository.getById(loginId);
+        final User user = users.getById(loginId);
         user.updateVisibility(UserVisibility.valueOf(visibility.getVisibility()));
     }
 }

src/main/java/daybyquest/user/domain/UserRepository.java

@@ -1,20 +1,20 @@
 package daybyquest.user.domain;
 
-import daybyquest.global.error.exception.NotExistUserException;
 import java.util.Optional;
 import org.springframework.data.repository.Repository;
 
-public interface UserRepository extends Repository<User, Long> {
+interface UserRepository extends Repository<User, Long> {
 
     User save(User user);
 
     Optional<User> findById(Long id);
 
+    Optional<User> findByUsername(String username);
+
+    boolean existsById(Long id);
+
     boolean existsByUsername(String username);
 
     boolean existsByEmail(String email);
 
-    default User getById(Long id) {
-        return this.findById(id).orElseThrow(NotExistUserException::new);
-    }
 }

src/main/java/daybyquest/user/application/UserValidator.java → src/main/java/daybyquest/user/domain/Users.java

@@ -1,24 +1,39 @@
-package daybyquest.user.application;
+package daybyquest.user.domain;
 
 import static daybyquest.global.error.ExceptionCode.DUPLICATED_EMAIL;
 import static daybyquest.global.error.ExceptionCode.DUPLICATED_USERNAME;
 
 import daybyquest.global.error.exception.BadRequestException;
-import daybyquest.user.domain.User;
-import daybyquest.user.domain.UserRepository;
+import daybyquest.global.error.exception.NotExistUserException;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
 @Component
-@Transactional(readOnly = true)
-public class UserValidator {
+public class Users {
 
     private final UserRepository userRepository;
 
-    public UserValidator(final UserRepository userRepository) {
+    public Users(final UserRepository userRepository) {
         this.userRepository = userRepository;
     }
 
+    public User save(final User user) {
+        return userRepository.save(user);
+    }
+
+    public User getById(final Long id) {
+        return userRepository.findById(id).orElseThrow(NotExistUserException::new);
+    }
+
+    public User getByUsername(final String username) {
+        return userRepository.findByUsername(username).orElseThrow(NotExistUserException::new);
+    }
+
+    void validateExistentById(Long id) {
+        if (!userRepository.existsById(id)) {
+            throw new NotExistUserException();
+        }
+    }
+
     public void validateUniqueness(final User user) {
         validateUniqueUsername(user.getUsername());
         validateUniqueEmail(user.getEmail());