리팩토링

Daemawiki · Mar 1, 2024 · e36fa02 · e36fa02
1 parent f6bd427
commit e36fa02
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/src/main/java/com/example/daemawiki/domain/editor/api/DocumentEditorController.java b/src/main/java/com/example/daemawiki/domain/editor/api/DocumentEditorController.java
@@ -5,12 +5,13 @@
 import com.example.daemawiki.domain.editor.service.AddEditor;
 import com.example.daemawiki.domain.editor.service.DeleteEditor;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Mono;
 
 @RestController
-@RequestMapping("/api/documents/editor")
+@RequestMapping("/api/documents/{documentId}/editor")
 public class DocumentEditorController {
     private final AddEditor addEditorService;
     private final DeleteEditor deleteEditorService;
@@ -22,14 +23,14 @@ public DocumentEditorController(AddEditor addEditorService, DeleteEditor deleteE
 
     @PatchMapping
     @ResponseStatus(HttpStatus.NO_CONTENT)
-    public Mono<Void> addEditor(@Valid @RequestBody AddEditorRequest request) {
-        return addEditorService.execute(request);
+    public Mono<Void> addEditor(@Valid @RequestBody AddEditorRequest request, @NotBlank @PathVariable String documentId) {
+        return addEditorService.execute(request, documentId);
     }
 
     @PatchMapping("/remove")
     @ResponseStatus(HttpStatus.NO_CONTENT)
-    public Mono<Void> deleteEditor(@Valid @RequestBody DeleteEditorRequest request) {
-        return deleteEditorService.execute(request);
+    public Mono<Void> deleteEditor(@Valid @RequestBody DeleteEditorRequest request, @NotBlank @PathVariable String documentId) {
+        return deleteEditorService.execute(request, documentId);
     }
 
 }
diff --git a/src/main/java/com/example/daemawiki/domain/editor/dto/AddEditorRequest.java b/src/main/java/com/example/daemawiki/domain/editor/dto/AddEditorRequest.java
@@ -3,8 +3,6 @@
 import jakarta.validation.constraints.NotBlank;
 
 public record AddEditorRequest(
-        @NotBlank(message = "문서의 id를 입력해주세요.")
-        String documentId,
         @NotBlank(message = "문서 변경 권한을 줄 유저의 이메일을 입력해주세요.")
         String email) {
 }
diff --git a/src/main/java/com/example/daemawiki/domain/editor/dto/DeleteEditorRequest.java b/src/main/java/com/example/daemawiki/domain/editor/dto/DeleteEditorRequest.java
@@ -3,8 +3,6 @@
 import jakarta.validation.constraints.NotBlank;
 
 public record DeleteEditorRequest(
-        @NotBlank(message = "문서의 id를 입력해주세요.")
-        String documentId,
         @NotBlank(message = "문서 변경 권한을 삭제할 유저의 id를 입력해주세요.")
         String userId) {
 }
diff --git a/src/main/java/com/example/daemawiki/domain/editor/service/AddEditor.java b/src/main/java/com/example/daemawiki/domain/editor/service/AddEditor.java
@@ -21,9 +21,9 @@ public AddEditor(UserFacade userFacade, DocumentFacade documentFacade, DocumentR
         this.documentRepository = documentRepository;
     }
 
-    public Mono<Void> execute(AddEditorRequest request) {
+    public Mono<Void> execute(AddEditorRequest request, String documentId) {
         return userFacade.currentUser()
-                .flatMap(user -> documentFacade.findDocumentById(request.documentId())
+                .flatMap(user -> documentFacade.findDocumentById(documentId)
                         .filter(document -> document.getEditor().getCreatedUser().id().equals(user.getId()))
                         .switchIfEmpty(Mono.error(NoPermissionUserException.EXCEPTION))
                         .zipWith(userFacade.findByEmailNotNull(request.email()), (document, user2) -> {

diff --git a/src/main/java/com/example/daemawiki/domain/editor/service/DeleteEditor.java b/src/main/java/com/example/daemawiki/domain/editor/service/DeleteEditor.java
@@ -22,9 +22,9 @@ public DeleteEditor(UserFacade userFacade, DocumentFacade documentFacade, Docume
         this.documentRepository = documentRepository;
     }
 
-    public Mono<Void> execute(DeleteEditorRequest request) {
+    public Mono<Void> execute(DeleteEditorRequest request, String documentId) {
         return userFacade.currentUser()
-                .flatMap(user -> documentFacade.findDocumentById(request.documentId())
+                .flatMap(user -> documentFacade.findDocumentById(documentId)
                         .filter(document -> Objects.equals(user.getId(), document.getEditor().getCreatedUser().id()))
                         .switchIfEmpty(Mono.error(NoPermissionUserException.EXCEPTION))
                         .flatMap(document -> {