Skip to content

[Release] V2.1.2 로그 관련 기능 수정 #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yongjun0511 merged 3 commits into from
Nov 15, 2025
Merged

[Release] V2.1.2 로그 관련 기능 수정 #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1e35e7
fix: 에러 알림 변경 (#303)
yongjun0511 Nov 10, 2025
c3da532
fix: security context에서 꺼내오도록 수정 (#305)
yongjun0511 Nov 15, 2025
3ec24be
fix: 가격 수정 (#307)
yongjun0511 Nov 15, 2025
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
2 changes: 1 addition & 1 deletion src/main/java/ssu/eatssu/domain/restaurant/entity/Restaurant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@Getter
public enum Restaurant {

DODAM("DODAM", 7000),
DODAM("DODAM", 6000),
DORMITORY("DORMITORY", 5500),
FOOD_COURT("FOOD_COURT", null),
SNACK_CORNER("SNACK_CORNER", null),
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ssu/eatssu/domain/slack/entity/SlackMessageFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public static String sendServerError(Throwable ex, String method, String uri, St
- HTTP Method: {4}
- URI: {5}
- User ID: {6}
- 요청 파라미터: {7}
- 로그 내용 (파라미터 정보 포함): {7}
===================
""";
MessageFormat messageFormat = new MessageFormat(messageTemplate);
Expand Down
21 changes: 12 additions & 9 deletions src/main/java/ssu/eatssu/global/log/ControllerLogAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
Expand Down Expand Up @@ -51,15 +53,7 @@ public Object logApi(ProceedingJoinPoint joinPoint) throws Throwable {
String[] paramNames = methodSignature.getParameterNames();
Object[] args = joinPoint.getArgs();

// 요청자
String userId = IntStream.range(0, args.length)
.filter(i -> args[i] instanceof CustomUserDetails)
.mapToObj(i -> {
CustomUserDetails user = (CustomUserDetails) args[i];
return String.valueOf(user.getId());
})
.findFirst()
.orElse("anonymous");
String userId = getUserIdFromSecurityContext();

String userIdLog = "userId=" + userId;

Expand Down Expand Up @@ -127,6 +121,15 @@ private String getCauseMessage(Throwable e) {
return message != null ? message : e.getClass().getSimpleName();
}

private String getUserIdFromSecurityContext() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication != null && authentication.isAuthenticated() && authentication.getPrincipal() instanceof CustomUserDetails) {
CustomUserDetails userDetails = (CustomUserDetails) authentication.getPrincipal();
return String.valueOf(userDetails.getId());
}
Comment on lines +126 to +129
Copy link

@gemini-code-assist gemini-code-assist bot Nov 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Java 16 이상을 사용하고 있다면, instanceof 패턴 매칭을 활용하여 코드를 더 간결하게 만들 수 있습니다. 이렇게 하면 타입 확인과 변수 할당을 한 줄로 처리할 수 있어 가독성이 향상됩니다.

        if (authentication != null && authentication.isAuthenticated() && authentication.getPrincipal() instanceof CustomUserDetails userDetails) {
            return String.valueOf(userDetails.getId());
        }

return "anonymous";
}

private Map<String, Object> toSafeMap(Object arg) {
Map<String, Object> result = new HashMap<>();
for (Field field : arg.getClass().getDeclaredFields()) {
Expand Down