feat : 포인트 충전과 결제 같은 분산락 key 사용하도록 변경 #38

- lockType 추가
- 포인트 충전과 결제를 같은 key를 사용하여 동시성 문제가 발생 안하도록 구현

src/main/java/com/kpop/ticketing/domain/common/annotation/DistributedLock.java

@@ -1,5 +1,6 @@
 package com.kpop.ticketing.domain.common.annotation;
 
+import com.kpop.ticketing.domain.common.aspect.LockType;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -9,6 +10,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface DistributedLock {
+    LockType lockType() default LockType.DEFAULT;
+
     TimeUnit timeUnit() default TimeUnit.SECONDS;
 
     long waitTime() default 10L;

src/main/java/com/kpop/ticketing/domain/common/aspect/DistributedLockAspect.java

@@ -39,9 +39,8 @@ public Object lock(final ProceedingJoinPoint joinPoint) throws Throwable {
 
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Method method = signature.getMethod();
-        String methodName = method.getName();
-        RLock rLock = redissonClient.getLock(String.format("lock:%s:%s", methodName, lockKey));
         DistributedLock lock = method.getAnnotation(DistributedLock.class);
+        RLock rLock = redissonClient.getLock(String.format("lock:%s:%s", lock.lockType(), lockKey));
 
         try {
             if (!rLock.tryLock(lock.waitTime(), lock.leaseTime(), lock.timeUnit())) {

src/main/java/com/kpop/ticketing/domain/common/aspect/LockType.java

@@ -0,0 +1,5 @@
+package com.kpop.ticketing.domain.common.aspect;
+
+public enum LockType {
+    POINT, RESERVATION, DEFAULT
+}

src/main/java/com/kpop/ticketing/presentation/payment/usecase/ProcessPaymentUseCase.java

@@ -1,6 +1,7 @@
 package com.kpop.ticketing.presentation.payment.usecase;
 
 import com.kpop.ticketing.domain.common.annotation.DistributedLock;
+import com.kpop.ticketing.domain.common.aspect.LockType;
 import org.springframework.stereotype.Component;
 
 import com.kpop.ticketing.domain.payment.components.PaymentStore;
@@ -21,7 +22,7 @@ public class ProcessPaymentUseCase {
 	private final PaymentStore paymentStore;
 	private final ReservationReader reservationReader;
 
-	@DistributedLock
+	@DistributedLock(lockType = LockType.POINT)
 	public void execute(Long reservationId) {
 		Reservation reservation = reservationReader.getReservation(reservationId);
 		User user = userReader.getUser(reservation.getUser().getId());

src/main/java/com/kpop/ticketing/presentation/reservation/usecase/ReserveSeatUseCase.java

@@ -1,6 +1,7 @@
 package com.kpop.ticketing.presentation.reservation.usecase;
 
 import com.kpop.ticketing.domain.common.annotation.DistributedLock;
+import com.kpop.ticketing.domain.common.aspect.LockType;
 import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,7 +30,7 @@ public class ReserveSeatUseCase {
 	private final ReservationStore reservationStore;
 	private final WaitTokenReader waitTokenReader;
 
-	@DistributedLock
+	@DistributedLock(lockType = LockType.RESERVATION)
 	public void execute(String token, Long seatId) {
 		WaitToken waitToken = waitTokenReader.getWaitTokenByToken(token);
 

src/main/java/com/kpop/ticketing/presentation/user/usecase/ChargeUserBalanceUseCase.java

@@ -1,6 +1,7 @@
 package com.kpop.ticketing.presentation.user.usecase;
 
 import com.kpop.ticketing.domain.common.annotation.DistributedLock;
+import com.kpop.ticketing.domain.common.aspect.LockType;
 import org.springframework.stereotype.Component;
 
 import com.kpop.ticketing.domain.user.components.UserReader;
@@ -18,7 +19,7 @@ public class ChargeUserBalanceUseCase {
 	private final UserReader userReader;
 	private final UserStore userStore;
 
-	@DistributedLock
+	@DistributedLock(lockType = LockType.POINT)
 	public void execute(Long userId, UserBalanceRequest userBalanceRequest) {
 		User user = userReader.getUser(userId);
 		user.chargeBalance(userBalanceRequest.getChargeAmount());