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
15 changes: 4 additions & 11 deletions src/main/java/clap/server/config/aop/LoggingAspect.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import clap.server.common.annotation.log.LogType;
import clap.server.exception.BaseException;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
Expand Down Expand Up @@ -88,9 +87,9 @@ public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable {

private void handleLoginLog(int statusCode, HttpServletRequest request, String customCode, LogStatus logStatus, Object result) throws JsonProcessingException {
if (statusCode == HttpStatus.SC_OK) {
loggingPort.createAnonymousLog(request, statusCode, customCode, logStatus, result, getRequestBody(request), getNicknameFromRequestBody(request));
loggingPort.createAnonymousLog(request, statusCode, customCode, logStatus, result, getRequestBody(request), getNicknameFromParameter(request));
} else {
loggingPort.createLoginFailedLog(request, statusCode, customCode, logStatus, getRequestBody(request), getNicknameFromRequestBody(request));
loggingPort.createLoginFailedLog(request, statusCode, customCode, logStatus, getRequestBody(request), getNicknameFromParameter(request));
}
}

Expand All @@ -102,14 +101,8 @@ private LogStatus getLogType(MethodSignature methodSignature) {
}
}

private String getNicknameFromRequestBody(HttpServletRequest request) {
try {
String requestBody = getRequestBody(request);
JsonNode jsonNode = objectMapper.readTree(requestBody);
return jsonNode.has("nickname") ? jsonNode.get("nickname").asText() : null;
} catch (Exception e) {
return null;
}
private String getNicknameFromParameter(HttpServletRequest request) {
return request.getParameter("nickname");
}

private String getRequestBody(HttpServletRequest request) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import clap.server.application.port.inbound.domain.MemberService;
import clap.server.application.port.outbound.member.CommandMemberPort;
import clap.server.application.port.outbound.member.LoadMemberPort;
import clap.server.application.service.admin.CsvParseService;
import clap.server.application.service.admin.RegisterMemberCSVService;
import clap.server.domain.model.member.Department;
import clap.server.domain.model.member.Member;
import clap.server.domain.model.member.MemberInfo;
Expand Down