Compare commits

...

1 Commits

Author SHA1 Message Date
dongHyo
2d637bbed6 refactor: 정적팩토리메서드 네이밍 통일 2022-06-13 22:44:48 +09:00
6 changed files with 19 additions and 19 deletions

View File

@@ -43,14 +43,14 @@ public class UserController {
@PostMapping
public ResponseEntity<SignUpResponse> 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<UserDeleteResponse> 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")

View File

@@ -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());
}

View File

@@ -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());
}

View File

@@ -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());
}

View File

@@ -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;
}

View File

@@ -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);