리팩토링;

Daemawiki · Feb 17, 2024 · 250cf96 · 250cf96
1 parent 92a64bf
commit 250cf96
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 22 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
@@ -1,10 +1,8 @@
 package com.example.daemawiki.domain.revision.api;
 
-import com.example.daemawiki.domain.revision.dto.request.GetRevisionPageRequest;
+import com.example.daemawiki.domain.revision.component.service.RevisionService;
 import com.example.daemawiki.domain.revision.dto.response.RevisionDocumentDetailResponse;
 import com.example.daemawiki.domain.revision.model.RevisionHistory;
-import com.example.daemawiki.domain.revision.component.service.RevisionService;
-import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Flux;
 
@@ -23,13 +21,13 @@ public Flux<RevisionDocumentDetailResponse> getRevisionTop10ByUpdatedDate() {
     }
 
     @GetMapping("/page")
-    public Flux<RevisionHistory> getRevisionToPage(@Valid @RequestBody GetRevisionPageRequest request) {
-        return revisionService.getAllRevisionPaging(request);
+    public Flux<RevisionHistory> getRevisionToPage(@RequestParam String lastRevisionId) {
+        return revisionService.getAllRevisionPaging(lastRevisionId);
     }
 
     @GetMapping("/{documentId}")
-    public Flux<RevisionHistory> getRevisionByDocument(@PathVariable String documentId, @Valid @RequestBody GetRevisionPageRequest request) {
-        return revisionService.getAllRevisionByDocument(documentId, request);
+    public Flux<RevisionHistory> getRevisionByDocument(@PathVariable String documentId, @RequestParam String lastRevisionId) {
+        return revisionService.getAllRevisionByDocument(documentId, lastRevisionId);
     }
 
 }
diff --git a/src/main/java/com/example/daemawiki/domain/revision/component/service/RevisionService.java b/src/main/java/com/example/daemawiki/domain/revision/component/service/RevisionService.java
@@ -1,9 +1,8 @@
 package com.example.daemawiki.domain.revision.component.service;
 
-import com.example.daemawiki.domain.revision.model.mapper.RevisionMapper;
-import com.example.daemawiki.domain.revision.dto.request.GetRevisionPageRequest;
 import com.example.daemawiki.domain.revision.dto.response.RevisionDocumentDetailResponse;
 import com.example.daemawiki.domain.revision.model.RevisionHistory;
+import com.example.daemawiki.domain.revision.model.mapper.RevisionMapper;
 import com.example.daemawiki.domain.revision.model.type.RevisionType;
 import com.example.daemawiki.domain.revision.repository.RevisionHistoryRepository;
 import org.bson.types.ObjectId;
@@ -40,16 +39,14 @@ public Flux<RevisionHistory> getFilteredRevisions(Flux<RevisionHistory> revision
                 .take(20);
     }
 
-    public Flux<RevisionHistory> getAllRevisionPaging(GetRevisionPageRequest request) {
-        String lastRevisionId = request.lastRevisionId();
+    public Flux<RevisionHistory> getAllRevisionPaging(String lastRevisionId) {
         return getFilteredRevisions(
                 revisionHistoryRepository.findAllByOrderByCreatedDateTimeDesc(),
                 lastRevisionId
         ).subscribeOn(scheduler);
     }
 
-    public Flux<RevisionHistory> getAllRevisionByDocument(String documentId, GetRevisionPageRequest request) {
-        String lastRevisionId = request.lastRevisionId();
+    public Flux<RevisionHistory> getAllRevisionByDocument(String documentId, String lastRevisionId) {
         return getFilteredRevisions(
                 revisionHistoryRepository.findAllByDocumentId(documentId),
                 lastRevisionId

diff --git a/src/main/java/com/example/daemawiki/domain/revision/dto/request/GetRevisionPageRequest.java b/src/main/java/com/example/daemawiki/domain/revision/dto/request/GetRevisionPageRequest.java