refactor: aop 를 통한 lock 검증 메서드 분리

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

@@ -1,4 +1,4 @@
-package com.ticketing.server.movie.service;
+package com.ticketing.server.movie.aop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
@@ -14,10 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-public class TicketServiceImplTest {
+class TicketLockAspectTest {
 
 	@Autowired
-	private TicketServiceImpl ticketService;
+	private TicketLockAspect ticketLockAspect;
 
 	@Test
 	@DisplayName("티켓 lock 동시성 체크")
@@ -33,19 +33,19 @@ public class TicketServiceImplTest {
 
 		// when
 		executorService.execute(() -> {
-			result1.set(ticketService.isEveryTicketIdLock(lockIds));
+			result1.set(ticketLockAspect.isEveryTicketIdLock(lockIds));
 			latch.countDown();
 		});
 
 		executorService.execute(() -> {
-			result2.set(ticketService.isEveryTicketIdLock(List.of("TicketLock:1")));
+			result2.set(ticketLockAspect.isEveryTicketIdLock(List.of("TicketLock:1")));
 			latch.countDown();
 		});
 
 		latch.await();
 
 		// then
-		Long unlockCount = ticketService.ticketIdsUnlock(lockIds);
+		Long unlockCount = ticketLockAspect.ticketIdsUnlock(lockIds);
 
 		assertAll(
 			() -> assertThat(result1).isNotEqualTo(result2),

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

@@ -27,6 +27,7 @@ public enum ErrorCode {
 	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, "해당 정보에 접근 권한이 존재하지 않습니다."),

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

@@ -0,0 +1,64 @@
+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/service/TicketLockService.java

@@ -0,0 +1,80 @@
+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.aop.TicketLock;
+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;
+
+	@TicketLock
+	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);
+	}
+
+	@TicketLock
+	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,13 +1,9 @@
 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 static com.ticketing.server.global.exception.ErrorCode.MOVIE_TIME_NOT_FOUND;
 import static com.ticketing.server.global.exception.ErrorCode.PAYMENT_ID_NOT_FOUND;
-import static com.ticketing.server.movie.domain.TicketLock.LOCK_KEY;
-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.global.validator.constraints.NotEmptyCollection;
 import com.ticketing.server.movie.domain.MovieTime;
@@ -15,22 +11,19 @@ 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;
 import com.ticketing.server.movie.service.interfaces.TicketService;
 import com.ticketing.server.payment.service.dto.TicketDetailDTO;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import javax.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -44,8 +37,7 @@ public class TicketServiceImpl implements TicketService {
 
 	private final TicketRepository ticketRepository;
 	private final MovieTimeRepository movieTimeRepository;
-
-	private final RedisTemplate<String, Object> redisTemplate;
+	private final TicketLockService ticketLockService;
 
 	@Override
 	public List<TicketDTO> getTickets(@NotNull Long movieTimeId) {
@@ -75,51 +67,13 @@ public class TicketServiceImpl implements TicketService {
 	@Override
 	@Transactional
 	public TicketsReservationDTO ticketReservation(@NotEmptyCollection List<Long> ticketIds) {
-		List<Ticket> tickets = getTicketsByInTicketIds(ticketIds);
-		List<String> ticketLockIds = makeTicketLockIds(ticketIds);
-
-		try {
-			if (!isEveryTicketIdLock(ticketLockIds)) {
-				throw new TicketingException(ErrorCode.BAD_REQUEST_TICKET_RESERVATION);
-			}
-
-			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 new TicketingException(BAD_REQUEST_MOVIE_TIME);
-			}
-
-			return new TicketsReservationDTO(firstMovieTitle(tickets), reservationDtoList);
-		} finally {
-			ticketIdsUnlock(ticketLockIds);
-		}
+		return ticketLockService.ticketReservation(new TicketIdsDTO(ticketIds));
 	}
 
 	@Override
 	@Transactional
 	public TicketsSoldDTO ticketSold(@NotNull Long paymentId, @NotEmptyCollection List<Long> ticketIds) {
-		List<Ticket> tickets = getTicketsByInTicketIds(ticketIds);
-		List<String> ticketLockIds = makeTicketLockIds(ticketIds);
-
-		try {
-			if (!isEveryTicketIdLock(ticketLockIds)) {
-				throw new TicketingException(ErrorCode.BAD_REQUEST_TICKET_SOLD);
-			}
-
-			List<TicketSoldDTO> soldDtoList = tickets.stream()
-				.map(ticket -> ticket.makeSold(paymentId))
-				.map(TicketSoldDTO::new)
-				.collect(Collectors.toList());
-
-			return new TicketsSoldDTO(paymentId, soldDtoList);
-		} finally {
-			ticketIdsUnlock(ticketLockIds);
-		}
+		return ticketLockService.ticketSold(paymentId, new TicketIdsDTO(ticketIds));
 	}
 
 	@Override
@@ -142,25 +96,6 @@ public class TicketServiceImpl implements TicketService {
 			.collect(Collectors.toList());
 	}
 
-	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> makeTicketLockIds(List<Long> ticketIds) {
-		return ticketIds.stream()
-			.map(id -> LOCK_KEY.getValue() + ":" + id)
-			.collect(Collectors.toList());
-	}
-
 	private List<Ticket> getTicketsByInTicketIds(List<Long> ticketIds) {
 		List<Ticket> tickets = ticketRepository.findTicketFetchJoinByTicketIds(ticketIds);
 
@@ -171,14 +106,4 @@ public class TicketServiceImpl implements TicketService {
 		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

@@ -0,0 +1,24 @@
+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,6 +3,7 @@ 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;
@@ -10,6 +11,7 @@ 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/test/java/com/ticketing/server/movie/aop/TicketLockAspectTest.java

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

@@ -0,0 +1,68 @@
+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,7 +10,6 @@ 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;
@@ -61,39 +60,4 @@ 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);
-	}
-
 }