refactor: testImplementation 와 다른 게 없어서 통합

* feat: 로그아웃 시 refreshToken 제거

* refactor: deleteRefreshToken 메서드 람다활용 문법으로 변경

server/build.gradle.kts

@@ -23,8 +23,6 @@ repositories {
 	mavenCentral()
 }
 
-
-
 dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
 	implementation("org.springframework.boot:spring-boot-starter-security")
@@ -32,14 +30,15 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	implementation("org.springframework.boot:spring-boot-starter-actuator")
 	implementation("org.springframework.boot:spring-boot-starter-log4j2")
-	implementation("org.projectlombok:lombok:1.18.20")
+	implementation("org.projectlombok:lombok:1.18.24")
 	implementation("io.springfox:springfox-boot-starter:3.0.0")
 	implementation("io.springfox:springfox-swagger-ui:3.0.0")
 	implementation("com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.4")
-	implementation("com.lmax:disruptor:3.4.2")
-	implementation("io.jsonwebtoken:jjwt-api:0.11.2")
+	implementation("com.lmax:disruptor:3.4.4")
+	implementation("io.jsonwebtoken:jjwt-api:0.11.5")
 	implementation("com.googlecode.json-simple:json-simple:1.1.1")
 	implementation("org.springframework.boot:spring-boot-starter-data-redis")
+	implementation("com.google.code.findbugs:jsr305:3.0.2")
 
 	modules {
 		module("org.springframework.boot:spring-boot-starter-logging") {
@@ -47,18 +46,14 @@ dependencies {
 		}
 	}
 
-	testImplementation("org.springframework.boot:spring-boot-starter-test")
-	testImplementation("org.springframework.security:spring-security-test")
-	testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
-
 	compileOnly("org.projectlombok:lombok")
 	runtimeOnly("mysql:mysql-connector-java")
-	runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.2")
-	runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.2")
+	runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.5")
+	runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.5")
 	annotationProcessor("org.projectlombok:lombok")
 	annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 
-	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
+	testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 	testImplementation("org.springframework.security:spring-security-test")
 }
@@ -66,3 +61,28 @@ dependencies {
 tasks.withType<Test> {
 	useJUnitPlatform()
 }
+
+sourceSets {
+	create("intTest") {
+		compileClasspath += sourceSets.main.get().output
+		runtimeClasspath += sourceSets.main.get().output
+	}
+}
+
+val intTestImplementation by configurations.getting {
+	extendsFrom(configurations.implementation.get())
+}
+
+configurations["intTestRuntimeOnly"].extendsFrom(configurations.runtimeOnly.get())
+configurations["intTestImplementation"].extendsFrom(configurations.testImplementation.get())
+
+val integrationTest = task<Test>("integrationTest") {
+	description = "Runs integration tests."
+	group = "verification"
+
+	testClassesDirs = sourceSets["intTest"].output.classesDirs
+	classpath = sourceSets["intTest"].runtimeClasspath
+	shouldRunAfter("test")
+}
+
+tasks.check { dependsOn(integrationTest) }

server/src/intTest/java/com/ticketing/server/user/application/AuthControllerTest.java

@@ -27,7 +27,11 @@ import org.springframework.web.context.WebApplicationContext;
 
 @SpringBootTest
 @Transactional
-class UserControllerTest {
+class AuthControllerTest {
+
+	private static final String LOGIN_URL = "/api/auth/token";
+	private static final String REGISTER_URL = "/api/users";
+	private static final String USER_EMAIL = "ticketing@gmail.com";
 
 	@Autowired
 	WebApplicationContext context;
@@ -50,10 +54,10 @@ class UserControllerTest {
 	@DisplayName("로그인 인증 성공")
 	void loginSuccess() throws Exception {
 		// given
-		LoginRequest request = new LoginRequest("ticketing@gmail.com", "qwe123");
+		LoginRequest request = new LoginRequest(USER_EMAIL, "qwe123");
 
 		// when
-		ResultActions actions = mvc.perform(post("/api/user/login")
+		ResultActions actions = mvc.perform(post(LOGIN_URL)
 			.content(asJsonString(request))
 			.contentType(MediaType.APPLICATION_JSON));
 
@@ -66,10 +70,10 @@ class UserControllerTest {
 	@DisplayName("로그인 패스워드 인증 실패")
 	void loginPasswordFail() throws Exception {
 		// given
-		LoginRequest request = new LoginRequest("ticketing@gmail.com", "qwe1234");
+		LoginRequest request = new LoginRequest(USER_EMAIL, "qwe1234");
 
 		// when
-		ResultActions actions = mvc.perform(post("/api/user/login")
+		ResultActions actions = mvc.perform(post(LOGIN_URL)
 			.content(asJsonString(request))
 			.contentType(MediaType.APPLICATION_JSON));
 
@@ -78,10 +82,6 @@ class UserControllerTest {
 			.andExpect(status().isUnauthorized());
 	}
 
-	private String asJsonString(Object object) throws JsonProcessingException {
-		return objectMapper.writeValueAsString(object);
-	}
-
 	@BeforeEach
 	void init() throws Exception {
 		mvc = MockMvcBuilders
@@ -89,9 +89,9 @@ class UserControllerTest {
 			.apply(springSecurity())
 			.build();
 
-		SignUpRequest signUpRequest = new SignUpRequest("ticketing", "ticketing@gmail.com", "qwe123", "010-2240-7920");
+		SignUpRequest signUpRequest = new SignUpRequest("ticketing", USER_EMAIL, "qwe123", "010-1234-5678");
 
-		mvc.perform(post("/api/user")
+		mvc.perform(post(REGISTER_URL)
 			.content(asJsonString(signUpRequest))
 			.contentType(MediaType.APPLICATION_JSON));
 	}
@@ -101,4 +101,8 @@ class UserControllerTest {
 		refreshRedisRepository.deleteAll();
 	}
 
+	private String asJsonString(Object object) throws JsonProcessingException {
+		return objectMapper.writeValueAsString(object);
+	}
+
 }

server/src/intTest/java/com/ticketing/server/user/application/UserControllerTest.java

@@ -0,0 +1,7 @@
+package com.ticketing.server.user.application;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class UserControllerTest {
+
+}

server/src/intTest/resources/application.yml

@@ -0,0 +1,37 @@
+spring:
+  datasource:
+    url: jdbc:mysql://localhost:3306/ticketing_test?serverTimezone=Asia/Seoul&characterEncoding=UTF-8
+    username: ENC(LowN1n4w0Ep/DqLD8+q5Bq6AXM4b8e3V)
+    password: ENC(OMvGcpZLpggFTiGNkqNe66Zq/SmJXF6o)
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  redis:
+    host: localhost
+    port: 6379
+
+  jpa:
+    properties:
+      hibernate:
+        show_sql: true
+        format_sql: true
+    hibernate:
+      ddl-auto: create
+
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+
+jasypt:
+  encryptor:
+    bean: jasyptStringEncryptor
+
+jwt:
+  access-header: Authorization
+  refresh-header: REFRESH_TOKEN
+  prefix: Bearer
+  secret-key: Zi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXktZi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXkK
+  access-token-validity-in-seconds: 60
+  refresh-token-validity-in-seconds: 259200
+
+tmdb:
+  api-key: 0d1503b6dcbfe1c514299b5564c649b8
+  read-access-token: eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIwZDE1MDNiNmRjYmZlMWM1MTQyOTliNTU2NGM2NDliOCIsInN1YiI6IjYyOWYwODRlNzI2ZmIxMTA2NDA4MjI2NCIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.rs8KZea8QLyashILiggWFx2s46lgUtzo-xSWoDgE58A

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/EmailNotFoundException.java

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

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

@@ -0,0 +1,31 @@
+package com.ticketing.server.global.exception;
+
+import static org.springframework.http.HttpStatus.BAD_REQUEST;
+import static org.springframework.http.HttpStatus.CONFLICT;
+import static org.springframework.http.HttpStatus.NOT_FOUND;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+@AllArgsConstructor
+public enum ErrorCode {
+
+	/* 400 BAD_REQUEST : 잘못된 요청 */
+	MISMATCH_PASSWORD(BAD_REQUEST, "비밀번호가 일치하지 않습니다."),
+	TOKEN_TYPE(BAD_REQUEST, "토큰 타입이 올바르지 않습니다."),
+	UNAVAILABLE_REFRESH_TOKEN(BAD_REQUEST, "사용할 수 없는 토큰 입니다."),
+
+	/* 404 NOT_FOUND : Resource 를 찾을 수 없음 */
+	EMAIL_NOT_FOUND(NOT_FOUND, "해당 이메일을 찾을 수 없습니다."),
+	REFRESH_TOKEN_NOT_FOUND(NOT_FOUND, "리프레쉬 토큰을 찾을 수 없습니다."),
+
+	/* 409 CONFLICT : Resource 의 현재 상태와 충돌. 보통 중복된 데이터 존재 */
+	DUPLICATE_EMAIL(CONFLICT, "이메일이 이미 존재합니다."),
+	DELETED_EMAIL(CONFLICT, "이미 삭제된 이메일 입니다.");
+
+	private final HttpStatus httpStatus;
+	private final String detail;
+
+}

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

@@ -0,0 +1,35 @@
+package com.ticketing.server.global.exception;
+
+import java.util.List;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+@EqualsAndHashCode
+public class ErrorResponse {
+
+	private final HttpStatus status;
+	private final String message;
+	private final List<String> errors;
+
+	public ErrorResponse(HttpStatus status, String message, List<String> errors) {
+		this.status = status;
+		this.message = message;
+		this.errors = errors;
+	}
+
+	public ErrorResponse(HttpStatus status, String message, String error) {
+		this.status = status;
+		this.message = message;
+		this.errors = List.of(error);
+	}
+
+	public static ErrorResponse toErrorResponse(ErrorCode errorCode) {
+		return new ErrorResponse(
+			errorCode.getHttpStatus(),
+			errorCode.name(),
+			errorCode.getDetail());
+	}
+
+}

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

@@ -0,0 +1,246 @@
+package com.ticketing.server.global.exception;
+
+import static org.springframework.http.HttpStatus.BAD_REQUEST;
+import static org.springframework.http.HttpStatus.FORBIDDEN;
+import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
+import static org.springframework.http.HttpStatus.METHOD_NOT_ALLOWED;
+import static org.springframework.http.HttpStatus.NOT_FOUND;
+import static org.springframework.http.HttpStatus.UNAUTHORIZED;
+import static org.springframework.http.HttpStatus.UNSUPPORTED_MEDIA_TYPE;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.TypeMismatchException;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.validation.BindException;
+import org.springframework.validation.FieldError;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.HttpMediaTypeNotSupportedException;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
+import org.springframework.web.multipart.support.MissingServletRequestPartException;
+import org.springframework.web.servlet.NoHandlerFoundException;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
+@Slf4j
+@RestControllerAdvice
+public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
+
+	/* 400 START */
+
+	/**
+	 * Valid 유효성 검사 실패
+	 */
+	@Override
+	protected ResponseEntity<Object> handleMethodArgumentNotValid(
+		MethodArgumentNotValidException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+		log.error("MethodArgumentNotValidException :: ", ex);
+
+		List<String> errors = generateErrors(ex);
+		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), errors);
+		return handleExceptionInternal(ex, response, headers, response.getStatus(), request);
+	}
+
+	/***
+	 * ModelAttribute 으로 binding error 발생
+	 */
+	@Override
+	protected ResponseEntity<Object> handleBindException(
+		BindException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+		log.error("BindException :: ", ex);
+
+		List<String> errors = generateErrors(ex);
+		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), errors);
+		return handleExceptionInternal(ex, response, headers, response.getStatus(), request);
+	}
+
+	/**
+	 * 잘못된 유형으로 Bean 속성 설정
+	 */
+	@Override
+	protected ResponseEntity<Object> handleTypeMismatch(
+		TypeMismatchException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+		log.error("TypeMismatchException :: ", ex);
+
+		String error = ex.getValue() + " value for " + ex.getPropertyName() + " should be of type " + ex.getRequiredType();
+		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), error);
+		return ResponseEntity.status(response.getStatus()).headers(headers).body(response);
+	}
+
+	/**
+	 * multipart/form-data 요청 실패
+	 */
+	@Override
+	protected ResponseEntity<Object> handleMissingServletRequestPart(
+		MissingServletRequestPartException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+		log.error("MissingServletRequestPartException :: ", ex);
+
+		String error = ex.getRequestPartName() + " part is missing";
+		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), error);
+		return ResponseEntity.status(response.getStatus()).headers(headers).body(response);
+	}
+
+	/**
+	 * 필수 인수 누락
+	 */
+	@Override
+	protected ResponseEntity<Object> handleMissingServletRequestParameter(
+		MissingServletRequestParameterException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+		log.error("MissingServletRequestParameterException :: ", ex);
+
+		String error = ex.getParameterName() + " parameter is missing";
+		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), error);
+		return ResponseEntity.status(response.getStatus()).headers(headers).body(response);
+	}
+
+	/**
+	 * 인수가 예상한 형식이 아닐 시
+	 */
+	@ExceptionHandler(value = MethodArgumentTypeMismatchException.class)
+	protected ResponseEntity<Object> handleMethodArgumentTypeMismatch(MethodArgumentTypeMismatchException ex) {
+		log.error("MethodArgumentTypeMismatchException :: ", ex);
+
+		String error = ex.getName() + " should be of type " + Objects.requireNonNull(ex.getRequiredType()).getName();
+		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), error);
+		return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
+	}
+
+	/**
+	 * 제약 조건 위반
+	 */
+	@ExceptionHandler(value = ConstraintViolationException.class)
+	protected ResponseEntity<Object> handleConstraintViolation(ConstraintViolationException ex) {
+		log.error("ConstraintViolationException :: ", ex);
+
+		List<String> errors = new ArrayList<>();
+		for (ConstraintViolation<?> violation : ex.getConstraintViolations()) {
+			errors.add(violation.getRootBeanClass().getName() + " " + violation.getPropertyPath() + ": " + violation.getMessage());
+		}
+
+		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), errors);
+		return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
+	}
+
+	/* 400 END */
+
+	/**
+	 * 404 발생
+	 */
+	@Override
+	protected ResponseEntity<Object> handleNoHandlerFoundException(
+		NoHandlerFoundException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+		log.error("NoHandlerFoundException :: ", ex);
+
+		String error = "No handler found for " + ex.getHttpMethod() + " " + ex.getRequestURL();
+		ErrorResponse response = new ErrorResponse(NOT_FOUND, ex.getLocalizedMessage(), error);
+		return ResponseEntity.status(response.getStatus()).headers(headers).body(response);
+	}
+
+	/**
+	 * 지원하지 않는 HTTP 메서드로 요청 405
+	 */
+	@Override
+	protected ResponseEntity<Object> handleHttpRequestMethodNotSupported(
+		HttpRequestMethodNotSupportedException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+		log.error("HttpRequestMethodNotSupportedException :: ", ex);
+
+		StringBuilder builder = new StringBuilder();
+		builder.append(ex.getMethod());
+		builder.append(" method is not supported for this request. Supported methods are ");
+
+		Set<HttpMethod> supportedHttpMethods = ex.getSupportedHttpMethods();
+		if (supportedHttpMethods != null) {
+			supportedHttpMethods.forEach(t -> builder.append(t).append(" "));
+		}
+
+		ErrorResponse response = new ErrorResponse(METHOD_NOT_ALLOWED, ex.getLocalizedMessage(), builder.toString());
+		return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
+	}
+
+	/**
+	 * 지원되지 않는 미디어 유형으로 요청 415
+	 */
+	@Override
+	protected ResponseEntity<Object> handleHttpMediaTypeNotSupported(
+		HttpMediaTypeNotSupportedException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+		log.error("HttpMediaTypeNotSupportedException :: ", ex);
+
+		StringBuilder builder = new StringBuilder();
+		builder.append(ex.getContentType());
+		builder.append(" media type is not supported. Supported media types are ");
+		ex.getSupportedMediaTypes().forEach(t -> builder.append(t).append(" "));
+
+		ErrorResponse response = new ErrorResponse(UNSUPPORTED_MEDIA_TYPE, ex.getLocalizedMessage(), builder.substring(0, builder.length() - 2));
+		return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
+	}
+
+	/**
+	 * 특정 핸들러 없는 모든 예외 500
+	 */
+	@ExceptionHandler(value = Exception.class)
+	protected ResponseEntity<Object> handleAll(Exception ex) {
+		log.error("Exception :: ", ex);
+
+		ErrorResponse response = new ErrorResponse(INTERNAL_SERVER_ERROR, ex.getLocalizedMessage(), "오류가 발생했습니다.");
+		return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
+	}
+
+	/**
+	 * 접근 권한이 없을 때
+	 */
+	@ExceptionHandler(value = AccessDeniedException.class)
+	protected ResponseEntity<ErrorResponse> handleAccessDeniedException(Exception ex) {
+		log.error("AccessDeniedException :: ", ex);
+
+		ErrorResponse response = new ErrorResponse(FORBIDDEN, ex.getLocalizedMessage(), "접근 권한이 없습니다.");
+		return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
+	}
+
+	/**
+	 * 인증 정보가 없을 때
+	 */
+	@ExceptionHandler(value = AuthenticationException.class)
+	protected ResponseEntity<ErrorResponse> handleAuthenticationException(Exception ex) {
+		log.error("AuthenticationException :: ", ex);
+
+		ErrorResponse response = new ErrorResponse(UNAUTHORIZED, ex.getLocalizedMessage(), "로그인 후 이용하실 수 있습니다.");
+		return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
+	}
+
+	/**
+	 * 커스텀 예외 발생 시
+	 */
+	@ExceptionHandler(value = TicketingException.class)
+	protected ResponseEntity<ErrorResponse> ticketingException(TicketingException ex) {
+		log.error("TicketingException :: ", ex);
+
+		ErrorCode errorCode = ex.getErrorCode();
+		return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.toErrorResponse(errorCode));
+	}
+
+	private List<String> generateErrors(BindException ex) {
+		List<String> errors = new ArrayList<>();
+		List<ObjectError> allErrors = ex.getBindingResult().getAllErrors();
+
+		for (ObjectError error : allErrors) {
+			errors.add(((FieldError) error).getField() + ": " + error.getDefaultMessage());
+		}
+		return errors;
+	}
+
+}

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/global/exception/TicketingException.java

@@ -0,0 +1,12 @@
+package com.ticketing.server.global.exception;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class TicketingException extends RuntimeException {
+
+	private final ErrorCode errorCode;
+
+}

server/src/main/java/com/ticketing/server/global/exception/token/TokenException.java

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

server/src/main/java/com/ticketing/server/global/exception/token/TokenNotFindException.java

@@ -1,10 +0,0 @@
-package com.ticketing.server.global.exception.token;
-
-public class TokenNotFindException extends TokenException {
-
-	private static final String MESSAGE = "일치하는 토큰을 찾지 못하였습니다.";
-
-	public TokenNotFindException() {
-		super(MESSAGE);
-	}
-}

server/src/main/java/com/ticketing/server/global/exception/token/TokenTypeException.java

@@ -1,10 +0,0 @@
-package com.ticketing.server.global.exception.token;
-
-public class TokenTypeException extends TokenException {
-
-	private static final String MESSAGE = "토큰 타입이 일치하지 않습니다.";
-
-	public TokenTypeException() {
-		super(MESSAGE);
-	}
-}

server/src/main/java/com/ticketing/server/global/exception/token/UnavailableRefreshTokenException.java

@@ -1,11 +0,0 @@
-package com.ticketing.server.global.exception.token;
-
-public class UnavailableRefreshTokenException extends TokenException {
-
-	private static final String MESSAGE = "사용할 수 없는 refresh Token 입니다.";
-
-	public UnavailableRefreshTokenException() {
-		super(MESSAGE);
-	}
-
-}

server/src/main/java/com/ticketing/server/global/security/WebSecurityConfig.java

@@ -9,7 +9,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -51,9 +50,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
 			.and()
 			.authorizeRequests()
-			.antMatchers(HttpMethod.POST, "/api/user/login").permitAll()
-			.antMatchers(HttpMethod.POST, "/api/user/refresh").permitAll()
-			.antMatchers(HttpMethod.POST, "/api/user").permitAll()
+			.antMatchers(HttpMethod.POST, "/api/auth/token").permitAll()
+			.antMatchers(HttpMethod.POST, "/api/auth/refresh").permitAll()
+			.antMatchers(HttpMethod.POST, "/api/users").permitAll()
 			.antMatchers("/api/movies/**").permitAll()
 			.antMatchers("/l7check").permitAll()
 			.antMatchers("/actuator/**").permitAll()

server/src/main/java/com/ticketing/server/global/security/jwt/handle/JwtAccessDeniedHandler.java

@@ -3,15 +3,24 @@ package com.ticketing.server.global.security.jwt.handle;
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.access.AccessDeniedHandler;
 import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerExceptionResolver;
 
-@Component
+@Component("JwtAccessDeniedHandler")
 public class JwtAccessDeniedHandler implements AccessDeniedHandler {
 
+	private final HandlerExceptionResolver resolver;
+
+	public JwtAccessDeniedHandler(@Qualifier("handlerExceptionResolver") HandlerExceptionResolver resolver) {
+		this.resolver = resolver;
+	}
+
 	@Override
 	public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException {
 		response.sendError(HttpServletResponse.SC_FORBIDDEN);
+		resolver.resolveException(request, response, null, accessDeniedException);
 	}
 }

server/src/main/java/com/ticketing/server/global/security/jwt/handle/JwtAuthenticationEntryPoint.java

@@ -3,15 +3,24 @@ package com.ticketing.server.global.security.jwt.handle;
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerExceptionResolver;
 
-@Component
+@Component("JwtAuthenticationEntryPoint")
 public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
 
+	private final HandlerExceptionResolver resolver;
+
+	public JwtAuthenticationEntryPoint(@Qualifier("handlerExceptionResolver") HandlerExceptionResolver resolver) {
+		this.resolver = resolver;
+	}
+
 	@Override
 	public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException {
-		response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
+		resolver.resolveException(request, response, null, authException);
 	}
 }

server/src/main/java/com/ticketing/server/global/validator/constraints/FieldsValueNotMatch.java

@@ -0,0 +1,28 @@
+package com.ticketing.server.global.validator.constraints;
+
+import com.ticketing.server.global.validator.constraintvalidators.FieldsValueNotMatchValidator;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+@Constraint(validatedBy = FieldsValueNotMatchValidator.class)
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface FieldsValueNotMatch {
+
+	String message();
+
+	String field();
+
+	String fieldMatch();
+
+	Class<?>[] groups() default {};
+
+	Class<? extends Payload>[] payload() default {};
+
+}

server/src/main/java/com/ticketing/server/global/validator/constraintvalidators/FieldsValueNotMatchValidator.java

@@ -0,0 +1,29 @@
+package com.ticketing.server.global.validator.constraintvalidators;
+
+import com.ticketing.server.global.validator.constraints.FieldsValueNotMatch;
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import org.springframework.beans.BeanWrapperImpl;
+
+public class FieldsValueNotMatchValidator implements ConstraintValidator<FieldsValueNotMatch, Object> {
+
+	private String field;
+	private String fieldMatch;
+
+	public void initialize(FieldsValueNotMatch constraintAnnotation) {
+		this.field = constraintAnnotation.field();
+		this.fieldMatch = constraintAnnotation.fieldMatch();
+	}
+
+	@Override
+	public boolean isValid(Object value, ConstraintValidatorContext context) {
+		Object fieldValue = new BeanWrapperImpl(value).getPropertyValue(field);
+		Object fieldMatchValue = new BeanWrapperImpl(value).getPropertyValue(fieldMatch);
+
+		if (fieldValue != null) {
+			return !fieldValue.equals(fieldMatchValue);
+		} else {
+			return fieldMatchValue != null;
+		}
+	}
+}

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

@@ -0,0 +1,63 @@
+package com.ticketing.server.user.application;
+
+import com.ticketing.server.user.application.request.LoginRequest;
+import com.ticketing.server.user.application.response.LogoutResponse;
+import com.ticketing.server.user.application.response.TokenDto;
+import com.ticketing.server.user.service.interfaces.AuthenticationService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/auth")
+@Slf4j
+public class AuthController {
+
+	private final AuthenticationService authenticationService;
+
+	@PostMapping("/token")
+	public ResponseEntity<TokenDto> login(@RequestBody LoginRequest loginRequest) {
+		TokenDto tokenDto = authenticationService.generateTokenDto(loginRequest.toAuthentication());
+
+		return ResponseEntity.status(HttpStatus.OK)
+			.headers(getHttpHeaders())
+			.body(tokenDto);
+	}
+
+	@PostMapping("/refresh")
+	public ResponseEntity<TokenDto> refreshToken(@RequestParam("refreshToken") String refreshToken) {
+		TokenDto tokenDto = authenticationService.reissueTokenDto(refreshToken);
+
+		return ResponseEntity.status(HttpStatus.OK)
+			.headers(getHttpHeaders())
+			.body(tokenDto);
+	}
+
+	@PostMapping("/logout")
+	public ResponseEntity<LogoutResponse> logout(@AuthenticationPrincipal UserDetails userRequest) {
+		LogoutResponse logoutResponse = authenticationService.deleteRefreshToken(userRequest.getUsername());
+
+		return ResponseEntity.status(HttpStatus.OK)
+			.body(logoutResponse);
+	}
+
+	private HttpHeaders getHttpHeaders() {
+		HttpHeaders httpHeaders = new HttpHeaders();
+		httpHeaders.set(HttpHeaders.CACHE_CONTROL, "no-cache, no-store, must-revalidate");
+		httpHeaders.set(HttpHeaders.PRAGMA, "no-store");
+		httpHeaders.set(HttpHeaders.EXPIRES, "0");
+
+		return httpHeaders;
+	}
+
+}

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

@@ -1,20 +1,15 @@
 package com.ticketing.server.user.application;
 
-import com.ticketing.server.global.security.jwt.JwtProperties;
-import com.ticketing.server.user.application.request.LoginRequest;
 import com.ticketing.server.user.application.request.SignUpRequest;
+import com.ticketing.server.user.application.request.UserChangePasswordRequest;
 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.TokenDto;
 import com.ticketing.server.user.application.response.UserChangePasswordResponse;
 import com.ticketing.server.user.application.response.UserDeleteResponse;
 import com.ticketing.server.user.application.response.UserDetailResponse;
 import com.ticketing.server.user.domain.User;
 import com.ticketing.server.user.domain.UserGrade;
 import com.ticketing.server.user.service.UserServiceImpl;
-import com.ticketing.server.user.service.interfaces.AuthenticationService;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -30,19 +25,16 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/user")
+@RequestMapping("/api/users")
 @Slf4j
 public class UserController {
 
 	private final UserServiceImpl userService;
-	private final AuthenticationService authenticationService;
 	private final PasswordEncoder passwordEncoder;
-	private final JwtProperties jwtProperties;
 
 	@PostMapping
 	public ResponseEntity<SignUpResponse> register(@RequestBody @Valid SignUpRequest request) {
@@ -50,9 +42,9 @@ public class UserController {
 		return ResponseEntity.status(HttpStatus.CREATED).body(SignUpResponse.from(user));
 	}
 
-	@GetMapping("/info")
+	@GetMapping("/details")
 	@Secured("ROLE_GUEST")
-	public ResponseEntity<UserDetailResponse> myInfo(@AuthenticationPrincipal UserDetails userRequest) {
+	public ResponseEntity<UserDetailResponse> details(@AuthenticationPrincipal UserDetails userRequest) {
 		User user = userService.findByEmail(userRequest.getUsername());
 		return ResponseEntity.status(HttpStatus.OK).body(UserDetailResponse.from(user));
 	}
@@ -66,32 +58,11 @@ public class UserController {
 
 	@PutMapping("/password")
 	@Secured(UserGrade.ROLES.GUEST)
-	public ResponseEntity<UserChangePasswordResponse> changePassword(@RequestBody @Valid UserModifyPasswordRequest request) {
-		if (request.oldEqualNew()) {
-			log.error("기존 패스워드와 동일한 패스워드로 변경할 수 없습니다.");
-			return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
-		}
-
-		User user = userService.changePassword(request.toChangePasswordDto(passwordEncoder));
+	public ResponseEntity<UserChangePasswordResponse> changePassword(
+		@AuthenticationPrincipal UserDetails userRequest,
+		@RequestBody @Valid UserChangePasswordRequest request) {
+		User user = userService.changePassword(request.toChangePasswordDto(userRequest.getUsername(), passwordEncoder));
 		return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.from(user));
 	}
 
-	@PostMapping("/login")
-	public ResponseEntity<TokenDto> login(@RequestBody LoginRequest loginRequest, HttpServletResponse response) {
-		TokenDto tokenDto = authenticationService.login(loginRequest.toAuthentication());
-
-		response.setHeader("Cache-Control", "no-store");
-		response.setHeader("Pragma", "no-store");
-		return ResponseEntity.status(HttpStatus.OK).body(tokenDto);
-	}
-
-	@PostMapping("/refresh")
-	public ResponseEntity<TokenDto> refreshToken(@RequestParam("refreshToken") String refreshToken, HttpServletResponse response) {
-		TokenDto tokenDto = authenticationService.reissueAccessToken(refreshToken);
-
-		response.setHeader(jwtProperties.getAccessHeader(), tokenDto.getAccessToken());
-		response.setHeader(jwtProperties.getRefreshHeader(), tokenDto.getRefreshToken());
-		return ResponseEntity.status(HttpStatus.OK).body(tokenDto);
-	}
-
 }

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

@@ -1,7 +1,7 @@
 package com.ticketing.server.user.application.request;
 
+import com.ticketing.server.global.validator.constraints.FieldsValueNotMatch;
 import com.ticketing.server.user.service.dto.ChangePasswordDTO;
-import javax.validation.constraints.Email;
 import javax.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -11,11 +11,12 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor
-public class UserModifyPasswordRequest {
-
-	@NotEmpty(message = "{validation.not.empty.email}")
-	@Email(message = "{validation.email}")
-	private String email;
+@FieldsValueNotMatch(
+	field = "oldPassword",
+	fieldMatch = "newPassword",
+	message = "{validation.password.not.change}"
+)
+public class UserChangePasswordRequest {
 
 	@NotEmpty(message = "{validation.not.empty.oldpassword}")
 	private String oldPassword;
@@ -23,12 +24,8 @@ public class UserModifyPasswordRequest {
 	@NotEmpty(message = "{validation.not.empty.newpassword}")
 	private String newPassword;
 
-	public ChangePasswordDTO toChangePasswordDto(PasswordEncoder passwordEncoder) {
+	public ChangePasswordDTO toChangePasswordDto(String email, 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/LogoutResponse.java

@@ -0,0 +1,28 @@
+package com.ticketing.server.user.application.response;
+
+import com.ticketing.server.global.redis.RefreshToken;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class LogoutResponse {
+
+	private Long refreshTokenId;
+	private String email;
+	private String refreshToken;
+
+	private LogoutResponse(String email) {
+		this.email = email;
+	}
+
+	public static LogoutResponse from(String email) {
+		return new LogoutResponse(email);
+	}
+
+	public static LogoutResponse from(RefreshToken refreshToken) {
+		return new LogoutResponse(refreshToken.getId(), refreshToken.getEmail(), refreshToken.getToken());
+	}
+
+}

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

@@ -1,8 +1,10 @@
 package com.ticketing.server.user.domain;
 
+import static com.ticketing.server.global.exception.ErrorCode.DELETED_EMAIL;
+import static com.ticketing.server.global.exception.ErrorCode.MISMATCH_PASSWORD;
+
 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.exception.TicketingException;
 import com.ticketing.server.global.validator.constraints.Phone;
 import com.ticketing.server.user.service.dto.ChangePasswordDTO;
 import com.ticketing.server.user.service.dto.DeleteUserDTO;
@@ -60,7 +62,7 @@ public class User extends AbstractEntity {
 
 	public User delete(DeleteUserDTO deleteUser) {
 		if (isDeleted) {
-			throw new AlreadyDeletedException("이미 탈퇴된 회원 입니다.");
+			throw new TicketingException(DELETED_EMAIL);
 		}
 
 		checkPassword(deleteUser);
@@ -79,7 +81,7 @@ public class User extends AbstractEntity {
 
 	public void checkPassword(PasswordMatches passwordMatches) {
 		if (!passwordMatches.passwordMatches(password)) {
-			throw new PasswordMismatchException();
+			throw new TicketingException(MISMATCH_PASSWORD);
 		}
 	}
 

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

@@ -1,12 +1,15 @@
 package com.ticketing.server.user.service;
 
-import com.ticketing.server.global.exception.token.TokenNotFindException;
-import com.ticketing.server.global.exception.token.TokenTypeException;
-import com.ticketing.server.global.exception.token.UnavailableRefreshTokenException;
+import static com.ticketing.server.global.exception.ErrorCode.REFRESH_TOKEN_NOT_FOUND;
+import static com.ticketing.server.global.exception.ErrorCode.TOKEN_TYPE;
+import static com.ticketing.server.global.exception.ErrorCode.UNAVAILABLE_REFRESH_TOKEN;
+
+import com.ticketing.server.global.exception.TicketingException;
 import com.ticketing.server.global.redis.RefreshRedisRepository;
 import com.ticketing.server.global.redis.RefreshToken;
 import com.ticketing.server.global.security.jwt.JwtProperties;
 import com.ticketing.server.global.security.jwt.JwtProvider;
+import com.ticketing.server.user.application.response.LogoutResponse;
 import com.ticketing.server.user.application.response.TokenDto;
 import com.ticketing.server.user.service.interfaces.AuthenticationService;
 import lombok.RequiredArgsConstructor;
@@ -29,7 +32,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
 	@Override
 	@Transactional
-	public TokenDto login(UsernamePasswordAuthenticationToken authenticationToken) {
+	public TokenDto generateTokenDto(UsernamePasswordAuthenticationToken authenticationToken) {
 		// 회원인증
 		Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken);
 
@@ -50,7 +53,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
 	@Override
 	@Transactional
-	public TokenDto reissueAccessToken(String bearerRefreshToken) {
+	public TokenDto reissueTokenDto(String bearerRefreshToken) {
 		String refreshToken = resolveToken(bearerRefreshToken);
 
 		// 토큰 검증
@@ -60,11 +63,11 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
 		// Redis 에 토큰이 있는지 검증
 		RefreshToken findTokenEntity = refreshRedisRepository.findByEmail(authentication.getName())
-			.orElseThrow(TokenNotFindException::new);
+			.orElseThrow(() -> new TicketingException(REFRESH_TOKEN_NOT_FOUND));
 
 		// redis 토큰과 input 토큰이 일치한지 확인
 		if (!refreshToken.equals(findTokenEntity.getToken())) {
-			throw new UnavailableRefreshTokenException();
+			throw new TicketingException(UNAVAILABLE_REFRESH_TOKEN);
 		}
 
 		// 토큰 발급
@@ -77,11 +80,21 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 		return tokenDto;
 	}
 
+	@Override
+	@Transactional
+	public LogoutResponse deleteRefreshToken(String email) {
+		return refreshRedisRepository.findByEmail(email)
+			.map(tokenDto -> {
+				refreshRedisRepository.delete(tokenDto);
+				return LogoutResponse.from(tokenDto);
+			}).orElseGet(() -> LogoutResponse.from(email));
+	}
+
 	private String resolveToken(String bearerToken) {
 		if (StringUtils.hasText(bearerToken) && jwtProperties.hasTokenStartsWith(bearerToken)) {
 			return bearerToken.substring(7);
 		}
-		throw new TokenTypeException();
+		throw new TicketingException(TOKEN_TYPE);
 	}
 
 }

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

@@ -1,5 +1,8 @@
-package com.ticketing.server.global.security.service;
+package com.ticketing.server.user.service;
 
+import static com.ticketing.server.global.exception.ErrorCode.EMAIL_NOT_FOUND;
+
+import com.ticketing.server.global.exception.TicketingException;
 import com.ticketing.server.user.domain.User;
 import com.ticketing.server.user.domain.repository.UserRepository;
 import java.util.Collections;
@@ -20,7 +23,7 @@ public class CustomUserDetailsService implements UserDetailsService {
 	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
 		return userRepository.findByEmailAndIsDeletedFalse(email)
 			.map(this::createUserDetails)
-			.orElseThrow(() -> new UsernameNotFoundException("존재하지 않는 email 입니다. :: " + email));
+			.orElseThrow(() -> new TicketingException(EMAIL_NOT_FOUND));
 	}
 
 	private UserDetails createUserDetails(User user) {

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

@@ -1,6 +1,9 @@
 package com.ticketing.server.user.service;
 
-import com.ticketing.server.global.exception.EmailNotFoundException;
+import static com.ticketing.server.global.exception.ErrorCode.DUPLICATE_EMAIL;
+import static com.ticketing.server.global.exception.ErrorCode.EMAIL_NOT_FOUND;
+
+import com.ticketing.server.global.exception.TicketingException;
 import com.ticketing.server.user.domain.User;
 import com.ticketing.server.user.domain.repository.UserRepository;
 import com.ticketing.server.user.service.dto.ChangePasswordDTO;
@@ -28,18 +31,17 @@ public class UserServiceImpl implements UserService {
 	@Transactional
 	public User register(@Valid SignUpDTO signUpDto) {
 		Optional<User> user = userRepository.findByEmail(signUpDto.getEmail());
-		if (user.isPresent()) {
-			log.error("이미 존재하는 이메일이기 때문에 신규 회원가입을 진행할 수 없습니다. :: {}", signUpDto);
-			throw new IllegalArgumentException("이미 존재하는 이메일이기 때문에 신규 회원가입을 진행할 수 없습니다.");
+		if (user.isEmpty()) {
+			return userRepository.save(signUpDto.toUser());
 		}
 
-		return userRepository.save(signUpDto.toUser());
+		throw new TicketingException(DUPLICATE_EMAIL);
 	}
 
 	@Override
 	@Transactional
 	public User delete(@Valid DeleteUserDTO deleteUserDto) {
-		User user = findByEmail(deleteUserDto.getEmail());
+		User user = findNotDeletedUserByEmail(deleteUserDto.getEmail());
 		return user.delete(deleteUserDto);
 	}
 
@@ -53,19 +55,16 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public User findByEmail(String email) {
 		return userRepository.findByEmail(email)
-			.orElseThrow(() -> {
-					log.error("존재하지 않는 이메일 입니다. :: {}", email);
-					throw new EmailNotFoundException();
-				}
-			);
+			.orElseThrow(UserServiceImpl::throwEmailNotFound);
 	}
 
 	private User findNotDeletedUserByEmail(String email) {
 		return userRepository.findByEmailAndIsDeletedFalse(email)
-			.orElseThrow(() -> {
-				log.error("존재하지 않는 이메일 입니다. :: {}", email);
-				throw new EmailNotFoundException();
-			});
+			.orElseThrow(UserServiceImpl::throwEmailNotFound);
+	}
+
+	private static RuntimeException throwEmailNotFound() {
+		throw new TicketingException(EMAIL_NOT_FOUND);
 	}
 
 }

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

@@ -1,12 +1,15 @@
 package com.ticketing.server.user.service.interfaces;
 
+import com.ticketing.server.user.application.response.LogoutResponse;
 import com.ticketing.server.user.application.response.TokenDto;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 
 public interface AuthenticationService {
 
-	TokenDto login(UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken);
+	TokenDto generateTokenDto(UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken);
 
-	TokenDto reissueAccessToken(String bearerRefreshToken);
+	TokenDto reissueTokenDto(String bearerRefreshToken);
+
+	LogoutResponse deleteRefreshToken(String email);
 
 }

server/src/main/resources/application.yml

@@ -21,6 +21,7 @@ spring:
   mvc:
     pathmatch:
       matching-strategy: ant_path_matcher
+    throw-exception-if-no-handler-found: true
 
 jasypt:
   encryptor:

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

@@ -1,9 +1,10 @@
-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."
-validation.phone="\uD734\uB300\uBC88\uD638\uAC00 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."
+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.
+validation.phone=\uD734\uB300\uBC88\uD638\uAC00 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+validation.password.not.change=\uB3D9\uC77C\uD55C \uD328\uC2A4\uC6CC\uB4DC\uB85C \uBCC0\uACBD\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.

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

@@ -1,9 +1,10 @@
-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."
-validation.phone="phone is not valid."
+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.
+validation.phone=phone is not valid.
+validation.password.not.change=password not change.

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

@@ -1,9 +1,10 @@
-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."
-validation.phone="\uD734\uB300\uBC88\uD638\uAC00 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."
+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.
+validation.phone=\uD734\uB300\uBC88\uD638\uAC00 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+validation.password.not.change=\uB3D9\uC77C\uD55C \uD328\uC2A4\uC6CC\uB4DC\uB85C \uBCC0\uACBD\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.

server/src/test/java/com/ticketing/server/ServerApplicationTests.java

@@ -1,13 +0,0 @@
-package com.ticketing.server;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class ServerApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}

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

@@ -4,8 +4,7 @@ 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.global.exception.TicketingException;
 import com.ticketing.server.user.service.dto.ChangePasswordDTO;
 import com.ticketing.server.user.service.dto.DeleteUserDTO;
 import com.ticketing.server.user.service.dto.DeleteUserDtoTest;
@@ -45,7 +44,7 @@ class UserTest {
 		// when
 		// then
 		assertThatThrownBy(() -> user.delete(deleteUser))
-			.isInstanceOf(PasswordMismatchException.class);
+			.isInstanceOf(TicketingException.class);
 	}
 
 	@ParameterizedTest
@@ -60,7 +59,8 @@ class UserTest {
 
 		// then
 		assertThatThrownBy(() -> user.delete(deleteUserDto))
-			.isInstanceOf(AlreadyDeletedException.class);
+			.isInstanceOf(TicketingException.class);
+
 	}
 
 	@ParameterizedTest
@@ -90,7 +90,7 @@ class UserTest {
 		// when
 		// then
 		assertThatThrownBy(() -> user.changePassword(changePasswordDto))
-			.isInstanceOf(PasswordMismatchException.class);
+			.isInstanceOf(TicketingException.class);
 	}
 
 	@Test

server/src/test/java/com/ticketing/server/user/domain/repository/UserRepositoryTest.java

@@ -1,31 +0,0 @@
-package com.ticketing.server.user.domain.repository;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.ticketing.server.user.domain.User;
-import com.ticketing.server.user.domain.UserGrade;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.transaction.annotation.Transactional;
-
-@SpringBootTest
-@Transactional
-class UserRepositoryTest {
-
-	@Autowired
-	UserRepository userRepository;
-
-	@Test
-	void 유저레포지토리테스트() {
-		// given
-		User user = new User("유저1", "email@gmail.com", "testPassword01", UserGrade.GUEST, "010-1234-5678");
-
-		// when
-		userRepository.save(user);
-
-		// then
-		assertThat(user).isNotNull();
-	}
-
-}

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

@@ -70,7 +70,7 @@ class AuthenticationServiceImplTest {
 		when(jwtProperties.hasTokenStartsWith(refreshToken)).thenReturn(true);
 
 		// when
-		TokenDto tokenDto = authenticationService.reissueAccessToken(refreshToken);
+		TokenDto tokenDto = authenticationService.reissueTokenDto(refreshToken);
 
 		// then
 		assertAll(

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

@@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
-import com.ticketing.server.global.exception.EmailNotFoundException;
+import com.ticketing.server.global.exception.TicketingException;
 import com.ticketing.server.user.domain.User;
 import com.ticketing.server.user.domain.UserGrade;
 import com.ticketing.server.user.domain.repository.UserRepository;
@@ -54,7 +54,7 @@ class UserServiceImplTest {
 		// when
 		// then
 		assertThatThrownBy(() -> userService.register(signUpDto))
-			.isInstanceOf(IllegalArgumentException.class);
+			.isInstanceOf(TicketingException.class);
 	}
 
 	@Test
@@ -75,19 +75,19 @@ class UserServiceImplTest {
 	@DisplayName("회원탈퇴 시 이메일이 존재하지 않을 경우")
 	void deleteFail() {
 		// given
-		when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.empty());
+		when(userRepository.findByEmailAndIsDeletedFalse("ticketing@gmail.com")).thenReturn(Optional.empty());
 
 		// when
 		// then
 		assertThatThrownBy(() -> userService.delete(deleteUserDto))
-			.isInstanceOf(EmailNotFoundException.class);
+			.isInstanceOf(TicketingException.class);
 	}
 
 	@Test
 	@DisplayName("회원탈퇴 성공했을 경우")
 	void deleteSuccess() {
 		// given
-		when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.of(user));
+		when(userRepository.findByEmailAndIsDeletedFalse("ticketing@gmail.com")).thenReturn(Optional.of(user));
 
 		// when
 		User user = userService.delete(deleteUserDto);
@@ -108,7 +108,7 @@ class UserServiceImplTest {
 		// when
 		// then
 		assertThatThrownBy(() -> userService.changePassword(changePasswordDto))
-			.isInstanceOf(EmailNotFoundException.class);
+			.isInstanceOf(TicketingException.class);
 	}
 
 	@Test

server/src/test/resources/application.yml

@@ -1,28 +1,3 @@
-spring:
-  datasource:
-    url: jdbc:mysql://localhost:3306/ticketing_test?serverTimezone=Asia/Seoul&characterEncoding=UTF-8
-    username: ENC(LowN1n4w0Ep/DqLD8+q5Bq6AXM4b8e3V)
-    password: ENC(OMvGcpZLpggFTiGNkqNe66Zq/SmJXF6o)
-    driver-class-name: com.mysql.cj.jdbc.Driver
-  redis:
-    host: localhost
-    port: 6379
-
-  jpa:
-    properties:
-      hibernate:
-        show_sql: true
-        format_sql: true
-    hibernate:
-      ddl-auto: create
-
-  mvc:
-    pathmatch:
-      matching-strategy: ant_path_matcher
-
-jasypt:
-  encryptor:
-    bean: jasyptStringEncryptor
 
 jwt:
   access-header: Authorization
@@ -31,7 +6,3 @@ jwt:
   secret-key: Zi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXktZi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXkK
   access-token-validity-in-seconds: 60
   refresh-token-validity-in-seconds: 259200
-
-tmdb:
-  api-key: 0d1503b6dcbfe1c514299b5564c649b8
-  read-access-token: eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIwZDE1MDNiNmRjYmZlMWM1MTQyOTliNTU2NGM2NDliOCIsInN1YiI6IjYyOWYwODRlNzI2ZmIxMTA2NDA4MjI2NCIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.rs8KZea8QLyashILiggWFx2s46lgUtzo-xSWoDgE58A