From d964806405f21e4e2be4ed92106321f666c72cea Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Mon, 10 Feb 2025 14:36:53 +0900 Subject: [PATCH 01/15] =?UTF-8?q?CLAP-358=20=20Fix:=20nickname=20=ED=8C=8C?= =?UTF-8?q?=EC=8B=B1=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clap/server/config/aop/LoggingAspect.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/main/java/clap/server/config/aop/LoggingAspect.java b/src/main/java/clap/server/config/aop/LoggingAspect.java index da7de978..90b745ae 100644 --- a/src/main/java/clap/server/config/aop/LoggingAspect.java +++ b/src/main/java/clap/server/config/aop/LoggingAspect.java @@ -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; @@ -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)); } } @@ -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) { From c0d26bf93e986ed04c751b89c72e673fca28d390 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Mon, 10 Feb 2025 14:39:35 +0900 Subject: [PATCH 02/15] =?UTF-8?q?CLAP-358=20=20Fix:=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...berCsvServiceTest.java => RegisterMemberCSVServiceTest.java} | 2 ++ 1 file changed, 2 insertions(+) rename src/test/java/clap/server/application/service/admin/{RegisterMemberCsvServiceTest.java => RegisterMemberCSVServiceTest.java} (97%) diff --git a/src/test/java/clap/server/application/service/admin/RegisterMemberCsvServiceTest.java b/src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java similarity index 97% rename from src/test/java/clap/server/application/service/admin/RegisterMemberCsvServiceTest.java rename to src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java index e28b309b..623a9384 100644 --- a/src/test/java/clap/server/application/service/admin/RegisterMemberCsvServiceTest.java +++ b/src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java @@ -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; From 97f7dd3283480e7d7a4214ef7194f4239412ac71 Mon Sep 17 00:00:00 2001 From: andrew Date: Mon, 10 Feb 2025 15:05:45 +0900 Subject: [PATCH 03/15] =?UTF-8?q?CLAP-361=20Fix=20:=20=EC=95=8C=EB=A6=BC?= =?UTF-8?q?=20=EC=9E=91=EC=84=B1=EC=9E=90=20=EB=A7=A4=ED=95=91=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/application/service/history/PostCommentService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/clap/server/application/service/history/PostCommentService.java b/src/main/java/clap/server/application/service/history/PostCommentService.java index 416a14db..fcedc2cf 100644 --- a/src/main/java/clap/server/application/service/history/PostCommentService.java +++ b/src/main/java/clap/server/application/service/history/PostCommentService.java @@ -54,7 +54,7 @@ public void save(Long memberId, Long taskId, CreateCommentRequest request) { Member processor = task.getProcessor(); Member requester = task.getRequester(); - if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) { + if (member.getMemberInfo().getRole() == requester.getMemberInfo().getRole()) { publishNotification(processor, task, request.content(), requester.getNickname()); } else { publishNotification(requester, task, request.content(), processor.getNickname()); From a4fe120564b0bbdfa77db501fd274d1d582a3230 Mon Sep 17 00:00:00 2001 From: joowojr Date: Mon, 10 Feb 2025 15:15:18 +0900 Subject: [PATCH 04/15] =?UTF-8?q?CLAP-361=20Fix:=20=EC=9E=98=EB=AA=BB?= =?UTF-8?q?=EB=90=9C=20=EB=A7=A4=EA=B0=9C=EB=B3=80=EC=88=98=20=EB=A7=A4?= =?UTF-8?q?=ED=95=91=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit