예외 처리

Daemawiki · Feb 20, 2024 · 13badb6 · 13badb6
1 parent 99332a9
commit 13badb6
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 9 deletions.
diff --git a/src/main/java/com/example/daemawiki/domain/document/component/CreateDocumentByUser.java b/src/main/java/com/example/daemawiki/domain/document/component/CreateDocumentByUser.java
@@ -8,6 +8,7 @@
 import com.example.daemawiki.domain.revision.dto.request.SaveRevisionHistoryRequest;
 import com.example.daemawiki.domain.revision.model.type.RevisionType;
 import com.example.daemawiki.domain.user.model.User;
+import com.example.daemawiki.global.exception.h500.ExecuteFailedException;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
@@ -34,7 +35,8 @@ public Mono<DefaultDocument> execute(User user) {
                         .documentId(document.getId())
                         .title(document.getTitle())
                         .build())
-                        .thenReturn(document));
+                        .thenReturn(document))
+                .onErrorMap(e -> ExecuteFailedException.EXCEPTION);
     }
 
     private DefaultDocument createDocument(User user) {

diff --git a/src/main/java/com/example/daemawiki/domain/document/component/service/CreateDocument.java b/src/main/java/com/example/daemawiki/domain/document/component/service/CreateDocument.java
@@ -7,6 +7,7 @@
 import com.example.daemawiki.domain.revision.dto.request.SaveRevisionHistoryRequest;
 import com.example.daemawiki.domain.revision.model.type.RevisionType;
 import com.example.daemawiki.domain.user.service.facade.UserFacade;
+import com.example.daemawiki.global.exception.h500.ExecuteFailedException;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
@@ -32,7 +33,8 @@ public Mono<Void> execute(SaveDocumentRequest request) {
                         .type(RevisionType.CREATE)
                         .documentId(document.getId())
                         .title(document.getTitle())
-                        .build()));
+                        .build()))
+                .onErrorMap(e -> ExecuteFailedException.EXCEPTION);
     }
 
 }
diff --git a/src/main/java/com/example/daemawiki/domain/document/component/service/DeleteDocument.java b/src/main/java/com/example/daemawiki/domain/document/component/service/DeleteDocument.java
@@ -1,9 +1,10 @@
 package com.example.daemawiki.domain.document.component.service;
 
 import com.example.daemawiki.domain.document.repository.DocumentRepository;
+import com.example.daemawiki.domain.revision.component.RevisionComponent;
 import com.example.daemawiki.domain.revision.dto.request.SaveRevisionHistoryRequest;
 import com.example.daemawiki.domain.revision.model.type.RevisionType;
-import com.example.daemawiki.domain.revision.component.RevisionComponent;
+import com.example.daemawiki.global.exception.h500.ExecuteFailedException;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
@@ -24,7 +25,8 @@ public Mono<Void> execute(String documentId) {
                                             .type(RevisionType.DELETE)
                                             .documentId(documentId)
                                             .title(document.getTitle())
-                                    .build())));
+                                    .build())))
+                .onErrorMap(e -> ExecuteFailedException.EXCEPTION);
     }
 
 }
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,15 +1,16 @@
 package com.example.daemawiki.domain.document.component.service;
 
+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;
 import com.example.daemawiki.domain.document.repository.DocumentRepository;
-import com.example.daemawiki.domain.document.component.facade.DocumentFacade;
 import com.example.daemawiki.domain.revision.component.RevisionComponent;
 import com.example.daemawiki.domain.revision.dto.request.SaveRevisionHistoryRequest;
 import com.example.daemawiki.domain.revision.model.type.RevisionType;
 import com.example.daemawiki.domain.user.dto.UserDetailResponse;
 import com.example.daemawiki.domain.user.service.facade.UserFacade;
 import com.example.daemawiki.global.exception.h400.VersionMismatchException;
+import com.example.daemawiki.global.exception.h500.ExecuteFailedException;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
@@ -60,7 +61,8 @@ public Mono<Void> execute(SaveDocumentRequest request, String documentId) {
                                 .type(RevisionType.UPDATE)
                                 .documentId(d.getId())
                                 .title(d.getTitle())
-                                .build()));
+                                .build()))
+                .onErrorMap(e -> ExecuteFailedException.EXCEPTION);
     }
 
 }
diff --git a/src/main/java/com/example/daemawiki/domain/revision/component/RevisionComponent.java b/src/main/java/com/example/daemawiki/domain/revision/component/RevisionComponent.java
@@ -4,6 +4,7 @@
 import com.example.daemawiki.domain.revision.model.RevisionHistory;
 import com.example.daemawiki.domain.revision.repository.RevisionHistoryRepository;
 import com.example.daemawiki.domain.user.service.facade.UserFacade;
+import com.example.daemawiki.global.exception.h500.ExecuteFailedException;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
@@ -29,7 +30,8 @@ public Mono<Void> saveHistory(SaveRevisionHistoryRequest request) {
                         .createdDateTime(LocalDateTime.now())
                         .build())
                 .flatMap(revisionHistoryRepository::save)
-                .then();
+                .then()
+                .onErrorMap(e -> ExecuteFailedException.EXCEPTION);
     }
 
 }
diff --git a/src/main/java/com/example/daemawiki/domain/user/service/ChangePassword.java b/src/main/java/com/example/daemawiki/domain/user/service/ChangePassword.java
@@ -3,6 +3,7 @@
 import com.example.daemawiki.domain.user.dto.ChangePasswordRequest;
 import com.example.daemawiki.domain.user.repository.UserRepository;
 import com.example.daemawiki.domain.user.service.facade.UserFacade;
+import com.example.daemawiki.global.exception.h500.ExecuteFailedException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
@@ -27,6 +28,7 @@ public Mono<Void> execute(ChangePasswordRequest request) {
                     user.changePassword(passwordEncoder.encode(request.newPassword()));
                     return userRepository.save(user);
                 })
+                .onErrorMap(e -> ExecuteFailedException.EXCEPTION)
                 .then();
     }
 

diff --git a/src/main/java/com/example/daemawiki/domain/user/service/ProfileImageUpload.java b/src/main/java/com/example/daemawiki/domain/user/service/ProfileImageUpload.java
@@ -2,6 +2,7 @@
 
 import com.example.daemawiki.domain.user.repository.UserRepository;
 import com.example.daemawiki.domain.user.service.facade.UserFacade;
+import com.example.daemawiki.global.exception.h500.ExecuteFailedException;
 import com.example.daemawiki.infra.s3.service.S3UploadObject;
 import org.springframework.http.codec.multipart.FilePart;
 import org.springframework.stereotype.Service;
@@ -26,6 +27,7 @@ public Mono<Void> execute(FilePart filePart) {
                     return user;
                 })
                 .flatMap(userRepository::save)
+                .onErrorMap(e -> ExecuteFailedException.EXCEPTION)
                 .then();
     }
 

diff --git a/src/main/java/com/example/daemawiki/infra/s3/service/S3DeleteObject.java b/src/main/java/com/example/daemawiki/infra/s3/service/S3DeleteObject.java
@@ -2,6 +2,7 @@
 
 import com.example.daemawiki.domain.file.dto.DeleteFileRequest;
 import com.example.daemawiki.domain.file.component.DeleteFile;
+import com.example.daemawiki.global.exception.h500.ExecuteFailedException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
@@ -28,7 +29,8 @@ public Mono<Void> deleteObject(DeleteFileRequest request) {
                         .build())
                 .map(s3AsyncClient::deleteObject)
                 .flatMap(Mono::fromFuture)
-                .flatMap(deleteObjectResponse -> deleteFile.deleteById(request.key()));
+                .flatMap(deleteObjectResponse -> deleteFile.deleteById(request.key()))
+                .onErrorMap(e -> ExecuteFailedException.EXCEPTION);
     }
 
 }
diff --git a/src/main/java/com/example/daemawiki/infra/s3/service/S3UploadObject.java b/src/main/java/com/example/daemawiki/infra/s3/service/S3UploadObject.java
@@ -4,6 +4,7 @@
 import com.example.daemawiki.domain.file.model.FileDetail;
 import com.example.daemawiki.domain.file.model.type.FileType;
 import com.example.daemawiki.domain.file.repository.FileRepository;
+import com.example.daemawiki.global.exception.h500.ExecuteFailedException;
 import com.example.daemawiki.global.exception.h500.FileUploadFailedException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.buffer.DataBufferUtils;
@@ -83,7 +84,8 @@ public Mono<File> uploadObject(FilePart filePart, String fileType) {
                                         .onErrorMap(e -> FileUploadFailedException.EXCEPTION);
                             });
                 })
-                .flatMap(response -> createFile(key, filename, type, fileType));
+                .flatMap(response -> createFile(key, filename, type, fileType))
+                .onErrorMap(e -> ExecuteFailedException.EXCEPTION);
     }
 
     private Mono<File> createFile(UUID key, String fileName, MediaType mediaType, String filetype) {