From a2359834757350456510c1de3eb7e71f93463ee3 Mon Sep 17 00:00:00 2001 From: Kim DongHyo <60608509+kdhyo@users.noreply.github.com> Date: Tue, 14 Jun 2022 00:30:28 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=A0=95=EC=A0=81=ED=8C=A9?= =?UTF-8?q?=ED=86=A0=EB=A6=AC=EB=A9=94=EC=84=9C=EB=93=9C=20=EB=84=A4?= =?UTF-8?q?=EC=9D=B4=EB=B0=8D=20=ED=86=B5=EC=9D=BC=20(#27)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/user/application/UserController.java | 6 +++--- .../user/application/response/SignUpResponse.java | 2 +- .../response/UserChangePasswordResponse.java | 2 +- .../application/response/UserDeleteResponse.java | 2 +- .../server/user/service/dto/ChangePasswordDTO.java | 14 +++++++------- .../server/user/service/dto/DeleteUserDTO.java | 12 ++++++------ 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/server/src/main/java/com/ticketing/server/user/application/UserController.java b/server/src/main/java/com/ticketing/server/user/application/UserController.java index 1fdeb26..6cb72c5 100644 --- a/server/src/main/java/com/ticketing/server/user/application/UserController.java +++ b/server/src/main/java/com/ticketing/server/user/application/UserController.java @@ -43,14 +43,14 @@ public class UserController { @PostMapping public ResponseEntity register(@RequestBody @Valid SignUpRequest request) { User user = userService.register(request.toSignUpDto(passwordEncoder)); - return ResponseEntity.status(HttpStatus.CREATED).body(SignUpResponse.of(user)); + return ResponseEntity.status(HttpStatus.CREATED).body(SignUpResponse.from(user)); } @DeleteMapping @Secured("ROLE_GUEST") public ResponseEntity deleteUser(@RequestBody @Valid UserDeleteRequest request) { User user = userService.delete(request.toDeleteUserDto(passwordEncoder)); - return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.of(user)); + return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.from(user)); } @PutMapping("/password") @@ -62,7 +62,7 @@ public class UserController { } User user = userService.changePassword(request.toChangePasswordDto(passwordEncoder)); - return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.of(user)); + return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.from(user)); } @PostMapping("/login") diff --git a/server/src/main/java/com/ticketing/server/user/application/response/SignUpResponse.java b/server/src/main/java/com/ticketing/server/user/application/response/SignUpResponse.java index 1bad9d9..195c1d1 100644 --- a/server/src/main/java/com/ticketing/server/user/application/response/SignUpResponse.java +++ b/server/src/main/java/com/ticketing/server/user/application/response/SignUpResponse.java @@ -13,7 +13,7 @@ public class SignUpResponse { private String email; - public static SignUpResponse of(User user) { + public static SignUpResponse from(User user) { return new SignUpResponse(user.getName(), user.getEmail()); } diff --git a/server/src/main/java/com/ticketing/server/user/application/response/UserChangePasswordResponse.java b/server/src/main/java/com/ticketing/server/user/application/response/UserChangePasswordResponse.java index 8601328..c6e6b2f 100644 --- a/server/src/main/java/com/ticketing/server/user/application/response/UserChangePasswordResponse.java +++ b/server/src/main/java/com/ticketing/server/user/application/response/UserChangePasswordResponse.java @@ -13,7 +13,7 @@ public class UserChangePasswordResponse { private String email; - public static UserChangePasswordResponse of(User user) { + public static UserChangePasswordResponse from(User user) { return new UserChangePasswordResponse(user.getName(), user.getEmail()); } diff --git a/server/src/main/java/com/ticketing/server/user/application/response/UserDeleteResponse.java b/server/src/main/java/com/ticketing/server/user/application/response/UserDeleteResponse.java index d3c4ea1..292643f 100644 --- a/server/src/main/java/com/ticketing/server/user/application/response/UserDeleteResponse.java +++ b/server/src/main/java/com/ticketing/server/user/application/response/UserDeleteResponse.java @@ -13,7 +13,7 @@ public class UserDeleteResponse { private String email; - public static UserDeleteResponse of(User user) { + public static UserDeleteResponse from(User user) { return new UserDeleteResponse(user.getName(), user.getEmail()); } diff --git a/server/src/main/java/com/ticketing/server/user/service/dto/ChangePasswordDTO.java b/server/src/main/java/com/ticketing/server/user/service/dto/ChangePasswordDTO.java index a0ae34a..d7cd6a5 100644 --- a/server/src/main/java/com/ticketing/server/user/service/dto/ChangePasswordDTO.java +++ b/server/src/main/java/com/ticketing/server/user/service/dto/ChangePasswordDTO.java @@ -6,13 +6,6 @@ import org.springframework.security.crypto.password.PasswordEncoder; public class ChangePasswordDTO implements PasswordMatches { - public ChangePasswordDTO(String email, String oldPassword, String newPassword, PasswordEncoder passwordEncoder) { - this.email = email; - this.oldPassword = oldPassword; - this.newPassword = newPassword; - this.passwordEncoder = passwordEncoder; - } - @NotEmpty(message = "{validation.not.empty.email}") @Email(message = "{validation.email}") private String email; @@ -25,6 +18,13 @@ public class ChangePasswordDTO implements PasswordMatches { private PasswordEncoder passwordEncoder; + public ChangePasswordDTO(String email, String oldPassword, String newPassword, PasswordEncoder passwordEncoder) { + this.email = email; + this.oldPassword = oldPassword; + this.newPassword = newPassword; + this.passwordEncoder = passwordEncoder; + } + public String getEmail() { return email; } diff --git a/server/src/main/java/com/ticketing/server/user/service/dto/DeleteUserDTO.java b/server/src/main/java/com/ticketing/server/user/service/dto/DeleteUserDTO.java index ed1c576..3540ed0 100644 --- a/server/src/main/java/com/ticketing/server/user/service/dto/DeleteUserDTO.java +++ b/server/src/main/java/com/ticketing/server/user/service/dto/DeleteUserDTO.java @@ -6,12 +6,6 @@ import org.springframework.security.crypto.password.PasswordEncoder; public class DeleteUserDTO implements PasswordMatches { - public DeleteUserDTO(String email, String inputPassword, PasswordEncoder passwordEncoder) { - this.email = email; - this.inputPassword = inputPassword; - this.passwordEncoder = passwordEncoder; - } - @NotEmpty(message = "{validation.not.empty.email}") @Email(message = "{validation.email}") private String email; @@ -21,6 +15,12 @@ public class DeleteUserDTO implements PasswordMatches { private PasswordEncoder passwordEncoder; + public DeleteUserDTO(String email, String inputPassword, PasswordEncoder passwordEncoder) { + this.email = email; + this.inputPassword = inputPassword; + this.passwordEncoder = passwordEncoder; + } + @Override public boolean passwordMatches(String password) { return passwordEncoder.matches(this.inputPassword, password);