Merge pull request #31 from TravelMate-KU/refactor/jaeuk

refactor: 불필요한 정적 팩토리 메서드 삭제
TravelMate-KU · Apr 4, 2024 · 32a28f6 · 32a28f6
2 parents 8dcc8c5 + 42e0db1
commit 32a28f6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/src/main/java/konkuk/travelmate/domain/User.java b/src/main/java/konkuk/travelmate/domain/User.java
@@ -37,18 +37,6 @@ private User(String name, String email, String password, String phoneNum, Role r
         this.health = health;
     }
 
-    public static User of(String name, String email, String string, String phoneNum, Role role, Health health) {
-        return User.builder()
-                .name(name)
-                .email(email)
-                .password(builder().password)
-                .phoneNum(phoneNum)
-                .role(role)
-                .health(health)
-                .build();
-    }
-
-
     public void setHealth(Health health){
         this.health=health;
     }

diff --git a/src/main/java/konkuk/travelmate/service/UserService.java b/src/main/java/konkuk/travelmate/service/UserService.java
@@ -32,20 +32,27 @@ public Optional<User> findByEmail(String email) {
 
     public User joinDisable(OAuth2User OAuth2User, Map<String, String> signupMap, Role role) {
         Health health = Health.of(signupMap);
-        User user = User.of(requireNonNull(OAuth2User.getAttribute("name")).toString(),
-                requireNonNull(OAuth2User.getAttribute("email")).toString(),
-                randomUUID().toString(), signupMap.get("phoneNum"), role, health);
+        User user = buildUser(OAuth2User, signupMap, role, health);
         healthRepository.save(health);
         UserRepository.save(user);
         return user;
     }
 
     public User joinVolunteer(OAuth2User OAuth2User, Map<String, String> signupMap, Role role) {
-        User user = User.of(requireNonNull(OAuth2User.getAttribute("name")).toString(),
-                requireNonNull(OAuth2User.getAttribute("email")),
-                randomUUID().toString(),signupMap.get("phoneNum"), role, null);
+        User user = buildUser(OAuth2User, signupMap, role, null);
         UserRepository.save(user);
         return user;
     }
 
+    private User buildUser(OAuth2User OAuth2User, Map<String, String> signupMap, Role role, Health health) {
+        return User.builder()
+                .name(requireNonNull(OAuth2User.getAttribute("name")).toString())
+                .email(requireNonNull(OAuth2User.getAttribute("email")).toString())
+                .password(randomUUID().toString())
+                .phoneNum(signupMap.get("phoneNum"))
+                .role(role)
+                .health(health)
+                .build();
+    }
+
 }