Weekly/8/issue#144 동시성 제어

build.gradle

@@ -51,6 +51,7 @@ dependencies {
 
     // redis
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    implementation 'org.redisson:redisson-spring-boot-starter:3.33.0'
 
     // embedded redis - 테스트 시 적용
     testImplementation('it.ozimov:embedded-redis:0.7.3') {

src/main/java/supernova/whokie/global/annotation/RedissonLock.java

@@ -0,0 +1,14 @@
+package supernova.whokie.global.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RedissonLock {
+    String value();
+    long waitTime() default 5000L;
+    long leaseTime() default 2000L;
+}

src/main/java/supernova/whokie/global/aop/RedissonAspect.java

@@ -0,0 +1,55 @@
+package supernova.whokie.global.aop;
+
+import lombok.RequiredArgsConstructor;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.redisson.client.RedisException;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.stereotype.Component;
+import supernova.whokie.global.annotation.RedissonLock;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
+
+@Aspect
+@Component
+@RequiredArgsConstructor
+public class RedissonAspect {
+
+    private final RedissonClient redissonClient;
+
+    @Around("@annotation(supernova.whokie.global.annotation.RedissonLock)")
+    public Object redissonLock(ProceedingJoinPoint joinPoint) throws Throwable {
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        Method method = signature.getMethod();
+        RedissonLock annotation = method.getAnnotation(RedissonLock.class);
+        String lockKey = method.getName() + getDynamicValue(signature.getParameterNames(), joinPoint.getArgs(), annotation.value());
+        RLock lock = redissonClient.getLock(lockKey);
+        try {
+            boolean lockable = lock.tryLock(annotation.waitTime(), annotation.leaseTime(), TimeUnit.MILLISECONDS);
+            if (!lockable) {
+                return false;
+            }
+            return joinPoint.proceed();
+        } catch (RedisException e) {
+            throw new Exception("Temporary errors failed to access the service");
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    public Object getDynamicValue(String[] parameterNames, Object[] args, String key) {
+        SpelExpressionParser parser = new SpelExpressionParser();
+        StandardEvaluationContext context = new StandardEvaluationContext();
+
+        for(int i=0; i < parameterNames.length; i++) {
+            context.setVariable(parameterNames[i], args[i]);
+        }
+        return parser.parseExpression(key).getValue(context, Object.class);
+    }
+}

src/main/java/supernova/whokie/global/config/RedisConfig.java

@@ -1,6 +1,9 @@
 package supernova.whokie.global.config;
 
 import lombok.RequiredArgsConstructor;
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
@@ -15,22 +18,17 @@
 @RequiredArgsConstructor
 public class RedisConfig {
     private final RedisProperties redisProperties;
+    private static final String REDISSON_HOST_PREFIX = "redis://";
 
     @Bean
     public RedisConnectionFactory redisConnectionFactory() {
         return new LettuceConnectionFactory(redisProperties.host(), redisProperties.port());
     }
 
     @Bean
-    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
-        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
-        redisTemplate.setConnectionFactory(redisConnectionFactory);
-
-        // Key는 String으로 저장
-        redisTemplate.setKeySerializer(new StringRedisSerializer());
-        // Value는 기본적으로 Jdk 직렬화로 저장
-        redisTemplate.setValueSerializer(new StringRedisSerializer());
-
-        return redisTemplate;
+    public RedissonClient redissonClient() {
+        Config config = new Config();
+        config.useSingleServer().setAddress(REDISSON_HOST_PREFIX + redisProperties.host() + ":" + redisProperties.port());
+        return Redisson.create(config);
     }
 }

src/main/java/supernova/whokie/groupmember/infrastructure/repository/GroupMemberRepository.java

@@ -15,10 +15,11 @@ public interface GroupMemberRepository extends JpaRepository<GroupMember, Long>
 
     void deleteByUserIdAndGroupId(Long userId, Long groupId);
 
+    @Query("SELECT gm FROM GroupMember gm JOIN FETCH gm.user WHERE gm.group.id = :groupId")
     List<GroupMember> findAllByGroupId(Long groupId);
 
-    @Query("SELECT g FROM GroupMember g WHERE g.user.id != :userId AND g.group.id = :groupId ORDER BY function('RAND')")
-    List<GroupMember> getRandomGroupMember(@Param("userId") Long userId,
+    @Query("SELECT g FROM GroupMember g JOIN FETCH g.user WHERE g.user.id != :userId AND g.group.id = :groupId ORDER BY function('RAND')")
+    List<GroupMember> getRandomGroupMemberJoinFetch(@Param("userId") Long userId,
                                            @Param("groupId") Long groupId, Pageable pageable);
 
     Boolean existsByUserIdAndGroupId(Long userId, Long groupId);

src/main/java/supernova/whokie/groupmember/service/GroupMemberReaderService.java

@@ -41,7 +41,7 @@ public List<GroupMember> getGroupMembers(Long userId, Long groupId) {
     @Transactional(readOnly = true)
     public List<GroupMember> getRandomGroupMembersByGroupId(Long userId, Long groupId,
         Pageable pageable) {
-        return groupMemberRepository.getRandomGroupMember(userId,
+        return groupMemberRepository.getRandomGroupMemberJoinFetch(userId,
             groupId, pageable);
     }
 

src/main/java/supernova/whokie/ranking/infrastructure/repoistory/RankingRepository.java

@@ -1,7 +1,9 @@
 package supernova.whokie.ranking.infrastructure.repoistory;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import supernova.whokie.group.Groups;
 import supernova.whokie.ranking.Ranking;
 import supernova.whokie.user.Users;
@@ -17,4 +19,8 @@ public interface RankingRepository extends JpaRepository<Ranking, Long> {
     List<Ranking> findAllByGroupIdFetchJoinUsers(Long groupId);
 
     Optional<Ranking> findByUsersAndQuestionAndGroups(Users users, String question, Groups groups);
+
+    @Modifying
+    @Query("UPDATE Ranking r SET r.count = r.count + 1 WHERE r.id = :id")
+    void incrementCount(@Param("id") Long id);
 }

src/main/java/supernova/whokie/ranking/service/RankingWriterService.java

@@ -34,6 +34,7 @@ public Ranking createRanking(Users user, String question, Groups groups) {
     public void increaseRankingCountByUserAndQuestionAndGroups(Users user, String question, Groups group) {
         Ranking ranking = rankingRepository.findByUsersAndQuestionAndGroups(user, question, group)
                 .orElseGet(() -> createRanking(user, question, group));
-        ranking.increaseCount();
+        rankingRepository.incrementCount(ranking.getId());
+        rankingRepository.save(ranking);
     }
 }

src/main/java/supernova/whokie/redis/event/RedisVisitCountEventDto.java

@@ -0,0 +1,18 @@
+package supernova.whokie.redis.event;
+
+import lombok.Builder;
+
+public class RedisVisitCountEventDto {
+
+    @Builder
+    public record Increment (
+        Long hostId
+    ) {
+
+        public static RedisVisitCountEventDto.Increment toDto(Long hostId) {
+            return Increment.builder()
+                .hostId(hostId)
+                .build();
+        }
+    }
+}

src/main/java/supernova/whokie/redis/event/RedisVisitCountEventHandler.java

@@ -0,0 +1,21 @@
+package supernova.whokie.redis.event;
+
+import lombok.AllArgsConstructor;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
+import supernova.whokie.redis.service.RedisVisitService;
+
+@Component
+@AllArgsConstructor
+public class RedisVisitCountEventHandler {
+
+    private final RedisVisitService redisVisitService;
+
+    @Async
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    public void RedisVisitCountIncreaseListener(RedisVisitCountEventDto.Increment event) {
+       redisVisitService.increaseVisitCount(event.hostId());
+    }
+}

src/main/java/supernova/whokie/redis/service/RedisVisitService.java

@@ -1,10 +1,14 @@
 package supernova.whokie.redis.service;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import supernova.whokie.global.annotation.RedissonLock;
 import supernova.whokie.profile.service.ProfileVisitReadService;
 import supernova.whokie.redis.entity.RedisVisitCount;
 import supernova.whokie.redis.entity.RedisVisitor;
+import supernova.whokie.redis.event.RedisVisitCountEventDto;
 import supernova.whokie.redis.infrastructure.repository.RedisVisitCountRepository;
 import supernova.whokie.redis.infrastructure.repository.RedisVisitorRepository;
 import supernova.whokie.redis.service.dto.RedisCommand;
@@ -20,12 +24,16 @@ public class RedisVisitService {
     private final RedisVisitorRepository redisVisitorRepository;
     private final RedisVisitCountRepository redisVisitCountRepository;
     private final ProfileVisitReadService profileVisitReadService;
+    private final ApplicationEventPublisher eventPublisher;
 
+    @Transactional
     public RedisVisitCount visitProfile(Long hostId, String visitorIp) {
         RedisVisitCount redisVisitCount = findVisitCountByHostId(hostId);
         if(!checkVisited(hostId, visitorIp)) {
             redisVisitCount.visit();
-            redisVisitCountRepository.save(redisVisitCount);
+            eventPublisher.publishEvent(
+                RedisVisitCountEventDto.Increment.toDto(redisVisitCount.getHostId())
+            );
         }
         // 방문자 로그 기록
         saveVisitor(hostId, visitorIp);
@@ -81,4 +89,10 @@ public void deleteAllVisitors(List<RedisVisitor> visitors) {
         redisVisitorRepository.deleteAllById(ids);
     }
 
+    @RedissonLock(value = "#hostId")
+    public void increaseVisitCount(Long hostId) {
+        RedisVisitCount redisVisitCount = findVisitCountByHostId(hostId);
+        redisVisitCount.visit();
+        redisVisitCountRepository.save(redisVisitCount);
+    }
 }

src/test/java/supernova/config/EmbeddedRedisConfig.java

@@ -2,7 +2,11 @@
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
 import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
 import redis.embedded.RedisServer;
 import redis.embedded.RedisServerBuilder;
 
@@ -11,14 +15,16 @@
 @TestConfiguration
 public class EmbeddedRedisConfig {
     private static final int REDIS_PORT = 6379;
+    private static final String REDIS_HOST = "localhost";
     private RedisServer redisServer;
 
     @PostConstruct
     public void startRedis() throws IOException {
         redisServer = new RedisServerBuilder()
-                .port(REDIS_PORT)
-                .setting("maxmemory 128M")
-                .build();
+            .port(REDIS_PORT)
+            .setting("maxmemory 128M")
+            .build();
+
         redisServer.start();
     }
 
@@ -28,4 +34,12 @@ public void stopRedisServer() {
             redisServer.stop();
         }
     }
+
+    @Bean
+    public RedissonClient redissonClient() {
+        Config config = new Config();
+        config.useSingleServer()
+            .setAddress("redis://" + REDIS_HOST + ":" + REDIS_PORT);
+        return Redisson.create(config);
+    }
 }

src/test/java/supernova/whokie/profile/ProfileIntegrationTest.java

@@ -1,9 +1,10 @@
 package supernova.whokie.profile;
 
 import io.awspring.cloud.s3.S3Template;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -32,7 +33,7 @@
 
 @SpringBootTest
 @AutoConfigureMockMvc
-@Import(EmbeddedRedisConfig.class)
+//@Import(EmbeddedRedisConfig.class)
 @TestPropertySource(properties = {
     "jwt.secret=abcd"
 })
@@ -55,11 +56,15 @@
     @Autowired
     private MockMvc mockMvc;
 
+    @Autowired
+    private RedissonClient redissonClient;
+
     private Users user;
     private Profile profile;
 
     @BeforeEach
     void setUp() {
+        redissonClient.getKeys().flushall();
         user = createUser();
         profile = createProfile();
         ProfileVisitCount profileVisitCount = createProfileVisitCount();