리팩토링

Daemawiki · Mar 5, 2024 · f0356cc · f0356cc
1 parent 22c6dfd
commit f0356cc
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 31 deletions.
diff --git a/...mple/daemawiki/domain/common/Commons.java → ...e/daemawiki/domain/common/UserFilter.java b/...mple/daemawiki/domain/common/Commons.java → ...e/daemawiki/domain/common/UserFilter.java
@@ -8,7 +8,7 @@
 import java.util.Objects;
 
 @Component
-public class Commons {
+public class UserFilter {
 
     public void userPermissionAndDocumentVersionCheck(DefaultDocument document, String userEmail, Integer requestVersion) {
         if (document.getEditor().hasEditPermission(userEmail)) {

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
@@ -1,6 +1,6 @@
 package com.example.daemawiki.domain.content.service;
 
-import com.example.daemawiki.domain.common.Commons;
+import com.example.daemawiki.domain.common.UserFilter;
 import com.example.daemawiki.domain.content.dto.AddContentRequest;
 import com.example.daemawiki.domain.content.model.Content;
 import com.example.daemawiki.domain.document.component.facade.DocumentFacade;
@@ -25,19 +25,19 @@ public class AddContentTable {
     private final DocumentFacade documentFacade;
     private final RevisionComponent revisionComponent;
     private final UserFacade userFacade;
-    private final Commons commons;
+    private final UserFilter userFilter;
 
-    public AddContentTable(DocumentFacade documentFacade, RevisionComponent revisionComponent, UserFacade userFacade, Commons commons) {
+    public AddContentTable(DocumentFacade documentFacade, RevisionComponent revisionComponent, UserFacade userFacade, UserFilter userFilter) {
         this.documentFacade = documentFacade;
         this.revisionComponent = revisionComponent;
         this.userFacade = userFacade;
-        this.commons = commons;
+        this.userFilter = userFilter;
     }
 
     public Mono<Void> execute(AddContentRequest request, String documentId) {
         return userFacade.currentUser()
                 .zipWith(documentFacade.findDocumentById(documentId), (user, document) -> {
-                    commons.userPermissionAndDocumentVersionCheck(document, user.getEmail(), request.version());
+                    userFilter.userPermissionAndDocumentVersionCheck(document, user.getEmail(), request.version());
 
                     return Tuples.of(document, user);
                 })

diff --git a/src/main/java/com/example/daemawiki/domain/content/service/DeleteContent.java b/src/main/java/com/example/daemawiki/domain/content/service/DeleteContent.java
@@ -1,6 +1,6 @@
 package com.example.daemawiki.domain.content.service;
 
-import com.example.daemawiki.domain.common.Commons;
+import com.example.daemawiki.domain.common.UserFilter;
 import com.example.daemawiki.domain.content.dto.DeleteContentRequest;
 import com.example.daemawiki.domain.document.component.facade.DocumentFacade;
 import com.example.daemawiki.domain.revision.component.RevisionComponent;
@@ -18,19 +18,19 @@ public class DeleteContent {
     private final DocumentFacade documentFacade;
     private final RevisionComponent revisionComponent;
     private final UserFacade userFacade;
-    private final Commons commons;
+    private final UserFilter userFilter;
 
-    public DeleteContent(DocumentFacade documentFacade, RevisionComponent revisionComponent, UserFacade userFacade, Commons commons) {
+    public DeleteContent(DocumentFacade documentFacade, RevisionComponent revisionComponent, UserFacade userFacade, UserFilter userFilter) {
         this.documentFacade = documentFacade;
         this.revisionComponent = revisionComponent;
         this.userFacade = userFacade;
-        this.commons = commons;
+        this.userFilter = userFilter;
     }
 
     public Mono<Void> execute(DeleteContentRequest request, String documentId) {
         return userFacade.currentUser()
                 .zipWith(documentFacade.findDocumentById(documentId), (user, document) -> {
-                    commons.userPermissionAndDocumentVersionCheck(document, user.getEmail(), request.version());
+                    userFilter.userPermissionAndDocumentVersionCheck(document, user.getEmail(), request.version());
                     return document;
                 })
                 .flatMap(document -> {

diff --git a/src/main/java/com/example/daemawiki/domain/content/service/EditContentTableTitle.java b/src/main/java/com/example/daemawiki/domain/content/service/EditContentTableTitle.java
@@ -1,6 +1,6 @@
 package com.example.daemawiki.domain.content.service;
 
-import com.example.daemawiki.domain.common.Commons;
+import com.example.daemawiki.domain.common.UserFilter;
 import com.example.daemawiki.domain.content.dto.EditContentTableTitleRequest;
 import com.example.daemawiki.domain.document.component.facade.DocumentFacade;
 import com.example.daemawiki.domain.revision.component.RevisionComponent;
@@ -15,19 +15,19 @@ public class EditContentTableTitle {
     private final DocumentFacade documentFacade;
     private final RevisionComponent revisionComponent;
     private final UserFacade userFacade;
-    private final Commons commons;
+    private final UserFilter userFilter;
 
-    public EditContentTableTitle(DocumentFacade documentFacade, RevisionComponent revisionComponent, UserFacade userFacade, Commons commons) {
+    public EditContentTableTitle(DocumentFacade documentFacade, RevisionComponent revisionComponent, UserFacade userFacade, UserFilter userFilter) {
         this.documentFacade = documentFacade;
         this.revisionComponent = revisionComponent;
         this.userFacade = userFacade;
-        this.commons = commons;
+        this.userFilter = userFilter;
     }
 
     public Mono<Void> execute(EditContentTableTitleRequest request, String documentId) {
         return userFacade.currentUser()
                 .zipWith(documentFacade.findDocumentById(documentId), (user, document) -> {
-                    commons.userPermissionAndDocumentVersionCheck(document, user.getEmail(), request.version());
+                    userFilter.userPermissionAndDocumentVersionCheck(document, user.getEmail(), request.version());
                     return document;
                 })
                 .map(document -> {

diff --git a/src/main/java/com/example/daemawiki/domain/content/service/WriteContent.java b/src/main/java/com/example/daemawiki/domain/content/service/WriteContent.java
@@ -1,6 +1,6 @@
 package com.example.daemawiki.domain.content.service;
 
-import com.example.daemawiki.domain.common.Commons;
+import com.example.daemawiki.domain.common.UserFilter;
 import com.example.daemawiki.domain.content.dto.WriteContentRequest;
 import com.example.daemawiki.domain.content.model.Content;
 import com.example.daemawiki.domain.document.component.facade.DocumentFacade;
@@ -28,19 +28,19 @@ public class WriteContent {
     private final DocumentFacade documentFacade;
     private final RevisionComponent revisionComponent;
     private final UserFacade userFacade;
-    private final Commons commons;
+    private final UserFilter userFilter;
 
-    public WriteContent(DocumentFacade documentFacade, RevisionComponent revisionComponent, UserFacade userFacade, Commons commons) {
+    public WriteContent(DocumentFacade documentFacade, RevisionComponent revisionComponent, UserFacade userFacade, UserFilter userFilter) {
         this.documentFacade = documentFacade;
         this.revisionComponent = revisionComponent;
         this.userFacade = userFacade;
-        this.commons = commons;
+        this.userFilter = userFilter;
     }
 
     public Mono<Void> execute(WriteContentRequest request, String documentId) {
         return userFacade.currentUser()
                 .zipWith(documentFacade.findDocumentById(documentId), (user, document) -> {
-                    commons.userPermissionAndDocumentVersionCheck(document, user.getEmail(), request.version());
+                    userFilter.userPermissionAndDocumentVersionCheck(document, user.getEmail(), request.version());
                     return Tuples.of(user, document);
                 })
                 .flatMap(tuple -> {

diff --git a/src/main/java/com/example/daemawiki/domain/document/component/service/UpdateDocument.java b/src/main/java/com/example/daemawiki/domain/document/component/service/UpdateDocument.java
@@ -1,6 +1,6 @@
 package com.example.daemawiki.domain.document.component.service;
 
-import com.example.daemawiki.domain.common.Commons;
+import com.example.daemawiki.domain.common.UserFilter;
 import com.example.daemawiki.domain.document.component.facade.DocumentFacade;
 import com.example.daemawiki.domain.document.dto.request.SaveDocumentRequest;
 import com.example.daemawiki.domain.document.model.type.service.GetDocumentType;
@@ -21,20 +21,20 @@ public class UpdateDocument {
     private final UserFacade userFacade;
     private final GetDocumentType getDocumentType;
     private final RevisionComponent revisionComponent;
-    private final Commons commons;
+    private final UserFilter userFilter;
 
-    public UpdateDocument(DocumentFacade documentFacade, UserFacade userFacade, GetDocumentType getDocumentType, RevisionComponent revisionComponent, Commons commons) {
+    public UpdateDocument(DocumentFacade documentFacade, UserFacade userFacade, GetDocumentType getDocumentType, RevisionComponent revisionComponent, UserFilter userFilter) {
         this.documentFacade = documentFacade;
         this.userFacade = userFacade;
         this.getDocumentType = getDocumentType;
         this.revisionComponent = revisionComponent;
-        this.commons = commons;
+        this.userFilter = userFilter;
     }
 
     public Mono<Void> execute(SaveDocumentRequest request, String documentId) {
         return userFacade.currentUser()
                 .zipWith(documentFacade.findDocumentById(documentId), (user, document) -> {
-                            commons.userPermissionAndDocumentVersionCheck(document, user.getEmail(), request.version());
+                            userFilter.userPermissionAndDocumentVersionCheck(document, user.getEmail(), request.version());
 
                             document.getEditor().setUpdatedUser(UserDetailResponse.builder()
                                     .id(user.getId())

diff --git a/src/main/java/com/example/daemawiki/domain/info/service/UpdateInfo.java b/src/main/java/com/example/daemawiki/domain/info/service/UpdateInfo.java
@@ -1,6 +1,6 @@
 package com.example.daemawiki.domain.info.service;
 
-import com.example.daemawiki.domain.common.Commons;
+import com.example.daemawiki.domain.common.UserFilter;
 import com.example.daemawiki.domain.document.component.facade.DocumentFacade;
 import com.example.daemawiki.domain.document.model.DefaultDocument;
 import com.example.daemawiki.domain.document.repository.DocumentRepository;
@@ -24,20 +24,20 @@ public class UpdateInfo {
     private final DocumentRepository documentRepository;
     private final RevisionComponent revisionComponent;
     private final UserFacade userFacade;
-    private final Commons commons;
+    private final UserFilter userFilter;
 
-    public UpdateInfo(DocumentFacade documentFacade, DocumentRepository documentRepository, RevisionComponent revisionComponent, UserFacade userFacade, Commons commons) {
+    public UpdateInfo(DocumentFacade documentFacade, DocumentRepository documentRepository, RevisionComponent revisionComponent, UserFacade userFacade, UserFilter userFilter) {
         this.documentFacade = documentFacade;
         this.documentRepository = documentRepository;
         this.revisionComponent = revisionComponent;
         this.userFacade = userFacade;
-        this.commons = commons;
+        this.userFilter = userFilter;
     }
 
     public Mono<Void> execute(UpdateInfoRequest request) {
         return userFacade.currentUser()
                 .zipWith(documentFacade.findDocumentById(request.documentId()), (user, document) -> {
-                    commons.userPermissionAndDocumentVersionCheck(document, user.getEmail(), request.version());
+                    userFilter.userPermissionAndDocumentVersionCheck(document, user.getEmail(), request.version());
 
                     return Tuples.of(document, user);
                 })