refactor AddContentTable.java

Daemawiki · Mar 16, 2024 · b376a9a · b376a9a
1 parent d18ec74
commit b376a9a
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/com/example/daemawiki/domain/content/service/AddContentTable.java b/src/main/java/com/example/daemawiki/domain/content/service/AddContentTable.java
@@ -17,6 +17,7 @@
 import com.example.daemawiki.global.exception.h500.ExecuteFailedException;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
 
 import java.util.Comparator;
 
@@ -40,10 +41,7 @@ public AddContentTable(DocumentFacade documentFacade, RevisionComponent revision
     public Mono<Void> execute(AddContentRequest request, String documentId) {
         return userFacade.currentUser()
                 .zipWith(documentFacade.findDocumentById(documentId))
-                .map(tuple -> {
-                    userFilter.userPermissionAndDocumentVersionCheck(tuple.getT2(), tuple.getT1().getEmail(), request.version());
-                    return tuple;
-                })
+                .flatMap(tuple -> checkUserPermissionAndVersion(tuple, request.version()))
                 .flatMap(tuple -> {
                     DefaultDocument document = tuple.getT2();
                     User user = tuple.getT1();
@@ -59,6 +57,11 @@ public Mono<Void> execute(AddContentRequest request, String documentId) {
                 .onErrorMap(this::mapException);
     }
 
+    private Mono<Tuple2<User, DefaultDocument>> checkUserPermissionAndVersion(Tuple2<User, DefaultDocument> tuple, int version) {
+        userFilter.userPermissionAndDocumentVersionCheck(tuple.getT2(), tuple.getT1().getEmail(), version);
+        return Mono.just(tuple);
+    }
+
     private void setDocumentContent(DefaultDocument document, String index, String title) {
         Content newContent = createContent(index, title);
         document.getContents().add(newContent);