Merge pull request #151 from Media-XI/fix/concurrent-test-issue-fix

동시성 테스트 실패 문제 해결

src/main/java/com/example/codebase/annotation/DistributedLock.java

@@ -6,11 +6,20 @@
 import java.lang.annotation.Target;
 import java.util.concurrent.TimeUnit;
 
+/**
+* <p>분산 락을 사용하기 위한 어노테이션</p>
+* key : Lock 을 구분하기 위한 key <br>
+* waitTime : 락을 얻기 위해 대기하는 시간 <br>
+* leaseTime : 락을 얻은 후 유지하는 시간 <br>
+* timeUnit : 시간 단위 <br>
+* transactional : 트랜잭션을 사용할지 여부 <br>
+ */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface DistributedLock {
     String key() default "";
     long waitTime() default 5;
     long leaseTime() default 2;
     TimeUnit timeUnit() default TimeUnit.SECONDS;
+    boolean transactional() default true;
 }

src/main/java/com/example/codebase/aop/DistributedLockAop.java

@@ -15,7 +15,6 @@
 import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
-import java.util.Map;
 
 @Aspect
 @Component
@@ -33,9 +32,7 @@ public Object lock(final ProceedingJoinPoint joinPoint) throws Throwable {
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Method method = signature.getMethod();
         DistributedLock distributedLock = method.getAnnotation(DistributedLock.class);
-        if (distributedLock == null) {
-            return aopForTransaction.proceed(joinPoint);
-        }
+
         String key = REDISSON_LOCK_PREFIX + CustomSpringELParser.getDynamicValue(signature.getParameterNames(), joinPoint.getArgs(), distributedLock.key());
         RLock rLock = redissonClient.getLock(key);
         try {
@@ -44,7 +41,7 @@ public Object lock(final ProceedingJoinPoint joinPoint) throws Throwable {
                 log.info("Redisson Lock Not Available serviceName : {} key : {}", method.getName(), key);
                 throw new IllegalArgumentException();
             }
-            return aopForTransaction.proceed(joinPoint);
+            return proceed(distributedLock, joinPoint);
         } catch (InterruptedException e) {
             throw new InterruptedException();
         } finally {
@@ -56,6 +53,13 @@ public Object lock(final ProceedingJoinPoint joinPoint) throws Throwable {
         }
     }
 
+    private Object proceed(DistributedLock distributedLock, ProceedingJoinPoint joinPoint) throws Throwable {
+        if (distributedLock.transactional()) {
+            return aopForTransaction.proceed(joinPoint);
+        }
+        return joinPoint.proceed();
+    }
+
     static class CustomSpringELParser {
         private CustomSpringELParser() {
         }

src/main/java/com/example/codebase/domain/post/entity/Post.java

@@ -44,7 +44,6 @@ public class Post {
     @Column(name = "created_time")
     private LocalDateTime createdTime;
 
-    @Version
     @Column(name = "updated_time")
     private LocalDateTime updatedTime;
 

src/main/java/com/example/codebase/domain/post/service/PostService.java

@@ -173,7 +173,6 @@ public PostWithLikesResponseDTO getPost(String loginUsername, Long postId) {
 
 //    @Transactional(isolation = Isolation.SERIALIZABLE) //
     @DistributedLock(key = "#postId")
-    @Transactional
     public PostResponseDTO likePost(Long postId, String loginUsername) {
         if (isDuplicatedRequest(postId, loginUsername)) {
             throw new LikePostDuplicatedRequestException();

src/test/java/com/example/codebase/domain/post/service/PostServiceTest.java

@@ -83,12 +83,12 @@ public Post createPost() {
     }
 
 
-    @DisplayName("2명 이상의 사용자가 동시에 좋아요 요청 시")
+    @DisplayName("2명 이상의 사용자가 동시에 좋아요 요청 시 - 100명 동시 요청")
     @Test
     void test1() throws Exception {
         // given
         Post post = createPost();
-        int threadCount = 5;
+        int threadCount = 100;
 
         List<Member> members = new ArrayList<>();
         for (int i = 0; i < threadCount; i++) {
@@ -103,6 +103,7 @@ void test1() throws Exception {
             executorService.execute(() -> {
                 try {
                     PostResponseDTO dto = postService.likePost(post.getId(), members.get(i).getUsername());
+                    assertEquals(true, dto.getIsLiked());
                 } finally {
                     latch.countDown();
                 }
@@ -131,7 +132,6 @@ void test2() throws Exception {
                 Thread.sleep(500);
                 executorService.execute(() -> {
                     PostResponseDTO dto = postService.likePost(post.getId(), member.getUsername());
-                    System.out.println(i + " " + dto.getLikes());
                     latch.countDown();
                 });
             } catch (InterruptedException e) {