API 추가 및 병렬 실행

Schedulers.boundedElastic 사용 IO 작업 최적화
Daemawiki · Feb 14, 2024 · 30c5958 · 30c5958
1 parent 02c2af8
commit 30c5958
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/src/main/java/com/example/daemawiki/domain/revision/api/RevisionHistoryController.java b/src/main/java/com/example/daemawiki/domain/revision/api/RevisionHistoryController.java
@@ -26,4 +26,9 @@ public Flux<RevisionHistory> getRevisionToPage(@Valid @RequestBody GetRevisionPa
         return revisionService.getAllRevisionPaging(request);
     }
 
+    @GetMapping("/{documentId}")
+    public Flux<RevisionHistory> getRevisionByDocument(@PathVariable String documentId, @Valid @RequestBody GetRevisionPageRequest request) {
+        return revisionService.getAllRevisionByDocument(documentId, request);
+    }
+
 }
diff --git a/src/main/java/com/example/daemawiki/domain/revision/service/RevisionService.java b/src/main/java/com/example/daemawiki/domain/revision/service/RevisionService.java
@@ -7,15 +7,18 @@
 import org.bson.types.ObjectId;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
+import reactor.core.scheduler.Scheduler;
 
 import java.util.List;
 
 @Service
 public class RevisionService {
     private final RevisionHistoryRepository revisionHistoryRepository;
+    private final Scheduler scheduler;
 
-    public RevisionService(RevisionHistoryRepository revisionHistoryRepository) {
+    public RevisionService(RevisionHistoryRepository revisionHistoryRepository, Scheduler scheduler) {
         this.revisionHistoryRepository = revisionHistoryRepository;
+        this.scheduler = scheduler;
     }
 
     public Flux<RevisionHistory> getUpdatedTop10Revision() {
@@ -26,17 +29,26 @@ public Flux<RevisionHistory> getUpdatedTop10Revision() {
 
     //        17077 92123
     //        17077 44486 최신
+    public Flux<RevisionHistory> getFilteredRevisions(Flux<RevisionHistory> revisions, String lastRevisionId) {
+        return revisions.filter(revisionHistory -> lastRevisionId == null || lastRevisionId.isEmpty() ||
+                        new ObjectId(revisionHistory.getId()).getTimestamp() > new ObjectId(lastRevisionId).getTimestamp())
+                .take(20);
+    }
+
     public Flux<RevisionHistory> getAllRevisionPaging(GetRevisionPageRequest request) {
         String lastRevisionId = request.lastRevisionId();
-
-        return revisionHistoryRepository.findAllByOrderByCreatedDateTimeDesc()
-                .filter(revisionHistory -> lastRevisionId == null || lastRevisionId == "" ||
-                        new ObjectId(revisionHistory.getId()).getTimestamp() > new ObjectId(lastRevisionId).getTimestamp())
-                .take(10);
+        return getFilteredRevisions(
+                revisionHistoryRepository.findAllByOrderByCreatedDateTimeDesc(),
+                lastRevisionId
+        ).subscribeOn(scheduler);
     }
 
-    public Flux<RevisionHistory> getAllRevisionByDocument(String documentId) {
-        return revisionHistoryRepository.findAllByDocumentId(documentId);
+    public Flux<RevisionHistory> getAllRevisionByDocument(String documentId, GetRevisionPageRequest request) {
+        String lastRevisionId = request.lastRevisionId();
+        return getFilteredRevisions(
+                revisionHistoryRepository.findAllByDocumentId(documentId),
+                lastRevisionId
+        ).subscribeOn(scheduler);
     }
 
 }