diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/archive/folder/controller/FolderController.java b/src/main/java/org/tuna/zoopzoop/backend/domain/archive/folder/controller/FolderController.java index 1897bf3b..3179435c 100644 --- a/src/main/java/org/tuna/zoopzoop/backend/domain/archive/folder/controller/FolderController.java +++ b/src/main/java/org/tuna/zoopzoop/backend/domain/archive/folder/controller/FolderController.java @@ -37,7 +37,6 @@ public RsData createFolder( ) { Member member = userDetails.getMember(); FolderResponse createFile = folderService.createFolderForPersonal(member.getId(), rq.folderName()); - resBodyForCreateFolder rs = new resBodyForCreateFolder(createFile.folderName(), createFile.folderId()); return new RsData<>( diff --git a/src/main/java/org/tuna/zoopzoop/backend/global/exception/GlobalExceptionHandler.java b/src/main/java/org/tuna/zoopzoop/backend/global/exception/GlobalExceptionHandler.java index e62e05e7..333b988c 100644 --- a/src/main/java/org/tuna/zoopzoop/backend/global/exception/GlobalExceptionHandler.java +++ b/src/main/java/org/tuna/zoopzoop/backend/global/exception/GlobalExceptionHandler.java @@ -189,6 +189,17 @@ public ResponseEntity> handleSecurityException(SecurityException e) ); } + @ExceptionHandler(IllegalStateException.class) // 동시성 에러 + public ResponseEntity> handleIllegalStateException(IllegalStateException e) { + return new ResponseEntity<>( + new RsData<>( + "409", + e.getMessage() + ), + CONFLICT + ); + } + @ExceptionHandler(Exception.class) // 내부 서버 에러(= 따로 Exception을 지정하지 않은 경우.) public ResponseEntity> handleException(Exception e) { return new ResponseEntity<>(