refactor: PasswordEncoder 를 SignUp 생성 시 적용

서비스에서는 파라미터로 넘어온 SignUp을 바로 엔티티로 저장하는 구조로 변경

pull_request_template.md

@@ -1,4 +1,4 @@
-## 작업 분류
+## 작업 내용
 - [ ] 기능 추가
 - [ ] 코드 수정
 - [ ] 환경 설정
@@ -30,3 +30,4 @@
 - [ ] 구현 사항에 대한 테스트를 완료했습니다.
 - [ ] 의도한 내용 이외에 다른 코드에는 변경 사항이 없는지 확인했습니다.
 - [ ] 코드 스타일을 적용하여 팀 코딩 컨벤션에 맞게 작성했습니다.
+- [ ] 팀원 모두 구현 내용 및 코드에 대해 이해하고 있습니다.

server/src/main/java/com/ticketing/server/global/exception/AlreadyDeletedException.java

@@ -1,9 +0,0 @@
-package com.ticketing.server.global.exception;
-
-public class AlreadyDeletedException extends RuntimeException {
-
-	public AlreadyDeletedException(String message) {
-		super(message);
-	}
-
-}

server/src/main/java/com/ticketing/server/global/exception/NotFoundEmailException.java

@@ -1,11 +0,0 @@
-package com.ticketing.server.global.exception;
-
-public class NotFoundEmailException extends IllegalArgumentException {
-
-	private static final String MESSAGE = "존재하지 않는 이메일 입니다.";
-
-	public NotFoundEmailException() {
-		super(MESSAGE);
-	}
-
-}

server/src/main/java/com/ticketing/server/global/exception/PasswordMismatchException.java

@@ -1,11 +0,0 @@
-package com.ticketing.server.global.exception;
-
-public class PasswordMismatchException extends RuntimeException {
-
-	private static final String MESSAGE = "패스워드가 일치하지 않습니다";
-
-	public PasswordMismatchException() {
-		super(MESSAGE);
-	}
-
-}

server/src/main/java/com/ticketing/server/user/application/UserController.java

@@ -1,21 +1,14 @@
 package com.ticketing.server.user.application;
 
 import com.ticketing.server.user.application.request.SignUpRequest;
-import com.ticketing.server.user.application.request.UserDeleteRequest;
-import com.ticketing.server.user.application.request.UserModifyPasswordRequest;
-import com.ticketing.server.user.application.response.SignUpResponse;
-import com.ticketing.server.user.application.response.UserDeleteResponse;
-import com.ticketing.server.user.application.response.UserChangePasswordResponse;
 import com.ticketing.server.user.domain.User;
 import com.ticketing.server.user.service.UserServiceImpl;
+import java.util.Optional;
 import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,33 +17,20 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/user")
-@Slf4j
 public class UserController {
 
 	private final UserServiceImpl userService;
 	private final PasswordEncoder passwordEncoder;
 
 	@PostMapping
-	public ResponseEntity<Object> register(@RequestBody @Valid SignUpRequest request) {
-		User user = userService.register(request.toSignUpDto(passwordEncoder));
-		return ResponseEntity.status(HttpStatus.CREATED).body(SignUpResponse.of(user));
-	}
+	public ResponseEntity<Object> register(@RequestBody @Valid SignUpRequest signUpRequest) {
+		Optional<User> user = userService.register(signUpRequest.toSignUp(passwordEncoder));
 
-	@DeleteMapping
-	public ResponseEntity<Object> deleteUser(@RequestBody @Valid UserDeleteRequest request) {
-		User user = userService.delete(request.toDeleteUserDto(passwordEncoder));
-		return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.of(user));
-	}
-
-	@PatchMapping("/password")
-	public ResponseEntity<Object> changePassword(@RequestBody @Valid UserModifyPasswordRequest request) {
-		if (request.oldEqualNew()) {
-			log.error("기존 패스워드와 동일한 패스워드로 변경할 수 없습니다.");
+		if (user.isEmpty()) {
 			return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
 		}
 
-		User user = userService.changePassword(request.toChangePasswordDto(passwordEncoder));
-		return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.of(user));
+		return ResponseEntity.status(HttpStatus.CREATED).build();
 	}
 
 }

server/src/main/java/com/ticketing/server/user/application/request/SignUpRequest.java

@@ -1,7 +1,7 @@
 package com.ticketing.server.user.application.request;
 
 import com.ticketing.server.global.validator.constraints.Phone;
-import com.ticketing.server.user.service.dto.SignUpDTO;
+import com.ticketing.server.user.service.dto.SignUp;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotEmpty;
 import lombok.Getter;
@@ -24,8 +24,8 @@ public class SignUpRequest {
 	@Phone
 	private String phone;
 
-	public SignUpDTO toSignUpDto(PasswordEncoder passwordEncoder) {
-		return new SignUpDTO(name, email, getEncodePassword(passwordEncoder), phone);
+	public SignUp toSignUp(PasswordEncoder passwordEncoder) {
+		return new SignUp(name, email, getEncodePassword(passwordEncoder), phone);
 	}
 
 	private String getEncodePassword(PasswordEncoder passwordEncoder) {

server/src/main/java/com/ticketing/server/user/application/request/UserDeleteRequest.java

@@ -1,23 +0,0 @@
-package com.ticketing.server.user.application.request;
-
-import com.ticketing.server.user.service.dto.DeleteUserDTO;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotEmpty;
-import lombok.Getter;
-import org.springframework.security.crypto.password.PasswordEncoder;
-
-@Getter
-public class UserDeleteRequest {
-
-	@NotEmpty(message = "{validation.not.empty.email}")
-	@Email(message = "{validation.email}")
-	private String email;
-
-	@NotEmpty(message = "{validation.not.empty.password}")
-	private String password;
-
-	public DeleteUserDTO toDeleteUserDto(PasswordEncoder passwordEncoder) {
-		return new DeleteUserDTO(email, password, passwordEncoder);
-	}
-
-}

server/src/main/java/com/ticketing/server/user/application/request/UserModifyPasswordRequest.java

@@ -1,30 +0,0 @@
-package com.ticketing.server.user.application.request;
-
-import com.ticketing.server.user.service.dto.ChangePasswordDTO;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotEmpty;
-import lombok.Getter;
-import org.springframework.security.crypto.password.PasswordEncoder;
-
-@Getter
-public class UserModifyPasswordRequest {
-
-	@NotEmpty(message = "{validation.not.empty.email}")
-	@Email(message = "{validation.email}")
-	private String email;
-
-	@NotEmpty(message = "{validation.not.empty.oldpassword}")
-	private String oldPassword;
-
-	@NotEmpty(message = "{validation.not.empty.newpassword}")
-	private String newPassword;
-
-	public ChangePasswordDTO toChangePasswordDto(PasswordEncoder passwordEncoder) {
-		return new ChangePasswordDTO(email, oldPassword, newPassword, passwordEncoder);
-	}
-
-	public boolean oldEqualNew() {
-		return oldPassword.equals(newPassword);
-	}
-
-}

server/src/main/java/com/ticketing/server/user/application/response/SignUpResponse.java

@@ -1,20 +0,0 @@
-package com.ticketing.server.user.application.response;
-
-import com.ticketing.server.user.domain.User;
-
-public class SignUpResponse {
-
-	public static SignUpResponse of(User user) {
-		return new SignUpResponse(user.getName(), user.getEmail());
-	}
-
-	public SignUpResponse(String name, String email) {
-		this.name = name;
-		this.email = email;
-	}
-
-	private String name;
-
-	private String email;
-
-}

server/src/main/java/com/ticketing/server/user/application/response/UserChangePasswordResponse.java

@@ -1,20 +0,0 @@
-package com.ticketing.server.user.application.response;
-
-import com.ticketing.server.user.domain.User;
-
-public class UserChangePasswordResponse {
-
-	public static SignUpResponse of(User user) {
-		return new SignUpResponse(user.getName(), user.getEmail());
-	}
-
-	public UserChangePasswordResponse(String name, String email) {
-		this.name = name;
-		this.email = email;
-	}
-
-	private String name;
-
-	private String email;
-
-}

server/src/main/java/com/ticketing/server/user/application/response/UserDeleteResponse.java

@@ -1,20 +0,0 @@
-package com.ticketing.server.user.application.response;
-
-import com.ticketing.server.user.domain.User;
-
-public class UserDeleteResponse {
-
-	public static SignUpResponse of(User user) {
-		return new SignUpResponse(user.getName(), user.getEmail());
-	}
-
-	public UserDeleteResponse(String name, String email) {
-		this.name = name;
-		this.email = email;
-	}
-
-	private String name;
-
-	private String email;
-
-}

server/src/main/java/com/ticketing/server/user/domain/User.java

@@ -1,12 +1,7 @@
 package com.ticketing.server.user.domain;
 
 import com.ticketing.server.global.dto.repository.AbstractEntity;
-import com.ticketing.server.global.exception.AlreadyDeletedException;
-import com.ticketing.server.global.exception.PasswordMismatchException;
 import com.ticketing.server.global.validator.constraints.Phone;
-import com.ticketing.server.user.service.dto.ChangePasswordDTO;
-import com.ticketing.server.user.service.dto.DeleteUserDTO;
-import com.ticketing.server.user.service.dto.PasswordMatches;
 import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -23,14 +18,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class User extends AbstractEntity {
 
-	public User(String name, String email, String password, UserGrade grade, String phone) {
-		this.name = name;
-		this.email = email;
-		this.password = password;
-		this.grade = grade;
-		this.phone = phone;
-	}
-
 	@Column(name = "name")
 	@NotEmpty(message = "{validation.not.empty.name}")
 	private String name;
@@ -58,29 +45,12 @@ public class User extends AbstractEntity {
 
 	private LocalDateTime deletedAt;
 
-	public User delete(DeleteUserDTO deleteUser) {
-		if (isDeleted) {
-			throw new AlreadyDeletedException("이미 탈퇴된 회원 입니다.");
-		}
-
-		checkPassword(deleteUser);
-
-		isDeleted = true;
-		deletedAt = LocalDateTime.now();
-		return this;
-	}
-
-	public User changePassword(ChangePasswordDTO changePassword) {
-		checkPassword(changePassword);
-
-		this.password = changePassword.getEncodePassword();
-		return this;
-	}
-
-	private void checkPassword(PasswordMatches passwordMatches) {
-		if (!passwordMatches.passwordMatches(password)) {
-			throw new PasswordMismatchException();
-		}
+	public User(String name, String email, String password, UserGrade grade, String phone) {
+		this.name = name;
+		this.email = email;
+		this.password = password;
+		this.grade = grade;
+		this.phone = phone;
 	}
 
 }

server/src/main/java/com/ticketing/server/user/domain/repository/UserRepository.java

@@ -10,6 +10,4 @@ public interface UserRepository extends JpaRepository<User, Long> {
 
 	Optional<User> findByEmail(String email);
 
-	Optional<User> findByEmailAndIsDeletedFalse(String email);
-
 }

server/src/main/java/com/ticketing/server/user/service/UserServiceImpl.java

@@ -1,11 +1,8 @@
 package com.ticketing.server.user.service;
 
-import com.ticketing.server.global.exception.NotFoundEmailException;
 import com.ticketing.server.user.domain.User;
 import com.ticketing.server.user.domain.repository.UserRepository;
-import com.ticketing.server.user.service.dto.ChangePasswordDTO;
-import com.ticketing.server.user.service.dto.DeleteUserDTO;
-import com.ticketing.server.user.service.dto.SignUpDTO;
+import com.ticketing.server.user.service.dto.SignUp;
 import com.ticketing.server.user.service.interfaces.UserService;
 import java.util.Optional;
 import javax.validation.Valid;
@@ -26,40 +23,15 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	@Transactional
-	public User register(@Valid SignUpDTO signUpDto) {
+	public Optional<User> register(@Valid SignUp signUpDto) {
 		Optional<User> user = userRepository.findByEmail(signUpDto.getEmail());
 		if (user.isPresent()) {
 			log.error("이미 존재하는 이메일이기 때문에 신규 회원가입을 진행할 수 없습니다. :: {}", signUpDto);
-			throw new IllegalArgumentException("이미 존재하는 이메일이기 때문에 신규 회원가입을 진행할 수 없습니다.");
+			return Optional.empty();
 		}
 
-		return userRepository.save(signUpDto.toUser());
-	}
-
-	@Override
-	@Transactional
-	public User delete(@Valid DeleteUserDTO deleteUserDto) {
-		Optional<User> optionalUser = userRepository.findByEmail(deleteUserDto.getEmail());
-		if (optionalUser.isEmpty()) {
-			log.error("존재하지 않는 이메일 입니다. :: {}", deleteUserDto);
-			throw new NotFoundEmailException();
-		}
-
-		User user = optionalUser.get();
-		return user.delete(deleteUserDto);
-	}
-
-	@Override
-	@Transactional
-	public User changePassword(@Valid ChangePasswordDTO changePasswordDto) {
-		Optional<User> optionalUser = userRepository.findByEmailAndIsDeletedFalse(changePasswordDto.getEmail());
-		if (optionalUser.isEmpty()) {
-			log.error("존재하지 않는 이메일 입니다. :: {}", changePasswordDto);
-			throw new NotFoundEmailException();
-		}
-
-		User user = optionalUser.get();
-		return user.changePassword(changePasswordDto);
+		User newUser = userRepository.save(signUpDto.toUser());
+		return Optional.of(newUser);
 	}
 
 }

server/src/main/java/com/ticketing/server/user/service/dto/ChangePasswordDTO.java

@@ -1,47 +0,0 @@
-package com.ticketing.server.user.service.dto;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotEmpty;
-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;
-
-	@NotEmpty(message = "{validation.not.empty.oldpassword}")
-	private String oldPassword;
-
-	@NotEmpty(message = "{validation.not.empty.newpassword}")
-	private String newPassword;
-
-	private PasswordEncoder passwordEncoder;
-
-	public String getEmail() {
-		return email;
-	}
-
-	@Override
-	public boolean passwordMatches(String password) {
-		return passwordEncoder.matches(oldPassword, password);
-	}
-
-	public String getEncodePassword() {
-		return passwordEncoder.encode(newPassword);
-	}
-
-	@Override
-	public String toString() {
-		return "ChangePassword{" +
-			"email='" + email + '\'' +
-			'}';
-	}
-}

server/src/main/java/com/ticketing/server/user/service/dto/DeleteUserDTO.java

@@ -1,40 +0,0 @@
-package com.ticketing.server.user.service.dto;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotEmpty;
-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;
-
-	@NotEmpty(message = "{validation.not.empty.password}")
-	private String inputPassword;
-
-	private PasswordEncoder passwordEncoder;
-
-	@Override
-	public boolean passwordMatches(String password) {
-		return passwordEncoder.matches(this.inputPassword, password);
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	@Override
-	public String toString() {
-		return "DeleteUser{" +
-			"email='" + email + '\'' +
-			'}';
-	}
-
-}

server/src/main/java/com/ticketing/server/user/service/dto/PasswordMatches.java

@@ -1,7 +0,0 @@
-package com.ticketing.server.user.service.dto;
-
-@FunctionalInterface
-public interface PasswordMatches {
-
-	boolean passwordMatches(String password);
-}

server/src/main/java/com/ticketing/server/user/service/dto/SignUp.java

@@ -8,7 +8,7 @@ import javax.validation.constraints.NotEmpty;
 import lombok.Getter;
 
 @Getter
-public class SignUpDTO {
+public class SignUp {
 
 	@NotEmpty(message = "{validation.not.empty.name}")
 	private String name;
@@ -24,7 +24,7 @@ public class SignUpDTO {
 	@Phone
 	private String phone;
 
-	public SignUpDTO(String name, String email, String password, String phone) {
+	public SignUp(String name, String email, String password, String phone) {
 		this.name = name;
 		this.email = email;
 		this.password = password;

server/src/main/java/com/ticketing/server/user/service/interfaces/UserService.java

@@ -1,17 +1,12 @@
 package com.ticketing.server.user.service.interfaces;
 
 import com.ticketing.server.user.domain.User;
-import com.ticketing.server.user.service.dto.ChangePasswordDTO;
-import com.ticketing.server.user.service.dto.DeleteUserDTO;
-import com.ticketing.server.user.service.dto.SignUpDTO;
+import com.ticketing.server.user.service.dto.SignUp;
+import java.util.Optional;
 import javax.validation.Valid;
 
 public interface UserService {
 
-	User register(@Valid SignUpDTO signUpDto);
-
-	User delete(@Valid DeleteUserDTO deleteUserDto);
-
-	User changePassword(@Valid ChangePasswordDTO changePasswordDto);
+	Optional<User> register(@Valid SignUp signUpDto);
 
 }

server/src/main/resources/i18n/messages.properties

@@ -1,8 +1,6 @@
 validation.not.empty.name="\uC774\uB984\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
 validation.not.empty.email="\uC774\uBA54\uC77C\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
 validation.not.empty.password="\uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
-validation.not.empty.oldpassword="\uD604\uC7AC \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
-validation.not.empty.newpassword="\uBCC0\uACBD\uD560 \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
 validation.not.empty.grade="\uC0AC\uC6A9\uC790 \uB4F1\uAE09\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
 validation.not.empty.phone="\uD734\uB300\uBC88\uD638\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
 validation.email="\uC774\uBA54\uC77C\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."

server/src/main/resources/i18n/messages_en.properties

@@ -1,8 +1,6 @@
 validation.not.empty.name="name is required."
 validation.not.empty.email="email is required."
 validation.not.empty.password="password is required."
-validation.not.empty.oldpassword="Old Password is required."
-validation.not.empty.newpassword="New Password is required."
 validation.not.empty.grade="user grade is required."
 validation.not.empty.phone="phone is required."
 validation.email="email is not valid."

server/src/main/resources/i18n/messages_ko.properties

@@ -1,8 +1,6 @@
 validation.not.empty.name="\uC774\uB984\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
 validation.not.empty.email="\uC774\uBA54\uC77C\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
 validation.not.empty.password="\uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
-validation.not.empty.oldpassword="\uD604\uC7AC \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
-validation.not.empty.newpassword="\uBCC0\uACBD\uD560 \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
 validation.not.empty.grade="\uC0AC\uC6A9\uC790 \uB4F1\uAE09\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
 validation.not.empty.phone="\uD734\uB300\uBC88\uD638\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
 validation.email="\uC774\uBA54\uC77C\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."

server/src/test/java/com/ticketing/server/user/domain/UserTest.java

@@ -1,18 +1,8 @@
 package com.ticketing.server.user.domain;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.assertAll;
 
-import com.ticketing.server.global.exception.AlreadyDeletedException;
-import com.ticketing.server.global.exception.PasswordMismatchException;
-import com.ticketing.server.user.service.dto.ChangePasswordDTO;
-import com.ticketing.server.user.service.dto.DeleteUserDTO;
-import com.ticketing.server.user.service.dto.DeleteUserDtoTest;
-import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.Validator;
@@ -21,98 +11,26 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.NullAndEmptySource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 class UserTest {
 
-	private Validator validator;
-	private Map<String, User> users;
+	private static Validator validator;
 
 	@BeforeEach
 	void init() {
 		ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
 		validator = factory.getValidator();
-		users = provideCorrectUsers().collect(Collectors.toMap(User::getEmail, user -> user));
-	}
 
-	@ParameterizedTest
-	@MethodSource("provideDifferentPasswordDeleteUsers")
-	@DisplayName("입력된 패스워드가 다를 경우")
-	void passwordMismatchException(DeleteUserDTO deleteUser) {
-		// given
-		User user = users.get(deleteUser.getEmail());
-
-		// when
-		// then
-		assertThatThrownBy(() -> user.delete(deleteUser))
-			.isInstanceOf(PasswordMismatchException.class);
-	}
-
-	@ParameterizedTest
-	@MethodSource("provideDeleteUsers")
-	@DisplayName("이미 회원탈퇴 되어 있는 경우")
-	void alreadyDeletedException(DeleteUserDTO deleteUserDto) {
-		// given
-		User user = users.get(deleteUserDto.getEmail());
-
-		// when
-		user.delete(deleteUserDto);
-
-		// then
-		assertThatThrownBy(() -> user.delete(deleteUserDto))
-			.isInstanceOf(AlreadyDeletedException.class);
-	}
-
-	@ParameterizedTest
-	@MethodSource("provideDeleteUsers")
-	@DisplayName("회원탈퇴 성공")
-	void deleteSuccess(DeleteUserDTO deleteUserDto) {
-		// given
-		User user = users.get(deleteUserDto.getEmail());
-
-		// when
-		User deletedUser = user.delete(deleteUserDto);
-
-		// then
-		assertAll(
-			() -> assertThat(deletedUser.getDeletedAt()).isNotNull()
-			, () -> assertThat(deletedUser.isDeleted()).isTrue()
-		);
 	}
 
 	@Test
-	@DisplayName("입력받은 패스워드와 불일치로 변경 실패")
-	void changePasswordFail() {
-		// given
-		ChangePasswordDTO changePasswordDto = new ChangePasswordDTO("ticketing1@gmail.com", "1234567", "ticketing1234", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER);
-		User user = users.get(changePasswordDto.getEmail());
-
-		// when
-		// then
-		assertThatThrownBy(() -> user.changePassword(changePasswordDto))
-			.isInstanceOf(PasswordMismatchException.class);
-	}
-
-	@Test
-	@DisplayName("패스워드 변경 성공")
-	void changePasswordSuccess() {
-		// given
-		ChangePasswordDTO changePasswordDto = new ChangePasswordDTO("ticketing1@gmail.com", "123456", "ticketing1234", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER);
-		User user = users.get(changePasswordDto.getEmail());
-		String oldPassword = user.getPassword();
-
-		// when
-		User modifiedUser = user.changePassword(changePasswordDto);
-
-		// then
-		assertThat(modifiedUser.getPassword()).isNotEqualTo(oldPassword);
-	}
-
-	@ParameterizedTest
-	@MethodSource("provideCorrectUsers")
 	@DisplayName("유저 검증 성공")
-	void validateSuccess(User user) {
+	void validateSuccess() {
 		// given
+		User user = new User("유저1", "email@gmail.com", "testPassword01", UserGrade.GUEST, "010-1234-5678");
+
 		// when
 		Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
 
@@ -121,10 +39,12 @@ class UserTest {
 	}
 
 	@ParameterizedTest
-	@MethodSource("provideNullOrEmptyOfName")
+	@NullAndEmptySource
 	@DisplayName("name null 혹은 빈값 검증")
-	void nameNullOrEmpty(User user) {
+	void nameNullOrEmpty(String name) {
 		// given
+		User user = new User(name, "email@gmail.com", "testPassword01", UserGrade.GUEST, "010-1234-5678");
+
 		// when
 		Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
 
@@ -133,10 +53,12 @@ class UserTest {
 	}
 
 	@ParameterizedTest
-	@MethodSource("provideNullOrEmptyOfEmail")
+	@NullAndEmptySource
 	@DisplayName("email null or empty 검증")
-	void emailNullOrEmpty(User user) {
+	void emailNullOrEmpty(String email) {
 		// given
+		User user = new User("유저1", email, "testPassword01", UserGrade.GUEST, "010-1234-5678");
+
 		// when
 		Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
 
@@ -145,10 +67,12 @@ class UserTest {
 	}
 
 	@ParameterizedTest
-	@MethodSource("provideValidationFailedOfEmail")
+	@ValueSource(strings = {"email", "@hello.com", "12Bye#domain.com"})
 	@DisplayName("email 실패 검증")
-	void emailValid(User user) {
+	void emailValid(String email) {
 		// given
+		User user = new User("유저1", email, "testPassword01", UserGrade.GUEST, "010-1234-5678");
+
 		// when
 		Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
 
@@ -157,10 +81,12 @@ class UserTest {
 	}
 
 	@ParameterizedTest
-	@MethodSource("provideNullOrEmptyOfPassword")
+	@NullAndEmptySource
 	@DisplayName("password null 혹은 빈값 검증")
-	void passwordNullOrEmpty(User user) {
+	void passwordNullOrEmpty(String password) {
 		// given
+		User user = new User("유저1", "email@gmail.com", password, UserGrade.GUEST, "010-1234-5678");
+
 		// when
 		Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
 
@@ -182,10 +108,12 @@ class UserTest {
 	}
 
 	@ParameterizedTest
-	@MethodSource("provideNullOrEmptyOfPhone")
 	@DisplayName("phone null or empty 검증")
-	void phoneNullOrEmpty(User user) {
+	@NullAndEmptySource
+	void phoneNullOrEmpty(String phone) {
 		// given
+		User user = new User("유저1", "email@gmail.com", "testPassword01", UserGrade.GUEST, phone);
+
 		// when
 		Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
 
@@ -194,10 +122,12 @@ class UserTest {
 	}
 
 	@ParameterizedTest
-	@MethodSource("provideValidationFailedOfPhone")
 	@DisplayName("phone 실패 검증")
-	void phoneValid(User user) {
+	@ValueSource(strings = {"010-123-1234", "02-0444-4044", "033-7953", "033-0455-504"})
+	void phoneValid(String phone) {
 		// given
+		User user = new User("유저1", "email@gmail.com", "testPassword01", UserGrade.GUEST, phone);
+
 		// when
 		Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
 
@@ -205,76 +135,4 @@ class UserTest {
 		assertThat(constraintViolations).hasSize(1);
 	}
 
-	public static Stream<User> provideCorrectUsers() {
-		return Stream.of(
-			new User("유저1", "ticketing1@gmail.com", "123456", UserGrade.GUEST, "010-1234-5678")
-			, new User("유저2", "ticketing2@gmail.com", "qwe123", UserGrade.GUEST, "010-2234-5678")
-			, new User("유저3", "ticketing3@gmail.com", "ticketing", UserGrade.STAFF, "010-3234-5678")
-			, new User("유저4", "ticketing4@gmail.com", "ticketing123456", UserGrade.STAFF, "010-4234-5678")
-		);
-	}
-
-	public static Stream<User> provideNullOrEmptyOfName() {
-		return Stream.of(
-			new User(null, "ticketing1@gmail.com", "123456", UserGrade.GUEST, "010-1234-5678")
-			, new User("", "ticketing2@gmail.com", "qwe123", UserGrade.GUEST, "010-2234-5678")
-		);
-	}
-
-	public static Stream<User> provideNullOrEmptyOfEmail() {
-		return Stream.of(
-			new User("유저1", null, "123456", UserGrade.GUEST, "010-1234-5678")
-			, new User("유저2", "", "qwe123", UserGrade.GUEST, "010-2234-5678")
-		);
-	}
-
-	public static Stream<User> provideValidationFailedOfEmail() {
-		return Stream.of(
-			new User("유저1", "email", "123456", UserGrade.GUEST, "010-1234-5678")
-			, new User("유저2", "@gmail.com", "qwe123", UserGrade.GUEST, "010-2234-5678")
-			, new User("유저3", "12Bye#domain.com", "ticketing", UserGrade.STAFF, "010-3234-5678")
-		);
-	}
-
-	public static Stream<User> provideNullOrEmptyOfPassword() {
-		return Stream.of(
-			new User("유저1", "ticketing1@gmail.com", null, UserGrade.GUEST, "010-1234-5678")
-			, new User("유저2", "ticketing2@gmail.com", "", UserGrade.GUEST, "010-2234-5678")
-		);
-	}
-
-	public static Stream<User> provideNullOrEmptyOfPhone() {
-		return Stream.of(
-			new User("유저1", "ticketing1@gmail.com", "123456", UserGrade.GUEST, null)
-			, new User("유저2", "ticketing2@gmail.com", "qwe123", UserGrade.GUEST, "")
-		);
-	}
-
-	public static Stream<User> provideValidationFailedOfPhone() {
-		return Stream.of(
-			new User("유저1", "ticketing1@gmail.com", "123456", UserGrade.GUEST, "010-123-1234")
-			, new User("유저2", "ticketing2@gmail.com", "qwe123", UserGrade.GUEST, "02-0444-4044")
-			, new User("유저3", "ticketing3@gmail.com", "ticketing", UserGrade.STAFF, "033-7953")
-			, new User("유저4", "ticketing4@gmail.com", "ticketing123456", UserGrade.STAFF, "033-0455-504")
-		);
-	}
-
-	public static Stream<DeleteUserDTO> provideDifferentPasswordDeleteUsers() {
-		return Stream.of(
-			new DeleteUserDTO("ticketing1@gmail.com", "1234561", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
-			, new DeleteUserDTO("ticketing2@gmail.com", "qwe1231", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
-			, new DeleteUserDTO("ticketing3@gmail.com", "ticketing1", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
-			, new DeleteUserDTO("ticketing4@gmail.com", "ticketing1234561", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
-		);
-	}
-
-	public static Stream<DeleteUserDTO> provideDeleteUsers() {
-		return Stream.of(
-			new DeleteUserDTO("ticketing1@gmail.com", "123456", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
-			, new DeleteUserDTO("ticketing2@gmail.com", "qwe123", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
-			, new DeleteUserDTO("ticketing3@gmail.com", "ticketing", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
-			, new DeleteUserDTO("ticketing4@gmail.com", "ticketing123456", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
-		);
-	}
-
 }

server/src/test/java/com/ticketing/server/user/service/UserServiceImplTest.java

@@ -1,18 +1,13 @@
 package com.ticketing.server.user.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
-import com.ticketing.server.global.exception.NotFoundEmailException;
 import com.ticketing.server.user.domain.User;
 import com.ticketing.server.user.domain.UserGrade;
 import com.ticketing.server.user.domain.repository.UserRepository;
-import com.ticketing.server.user.service.dto.ChangePasswordDTO;
-import com.ticketing.server.user.service.dto.DeleteUserDTO;
-import com.ticketing.server.user.service.dto.DeleteUserDtoTest;
-import com.ticketing.server.user.service.dto.SignUpDTO;
+import com.ticketing.server.user.service.dto.SignUp;
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -26,9 +21,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 class UserServiceImplTest {
 
 	User user;
-	SignUpDTO signUpDto;
-	DeleteUserDTO deleteUserDto;
-	ChangePasswordDTO changePasswordDto;
+	SignUp signUp;
 
 	@Mock
 	UserRepository userRepository;
@@ -38,10 +31,9 @@ class UserServiceImplTest {
 
 	@BeforeEach
 	void init() {
-		signUpDto = new SignUpDTO("유저", "ticketing@gmail.com", "123456", "010-1234-5678");
+
+		signUp = new SignUp("유저", "ticketing@gmail.com", "123456", "010-1234-5678");
 		user = new User("유저", "ticketing@gmail.com", "123456", UserGrade.GUEST, "010-1234-5678");
-		deleteUserDto = new DeleteUserDTO("ticketing@gmail.com", "123456", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER);
-		changePasswordDto = new ChangePasswordDTO("ticketing@gmail.com", "123456", "ticketing1234", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER);
 	}
 
 	@Test
@@ -51,73 +43,24 @@ class UserServiceImplTest {
 		when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.of(user));
 
 		// when
+		Optional<User> user = userService.register(signUp);
+
 		// then
-		assertThatThrownBy(() -> userService.register(signUpDto))
-			.isInstanceOf(IllegalArgumentException.class);
+		assertThat(user).isEmpty();
 	}
 
 	@Test
 	@DisplayName("회원가입 성공했을 경우")
-	void registerSuccess() {
+	void UserServiceImplTest() {
 		// given
 		when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.empty());
 		when(userRepository.save(any())).thenReturn(user);
 
 		// when
-		User user = userService.register(signUpDto);
+		Optional<User> user = userService.register(signUp);
 
 		// then
-		assertThat(user).isNotNull();
-	}
-
-	@Test
-	@DisplayName("회원탈퇴 시 이메일이 존재하지 않을 경우")
-	void deleteFail() {
-		// given
-		when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.empty());
-
-		// when
-		// then
-		assertThatThrownBy(() -> userService.delete(deleteUserDto))
-			.isInstanceOf(NotFoundEmailException.class);
-	}
-
-	@Test
-	@DisplayName("회원탈퇴 성공했을 경우")
-	void deleteSuccess() {
-		// given
-		when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.of(user));
-
-		// when
-		User user = userService.delete(deleteUserDto);
-
-		// then
-		assertThat(user).isNotNull();
-	}
-
-	@Test
-	@DisplayName("패스워드 변경 시 이메일이 존재하지 않을 경우")
-	void changePasswordFail() {
-		// given
-		when(userRepository.findByEmailAndIsDeletedFalse("ticketing@gmail.com")).thenReturn(Optional.empty());
-
-		// when
-		// then
-		assertThatThrownBy(() -> userService.changePassword(changePasswordDto))
-			.isInstanceOf(NotFoundEmailException.class);
-	}
-
-	@Test
-	@DisplayName("패스워드 변경 성공했을 경우")
-	void changePasswordSuccess() {
-		// given
-		when(userRepository.findByEmailAndIsDeletedFalse("ticketing@gmail.com")).thenReturn(Optional.of(user));
-
-		// when
-		User user = userService.changePassword(changePasswordDto);
-
-		// then
-		assertThat(user).isNotNull();
+		assertThat(user).isPresent();
 	}
 
 }

server/src/test/java/com/ticketing/server/user/service/dto/DeleteUserDtoTest.java

@@ -1,37 +0,0 @@
-package com.ticketing.server.user.service.dto;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.springframework.security.crypto.password.PasswordEncoder;
-
-public class DeleteUserDtoTest {
-
-	public static PasswordEncoder CUSTOM_PASSWORD_ENCODER = new CustomPasswordEncoder();
-
-	public static class CustomPasswordEncoder implements PasswordEncoder {
-
-		@Override
-		public String encode(CharSequence rawPassword) {
-			return null;
-		}
-
-		@Override
-		public boolean matches(CharSequence rawPassword, String encodedPassword) {
-			return rawPassword.toString().equals(encodedPassword);
-		}
-	}
-
-	@Test
-	@DisplayName("CustomPasswordEncoder matches 테스트")
-	void customPasswordEncoderMatches() {
-		// given
-		DeleteUserDTO deleteUserDto = new DeleteUserDTO("ticketing@gmail.com", "123456", CUSTOM_PASSWORD_ENCODER);
-
-		// when
-		// then
-		assertThat(deleteUserDto.passwordMatches("123456")).isTrue();
-	}
-
-}

server/src/test/java/com/ticketing/server/user/service/dto/SignUpTest.java

@@ -6,13 +6,13 @@ import com.ticketing.server.user.domain.User;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-class SignUpDtoTest {
+class SignUpTest {
 
 	@Test
 	@DisplayName("toUser 메소드로 User 객체 생성")
 	void toUser() {
 		// given
-		SignUpDTO signUp = new SignUpDTO("유저1", "ticketing@gmail.com", "123456", "010-1234-5678");
+		SignUp signUp = new SignUp("유저1", "ticketing@gmail.com", "123456", "010-1234-5678");
 
 		// when
 		User user = signUp.toUser();