[refactor] 동시성 이슈

build.gradle

@@ -60,6 +60,9 @@ dependencies {
 
     // Discord Webhook
     implementation("club.minnced:discord-webhooks:0.8.4")
+
+    // awaitility
+    testImplementation 'org.awaitility:awaitility:4.3.0'
 }
 
 // ------------------

src/main/java/com/pitchain/bmscrap/domain/BmScrap.java

@@ -10,6 +10,7 @@
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Table(uniqueConstraints = @UniqueConstraint(columnNames = {"member_id", "bm_id"}))
 public class BmScrap {
 
     @Id

src/main/java/com/pitchain/common/config/AsyncConfig.java

@@ -0,0 +1,73 @@
+package com.pitchain.common.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.MDC;
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.task.TaskDecorator;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.concurrent.Executor;
+
+@Configuration
+@EnableAsync
+public class AsyncConfig implements AsyncConfigurer {
+
+    @Bean
+    public Executor asyncTaskExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        //TODO - corePoolSize, maxPoolSize, queueCapacity는 서비스에 맞게 테스트를 통해 설정
+        executor.setCorePoolSize(Runtime.getRuntime().availableProcessors());
+        executor.setMaxPoolSize(Runtime.getRuntime().availableProcessors());
+//        executor.setQueueCapacity();
+        executor.setTaskDecorator(new MdcTaskDecorator());
+        executor.setThreadNamePrefix("async");
+        executor.setWaitForTasksToCompleteOnShutdown(true);
+        executor.initialize();
+
+        return executor;
+    }
+
+    @Override
+    public Executor getAsyncExecutor() {
+        return asyncTaskExecutor();
+    }
+
+    @Override
+    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
+        return new AsyncExceptionHandler();
+    }
+
+    @Slf4j
+    private static class AsyncExceptionHandler implements AsyncUncaughtExceptionHandler {
+
+        @Override
+        public void handleUncaughtException(Throwable throwable, Method method, Object... params) {
+            log.error("비동기 실행 중 에러가 발생했습니다: ", throwable);
+        }
+    }
+
+    @Slf4j
+    private static class MdcTaskDecorator implements TaskDecorator {
+        @Override
+        public Runnable decorate(Runnable runnable) {
+            Map<String, String> contextMap = MDC.getCopyOfContextMap();
+            return () -> {
+                try {
+                    if (contextMap != null) {
+                        MDC.setContextMap(contextMap);
+                    }
+                    runnable.run();
+                } finally {
+                    MDC.clear();
+                }
+            };
+        }
+    }
+
+}

src/main/java/com/pitchain/common/config/RedisConfig.java

@@ -4,13 +4,21 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.script.DefaultRedisScript;
+import org.springframework.data.redis.core.script.RedisScript;
 import org.springframework.data.redis.listener.ChannelTopic;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
 import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
+import org.springframework.scripting.ScriptSource;
+import org.springframework.scripting.support.ResourceScriptSource;
+
+import java.io.IOException;
+import java.util.List;
 
 @Configuration
 @EnableRedisRepositories
@@ -45,4 +53,12 @@ public MessageListenerAdapter messageListenerAdapter(RedisSubscriber subscriber)
         return new MessageListenerAdapter(subscriber, "onMessage");
     }
 
+    @Bean
+    public RedisScript<List> script() throws IOException {
+        ScriptSource scriptSource = new ResourceScriptSource(new ClassPathResource("META-INF/scripts/getanddeleteall.lua"));
+        String script = scriptSource.getScriptAsString();
+
+        return new DefaultRedisScript<>(script, List.class);
+    }
+
 }

src/main/java/com/pitchain/common/exception/GlobalExceptionHandler.java

@@ -6,14 +6,17 @@
 import com.pitchain.common.apiPayload.ErrorStatus;
 import jakarta.validation.ConstraintViolationException;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.MessageSource;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
+@Slf4j
 @RestControllerAdvice
 @RequiredArgsConstructor
 public class GlobalExceptionHandler {
@@ -72,4 +75,17 @@ public ResponseEntity<CustomResponse> handleJWTVerificationException(JWTVerifica
                 .status(HttpStatus.UNAUTHORIZED)
                 .body(customResponse);
     }
+
+    @ExceptionHandler(DataIntegrityViolationException.class)
+    public ResponseEntity<CustomResponse> handleDataIntegrityViolationException(DataIntegrityViolationException e) {
+        log.error("DataIntegrityViolationException = {}", e.getMessage());
+        String errorMessage = "DataIntegrityViolationException(제약 조건 위반 오류)가 발생했습니다.";
+
+        HttpStatus httpStatus = HttpStatus.BAD_REQUEST;
+        CustomResponse customResponse = CustomResponse.onFailure(httpStatus.name(), errorMessage);
+
+        return ResponseEntity
+                .status(httpStatus)
+                .body(customResponse);
+    }
 }

src/main/java/com/pitchain/common/redis/RedisHashRepository.java

@@ -0,0 +1,33 @@
+package com.pitchain.common.redis;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.script.RedisScript;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@RequiredArgsConstructor
+public class RedisHashRepository {
+
+    private final RedisTemplate<String, String> redisTemplate;
+    private final RedisScript<List> script;
+
+    public void increment(String key, String hashKey, Long value) {
+        redisTemplate.opsForHash().increment(key, hashKey, value);
+    }
+
+    public Map<String, String> findAll(String key) {
+        HashOperations<String, String, String> ops = redisTemplate.opsForHash();
+        return ops.entries(key);
+    }
+
+    public List<String> getAndDeleteAll(String key) {
+        return redisTemplate.execute(script, Collections.singletonList(key));
+    }
+
+}

src/main/java/com/pitchain/sp/application/SpService.java

@@ -18,6 +18,7 @@
 public class SpService {
     private final SpCommandService spCommandService;
     private final SpQueryService spQueryService;
+    private final SpViewsService spViewsService;
 
     @Transactional
     public void createSp(MemberDetails memberDetails, Long bmId, SpCreateReq spCreateReq, MultipartFile thumbnailImg) {
@@ -34,9 +35,10 @@ public InfinityScrollRes<SpDetailRes> getSpDetailsFilteredCategory(MemberDetails
         return spQueryService.getSpDetailsFilteredCategory(memberDetails, mainCategoryInKorean, lastSpId, size);
     }
 
-    @Transactional(readOnly = true)
     public SpDetailRes getSpDetail(MemberDetails memberDetails, Long bmId, Long spId) {
-        return spQueryService.getSpDetail(memberDetails, bmId, spId);
+        SpDetailRes spDetailRes = spQueryService.getSpDetail(memberDetails, bmId, spId);
+        spViewsService.updateSpView(spId);
+        return spDetailRes;
     }
 
     @Transactional

src/main/java/com/pitchain/sp/application/SpViewsService.java

@@ -0,0 +1,82 @@
+package com.pitchain.sp.application;
+
+import com.pitchain.common.redis.RedisHashRepository;
+import com.pitchain.sp.infrastucture.SpRepositoryCustom;
+import com.pitchain.sp.infrastucture.dto.SpViewsDto;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SpViewsService {
+
+    private final SpRepositoryCustom spRepositoryCustom;
+    private final RedisHashRepository redisHashRepository;
+
+    private static final String SP_VIEW_REDIS_KEY = "spView";
+
+    /**
+     * Redis에 Sp 조회수 증가
+     * @param spId
+     */
+    @Async
+    public void updateSpView(Long spId) {
+        redisHashRepository.increment(SP_VIEW_REDIS_KEY, String.valueOf(spId), 1L);
+    }
+
+    /**
+     * Redis에서 DB로 Sp 조회수 업데이트
+     */
+    @Transactional
+    public void updateSpViews() {
+        List<String> spViewsResult = redisHashRepository.getAndDeleteAll(SP_VIEW_REDIS_KEY);
+        List<SpViewsDto> spViewsDtoList = parseResult(spViewsResult);
+
+        for (SpViewsDto spViewsDto : spViewsDtoList) {
+            spRepositoryCustom.updateSpView(spViewsDto.spId(), spViewsDto.views());
+        }
+    }
+
+    /**
+     * 1분마다 Redis에서 DB로 Sp 조회수 업데이트하는 작업 수행
+     */
+    @Scheduled(cron = "0 */1 * * * *")
+    public void runUpdateSpViews() {
+        try {
+            updateSpViews();
+        } catch (Exception e) {
+            log.error("Scheduling task [runUpdateSpViews] failed", e);
+        }
+    }
+
+    /**
+     * Redis에서 가져온 Sp 조회수 String 리스트를 Dto 리스트로 파싱
+     * @param List<String>
+     * @return List<SpViewsDto>
+     */
+    private List<SpViewsDto> parseResult(List<String> spViewsStringList) {
+        if (spViewsStringList.size() % 2 != 0){
+            log.error("spViewsStringList 개수가 올바르지 않습니다.");
+            throw new IllegalArgumentException("spViewsStringList 개수가 올바르지 않습니다.");
+        }
+
+        List<SpViewsDto> spViewsDtoList = new ArrayList<>();
+        for (int i = 0; i < spViewsStringList.size(); i += 2) {
+            Long spId = Long.parseLong(spViewsStringList.get(i));
+            Long views = Long.parseLong(spViewsStringList.get(i + 1));
+
+            SpViewsDto spViewsDto = new SpViewsDto(spId, views);
+            spViewsDtoList.add(spViewsDto);
+        }
+
+        return spViewsDtoList;
+    }
+}

src/main/java/com/pitchain/sp/application/res/SpDetailRes.java

@@ -31,7 +31,7 @@ public record SpDetailRes(
         @S3Url
         String thumbnailImgURL,
         @NotNull
-        Integer views,
+        Long views,
         @NotBlank
         String name,
         @NotBlank

src/main/java/com/pitchain/sp/domain/Sp.java

@@ -28,7 +28,7 @@ public class Sp extends BaseEntity {
     @Column(nullable = false)
     private String thumbnailImgKey;
 
-    private int views = 0;
+    private Long views;
 
     @Column(nullable = false)
     private String name;
@@ -42,7 +42,7 @@ public static Sp of(Bm bm, String thumbnailImgKey, String name) {
         sp.thumbnailImgKey = thumbnailImgKey;
         sp.name = name;
         sp.spStatus = SpStatus.TRANSCODING;
-        sp.views = 0;
+        sp.views = 0L;
         return sp;
     }
 

src/main/java/com/pitchain/sp/infrastucture/SpRepositoryCustom.java

@@ -7,6 +7,7 @@
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -46,4 +47,13 @@ private static BooleanExpression eqMainCategory(MainCategory category) {
     private BooleanExpression ltSpId(Long lastSpId) {
         return lastSpId == null ? null : sp.id.lt(lastSpId);
     }
+
+    @Transactional
+    public long updateSpView(Long spId, Long views) {
+         return queryFactory
+                .update(sp)
+                .set(sp.views, sp.views.add(views))
+                .where(sp.id.eq(spId))
+                .execute();
+    }
 }

src/main/java/com/pitchain/sp/infrastucture/dto/SpViewsDto.java

@@ -0,0 +1,4 @@
+package com.pitchain.sp.infrastucture.dto;
+
+public record SpViewsDto(Long spId, Long views) {
+}

src/main/java/com/pitchain/splike/domain/SpLike.java

@@ -10,6 +10,7 @@
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Table(uniqueConstraints = @UniqueConstraint(columnNames = {"member_id", "sp_id"}))
 public class SpLike {
 
     @Id

src/main/resources/META-INF/scripts/getanddeleteall.lua

@@ -0,0 +1,3 @@
+local data = redis.call('HGETALL', KEYS[1])
+redis.call('DEL', KEYS[1])
+return data