Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public RsData<resBodyForCreateFolder> createFolder(
) {
Member member = userDetails.getMember();
FolderResponse createFile = folderService.createFolderForPersonal(member.getId(), rq.folderName());

resBodyForCreateFolder rs = new resBodyForCreateFolder(createFile.folderName(), createFile.folderId());

return new RsData<>(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,17 @@ public ResponseEntity<RsData<Void>> handleSecurityException(SecurityException e)
);
}

@ExceptionHandler(IllegalStateException.class) // 동시성 에러
public ResponseEntity<RsData<Void>> handleIllegalStateException(IllegalStateException e) {
return new ResponseEntity<>(
new RsData<>(
"409",
e.getMessage()
),
CONFLICT
);
}

@ExceptionHandler(Exception.class) // 내부 서버 에러(= 따로 Exception을 지정하지 않은 경우.)
public ResponseEntity<RsData<Void>> handleException(Exception e) {
return new ResponseEntity<>(
Expand Down