Merge pull request #589 from SWM-Morandi/dev

[FIX] 테스트 문제 추출, 스케줄링시 스레드풀 추가 및 수정
SWM-Morandi · Dec 6, 2023 · 971e404 · 971e404
2 parents f66050d + a38b1dd
commit 971e404
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 35 deletions.
diff --git a/src/main/java/swm_nm/morandi/domain/testDuring/scheduler/TestScheduler.java b/src/main/java/swm_nm/morandi/domain/testDuring/scheduler/TestScheduler.java
@@ -14,13 +14,11 @@
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Future;
+import java.util.concurrent.*;
 
 @Component
 @RequiredArgsConstructor
 @Slf4j
-@EnableAsync
 public class TestScheduler {
 
     private final TestRepository testRepository;
@@ -33,37 +31,41 @@ public void addTest(TestCheckDto testCheckDto) {
         testMapManager.addTest(testCheckDto);
     }
     @Scheduled(fixedRate = 60000)
-    @Async
-    public Future<Void> callApiPeriodically() {
+    public void callApiPeriodically() {
         List<TestCheckDto> deleteList = new ArrayList<>();
         ConcurrentHashMap<Long, TestCheckDto> testMap = testMapManager.getTestMap();
+        ExecutorService executorService = Executors.newFixedThreadPool(5);
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
         testMap.forEach((testId, testCheckDto) -> {
-            log.info("Scheduler call testID : " + testId);
-            Optional<Tests> result = testRepository.findById(testId);
-            if (result.isEmpty()) {
-                log.info("Scheduler Not Found testID : " + testCheckDto.getTestId());
-                deleteList.add(testCheckDto);
-            }
-            else {
-                Tests test = result.get();
-                if (test.getTestStatus() == TestStatus.COMPLETED) {
-                    log.info("Scheduler Completed testID : " + testId);
-                    deleteList.add(testCheckDto);
-                    return;
-                }
-                Duration duration = Duration.between(test.getTestDate(), LocalDateTime.now());
-                Long minutes = duration.toMinutes();
-                if (minutes > test.getTestTime()) {
-                    log.info("Scheduler exceed minutes testID : " + testId);
-                    deleteList.add(testCheckDto);
-                    return;
-                }
-                checkAttemptProblemService.checkAttemptedProblemResult(test, testCheckDto.getBojId());
-            }
+            CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
+                        log.info("Scheduler call testID : " + testId);
+                        Optional<Tests> result = testRepository.findById(testId);
+                        if (result.isEmpty()) {
+                            log.info("Scheduler Not Found testID : " + testCheckDto.getTestId());
+                            deleteList.add(testCheckDto);
+                        } else {
+                            Tests test = result.get();
+                            if (test.getTestStatus() == TestStatus.COMPLETED) {
+                                log.info("Scheduler Completed testID : " + testId);
+                                deleteList.add(testCheckDto);
+                                return;
+                            }
+                            Duration duration = Duration.between(test.getTestDate(), LocalDateTime.now());
+                            Long minutes = duration.toMinutes();
+                            if (minutes > test.getTestTime()) {
+                                log.info("Scheduler exceed minutes testID : " + testId);
+                                deleteList.add(testCheckDto);
+                                return;
+                            }
+                            checkAttemptProblemService.checkAttemptedProblemResult(test, testCheckDto.getBojId());
+                        }
+                    }, executorService);
+            futures.add(future);
         });
 
+        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+
         deleteList.forEach(testCheckDto ->
                 testMap.remove(testCheckDto.getTestId(), testCheckDto));
-        return null;
     }
 }
diff --git a/src/main/java/swm_nm/morandi/domain/testStart/service/GetProblemsService.java b/src/main/java/swm_nm/morandi/domain/testStart/service/GetProblemsService.java
@@ -21,6 +21,8 @@
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -34,6 +36,7 @@ public List<BojProblem> getProblemsByApi(TestType testType, String bojId) {
         List<DifficultyRange> difficultyRanges = testType.getDifficultyRanges();
         List<BojProblem> bojProblems = BojProblem.initBojProblems(difficultyRanges);
         String apiUrl = "https://solved.ac/api/v3/search/problem";
+        ExecutorService executorService = Executors.newFixedThreadPool(5);
 
         List<CompletableFuture<Void>> futures = bojProblems.stream()
                 .map(bojProblem -> CompletableFuture.runAsync(() -> {
@@ -60,7 +63,7 @@ public List<BojProblem> getProblemsByApi(TestType testType, String bojId) {
                             throw new MorandiException(TestErrorCode.JSON_PARSE_ERROR);
                         }
                     }
-                })).collect(Collectors.toList());
+                }, executorService)).collect(Collectors.toList());
 
         CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
 

diff --git a/src/test/java/swm_nm/morandi/domain/testDuring/scheduler/TestSchedulerTest.java b/src/test/java/swm_nm/morandi/domain/testDuring/scheduler/TestSchedulerTest.java
@@ -60,12 +60,7 @@ void testScheduler() {
 
         // when
         long startTime = System.currentTimeMillis();
-        Future<Void> future = testScheduler.callApiPeriodically();
-        try {
-            future.get();
-        } catch (InterruptedException | ExecutionException e) {
-            throw new RuntimeException(e);
-        }
+        testScheduler.callApiPeriodically();
         long endTime = System.currentTimeMillis();
 
         // then