refactor: UserService에서 uid로 User를 찾는 로직 공통화

makevook · Jun 28, 2024 · 22911ed · 22911ed
1 parent 729a925
commit 22911ed
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/api/src/main/java/vook/server/api/domain/user/service/UserService.java b/api/src/main/java/vook/server/api/domain/user/service/UserService.java
@@ -37,11 +37,11 @@ public SocialUser signUpFromSocial(@Valid SignUpFromSocialCommand command) {
     }
 
     public User getByUid(@NotBlank String uid) {
-        return repository.findByUid(uid).orElseThrow(UserNotFoundException::new);
+        return getUserByUid(uid);
     }
 
     public void register(@Valid RegisterCommand command) {
-        User user = repository.findByUid(command.userUid()).orElseThrow();
+        User user = getUserByUid(command.userUid());
         if (user.isRegistered()) {
             throw new AlreadyRegisteredException();
         }
@@ -58,7 +58,7 @@ public void register(@Valid RegisterCommand command) {
     }
 
     public void onboarding(@Valid OnboardingCommand command) {
-        User user = repository.findByUid(command.userUid()).orElseThrow();
+        User user = getUserByUid(command.userUid());
         if (!user.isReadyToOnboarding()) {
             throw new NotReadyToOnboardingException();
         }
@@ -73,18 +73,22 @@ public void updateInfo(
             @NotBlank String uid,
             @NotBlank @Size(min = 1, max = 10) String nickname
     ) {
-        User user = repository.findByUid(uid).orElseThrow();
+        User user = getUserByUid(uid);
         if (!user.isRegistered()) {
             throw new NotRegisteredException();
         }
         user.update(nickname);
     }
 
     public void withdraw(@NotBlank String uid) {
-        User user = repository.findByUid(uid).orElseThrow();
+        User user = getUserByUid(uid);
         if (user.isWithdrawn()) {
             return;
         }
         user.withdraw();
     }
+
+    private User getUserByUid(String uid) {
+        return repository.findByUid(uid).orElseThrow(UserNotFoundException::new);
+    }
 }