[#43] refactor: 미사용 getter 제거 및 toValueObject 메소드 추가

real-world-study · Sep 6, 2021 · 4c8a4d6 · 4c8a4d6
1 parent cee09dc
commit 4c8a4d6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 57 deletions.
diff --git a/src/main/java/com/study/realworld/user/controller/UserController.java b/src/main/java/com/study/realworld/user/controller/UserController.java
@@ -7,8 +7,6 @@
 import com.study.realworld.user.controller.request.UserLoginRequest;
 import com.study.realworld.user.controller.request.UserUpdateRequest;
 import com.study.realworld.user.controller.response.UserResponse;
-import com.study.realworld.user.domain.Email;
-import com.study.realworld.user.domain.Password;
 import com.study.realworld.user.domain.User;
 import com.study.realworld.user.service.UserService;
 import org.springframework.http.ResponseEntity;
@@ -42,7 +40,7 @@ public ResponseEntity<UserResponse> join(@RequestBody UserJoinRequest request) {
 
     @PostMapping("/users/login")
     public ResponseEntity<UserResponse> login(@RequestBody UserLoginRequest request) {
-        User user = userService.login(Email.of(request.getEmail()), Password.of(request.getPassword()));
+        User user = userService.login(request.toEmail(), request.toPassword());
         return ResponseEntity.ok().body(fromUserAndToken(user, jwtService.createToken(user)));
     }
 

diff --git a/src/main/java/com/study/realworld/user/controller/request/UserJoinRequest.java b/src/main/java/com/study/realworld/user/controller/request/UserJoinRequest.java
@@ -32,33 +32,13 @@ public class UserJoinRequest {
     protected UserJoinRequest() {
     }
 
-    public String getUsername() {
-        return username;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public String getBio() {
-        return bio;
-    }
-
-    public String getImage() {
-        return image;
-    }
-
     public User toUser() {
         return User.Builder()
-            .username(Username.of(getUsername()))
-            .email(Email.of(getEmail()))
-            .password(Password.of(getPassword()))
-            .bio(new Bio(getBio()))
-            .image(new Image(getImage()))
+            .username(Username.of(username))
+            .email(Email.of(email))
+            .password(Password.of(password))
+            .bio(new Bio(bio))
+            .image(new Image(image))
             .build();
     }
 

diff --git a/src/main/java/com/study/realworld/user/controller/request/UserLoginRequest.java b/src/main/java/com/study/realworld/user/controller/request/UserLoginRequest.java
@@ -3,6 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.study.realworld.user.domain.Email;
+import com.study.realworld.user.domain.Password;
 
 @JsonTypeName(value = "user")
 @JsonTypeInfo(include = JsonTypeInfo.As.WRAPPER_OBJECT, use = JsonTypeInfo.Id.NAME)
@@ -17,12 +19,12 @@ public class UserLoginRequest {
     protected UserLoginRequest() {
     }
 
-    public String getEmail() {
-        return email;
+    public Email toEmail() {
+        return Email.of(email);
     }
 
-    public String getPassword() {
-        return password;
+    public Password toPassword() {
+        return Password.of(password);
     }
 
 }
diff --git a/src/main/java/com/study/realworld/user/controller/request/UserUpdateRequest.java b/src/main/java/com/study/realworld/user/controller/request/UserUpdateRequest.java
@@ -32,33 +32,13 @@ public class UserUpdateRequest {
     protected UserUpdateRequest() {
     }
 
-    public String getUsername() {
-        return username;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public String getBio() {
-        return bio;
-    }
-
-    public String getImage() {
-        return image;
-    }
-
     public UserUpdateModel toUserUpdateModel() {
         return new UserUpdateModel(
-            Username.of(getUsername()),
-            Email.of(getEmail()),
-            Password.of(getPassword()),
-            new Bio(getBio()),
-            new Image(getImage())
+            Username.of(username),
+            Email.of(email),
+            Password.of(password),
+            new Bio(bio),
+            new Image(image)
         );
     }