diff --git a/src/main/java/com/project/bumawiki/domain/docs/service/DocsUpdateService.java b/src/main/java/com/project/bumawiki/domain/docs/service/DocsUpdateService.java index 564a5142..9bfc756b 100644 --- a/src/main/java/com/project/bumawiki/domain/docs/service/DocsUpdateService.java +++ b/src/main/java/com/project/bumawiki/domain/docs/service/DocsUpdateService.java @@ -14,7 +14,6 @@ import com.project.bumawiki.domain.docs.domain.type.DocsType; import com.project.bumawiki.domain.docs.domain.type.Status; import com.project.bumawiki.domain.docs.exception.CannotChangeYourDocsException; -import com.project.bumawiki.domain.docs.exception.DocsConflictedException; import com.project.bumawiki.domain.docs.exception.NoUpdatableDocsException; import com.project.bumawiki.domain.docs.presentation.dto.request.DocsTitleUpdateRequestDto; import com.project.bumawiki.domain.docs.presentation.dto.request.DocsTypeUpdateDto; @@ -42,9 +41,9 @@ public Long execute(String bearer, String title, DocsUpdateRequestDto docsUpdate Docs foundDocs = findDocsByTitle(title); validate(authId, foundDocs); - if (foundDocs.getStatus() == Status.CONFLICTED) { - throw new DocsConflictedException(); - } + // if (foundDocs.getStatus() == Status.CONFLICTED) { + // throw new DocsConflictedException(); + // } VersionDocs savedVersionDocs = saveVersionDocs(docsUpdateRequestDto, foundDocs.getId(), foundDocs.getLastVersion()); diff --git a/src/main/java/com/project/bumawiki/global/error/ErrorResponse.java b/src/main/java/com/project/bumawiki/global/error/ErrorResponse.java index fd0acf96..3e4537d6 100644 --- a/src/main/java/com/project/bumawiki/global/error/ErrorResponse.java +++ b/src/main/java/com/project/bumawiki/global/error/ErrorResponse.java @@ -1,12 +1,15 @@ package com.project.bumawiki.global.error; +import com.fasterxml.jackson.annotation.JsonIgnore; + import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor public class ErrorResponse { - private final String errorLogsFormat = """ + @JsonIgnore + private static final String errorLogsFormat = """ { "status": "%s", "code": "%s", diff --git a/src/main/java/com/project/bumawiki/global/error/GlobalExceptionHandler.java b/src/main/java/com/project/bumawiki/global/error/GlobalExceptionHandler.java index 4e333dd1..62252ba9 100644 --- a/src/main/java/com/project/bumawiki/global/error/GlobalExceptionHandler.java +++ b/src/main/java/com/project/bumawiki/global/error/GlobalExceptionHandler.java @@ -21,7 +21,6 @@ @RestControllerAdvice @Slf4j public class GlobalExceptionHandler { - @SuppressWarnings("checkstyle:RegexpSinglelineJava") private static final String errorLogsFormat = """ { "status": "%s",