refactor: 제출 로직 리팩토링 (#170)

* refactor: hikari pool 조정

* refactor: thread pool 조정

* refactor: WebClient pool 조정

* refactor: 제출 시 Problem Count DeadLock 문제 해결

* refactor: 주간 토큰 로직 지급 대상자 변경

* refactor: Lock TTL 시간 조정

* refactor: Application idle 상태 시 Consumer 사라지는 현상 해결

* refactor: 리소스 관리 개선 (리소스 해제)

* refactor: WebClient 풀 사이즈 조정

* refactor: 문제 제출 횟수 업데이트 로직 수정

* test: 테스트 코드 수정

Author: thezz9

src/main/java/org/ezcode/codetest/application/problem/service/ProblemService.java

@@ -27,6 +27,7 @@
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -193,5 +194,10 @@ public void addImageToExistingProblem(Long problemId, MultipartFile imageFile) {
 		problemDomainService.saveProblem(problem);
 	}
 
+	@Transactional(propagation = Propagation.REQUIRES_NEW)
+	public void problemCountAdjustment(Long problemId, boolean isSolved) {
+		int correctInc = isSolved ? 1 : 0;
+		problemDomainService.problemCountAdjustment(problemId, correctInc);
+	}
 }
 

src/main/java/org/ezcode/codetest/application/submission/dto/event/ProblemCountAdjustmentEvent.java

@@ -0,0 +1,10 @@
+package org.ezcode.codetest.application.submission.dto.event;
+
+public record ProblemCountAdjustmentEvent(
+
+    Long problemId,
+
+    boolean isSolved
+
+) {
+}

src/main/java/org/ezcode/codetest/application/submission/model/SubmissionContext.java

@@ -165,4 +165,8 @@ public String getLanguageVersion() {
     public String getUserEmail() {
         return user.getEmail();
     }
+
+    public Long getProblemId() {
+        return getProblem().getId();
+    }
 }

src/main/java/org/ezcode/codetest/application/submission/port/SubmissionEventService.java

@@ -1,6 +1,7 @@
 package org.ezcode.codetest.application.submission.port;
 
 import org.ezcode.codetest.application.submission.dto.event.GitPushStatusEvent;
+import org.ezcode.codetest.application.submission.dto.event.ProblemCountAdjustmentEvent;
 import org.ezcode.codetest.application.submission.dto.event.SubmissionErrorEvent;
 import org.ezcode.codetest.application.submission.dto.event.SubmissionJudgingFinishedEvent;
 import org.ezcode.codetest.application.submission.dto.event.TestcaseListInitializedEvent;
@@ -17,4 +18,6 @@ public interface SubmissionEventService {
     void publishSubmissionError(SubmissionErrorEvent event);
 
     void publishGitPushStatus(GitPushStatusEvent event);
+
+    void publishProblemCountAdjustment(ProblemCountAdjustmentEvent event);
 }

src/main/java/org/ezcode/codetest/application/submission/service/JudgementService.java

@@ -5,6 +5,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.IntStream;
 
+import org.ezcode.codetest.application.submission.dto.event.ProblemCountAdjustmentEvent;
 import org.ezcode.codetest.application.submission.dto.event.SubmissionErrorEvent;
 import org.ezcode.codetest.application.submission.dto.event.SubmissionJudgingFinishedEvent;
 import org.ezcode.codetest.application.submission.dto.event.TestcaseEvaluatedEvent;
@@ -24,6 +25,7 @@
 import org.ezcode.codetest.domain.submission.model.TestcaseEvaluationInput;
 import org.ezcode.codetest.domain.submission.service.SubmissionDomainService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -56,11 +58,13 @@ public void runTestcases(SubmissionContext ctx) throws InterruptedException {
         }
     }
 
+    @Transactional
     public void finalizeAndPublish(SubmissionContext ctx) {
         SubmissionResult submissionResult = submissionDomainService.finalizeSubmission(ctx);
 
         publishFinalResult(ctx);
         publishProblemSolve(submissionResult);
+        publishProblemCountAdjustment(ctx, submissionResult);
     }
 
     public void publishSubmissionError(String sessionKey, Exception e) {
@@ -103,4 +107,10 @@ private void publishFinalResult(SubmissionContext ctx){
     private void publishProblemSolve(SubmissionResult submissionResult) {
         problemEventService.publishProblemSolveEvent(submissionResult);
     }
+
+    private void publishProblemCountAdjustment(SubmissionContext ctx, SubmissionResult submissionResult) {
+        submissionEventService.publishProblemCountAdjustment(
+            new ProblemCountAdjustmentEvent(ctx.getProblemId(), submissionResult.isSolved())
+        );
+    }
 }

src/main/java/org/ezcode/codetest/application/submission/service/SubmissionService.java

@@ -74,7 +74,6 @@ public void enqueueCodeSubmission(Long problemId, CodeSubmitRequest request, Aut
     }
 
     @Async("judgeSubmissionExecutor")
-    @Transactional
     public void processSubmissionAsync(SubmissionMessage msg) {
         try {
             log.info("[Submission RUN] Thread = {}", Thread.currentThread().getName());

src/main/java/org/ezcode/codetest/common/config/ExecutorConfig.java

@@ -14,9 +14,9 @@ public class ExecutorConfig {
     @Bean(name = "consumerExecutor")
     public Executor consumerExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(5);
-        executor.setMaxPoolSize(10);
-        executor.setQueueCapacity(100);
+        executor.setCorePoolSize(40);
+        executor.setMaxPoolSize(80);
+        executor.setQueueCapacity(1000);
         executor.setThreadNamePrefix("consumer-");
         executor.initialize();
         return executor;
@@ -25,9 +25,9 @@ public Executor consumerExecutor() {
     @Bean(name = "judgeSubmissionExecutor")
     public Executor judgeSubmissionExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(5);
-        executor.setMaxPoolSize(10);
-        executor.setQueueCapacity(100);
+        executor.setCorePoolSize(40);
+        executor.setMaxPoolSize(80);
+        executor.setQueueCapacity(1000);
         executor.setThreadNamePrefix("submission-");
         executor.initialize();
         return executor;
@@ -36,9 +36,9 @@ public Executor judgeSubmissionExecutor() {
     @Bean(name = "judgeTestcaseExecutor")
     public Executor judgeTestcaseExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(25);
-        executor.setMaxPoolSize(50);
-        executor.setQueueCapacity(500);
+        executor.setCorePoolSize(40);
+        executor.setMaxPoolSize(80);
+        executor.setQueueCapacity(2000);
         executor.setThreadNamePrefix("testcase-");
         executor.initialize();
         return executor;

src/main/java/org/ezcode/codetest/domain/problem/repository/ProblemRepository.java

@@ -21,4 +21,6 @@ public interface ProblemRepository {
 	Optional<Problem> findProblemWithTestcasesById(Long problemId);
 
 	boolean existsByTitleAndIsDeletedIsFalse(String title);
+
+	void problemCountAdjustment(Long problemId, int correctInc);
 }

src/main/java/org/ezcode/codetest/domain/problem/service/ProblemDomainService.java

@@ -19,6 +19,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 
 import lombok.RequiredArgsConstructor;
 
@@ -125,4 +126,8 @@ public ProblemInfo getProblemInfo(Long problemId) {
 	public void saveProblem(Problem problem) {
 		problemRepository.save(problem);
 	}
+
+	public void problemCountAdjustment(Long problemId, int correctInc) {
+		problemRepository.problemCountAdjustment(problemId, correctInc);
+	}
 }

src/main/java/org/ezcode/codetest/domain/submission/model/SubmissionResult.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.ezcode.codetest.application.submission.model.SubmissionContext;
 import org.ezcode.codetest.domain.submission.model.entity.UserProblemResult;
 
 import lombok.Builder;
@@ -18,12 +19,17 @@ public record SubmissionResult(
 	boolean hasBeenSolved
 
 ) {
-	public static SubmissionResult from(UserProblemResult result, List<String> problemCategory, boolean hasBeenSolved) {
+	public static SubmissionResult of(
+		UserProblemResult upr,
+		SubmissionContext ctx,
+		boolean allPassed,
+		boolean before
+	) {
 		return SubmissionResult.builder()
-			.userId(result.getUser().getId())
-			.problemCategory(problemCategory)
-			.isSolved(result.isCorrect())
-			.hasBeenSolved(hasBeenSolved)
+			.userId(upr.getUser().getId())
+			.problemCategory(ctx.getCategories())
+			.isSolved(allPassed && !before)
+			.hasBeenSolved(before)
 			.build();
 	}
 }