refactor: user delete test code refactoring

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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -1,32 +0,0 @@
-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, "해당 이메일을 찾을 수 없습니다."),
-	MOVIE_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

@@ -1,35 +0,0 @@
-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

@@ -1,246 +0,0 @@
-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

@@ -0,0 +1,11 @@
+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

@@ -1,12 +0,0 @@
-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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,11 @@
+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/RoleConfig.java

@@ -1,56 +0,0 @@
-package com.ticketing.server.global.security;
-
-import com.ticketing.server.user.domain.UserGrade;
-import java.util.ArrayList;
-import java.util.List;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.access.AccessDecisionManager;
-import org.springframework.security.access.AccessDecisionVoter;
-import org.springframework.security.access.annotation.Jsr250Voter;
-import org.springframework.security.access.expression.method.ExpressionBasedPreInvocationAdvice;
-import org.springframework.security.access.hierarchicalroles.RoleHierarchy;
-import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl;
-import org.springframework.security.access.prepost.PreInvocationAuthorizationAdviceVoter;
-import org.springframework.security.access.vote.AffirmativeBased;
-import org.springframework.security.access.vote.AuthenticatedVoter;
-import org.springframework.security.access.vote.RoleHierarchyVoter;
-import org.springframework.security.access.vote.RoleVoter;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration;
-
-@EnableGlobalMethodSecurity(
-	securedEnabled = true,
-	jsr250Enabled = true,
-	prePostEnabled = true
-)
-@Configuration
-public class RoleConfig extends GlobalMethodSecurityConfiguration {
-
-	@Override
-	protected AccessDecisionManager accessDecisionManager() {
-		List<AccessDecisionVoter<?>> decisionVoters = new ArrayList<>();
-		ExpressionBasedPreInvocationAdvice expressionAdvice = new ExpressionBasedPreInvocationAdvice();
-		expressionAdvice.setExpressionHandler(getExpressionHandler());
-		decisionVoters.add(new PreInvocationAuthorizationAdviceVoter(expressionAdvice));
-		decisionVoters.add(new Jsr250Voter());
-
-		decisionVoters.add(new RoleVoter());
-		decisionVoters.add(roleHierarchyVoter());
-		decisionVoters.add(new AuthenticatedVoter());
-		return new AffirmativeBased(decisionVoters);
-	}
-
-	@Bean
-	public RoleHierarchyVoter roleHierarchyVoter() {
-		return new RoleHierarchyVoter(roleHierarchy());
-	}
-
-	@Bean
-	public RoleHierarchy roleHierarchy() {
-		RoleHierarchyImpl roleHierarchy = new RoleHierarchyImpl();
-		roleHierarchy.setHierarchy(UserGrade.getRoleHierarchy());
-		return roleHierarchy;
-	}
-
-}

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

@@ -8,7 +8,9 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 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;
@@ -17,6 +19,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 
 @Configuration
 @EnableWebSecurity
+@EnableGlobalMethodSecurity(securedEnabled = true)
 @RequiredArgsConstructor
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
@@ -50,11 +53,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
 			.and()
 			.authorizeRequests()
-			.antMatchers(HttpMethod.POST, "/api/auth/token").permitAll()
-			.antMatchers(HttpMethod.POST, "/api/auth/refresh").permitAll()
-			.antMatchers(HttpMethod.POST, "/api/users").permitAll()
+			.antMatchers(HttpMethod.POST, "/api/user/login").permitAll()
+			.antMatchers(HttpMethod.POST, "/api/user/refresh").permitAll()
+			.antMatchers(HttpMethod.POST, "/api/user").permitAll()
 			.antMatchers("/api/movies/**").permitAll()
-			.antMatchers("/api/movieTimes/**").permitAll()
 			.antMatchers("/l7check").permitAll()
 			.antMatchers("/actuator/**").permitAll()
 			.antMatchers("/api/v3/", "/swagger-ui/**", "/swagger/", "/swagger-resources/**", "/v3/api-docs").permitAll()

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

@@ -3,24 +3,15 @@ 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("JwtAccessDeniedHandler")
+@Component
 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,24 +3,15 @@ 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("JwtAuthenticationEntryPoint")
+@Component
 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 {
-		resolver.resolveException(request, response, null, authException);
+		response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
 	}
 }

server/src/main/java/com/ticketing/server/global/security/service/CustomUserDetailsService.java

@@ -1,8 +1,5 @@
-package com.ticketing.server.user.service;
+package com.ticketing.server.global.security.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;
@@ -23,7 +20,7 @@ public class CustomUserDetailsService implements UserDetailsService {
 	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
 		return userRepository.findByEmailAndIsDeletedFalse(email)
 			.map(this::createUserDetails)
-			.orElseThrow(() -> new TicketingException(EMAIL_NOT_FOUND));
+			.orElseThrow(() -> new UsernameNotFoundException("존재하지 않는 email 입니다. :: " + email));
 	}
 
 	private UserDetails createUserDetails(User user) {

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

@@ -1,28 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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/movie/application/MovieTimeController.java

@@ -1,39 +0,0 @@
-package com.ticketing.server.movie.application;
-
-import com.ticketing.server.movie.application.response.MovieTimeListResponse;
-import com.ticketing.server.movie.service.interfaces.MovieTimeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.time.LocalDate;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/api/movieTimes")
-@Api(value = "MovieTime API", tags = {"Movie Time"})
-@RequiredArgsConstructor
-@Slf4j
-public class MovieTimeController {
-
-    private final MovieTimeService movieTimeService;
-
-    @GetMapping
-    @ApiOperation(value = "영화 시간표 조회")
-    @Validated
-    public ResponseEntity<MovieTimeListResponse> getMovieTimes(
-        @ApiParam(value = "영화 제목", required = true) @RequestParam String title,
-        @ApiParam(value = "상영 날짜", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate runningDate) {
-        return ResponseEntity.status(HttpStatus.OK).body(MovieTimeListResponse.from(movieTimeService.getMovieTimes(title, runningDate)));
-    }
-
-
-}

server/src/main/java/com/ticketing/server/movie/application/MovieTimesController.java

@@ -0,0 +1,8 @@
+package com.ticketing.server.movie.application;
+
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class MovieTimesController {
+
+}

server/src/main/java/com/ticketing/server/movie/application/response/MovieListResponse.java

@@ -1,5 +1,6 @@
 package com.ticketing.server.movie.application.response;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ticketing.server.movie.service.dto.MovieDto;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
@@ -12,6 +13,7 @@ import lombok.Getter;
 public class MovieListResponse {
 
     @ApiModelProperty(value = "영화 제목")
+    @JsonProperty
     private List<MovieDto> movieDtos;
 
     public static MovieListResponse from(List<MovieDto> movieDtos) {

server/src/main/java/com/ticketing/server/movie/application/response/MovieTimeListResponse.java

@@ -1,21 +0,0 @@
-package com.ticketing.server.movie.application.response;
-
-import com.ticketing.server.movie.service.dto.MovieTimeDto;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class MovieTimeListResponse {
-
-    @ApiModelProperty(value = "영화 시간표 정보")
-    private List<MovieTimeDto> movieTimeDtos;
-
-    public static MovieTimeListResponse from(List<MovieTimeDto> movieTimeDtos) {
-        return new MovieTimeListResponse(movieTimeDtos);
-    }
-
-}

server/src/main/java/com/ticketing/server/movie/domain/Movie.java

@@ -22,4 +22,8 @@ public class Movie extends AbstractEntity {
     @NotNull
     private Integer runningTime;
 
+    public MovieDto toDto() {
+        return new MovieDto(this.title);
+    }
+
 }

server/src/main/java/com/ticketing/server/movie/domain/MovieTimes.java

@@ -1,7 +1,7 @@
 package com.ticketing.server.movie.domain;
 
 import com.ticketing.server.global.dto.repository.AbstractEntity;
-import com.ticketing.server.movie.service.dto.MovieTimeDto;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
@@ -11,7 +11,7 @@ import lombok.Getter;
 
 @Entity
 @Getter
-public class MovieTime extends AbstractEntity {
+public class MovieTimes extends AbstractEntity {
 
 	@NotNull
 	@ManyToOne
@@ -23,6 +23,9 @@ public class MovieTime extends AbstractEntity {
 	@JoinColumn(name = "theater_id", referencedColumnName = "id", updatable = false)
 	private Theater theater;
 
+	@NotNull
+	private LocalDate runningDate;
+
 	@NotNull
 	private Integer round;
 

server/src/main/java/com/ticketing/server/movie/domain/Ticket.java

@@ -20,7 +20,7 @@ public class Ticket extends AbstractEntity {
 	@NotNull
 	@ManyToOne
 	@JoinColumn(name = "movie_times_id", referencedColumnName = "id", updatable = false)
-	private MovieTime movieTime;
+	private MovieTimes movieTimes;
 
 	@ManyToOne
 	@JoinColumn(name = "payment_id", referencedColumnName = "id", updatable = false)

server/src/main/java/com/ticketing/server/movie/domain/repository/MovieTimeRepository.java

@@ -1,22 +0,0 @@
-package com.ticketing.server.movie.domain.repository;
-
-import com.ticketing.server.movie.domain.Movie;
-import com.ticketing.server.movie.domain.MovieTime;
-import java.time.LocalDateTime;
-import java.util.List;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface MovieTimeRepository extends JpaRepository<MovieTime, Long> {
-
-    @Query(value = "SELECT mt "
-        + "FROM MovieTime mt "
-        + "JOIN FETCH mt.movie "
-        + "WHERE mt.movie = :movie "
-        + "AND mt.startAt "
-        + "BETWEEN :startOfDay AND :endOfDay", nativeQuery = false)
-    List<MovieTime> findValidMovieTimes(Movie movie, LocalDateTime startOfDay, LocalDateTime endOfDay);
-
-}

server/src/main/java/com/ticketing/server/movie/domain/repository/MovieTimesRepository.java

@@ -0,0 +1,10 @@
+package com.ticketing.server.movie.domain.repository;
+
+import com.ticketing.server.movie.domain.MovieTimes;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MovieTimesRepository extends JpaRepository<MovieTimes, Long> {
+
+}

server/src/main/java/com/ticketing/server/movie/service/MovieServiceImpl.java

@@ -21,7 +21,7 @@ public class MovieServiceImpl implements MovieService {
         List<Movie> movies = movieRepository.findValidMovies();
 
         return movies.stream()
-            .map(MovieDto::from)
+            .map(movie -> movie.toDto())
             .collect(Collectors.toList());
 
     }

server/src/main/java/com/ticketing/server/movie/service/MovieTimeServiceImpl.java

@@ -1,49 +0,0 @@
-package com.ticketing.server.movie.service;
-
-import static com.ticketing.server.global.exception.ErrorCode.MOVIE_NOT_FOUND;
-
-import com.ticketing.server.global.exception.TicketingException;
-import com.ticketing.server.movie.domain.Movie;
-import com.ticketing.server.movie.domain.MovieTime;
-import com.ticketing.server.movie.domain.repository.MovieRepository;
-import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
-import com.ticketing.server.movie.service.dto.MovieTimeDto;
-import com.ticketing.server.movie.service.interfaces.MovieTimeService;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.stream.Collectors;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class MovieTimeServiceImpl implements MovieTimeService {
-
-    private final MovieRepository movieRepository;
-
-    private final MovieTimeRepository movieTimeRepository;
-
-    @Override
-    public List<MovieTimeDto> getMovieTimes(String title, LocalDate runningDate) {
-        Movie movie = movieRepository.findByTitle(title)
-            .orElseThrow(MovieTimeServiceImpl::throwMovieNotFound);
-
-        LocalDateTime startOfDay = runningDate.atStartOfDay().plusHours(6);
-        LocalDateTime endOfDay = startOfDay.plusDays(1);
-
-        List<MovieTime> movieTimes = movieTimeRepository.findValidMovieTimes(movie, startOfDay, endOfDay);
-
-        return movieTimes.stream()
-            .map(MovieTimeDto::from)
-            .collect(Collectors.toList());
-
-    }
-
-    private static RuntimeException throwMovieNotFound() {
-        throw new TicketingException(MOVIE_NOT_FOUND);
-    }
-
-}

server/src/main/java/com/ticketing/server/movie/service/MovieTimesServiceImpl.java

@@ -0,0 +1,9 @@
+package com.ticketing.server.movie.service;
+
+import com.ticketing.server.movie.service.interfaces.MovieTimesService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MovieTimesServiceImpl implements MovieTimesService {
+
+}

server/src/main/java/com/ticketing/server/movie/service/TMBDServiceImpl.java

@@ -0,0 +1,9 @@
+package com.ticketing.server.movie.service;
+
+import com.ticketing.server.movie.service.interfaces.TMDBService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TMBDServiceImpl implements TMDBService {
+
+}

server/src/main/java/com/ticketing/server/movie/service/dto/MovieDto.java

@@ -1,18 +1,12 @@
 package com.ticketing.server.movie.service.dto;
 
-import com.ticketing.server.movie.domain.Movie;
-import lombok.AccessLevel;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
-import lombok.Getter;
 
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor
 public class MovieDto {
 
+    @JsonProperty
     private String title;
 
-    public static MovieDto from(Movie movie) {
-        return new MovieDto(movie.getTitle());
-    }
-
 }

server/src/main/java/com/ticketing/server/movie/service/dto/MovieTimeDto.java

@@ -1,28 +0,0 @@
-package com.ticketing.server.movie.service.dto;
-
-import com.ticketing.server.movie.domain.MovieTime;
-import java.time.LocalDateTime;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class MovieTimeDto {
-
-    private long movieTimeId;
-
-    private Integer theaterNumber;
-
-    private Integer round;
-
-    private LocalDateTime startAt;
-
-    private LocalDateTime endAt;
-
-    public static MovieTimeDto from(MovieTime movieTime) {
-        return new MovieTimeDto(movieTime.getId(), movieTime.getTheater().getTheaterNumber(),
-            movieTime.getRound(), movieTime.getStartAt(), movieTime.getEndAt());
-    }
-
-}

server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieTimeService.java

@@ -1,11 +0,0 @@
-package com.ticketing.server.movie.service.interfaces;
-
-import com.ticketing.server.movie.service.dto.MovieTimeDto;
-import java.time.LocalDate;
-import java.util.List;
-
-public interface MovieTimeService {
-
-    List<MovieTimeDto> getMovieTimes(String title, LocalDate runningDate);
-
-}

server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieTimesService.java

@@ -0,0 +1,5 @@
+package com.ticketing.server.movie.service.interfaces;
+
+public interface MovieTimesService {
+
+}

server/src/main/java/com/ticketing/server/movie/service/interfaces/TMDBService.java

@@ -0,0 +1,5 @@
+package com.ticketing.server.movie.service.interfaces;
+
+public interface TMDBService {
+
+}

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

@@ -1,63 +0,0 @@
-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,15 +1,19 @@
 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;
@@ -25,16 +29,19 @@ 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/users")
+@RequestMapping("/api/user")
 @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) {
@@ -42,27 +49,48 @@ public class UserController {
 		return ResponseEntity.status(HttpStatus.CREATED).body(SignUpResponse.from(user));
 	}
 
-	@GetMapping("/details")
+	@GetMapping("/info")
 	@Secured("ROLE_GUEST")
-	public ResponseEntity<UserDetailResponse> details(@AuthenticationPrincipal UserDetails userRequest) {
+	public ResponseEntity<UserDetailResponse> myInfo(@AuthenticationPrincipal UserDetails userRequest) {
 		User user = userService.findByEmail(userRequest.getUsername());
 		return ResponseEntity.status(HttpStatus.OK).body(UserDetailResponse.from(user));
 	}
 
 	@DeleteMapping
-	@Secured(UserGrade.ROLES.GUEST)
+	@Secured("ROLE_GUEST")
 	public ResponseEntity<UserDeleteResponse> deleteUser(@RequestBody @Valid UserDeleteRequest request) {
 		User user = userService.delete(request.toDeleteUserDto(passwordEncoder));
 		return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.from(user));
 	}
 
 	@PutMapping("/password")
-	@Secured(UserGrade.ROLES.GUEST)
-	public ResponseEntity<UserChangePasswordResponse> changePassword(
-		@AuthenticationPrincipal UserDetails userRequest,
-		@RequestBody @Valid UserChangePasswordRequest request) {
-		User user = userService.changePassword(request.toChangePasswordDto(userRequest.getUsername(), passwordEncoder));
+	@Secured("ROLE_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));
 		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/UserModifyPasswordRequest.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,12 +11,11 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor
-@FieldsValueNotMatch(
-	field = "oldPassword",
-	fieldMatch = "newPassword",
-	message = "{validation.password.not.change}"
-)
-public class UserChangePasswordRequest {
+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;
@@ -24,8 +23,12 @@ public class UserChangePasswordRequest {
 	@NotEmpty(message = "{validation.not.empty.newpassword}")
 	private String newPassword;
 
-	public ChangePasswordDTO toChangePasswordDto(String email, PasswordEncoder passwordEncoder) {
+	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/LogoutResponse.java

@@ -1,28 +0,0 @@
-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,10 +1,8 @@
 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.TicketingException;
+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;
@@ -25,6 +23,14 @@ 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;
@@ -52,17 +58,9 @@ public class User extends AbstractEntity {
 
 	private LocalDateTime deletedAt;
 
-	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;
-	}
-
 	public User delete(DeleteUserDTO deleteUser) {
 		if (isDeleted) {
-			throw new TicketingException(DELETED_EMAIL);
+			throw new AlreadyDeletedException("이미 탈퇴된 회원 입니다.");
 		}
 
 		checkPassword(deleteUser);
@@ -81,7 +79,7 @@ public class User extends AbstractEntity {
 
 	public void checkPassword(PasswordMatches passwordMatches) {
 		if (!passwordMatches.passwordMatches(password)) {
-			throw new TicketingException(MISMATCH_PASSWORD);
+			throw new PasswordMismatchException();
 		}
 	}
 

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

@@ -1,38 +1,5 @@
 package com.ticketing.server.user.domain;
 
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
 public enum UserGrade {
-	ADMIN(ROLES.ADMIN, null),
-	STAFF(ROLES.STAFF, ROLES.ADMIN),
-	GUEST(ROLES.GUEST, ROLES.STAFF);
-
-	private final String roleName;
-	private final String parentName;
-
-	public static class ROLES {
-
-		public static final String ADMIN = "ROLE_ADMIN";
-		public static final String STAFF = "ROLE_STAFF";
-		public static final String GUEST = "ROLE_GUEST";
-
-		private ROLES() {
-		}
-	}
-
-	public static String getRoleHierarchy() {
-		StringBuilder sb = new StringBuilder();
-
-		for (UserGrade grade : UserGrade.values()) {
-			if (grade.parentName != null) {
-				sb.append(grade.parentName);
-				sb.append(" > ");
-				sb.append(grade.roleName);
-				sb.append("\n");
-			}
-		}
-
-		return sb.toString();
-	}
+	GUEST, STAFF
 }

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

@@ -1,15 +1,12 @@
 package com.ticketing.server.user.service;
 
-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.exception.token.TokenNotFindException;
+import com.ticketing.server.global.exception.token.TokenTypeException;
+import com.ticketing.server.global.exception.token.UnavailableRefreshTokenException;
 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;
@@ -32,7 +29,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
 	@Override
 	@Transactional
-	public TokenDto generateTokenDto(UsernamePasswordAuthenticationToken authenticationToken) {
+	public TokenDto login(UsernamePasswordAuthenticationToken authenticationToken) {
 		// 회원인증
 		Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken);
 
@@ -53,7 +50,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
 	@Override
 	@Transactional
-	public TokenDto reissueTokenDto(String bearerRefreshToken) {
+	public TokenDto reissueAccessToken(String bearerRefreshToken) {
 		String refreshToken = resolveToken(bearerRefreshToken);
 
 		// 토큰 검증
@@ -63,11 +60,11 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
 		// Redis 에 토큰이 있는지 검증
 		RefreshToken findTokenEntity = refreshRedisRepository.findByEmail(authentication.getName())
-			.orElseThrow(() -> new TicketingException(REFRESH_TOKEN_NOT_FOUND));
+			.orElseThrow(TokenNotFindException::new);
 
 		// redis 토큰과 input 토큰이 일치한지 확인
 		if (!refreshToken.equals(findTokenEntity.getToken())) {
-			throw new TicketingException(UNAVAILABLE_REFRESH_TOKEN);
+			throw new UnavailableRefreshTokenException();
 		}
 
 		// 토큰 발급
@@ -80,21 +77,11 @@ 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 TicketingException(TOKEN_TYPE);
+		throw new TokenTypeException();
 	}
 
 }

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

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

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

@@ -1,15 +1,12 @@
 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 generateTokenDto(UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken);
+	TokenDto login(UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken);
 
-	TokenDto reissueTokenDto(String bearerRefreshToken);
-
-	LogoutResponse deleteRefreshToken(String email);
+	TokenDto reissueAccessToken(String bearerRefreshToken);
 
 }

server/src/main/resources/application.yml

@@ -21,7 +21,6 @@ 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,10 +1,9 @@
-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.
+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."

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

@@ -1,10 +1,9 @@
-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.
+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."

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

@@ -1,10 +1,9 @@
-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.
+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."

server/src/test/java/com/ticketing/server/movie/domain/repository/MovieTimeRepositoryTest.java

@@ -1,18 +0,0 @@
-package com.ticketing.server.movie.domain.repository;
-
-import javax.transaction.Transactional;
-import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.TestMethodOrder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-@Transactional
-@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-public class MovieTimeRepositoryTest {
-
-    @Autowired
-    MovieTimeRepository movieTimeRepository;
-
-
-}

server/src/test/java/com/ticketing/server/movie/domain/repository/MovieTimesRepositoryTest.java

@@ -0,0 +1,5 @@
+package com.ticketing.server.movie.domain.repository;
+
+public class MovieTimesRepositoryTest {
+
+}

server/src/test/java/com/ticketing/server/movie/service/MovieServiceImplTest.java

@@ -42,6 +42,7 @@ public class MovieServiceImplTest {
 
         // then
         assertTrue(movieDtoList.isEmpty());
+
     }
 
     @Test
@@ -49,7 +50,7 @@ public class MovieServiceImplTest {
     void shouldAbleToGetMovies() {
         // given
         movie = new Movie("범죄도시2", 106);
-        movieDto = MovieDto.from(movie);
+        movieDto = movie.toDto();
         movies.add(movie);
         movieDtos.add(movieDto);
 

server/src/test/java/com/ticketing/server/movie/service/MovieTimeServiceImplTest.java

@@ -1,58 +0,0 @@
-package com.ticketing.server.movie.service;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.when;
-import static org.mockito.ArgumentMatchers.any;
-
-import com.ticketing.server.movie.domain.Movie;
-import com.ticketing.server.movie.domain.repository.MovieRepository;
-import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
-import com.ticketing.server.movie.service.dto.MovieTimeDto;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.test.annotation.Rollback;
-
-@ExtendWith(MockitoExtension.class)
-public class MovieTimeServiceImplTest {
-
-    LocalDateTime startOfDay = LocalDate.now().atStartOfDay().plusHours(6);
-    LocalDateTime endOfDay = startOfDay.plusDays(1);
-
-    @Mock
-    MovieRepository movieRepository;
-
-    @Mock
-    MovieTimeRepository movieTimeRepository;
-
-    @InjectMocks
-    MovieTimeServiceImpl movieTimeService;
-
-    @Test
-    @DisplayName("MovieTime Service Test - get empty list when there is no valid movie times")
-    void shouldGetEmptyList() {
-        String title = "범죄도시2";
-        Movie movie = new Movie(title, 106);
-
-        when(movieRepository.findByTitle(title)).thenReturn(Optional.of(movie));
-        when(movieTimeRepository.findValidMovieTimes(any(), any(), any()))
-            .thenReturn(Collections.emptyList());
-
-        // when
-        List<MovieTimeDto> movieTimeDtoList = movieTimeService.getMovieTimes(title, LocalDate.now());
-
-        // then
-        assertTrue(movieTimeDtoList.isEmpty());
-
-    }
-
-}

server/src/test/java/com/ticketing/server/movie/service/TMDBServiceImplTest.java

@@ -0,0 +1,94 @@
+package com.ticketing.server.movie.service;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
+
+@SpringBootTest
+public class TMDBServiceImplTest {
+
+    @Value("${tmdb.api-key}")
+    private String apiKey;
+
+    @Value("${tmdb.read-access-token}")
+    private String readAccessToken;
+
+    @Autowired
+    RestTemplate restTemplate;
+
+    @Test
+    @DisplayName("TMDB Service Test - Get [Now Playing] movies")
+    void shouldAbleToGetMovieList() throws Exception {
+        // given
+        assertNotNull(apiKey);
+        assertNotNull(readAccessToken);
+
+        ArrayList<Charset> acceptCharset = new ArrayList<>();
+        acceptCharset.add(StandardCharsets.UTF_8);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setAcceptCharset(acceptCharset);
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setBearerAuth(readAccessToken);
+
+        Map<String, String> params = new HashMap<>();
+        params.put("api_key", apiKey);
+        params.put("language", "ko");
+
+        HttpEntity<?> request = new HttpEntity<>(headers);
+
+        // when
+        ResponseEntity<?> response = restTemplate.exchange(
+            "https://api.themoviedb.org/3/movie/now_playing?" + mapToUrlParam(params),
+            HttpMethod.GET,
+            request,
+            String.class
+        );
+
+//        JSONParser parser  = new JSONParser();
+//        Object obj = parser.parse(String.valueOf(response));
+//        Object results = ((JSONObject) obj).get("results");
+//
+//        ArrayList<String> movieList = new ArrayList<>();
+//
+//        ArrayList<JSONObject> jsonMovieList = new ArrayList<>();
+
+        // then
+        assertTrue(response.getStatusCode().is2xxSuccessful());
+    }
+
+    private static String mapToUrlParam(Map<String, String> params) {
+        StringBuffer paramData = new StringBuffer();
+
+        for (Map.Entry<String, String> param : params.entrySet()) {
+            if (paramData.length() != 0) {
+                paramData.append('&');
+            }
+
+            paramData.append(param.getKey());
+            paramData.append('=');
+            paramData.append(param.getValue());
+        }
+
+        return paramData.toString();
+    }
+
+}
+
+

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

@@ -27,10 +27,7 @@ import org.springframework.web.context.WebApplicationContext;
 
 @SpringBootTest
 @Transactional
-class AuthControllerTest {
-
-	private static final String LOGIN_URL = "/api/auth/token";
-	private static final String REGISTER_URL = "/api/users";
+class UserControllerTest {
 
 	@Autowired
 	WebApplicationContext context;
@@ -56,7 +53,7 @@ class AuthControllerTest {
 		LoginRequest request = new LoginRequest("ticketing@gmail.com", "qwe123");
 
 		// when
-		ResultActions actions = mvc.perform(post(LOGIN_URL)
+		ResultActions actions = mvc.perform(post("/api/user/login")
 			.content(asJsonString(request))
 			.contentType(MediaType.APPLICATION_JSON));
 
@@ -72,7 +69,7 @@ class AuthControllerTest {
 		LoginRequest request = new LoginRequest("ticketing@gmail.com", "qwe1234");
 
 		// when
-		ResultActions actions = mvc.perform(post(LOGIN_URL)
+		ResultActions actions = mvc.perform(post("/api/user/login")
 			.content(asJsonString(request))
 			.contentType(MediaType.APPLICATION_JSON));
 
@@ -94,7 +91,7 @@ class AuthControllerTest {
 
 		SignUpRequest signUpRequest = new SignUpRequest("ticketing", "ticketing@gmail.com", "qwe123", "010-2240-7920");
 
-		mvc.perform(post(REGISTER_URL)
+		mvc.perform(post("/api/user")
 			.content(asJsonString(signUpRequest))
 			.contentType(MediaType.APPLICATION_JSON));
 	}

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

@@ -4,7 +4,8 @@ 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.TicketingException;
+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;
@@ -44,7 +45,7 @@ class UserTest {
 		// when
 		// then
 		assertThatThrownBy(() -> user.delete(deleteUser))
-			.isInstanceOf(TicketingException.class);
+			.isInstanceOf(PasswordMismatchException.class);
 	}
 
 	@ParameterizedTest
@@ -59,8 +60,7 @@ class UserTest {
 
 		// then
 		assertThatThrownBy(() -> user.delete(deleteUserDto))
-			.isInstanceOf(TicketingException.class);
-
+			.isInstanceOf(AlreadyDeletedException.class);
 	}
 
 	@ParameterizedTest
@@ -90,7 +90,7 @@ class UserTest {
 		// when
 		// then
 		assertThatThrownBy(() -> user.changePassword(changePasswordDto))
-			.isInstanceOf(TicketingException.class);
+			.isInstanceOf(PasswordMismatchException.class);
 	}
 
 	@Test

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.reissueTokenDto(refreshToken);
+		TokenDto tokenDto = authenticationService.reissueAccessToken(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.TicketingException;
+import com.ticketing.server.global.exception.EmailNotFoundException;
 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(TicketingException.class);
+			.isInstanceOf(IllegalArgumentException.class);
 	}
 
 	@Test
@@ -75,19 +75,19 @@ class UserServiceImplTest {
 	@DisplayName("회원탈퇴 시 이메일이 존재하지 않을 경우")
 	void deleteFail() {
 		// given
-		when(userRepository.findByEmailAndIsDeletedFalse("ticketing@gmail.com")).thenReturn(Optional.empty());
+		when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.empty());
 
 		// when
 		// then
 		assertThatThrownBy(() -> userService.delete(deleteUserDto))
-			.isInstanceOf(TicketingException.class);
+			.isInstanceOf(EmailNotFoundException.class);
 	}
 
 	@Test
 	@DisplayName("회원탈퇴 성공했을 경우")
 	void deleteSuccess() {
 		// given
-		when(userRepository.findByEmailAndIsDeletedFalse("ticketing@gmail.com")).thenReturn(Optional.of(user));
+		when(userRepository.findByEmail("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(TicketingException.class);
+			.isInstanceOf(EmailNotFoundException.class);
 	}
 
 	@Test

server/src/test/resources/application.yml

@@ -31,3 +31,7 @@ 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

test/.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

test/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

test/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/test.iml" filepath="$PROJECT_DIR$/test.iml" />
-    </modules>
-  </component>
-</project>

test/.idea/runConfigurations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

test/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>

test/src/SnowFlake.java

@@ -1,148 +0,0 @@
-public class SnowFlake {
-
-    //Data center (machine room) id
-    private long datacenterId;
-    //Machine ID
-    private long workerId;
-    //Same time series
-    private long sequence;
-
-    public SnowFlake(long workerId, long datacenterId) {
-        this(workerId, datacenterId, 0);
-    }
-
-    public SnowFlake(long workerId, long datacenterId, long sequence) {
-        //Legal judgment
-        if (workerId > maxWorkerId || workerId < 0) {
-            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
-        }
-        if (datacenterId > maxDatacenterId || datacenterId < 0) {
-            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
-        }
-        System.out.printf("worker starting. timestamp left shift %d, datacenter id bits %d, worker id bits %d, sequence bits %d, workerid %d",
-            timestampLeftShift, datacenterIdBits, workerIdBits, sequenceBits, workerId);
-
-        this.workerId = workerId;
-        this.datacenterId = datacenterId;
-        this.sequence = sequence;
-    }
-
-    //Start timestamp
-    private long twepoch = 1420041600000L;
-
-    //Machine room number, the number of digits occupied by the ID of the machine room is 5 bits, the maximum is 11111 (binary) - > 31 (decimal)
-    private long datacenterIdBits = 5L;
-
-    //Machine ID所占的位数 5个bit 最大:11111(2进制)--> 31(10进制)
-    private long workerIdBits = 5L;
-
-    //5 bit can only have 31 digits at most, that is, the machine ID can only be within 32 at most
-    private long maxWorkerId = -1L ^ (-1L << workerIdBits);
-
-    //5-bit can only have 31 digits at most, and the machine room ID can only be within 32 at most
-    private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
-
-    //Same time series所占的位数 12个bit 111111111111 = 4095  最多就是同一毫秒生成4096个
-    private long sequenceBits = 12L;
-
-    //Offset of workerid
-    private long workerIdShift = sequenceBits;
-
-    //Offset of datacenter ID
-    private long datacenterIdShift = sequenceBits + workerIdBits;
-
-    //Offset of timestampleft
-    private long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
-
-    //Serial number mask 4095 (0b111111 = 0xfff = 4095)
-    //It is used for the sum operation of serial number to ensure that the maximum value of serial number is between 0-4095
-    private long sequenceMask = -1L ^ (-1L << sequenceBits);
-
-    //Last timestamp
-    private long lastTimestamp = -1L;
-
-
-    //Get machine ID
-    public long getWorkerId() {
-        return workerId;
-    }
-
-
-    //Get machine room ID
-    public long getDatacenterId() {
-        return datacenterId;
-    }
-
-
-    //Get the latest timestamp
-    public long getLastTimestamp() {
-        return lastTimestamp;
-    }
-
-
-    //Get the next random ID
-    public synchronized long nextId() {
-        //Gets the current timestamp in milliseconds
-        long timestamp = timeGen();
-
-        if (timestamp < lastTimestamp) {
-            System.err.printf("clock is moving backwards.  Rejecting requests until %d.", lastTimestamp);
-            throw new RuntimeException(String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds",
-                lastTimestamp - timestamp));
-        }
-
-        //Weight removal
-        if (lastTimestamp == timestamp) {
-
-            sequence = (sequence + 1) & sequenceMask;
-
-            //Sequence sequence is greater than 4095
-            if (sequence == 0) {
-                //Method called to the next timestamp
-                timestamp = tilNextMillis(lastTimestamp);
-            }
-        } else {
-            //If it is the first acquisition of the current time, it is set to 0
-            sequence = 0;
-        }
-
-        //Record the last timestamp
-        lastTimestamp = timestamp;
-
-        //Offset calculation
-        return ((timestamp - twepoch) << timestampLeftShift) |
-            (datacenterId << datacenterIdShift) |
-            (workerId << workerIdShift) |
-            sequence;
-    }
-
-    private long tilNextMillis(long lastTimestamp) {
-        //Get latest timestamp
-        long timestamp = timeGen();
-        //If the latest timestamp is found to be less than or equal to the timestamp whose serial number has exceeded 4095
-        while (timestamp <= lastTimestamp) {
-            //If not, continue
-            timestamp = timeGen();
-        }
-        return timestamp;
-    }
-
-    private long timeGen() {
-        return System.currentTimeMillis();
-    }
-
-    public static void main(String[] args) {
-        SnowFlake worker = new SnowFlake(1, 1);
-        long timer = System.currentTimeMillis();
-        for (int i = 0; i < 100; i++) {
-            worker.nextId();
-        }
-        System.out.println(System.currentTimeMillis());
-        System.out.println(System.currentTimeMillis() - timer);
-        for(int i=0; i<200; i++) {
-            System.out.println( );
-            System.out.println(worker.nextId());
-        }
-    }
-
-}

test/test.iml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>