Skip to content

Commit

Permalink
πŸ“ [DOCS] 좜λ ₯ ν˜•μ‹ 더 이쁘게 λ³€κ²½ #52
Browse files Browse the repository at this point in the history
  • Loading branch information
ddongseop committed Jan 14, 2024
1 parent b139d9b commit 1d8fa43
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public BookCreateResponseDto createBook(Book book, Member member) {
member.addBook(book);
Book createdBook = bookRepository.save(book);

log.info("- πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“\n\n" +
log.info("πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“πŸ“\n\n" +
"- πŸ“ μœ μ €κ°€ μƒˆλ‘œμš΄ λ ˆνλΆμ„ μƒμ„±ν–ˆμŠ΅λ‹ˆλ‹€!\n" +
"- πŸ‘€ μœ μ € λ‹‰λ„€μž„: " + member.getNickname() + "\n" +
"- ⏰ 생성 μ‹œκ°„: " + createdBook.getCreatedAt() + "\n" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public MemberLoginResponseDto login(String socialAccessToken, SocialLoginRequest
}

if (!isRegistered && socialPlatform == SocialPlatform.KAKAO) {
log.info("- 🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣\n\n" +
log.info("🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣🐣\n\n" +
"- 🐣 μƒˆλ‘œμš΄ μœ μ €κ°€ νšŒμ›κ°€μž…μ„ μ™„λ£Œν–ˆμŠ΅λ‹ˆλ‹€!\n" +
"- πŸ† λˆ„μ  νšŒμ›κ°€μž… 수: " + loginMember.getId() + " λͺ…\n" +
"\n" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public NoteCreateResponseDto saveNote(Note note, Member member, Book book) {

Note createdNote = noteRepository.save(note);

log.info("- πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ\n\n" +
log.info("πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ πŸ’Œ\n\n" +
"- πŸ’Œ μœ μ €κ°€ μƒˆλ‘œμš΄ λ ˆνλ…ΈνŠΈλ₯Ό λ‚¨κ²ΌμŠ΅λ‹ˆλ‹€!\n" +
"- πŸ‘€ μœ μ € λ‹‰λ„€μž„: " + member.getNickname() + "\n" +
"- ⏰ 남긴 μ‹œκ°„: " + createdNote.getCreatedAt() + "\n" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull Ht
SecurityContextHolder.getContext().setAuthentication(authentication);
}
} catch (Exception exception) {
log.error("- 🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨");
log.error("- 🚨 JWT 인증 ν•„ν„°μ—μ„œ 였λ₯˜κ°€ λ°œμƒν–ˆλ‹€!: ", exception);
log.error("🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨\n\n" +
"- 🚨 JWT 인증 ν•„ν„°μ—μ„œ 였λ₯˜κ°€ λ°œμƒν–ˆλ‹€!: ");
log.error(exception.getMessage(), exception);
}

filterChain.doFilter(request, response);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,10 @@ public static ApiResponse<?> error(ErrorType errorType) {
return new ApiResponse<>(errorType.getHttpStatusCode(), errorType.getMessage());
}

public static ApiResponse<?> error(ErrorType errorType, String message) {
return new ApiResponse<>(errorType.getHttpStatusCode(), message);
}

public static <T> ApiResponse<T> error(ErrorType errorType, T data) {
return new ApiResponse<>(errorType.getHttpStatusCode(), errorType.getMessage(), data);
}

public static <T> ApiResponse<T> error(ErrorType errorType, String message, T data) {
return new ApiResponse<>(errorType.getHttpStatusCode(), message, data);
}

public static <T> ApiResponse<Exception> error(ErrorType errorType, Exception e) {
return new ApiResponse<>(errorType.getHttpStatusCode(), errorType.getMessage(), e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ public Object requestErrorLevelLogging(ProceedingJoinPoint proceedingJoinPoint)
long endAt = System.currentTimeMillis();

StringBuilder logMessage = new StringBuilder();
logMessage.append("\n" +
"- ✨ REQUEST: [" + request.getMethod() + "] " + request.getRequestURL() + "\n" +
"- ✨ DURATION: " + (endAt - startAt) + "ms\n" +
"- ✨ HEADERS: " + getHeaders(request) + "\n");
logMessage.append(
"πŸ”μƒμ„Έ 정보" + "\n" +
"- ✨ REQUEST: [" + request.getMethod() + "] " + request.getRequestURL() + "\n" +
"- ✨ DURATION: " + (endAt - startAt) + "ms\n" +
"- ✨ HEADERS: " + getHeaders(request) + "\n");

Object[] args = proceedingJoinPoint.getArgs();
if (args.length > 0) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,42 +86,44 @@ protected ApiResponse<?> handleHttpRequestMethodNotSupportedException(final Http
@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
@ExceptionHandler(Exception.class)
protected ApiResponse<Exception> handleException(final Exception e, final HttpServletRequest request) {
log.error("- 🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨");
log.error("- 🚨 μ•Όμƒμ˜ μ„œλ²„ μ—λŸ¬κ°€ λ°œμƒν–ˆλ‹€!: ", e);
log.error("🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨\n\n" +
"- 🚨 μ•Όμƒμ˜ μ„œλ²„ μ—λŸ¬κ°€ λ°œμƒν–ˆλ‹€!: ");
log.error(e.getMessage(), e);
return ApiResponse.error(INTERNAL_SERVER_ERROR, e);
}

@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
@ExceptionHandler(IllegalArgumentException.class)
public ApiResponse<Exception> handleIllegalArgumentException(final IllegalArgumentException e, final HttpServletRequest request) {
log.error("- 🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨");
log.error("- 🚨 μ•Όμƒμ˜ μ„œλ²„ μ—λŸ¬κ°€ λ°œμƒν–ˆλ‹€!: ", e);
log.error("🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨\n\n" +
"- 🚨 μ•Όμƒμ˜ μ„œλ²„ μ—λŸ¬κ°€ λ°œμƒν–ˆλ‹€!: ");
log.error(e.getMessage(), e);
return ApiResponse.error(ErrorType.INTERNAL_SERVER_ERROR, e);
}

@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
@ExceptionHandler(IOException.class)
public ApiResponse<Exception> handleIOException(final IOException e, final HttpServletRequest request) {
log.error("- 🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨");
log.error("- 🚨 μ•Όμƒμ˜ μ„œλ²„ μ—λŸ¬κ°€ λ°œμƒν–ˆλ‹€!: ", e);
log.error("🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨\n\n" +
"- 🚨 μ•Όμƒμ˜ μ„œλ²„ μ—λŸ¬κ°€ λ°œμƒν–ˆλ‹€!: ");
log.error(e.getMessage(), e);
return ApiResponse.error(ErrorType.INTERNAL_SERVER_ERROR, e);
}

@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
@ExceptionHandler(RuntimeException.class)
public ApiResponse<Exception> handleRuntimeException(final RuntimeException e, final HttpServletRequest request) {

log.error("- 🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨");
log.error("- 🚨 μ•Όμƒμ˜ μ„œλ²„ μ—λŸ¬κ°€ λ°œμƒν–ˆλ‹€!: ", e);

log.error("🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨\n\n" +
"- 🚨 μ•Όμƒμ˜ μ„œλ²„ μ—λŸ¬κ°€ λ°œμƒν–ˆλ‹€!: ");
log.error(e.getMessage(), e);
if (e.getMessage() != null) {
return ApiResponse.error(ErrorType.INTERNAL_SERVER_ERROR, e.getMessage(), e);
} else {
return ApiResponse.error(ErrorType.INTERNAL_SERVER_ERROR, e);
}
}


/**
* CUSTOM_ERROR
*/
Expand All @@ -131,6 +133,6 @@ protected ResponseEntity<ApiResponse<?>> handleCustomException(CustomException e
log.warn("CustomException Occured: {}", e.getMessage(), e);

return ResponseEntity.status(e.getHttpStatus())
.body(ApiResponse.error(e.getErrorType(), e.getMessage()));
.body(ApiResponse.error(e.getErrorType()));
}
}

0 comments on commit 1d8fa43

Please sign in to comment.