refactor: set ddl-auto: validate

server/.gitignore

@@ -6,7 +6,6 @@
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 HELP.md
-bin/**
 
 # User-specific stuff
 .idea/**/workspace.xml

server/src/intTest/java/com/ticketing/server/movie/aop/TicketLockAspectTest.java

@@ -1,56 +0,0 @@
-package com.ticketing.server.movie.aop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertAll;
-
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class TicketLockAspectTest {
-
-	@Autowired
-	private TicketLockAspect ticketLockAspect;
-
-	@Test
-	@DisplayName("티켓 lock 동시성 체크")
-	@SuppressWarnings({"java:S5960"})
-	void ticketMultiThread() throws InterruptedException {
-		// given
-		ExecutorService executorService = Executors.newFixedThreadPool(2);
-		CountDownLatch latch = new CountDownLatch(2);
-
-		List<String> lockIds = List.of("TicketLock:1", "TicketLock:2", "TicketLock:3");
-		AtomicBoolean result1 = new AtomicBoolean(Boolean.TRUE);
-		AtomicBoolean result2 = new AtomicBoolean(Boolean.TRUE);
-
-		// when
-		executorService.execute(() -> {
-			result1.set(ticketLockAspect.isEveryTicketIdLock(lockIds));
-			latch.countDown();
-		});
-
-		executorService.execute(() -> {
-			result2.set(ticketLockAspect.isEveryTicketIdLock(List.of("TicketLock:1")));
-			latch.countDown();
-		});
-
-		latch.await();
-
-		// then
-		Long unlockCount = ticketLockAspect.ticketIdsUnlock(lockIds);
-
-		assertAll(
-			() -> assertThat(result1).isNotEqualTo(result2),
-			() -> assertThat(unlockCount > 0).isTrue()
-		);
-	}
-
-}

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

@@ -1,7 +1,5 @@
 package com.ticketing.server.user.application;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
@@ -11,11 +9,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ticketing.server.global.redis.RefreshRedisRepository;
 import com.ticketing.server.user.application.request.LoginRequest;
-import com.ticketing.server.user.application.request.RefreshRequest;
 import com.ticketing.server.user.application.request.SignUpRequest;
-import com.ticketing.server.user.application.response.TokenResponse;
 import com.ticketing.server.user.service.interfaces.UserService;
-import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -35,12 +30,8 @@ import org.springframework.web.context.WebApplicationContext;
 class AuthControllerTest {
 
 	private static final String LOGIN_URL = "/api/auth/token";
-	private static final String REFRESH_URL = "/api/auth/refresh";
-	private static final String LOGOUT_URL = "/api/auth/logout";
 	private static final String REGISTER_URL = "/api/users";
-
 	private static final String USER_EMAIL = "ticketing@gmail.com";
-	private static final String USER_PW = "qwe123";
 
 	@Autowired
 	WebApplicationContext context;
@@ -63,7 +54,7 @@ class AuthControllerTest {
 	@DisplayName("로그인 인증 성공")
 	void loginSuccess() throws Exception {
 		// given
-		LoginRequest request = new LoginRequest(USER_EMAIL, USER_PW);
+		LoginRequest request = new LoginRequest(USER_EMAIL, "qwe123");
 
 		// when
 		ResultActions actions = mvc.perform(post(LOGIN_URL)
@@ -91,69 +82,6 @@ class AuthControllerTest {
 			.andExpect(status().isUnauthorized());
 	}
 
-	@Test
-	@DisplayName("리프레쉬 토큰 발급 성공")
-	void refreshTokenSuccess() throws Exception {
-		// given
-		LoginRequest loginRequest = new LoginRequest(USER_EMAIL, USER_PW);
-
-		// when
-		// 로그인
-		String loginResponseBody = mvc.perform(post(LOGIN_URL)
-				.content(asJsonString(loginRequest))
-				.contentType(MediaType.APPLICATION_JSON))
-			.andReturn()
-			.getResponse()
-			.getContentAsString();
-
-		TokenResponse loginResponse = objectMapper.readValue(loginResponseBody, TokenResponse.class);
-		RefreshRequest refreshRequest = new RefreshRequest(loginResponse.getRefreshToken());
-
-		// 토큰재발급
-		String refreshResponseBody = mvc.perform(post(REFRESH_URL)
-				.content(asJsonString(refreshRequest))
-				.contentType(MediaType.APPLICATION_JSON))
-			.andReturn()
-			.getResponse()
-			.getContentAsString();
-
-		TokenResponse refreshBody = objectMapper.readValue(refreshResponseBody, TokenResponse.class);
-
-		// then
-		assertAll(
-			() -> assertThat(refreshBody.getAccessToken()).isNotEmpty(),
-			() -> assertThat(refreshBody.getRefreshToken()).isNotEmpty(),
-			() -> assertThat(loginResponse.getTokenType()).isEqualTo(refreshBody.getTokenType()),
-			() -> assertThat(loginResponse.getExpiresIn()).isEqualTo(refreshBody.getExpiresIn())
-		);
-	}
-
-	@Test
-	@DisplayName("로그아웃 성공")
-	void logoutSuccess() throws Exception {
-		// given
-		LoginRequest loginRequest = new LoginRequest(USER_EMAIL, USER_PW);
-
-		// 로그인
-		String loginResponseBody = mvc.perform(post(LOGIN_URL)
-				.content(asJsonString(loginRequest))
-				.contentType(MediaType.APPLICATION_JSON))
-			.andReturn()
-			.getResponse()
-			.getContentAsString();
-
-		TokenResponse loginResponse = objectMapper.readValue(loginResponseBody, TokenResponse.class);
-		String authorization = loginResponse.getTokenType() + " " + loginResponse.getAccessToken();
-
-		// 로그아웃
-		ResultActions actions = mvc.perform(post(LOGOUT_URL)
-			.header("Authorization", authorization));
-
-		// then
-		actions.andDo(print())
-			.andExpect(status().isOk());
-	}
-
 	@BeforeEach
 	void init() throws Exception {
 		mvc = MockMvcBuilders
@@ -161,7 +89,7 @@ class AuthControllerTest {
 			.apply(springSecurity())
 			.build();
 
-		SignUpRequest signUpRequest = new SignUpRequest("ticketing", USER_EMAIL, USER_PW, "010-1234-5678");
+		SignUpRequest signUpRequest = new SignUpRequest("ticketing", USER_EMAIL, "qwe123", "010-1234-5678");
 
 		mvc.perform(post(REGISTER_URL)
 			.content(asJsonString(signUpRequest))
@@ -174,7 +102,6 @@ class AuthControllerTest {
 	}
 
 	private String asJsonString(Object object) throws JsonProcessingException {
-
 		return objectMapper.writeValueAsString(object);
 	}
 

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

@@ -69,6 +69,7 @@ class UserControllerTest {
 
 	SignUpRequest signUpRequest;
 
+
 	@Test
 	@DisplayName("회원가입 성공")
 	void registerSuccess() throws Exception {

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

@@ -5,6 +5,7 @@ import static org.springframework.http.HttpStatus.CONFLICT;
 import static org.springframework.http.HttpStatus.FORBIDDEN;
 import static org.springframework.http.HttpStatus.NOT_FOUND;
 
+import com.ticketing.server.global.redis.PaymentCache;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.springframework.http.HttpStatus;
@@ -23,11 +24,8 @@ public enum ErrorCode {
 	BAD_REQUEST_PAYMENT_COMPLETE(BAD_REQUEST, "처리할 결제 정보가 존재하지 않습니다."),
 	BAD_REQUEST_PAYMENT_READY(BAD_REQUEST, "이미 진행 중인 결제가 존재합니다."),
 	BAD_REQUEST_PAYMENT_CANCEL(BAD_REQUEST, "취소할 티켓이 존재하지 않습니다."),
-	BAD_REQUEST_TICKET_RESERVATION(BAD_REQUEST, "이미 다른 고객이 예약 진행 중인 좌석이 존재합니다."),
-	BAD_REQUEST_TICKET_SOLD(BAD_REQUEST, "이미 환불 진행 중 입니다."),
 	NOT_REFUNDABLE_TIME(BAD_REQUEST, "환불이 가능한 시간이 지났습니다."),
 	NOT_REFUNDABLE_SEAT(BAD_REQUEST, "환불할 수 있는 좌석이 아닙니다."),
-	EMPTY_TICKET_ID(BAD_REQUEST, "티켓 정보가 존재하지 않습니다."),
 
 	/* 403 FORBIDDEN : 접근 권한 제한 */
 	VALID_USER_ID(FORBIDDEN, "해당 정보에 접근 권한이 존재하지 않습니다."),
@@ -50,7 +48,7 @@ public enum ErrorCode {
 	DELETED_MOVIE(CONFLICT, "이미 삭제된 영화 입니다.");
 
 	private final HttpStatus httpStatus;
-	private final String detail;
+	private String detail;
 
 	/* 400 BAD_REQUEST : 잘못된 요청 */
 	public static TicketingException throwMismatchPassword() {
@@ -69,6 +67,14 @@ public enum ErrorCode {
 		throw new TicketingException(UNABLE_CHANGE_GRADE);
 	}
 
+	public static TicketingException throwInvalidTicketId() {
+		throw new TicketingException(INVALID_TICKET_ID);
+	}
+
+	public static TicketingException throwBadRequestMovieTime() {
+		throw new TicketingException(BAD_REQUEST_MOVIE_TIME);
+	}
+
 	public static TicketingException throwBadRequestPaymentComplete() {
 		throw new TicketingException(BAD_REQUEST_PAYMENT_COMPLETE);
 	}
@@ -77,12 +83,27 @@ public enum ErrorCode {
 		throw new TicketingException(BAD_REQUEST_PAYMENT_READY);
 	}
 
+	public static TicketingException throwBadRequestPaymentCancel() {
+		throw new TicketingException(BAD_REQUEST_PAYMENT_CANCEL);
+	}
+
+	public static TicketingException throwNotRefundableTime() {
+		throw new TicketingException(NOT_REFUNDABLE_TIME);
+	}
+
+	public static TicketingException throwNotRefundableSeat() {
+		throw new TicketingException(NOT_REFUNDABLE_SEAT);
+	}
+
 	/* 403 FORBIDDEN : 접근 권한 제한 */
 	public static TicketingException throwValidUserId() {
 		throw new TicketingException(VALID_USER_ID);
 	}
 
 	/* 404 NOT_FOUND : Resource 를 찾을 수 없음 */
+	public static TicketingException throwUserNotFound() {
+		throw new TicketingException(USER_NOT_FOUND);
+	}
 
 	public static TicketingException throwEmailNotFound() {
 		throw new TicketingException(EMAIL_NOT_FOUND);
@@ -92,6 +113,10 @@ public enum ErrorCode {
 		throw new TicketingException(MOVIE_NOT_FOUND);
 	}
 
+	public static TicketingException throwMovieTimeNotFound() {
+		throw new TicketingException(MOVIE_TIME_NOT_FOUND);
+	}
+
 	public static TicketingException throwRefreshTokenNotFound() {
 		throw new TicketingException(REFRESH_TOKEN_NOT_FOUND);
 	}

server/src/main/java/com/ticketing/server/global/redis/RefreshToken.java

@@ -28,9 +28,8 @@ public class RefreshToken {
 		this.token = token;
 	}
 
-	public RefreshToken changeToken(String token) {
+	public void changeToken(String token) {
 		this.token = token;
-		return this;
 	}
 
 }

server/src/main/java/com/ticketing/server/global/security/jwt/JwtProvider.java

@@ -27,7 +27,6 @@ public class JwtProvider {
 
 	private static final String AUTHORITIES_KEY = "auth";
 	private static final String AUTHORITIES_DELIMITER = ",";
-	private static final String ROLE = "ROLE_";
 
 	private final Key key;
 	private final String prefix;
@@ -90,7 +89,7 @@ public class JwtProvider {
 	}
 
 	private String makeRoleName(String role) {
-		return role.contains(ROLE) ? role.toUpperCase() : ROLE + role.toUpperCase();
+		return "ROLE_" + role.toUpperCase();
 	}
 
 	public Authentication getAuthentication(String token) {

server/src/main/java/com/ticketing/server/movie/aop/TicketLockAspect.java

@@ -1,64 +0,0 @@
-package com.ticketing.server.movie.aop;
-
-import static com.ticketing.server.movie.domain.TicketLock.LOCK_VALUE;
-
-import com.ticketing.server.global.exception.ErrorCode;
-import com.ticketing.server.global.exception.TicketingException;
-import com.ticketing.server.movie.service.dto.TicketIdsDTO;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import lombok.RequiredArgsConstructor;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-
-@Component
-@Aspect
-@RequiredArgsConstructor
-public class TicketLockAspect {
-
-	private final RedisTemplate<String, Object> redisTemplate;
-
-	@Around("execution(* com.ticketing.server.movie.service.TicketLockService.*(..))")
-	public Object ticketLock(ProceedingJoinPoint joinPoint) throws Throwable {
-		List<String> ticketLockIds = getTicketLockIds(joinPoint);
-
-		try {
-			if (!isEveryTicketIdLock(ticketLockIds)) {
-				throw new TicketingException(ErrorCode.BAD_REQUEST_TICKET_SOLD);
-			}
-
-			return joinPoint.proceed();
-		} finally {
-			ticketIdsUnlock(ticketLockIds);
-		}
-	}
-
-	protected boolean isEveryTicketIdLock(List<String> ids) {
-		for (String id : ids) {
-			if (Boolean.FALSE.equals(redisTemplate.opsForValue().setIfAbsent(id, LOCK_VALUE.getValue(), 5, TimeUnit.MINUTES))) {
-				return Boolean.FALSE;
-			}
-		}
-		return Boolean.TRUE;
-	}
-
-	protected Long ticketIdsUnlock(List<String> ids) {
-		return redisTemplate.delete(ids);
-	}
-
-	private List<String> getTicketLockIds(ProceedingJoinPoint joinPoint) {
-		for (Object arg : joinPoint.getArgs()) {
-			if (arg instanceof TicketIdsDTO) {
-				TicketIdsDTO ids = (TicketIdsDTO) arg;
-				return ids.makeTicketLockIds();
-			}
-		}
-
-		throw new TicketingException(ErrorCode.EMPTY_TICKET_ID);
-	}
-
-
-}

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

@@ -1,13 +1,7 @@
 package com.ticketing.server.movie.domain;
 
-import static com.ticketing.server.global.exception.ErrorCode.BAD_REQUEST_PAYMENT_CANCEL;
-import static com.ticketing.server.global.exception.ErrorCode.DUPLICATE_PAYMENT;
-import static com.ticketing.server.global.exception.ErrorCode.NOT_REFUNDABLE_SEAT;
-import static com.ticketing.server.global.exception.ErrorCode.NOT_REFUNDABLE_TIME;
-
 import com.ticketing.server.global.dto.repository.AbstractEntity;
 import com.ticketing.server.global.exception.ErrorCode;
-import com.ticketing.server.global.exception.TicketingException;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import javax.persistence.Entity;
@@ -62,7 +56,7 @@ public class Ticket extends AbstractEntity {
 
 	public Ticket makeReservation() {
 		if (!TicketStatus.SALE.equals(status)) {
-			throw new TicketingException(DUPLICATE_PAYMENT);
+			throw ErrorCode.throwDuplicatePayment();
 		}
 
 		status = TicketStatus.RESERVATION;
@@ -71,7 +65,7 @@ public class Ticket extends AbstractEntity {
 
 	public Ticket makeSold(Long paymentId) {
 		if (TicketStatus.SOLD.equals(status)) {
-			throw new TicketingException(DUPLICATE_PAYMENT);
+			throw ErrorCode.throwDuplicatePayment();
 		}
 
 		status = TicketStatus.SOLD;
@@ -81,7 +75,7 @@ public class Ticket extends AbstractEntity {
 
 	public Ticket cancel() {
 		if (!TicketStatus.RESERVATION.equals(status)) {
-			throw new TicketingException(BAD_REQUEST_PAYMENT_CANCEL);
+			throw ErrorCode.throwBadRequestPaymentCancel();
 		}
 
 		status = TicketStatus.SALE;
@@ -92,7 +86,7 @@ public class Ticket extends AbstractEntity {
 	public Ticket refund(LocalDateTime dateTime) {
 		long seconds = ChronoUnit.SECONDS.between(dateTime, getStartAt());
 		if (600L > seconds) {
-			throw new TicketingException(NOT_REFUNDABLE_TIME);
+			throw ErrorCode.throwNotRefundableTime();
 		}
 
 		return refund();
@@ -100,7 +94,7 @@ public class Ticket extends AbstractEntity {
 
 	public Ticket refund() {
 		if (!TicketStatus.SOLD.equals(status)) {
-			throw new TicketingException(NOT_REFUNDABLE_SEAT);
+			throw ErrorCode.throwNotRefundableSeat();
 		}
 
 		status = TicketStatus.SALE;

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

@@ -1,15 +0,0 @@
-package com.ticketing.server.movie.domain;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@Getter
-@RequiredArgsConstructor
-public enum TicketLock {
-
-	LOCK_KEY("TicketLock"),
-	LOCK_VALUE("lock");
-
-	private final String value;
-
-}

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

@@ -1,77 +0,0 @@
-package com.ticketing.server.movie.service;
-
-import static com.ticketing.server.global.exception.ErrorCode.BAD_REQUEST_MOVIE_TIME;
-import static com.ticketing.server.global.exception.ErrorCode.INVALID_TICKET_ID;
-
-import com.ticketing.server.global.exception.TicketingException;
-import com.ticketing.server.movie.domain.Ticket;
-import com.ticketing.server.movie.domain.repository.TicketRepository;
-import com.ticketing.server.movie.service.dto.TicketIdsDTO;
-import com.ticketing.server.movie.service.dto.TicketReservationDTO;
-import com.ticketing.server.movie.service.dto.TicketSoldDTO;
-import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
-import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-@Service
-@RequiredArgsConstructor
-@Validated
-public class TicketLockService {
-
-	private final TicketRepository ticketRepository;
-
-	public TicketsReservationDTO ticketReservation(@Valid TicketIdsDTO ticketIdsDto) {
-		List<Ticket> tickets = getTicketsByInTicketIds(ticketIdsDto.getTicketIds());
-
-		Long firstMovieTimeId = firstMovieTimeId(tickets);
-		List<TicketReservationDTO> reservationDtoList = tickets.stream()
-			.map(Ticket::makeReservation)
-			.filter(ticket -> firstMovieTimeId.equals(ticket.getMovieTimeId()))
-			.map(TicketReservationDTO::new)
-			.collect(Collectors.toList());
-
-		if (tickets.size() != reservationDtoList.size()) {
-			throw new TicketingException(BAD_REQUEST_MOVIE_TIME);
-		}
-
-		return new TicketsReservationDTO(firstMovieTitle(tickets), reservationDtoList);
-	}
-
-	public TicketsSoldDTO ticketSold(@NotNull Long paymentId, @Valid TicketIdsDTO ticketIdsDto) {
-		List<Ticket> tickets = getTicketsByInTicketIds(ticketIdsDto.getTicketIds());
-
-		List<TicketSoldDTO> soldDtoList = tickets.stream()
-			.map(ticket -> ticket.makeSold(paymentId))
-			.map(TicketSoldDTO::new)
-			.collect(Collectors.toList());
-
-		return new TicketsSoldDTO(paymentId, soldDtoList);
-	}
-
-	private List<Ticket> getTicketsByInTicketIds(List<Long> ticketIds) {
-		List<Ticket> tickets = ticketRepository.findTicketFetchJoinByTicketIds(ticketIds);
-
-		if (tickets.size() != ticketIds.size()) {
-			throw new TicketingException(INVALID_TICKET_ID);
-		}
-
-		return tickets;
-	}
-
-	private Long firstMovieTimeId(List<Ticket> tickets) {
-		Ticket ticket = tickets.get(0);
-		return ticket.getMovieTimeId();
-	}
-
-	private String firstMovieTitle(List<Ticket> tickets) {
-		Ticket ticket = tickets.get(0);
-		return ticket.getMovieTitle();
-	}
-
-}

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

@@ -1,18 +1,15 @@
 package com.ticketing.server.movie.service;
 
-import static com.ticketing.server.global.exception.ErrorCode.INVALID_TICKET_ID;
-import static com.ticketing.server.global.exception.ErrorCode.MOVIE_TIME_NOT_FOUND;
-import static com.ticketing.server.global.exception.ErrorCode.PAYMENT_ID_NOT_FOUND;
-
-import com.ticketing.server.global.exception.TicketingException;
+import com.ticketing.server.global.exception.ErrorCode;
 import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
 import com.ticketing.server.movie.domain.MovieTime;
 import com.ticketing.server.movie.domain.Ticket;
 import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
 import com.ticketing.server.movie.domain.repository.TicketRepository;
 import com.ticketing.server.movie.service.dto.TicketDTO;
-import com.ticketing.server.movie.service.dto.TicketIdsDTO;
 import com.ticketing.server.movie.service.dto.TicketRefundDTO;
+import com.ticketing.server.movie.service.dto.TicketReservationDTO;
+import com.ticketing.server.movie.service.dto.TicketSoldDTO;
 import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
 import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
 import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
@@ -36,13 +33,13 @@ import org.springframework.validation.annotation.Validated;
 public class TicketServiceImpl implements TicketService {
 
 	private final TicketRepository ticketRepository;
+
 	private final MovieTimeRepository movieTimeRepository;
-	private final TicketLockService ticketLockService;
 
 	@Override
 	public List<TicketDTO> getTickets(@NotNull Long movieTimeId) {
 		MovieTime movieTime = movieTimeRepository.findById(movieTimeId)
-			.orElseThrow(() -> new TicketingException(MOVIE_TIME_NOT_FOUND));
+			.orElseThrow(ErrorCode::throwMovieTimeNotFound);
 
 		return ticketRepository.findValidTickets(movieTime)
 			.stream()
@@ -58,7 +55,7 @@ public class TicketServiceImpl implements TicketService {
 			.collect(Collectors.toList());
 
 		if (ticketDetails.isEmpty()) {
-			throw new TicketingException(PAYMENT_ID_NOT_FOUND);
+			throw ErrorCode.throwPaymentIdNotFound();
 		}
 
 		return ticketDetails;
@@ -67,13 +64,33 @@ public class TicketServiceImpl implements TicketService {
 	@Override
 	@Transactional
 	public TicketsReservationDTO ticketReservation(@NotEmptyCollection List<Long> ticketIds) {
-		return ticketLockService.ticketReservation(new TicketIdsDTO(ticketIds));
+		List<Ticket> tickets = getTicketsByInTicketIds(ticketIds);
+
+		Long firstMovieTimeId = firstMovieTimeId(tickets);
+		List<TicketReservationDTO> reservationDtoList = tickets.stream()
+			.map(Ticket::makeReservation)
+			.filter(ticket -> firstMovieTimeId.equals(ticket.getMovieTimeId()))
+			.map(TicketReservationDTO::new)
+			.collect(Collectors.toList());
+
+		if (ticketIds.size() != reservationDtoList.size()) {
+			throw ErrorCode.throwBadRequestMovieTime();
+		}
+
+		return new TicketsReservationDTO(firstMovieTitle(tickets), reservationDtoList);
 	}
 
 	@Override
 	@Transactional
 	public TicketsSoldDTO ticketSold(@NotNull Long paymentId, @NotEmptyCollection List<Long> ticketIds) {
-		return ticketLockService.ticketSold(paymentId, new TicketIdsDTO(ticketIds));
+		List<Ticket> tickets = getTicketsByInTicketIds(ticketIds);
+
+		List<TicketSoldDTO> soldDtoList = tickets.stream()
+			.map(ticket -> ticket.makeSold(paymentId))
+			.map(TicketSoldDTO::new)
+			.collect(Collectors.toList());
+
+		return new TicketsSoldDTO(paymentId, soldDtoList);
 	}
 
 	@Override
@@ -100,10 +117,20 @@ public class TicketServiceImpl implements TicketService {
 		List<Ticket> tickets = ticketRepository.findTicketFetchJoinByTicketIds(ticketIds);
 
 		if (tickets.size() != ticketIds.size()) {
-			throw new TicketingException(INVALID_TICKET_ID);
+			throw ErrorCode.throwInvalidTicketId();
 		}
 
 		return tickets;
 	}
 
+	private Long firstMovieTimeId(List<Ticket> tickets) {
+		Ticket ticket = tickets.get(0);
+		return ticket.getMovieTimeId();
+	}
+
+	private String firstMovieTitle(List<Ticket> tickets) {
+		Ticket ticket = tickets.get(0);
+		return ticket.getMovieTitle();
+	}
+
 }

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

@@ -1,24 +0,0 @@
-package com.ticketing.server.movie.service.dto;
-
-import static com.ticketing.server.movie.domain.TicketLock.LOCK_KEY;
-
-import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
-import java.util.List;
-import java.util.stream.Collectors;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class TicketIdsDTO {
-
-	@NotEmptyCollection
-	private List<Long> ticketIds;
-
-	public List<String> makeTicketLockIds() {
-		return ticketIds.stream()
-			.map(id -> LOCK_KEY.getValue() + ":" + id)
-			.collect(Collectors.toList());
-	}
-
-}

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

@@ -3,7 +3,6 @@ package com.ticketing.server.movie.service.interfaces;
 import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
 import com.ticketing.server.movie.domain.Ticket;
 import com.ticketing.server.movie.service.dto.TicketDTO;
-import com.ticketing.server.movie.service.dto.TicketIdsDTO;
 import com.ticketing.server.movie.service.dto.TicketRefundDTO;
 import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
 import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
@@ -11,7 +10,6 @@ import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
 import com.ticketing.server.payment.service.dto.TicketDetailDTO;
 import java.util.List;
 import java.util.function.UnaryOperator;
-import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
 public interface TicketService {

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

@@ -1,11 +1,10 @@
 package com.ticketing.server.user.application;
 
 import com.ticketing.server.user.application.request.LoginRequest;
-import com.ticketing.server.user.application.request.RefreshRequest;
 import com.ticketing.server.user.application.response.LogoutResponse;
+import com.ticketing.server.user.service.dto.TokenDTO;
 import com.ticketing.server.user.application.response.TokenResponse;
 import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
-import com.ticketing.server.user.service.dto.TokenDTO;
 import com.ticketing.server.user.service.interfaces.AuthenticationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -17,6 +16,7 @@ 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
@@ -37,8 +37,8 @@ public class AuthController {
 	}
 
 	@PostMapping("/refresh")
-	public ResponseEntity<TokenResponse> refreshToken(@RequestBody RefreshRequest request) {
-		TokenDTO tokenDto = authenticationService.reissueTokenDto(request.getRefreshToken());
+	public ResponseEntity<TokenResponse> refreshToken(@RequestParam("refreshToken") String refreshToken) {
+		TokenDTO tokenDto = authenticationService.reissueTokenDto(refreshToken);
 
 		return ResponseEntity.status(HttpStatus.OK)
 			.headers(getHttpHeaders())

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

@@ -1,14 +0,0 @@
-package com.ticketing.server.user.application.request;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Getter
-@NoArgsConstructor
-@AllArgsConstructor
-public class RefreshRequest {
-
-	private String refreshToken;
-
-}

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

@@ -2,16 +2,14 @@ package com.ticketing.server.user.application.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 @Getter
-@NoArgsConstructor
 @AllArgsConstructor
 public class TokenResponse {
 
-	private String accessToken;
-	private String refreshToken;
-	private String tokenType;
-	private long expiresIn;
+	private final String accessToken;
+	private final String refreshToken;
+	private final String tokenType;
+	private final long expiresIn;
 
 }

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

@@ -3,9 +3,10 @@ package com.ticketing.server.user.service;
 import com.ticketing.server.global.exception.ErrorCode;
 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.service.dto.DeleteRefreshTokenDTO;
 import com.ticketing.server.user.service.dto.TokenDTO;
+import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
 import com.ticketing.server.user.service.interfaces.AuthenticationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -13,6 +14,7 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 @Service
 @RequiredArgsConstructor
@@ -21,6 +23,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 	private final RefreshRedisRepository refreshRedisRepository;
 
 	private final JwtProvider jwtProvider;
+	private final JwtProperties jwtProperties;
 	private final AuthenticationManagerBuilder authenticationManagerBuilder;
 
 	@Override
@@ -37,14 +40,8 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 		// refresh 토큰이 있으면 수정, 없으면 생성
 		refreshRedisRepository.findByEmail(email)
 			.ifPresentOrElse(
-				tokenEntity -> refreshRedisRepository.save(
-					tokenEntity.changeToken(
-						tokenDto.getRefreshToken()
-					)
-				),
-				() -> refreshRedisRepository.save(
-					new RefreshToken(email, tokenDto.getRefreshToken())
-				)
+				tokenEntity -> tokenEntity.changeToken(tokenDto.getRefreshToken()),
+				() -> refreshRedisRepository.save(new RefreshToken(email, tokenDto.getRefreshToken()))
 			);
 
 		return tokenDto;
@@ -52,7 +49,9 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
 	@Override
 	@Transactional
-	public TokenDTO reissueTokenDto(String refreshToken) {
+	public TokenDTO reissueTokenDto(String bearerRefreshToken) {
+		String refreshToken = resolveToken(bearerRefreshToken);
+
 		// 토큰 검증
 		jwtProvider.validateToken(refreshToken);
 
@@ -62,7 +61,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 		RefreshToken findTokenEntity = refreshRedisRepository.findByEmail(authentication.getName())
 			.orElseThrow(ErrorCode::throwRefreshTokenNotFound);
 
-		// input 토큰이 최신 토큰이 아닐 경우 예외 처리
+		// redis 토큰과 input 토큰이 일치한지 확인
 		if (!refreshToken.equals(findTokenEntity.getToken())) {
 			throw ErrorCode.throwUnavailableRefreshToken();
 		}
@@ -89,4 +88,11 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 			);
 	}
 
+	private String resolveToken(String bearerToken) {
+		if (StringUtils.hasText(bearerToken) && jwtProperties.hasTokenStartsWith(bearerToken)) {
+			return bearerToken.substring(7);
+		}
+		throw ErrorCode.throwTokenType();
+	}
+
 }

server/src/test/java/com/ticketing/server/movie/aop/TicketLockAspectTest.java

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

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

@@ -1,68 +0,0 @@
-package com.ticketing.server.movie.service;
-
-import static com.ticketing.server.movie.domain.TicketTest.setupTickets;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.when;
-
-import com.ticketing.server.global.exception.ErrorCode;
-import com.ticketing.server.global.exception.TicketingException;
-import com.ticketing.server.movie.domain.Ticket;
-import com.ticketing.server.movie.domain.repository.TicketRepository;
-import com.ticketing.server.movie.service.dto.TicketIdsDTO;
-import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
-import java.util.List;
-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;
-
-@ExtendWith(MockitoExtension.class)
-class TicketLockServiceTest {
-
-	@Mock
-	TicketRepository ticketRepository;
-
-	@InjectMocks
-	TicketLockService ticketLockService;
-
-	@Test
-	@DisplayName("티켓목록 예약으로 변경 시 조회된 갯수랑 다른 경우")
-	void ticketReservationFail() {
-		// given
-		List<Ticket> tickets = setupTickets();
-		List<Ticket> list = List.of(tickets.get(0), tickets.get(1), tickets.get(2));
-		List<Long> ids = List.of(0L, 1L, 2L, 10000L);
-		TicketIdsDTO ticketIdsDto = new TicketIdsDTO(ids);
-
-		when(ticketRepository.findTicketFetchJoinByTicketIds(ids)).thenReturn(list);
-
-		// when
-		// then
-		assertThatThrownBy(() -> ticketLockService.ticketReservation(ticketIdsDto))
-			.isInstanceOf(TicketingException.class)
-			.extracting("errorCode")
-			.isEqualTo(ErrorCode.INVALID_TICKET_ID);
-	}
-
-	@Test
-	@DisplayName("티켓목록 예약으로 변경 완료")
-	void ticketReservationSuccess() {
-		// given
-		List<Ticket> tickets = setupTickets();
-		List<Ticket> list = List.of(tickets.get(0), tickets.get(1), tickets.get(2));
-		List<Long> ids = List.of(0L, 1L, 2L);
-		TicketIdsDTO ticketIdsDto = new TicketIdsDTO(ids);
-
-		when(ticketRepository.findTicketFetchJoinByTicketIds(ids)).thenReturn(list);
-
-		// when
-		TicketsReservationDTO ticketReservationsDto = ticketLockService.ticketReservation(ticketIdsDto);
-
-		// then
-		assertThat(ticketReservationsDto.getTicketReservationDtoList()).hasSize(3);
-	}
-
-}

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

@@ -10,6 +10,7 @@ import com.ticketing.server.global.exception.ErrorCode;
 import com.ticketing.server.global.exception.TicketingException;
 import com.ticketing.server.movie.domain.Ticket;
 import com.ticketing.server.movie.domain.repository.TicketRepository;
+import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
 import com.ticketing.server.payment.service.dto.TicketDetailDTO;
 import java.util.Collections;
 import java.util.List;
@@ -60,4 +61,39 @@ class TicketServiceImplTest {
 		);
 	}
 
+	@Test
+	@DisplayName("티켓목록 예약으로 변경 시 조회된 갯수랑 다른 경우")
+	void ticketReservationFail() {
+		// given
+		List<Ticket> tickets = setupTickets();
+		List<Ticket> list = List.of(tickets.get(0), tickets.get(1), tickets.get(2));
+		List<Long> ids = List.of(0L, 1L, 2L, 10000L);
+
+		when(ticketRepository.findTicketFetchJoinByTicketIds(ids)).thenReturn(list);
+
+		// when
+		// then
+		assertThatThrownBy(() -> ticketService.ticketReservation(ids))
+			.isInstanceOf(TicketingException.class)
+			.extracting("errorCode")
+			.isEqualTo(ErrorCode.INVALID_TICKET_ID);
+	}
+
+	@Test
+	@DisplayName("티켓목록 예약으로 변경 완료")
+	void ticketReservationSuccess() {
+		// given
+		List<Ticket> tickets = setupTickets();
+		List<Ticket> list = List.of(tickets.get(0), tickets.get(1), tickets.get(2));
+		List<Long> ids = List.of(0L, 1L, 2L);
+
+		when(ticketRepository.findTicketFetchJoinByTicketIds(ids)).thenReturn(list);
+
+		// when
+		TicketsReservationDTO ticketReservationsDto = ticketService.ticketReservation(ids);
+
+		// then
+		assertThat(ticketReservationsDto.getTicketReservationDtoList()).hasSize(3);
+	}
+
 }

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

@@ -10,8 +10,8 @@ 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.domain.UserGrade;
 import com.ticketing.server.user.service.dto.TokenDTO;
+import com.ticketing.server.user.domain.UserGrade;
 import java.util.Collections;
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
@@ -62,7 +62,7 @@ class AuthenticationServiceImplTest {
 	@DisplayName("토큰 재발급 성공")
 	void reissueAccessToken() {
 		// given
-		String refreshToken = "eyJhbGciOiJIUzUxMiJ9";
+		String refreshToken = "Bearer eyJhbGciOiJIUzUxMiJ9";
 		when(jwtProvider.validateToken(any())).thenReturn(true);
 		when(jwtProvider.getAuthentication(any())).thenReturn(authenticationToken);
 		when(jwtProvider.generateTokenDto(any())).thenReturn(useJwtProvider.generateTokenDto(authenticationToken));