From 3222f59e253253adcee809a9e8d51b72974e805e Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Mon, 10 Feb 2025 16:06:00 +0900 Subject: [PATCH 1/3] =?UTF-8?q?CLAP-365=20Fix:=20size=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EC=8B=9C=20join=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/log/MemberLogCustomRepositoryImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepositoryImpl.java index 29154e8e..dca33624 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepositoryImpl.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepositoryImpl.java @@ -40,7 +40,7 @@ public Page filterMemberLogs(FilterLogRequest request, Pageable builder.and(memberEntity.nickname.contains(request.nickName())); } if (!request.clientIp().isEmpty()) { - builder.and(memberLogEntity.clientIp.contains(request.clientIp())); + builder.and(memberLogEntity.clientIp.startsWith(request.clientIp())); } OrderSpecifier orderSpecifier = sortDirection.equalsIgnoreCase("ASC") ? memberLogEntity.requestAt.asc() @@ -56,6 +56,7 @@ public Page filterMemberLogs(FilterLogRequest request, Pageable .fetch(); long total = queryFactory .selectFrom(memberLogEntity) + .leftJoin(memberLogEntity.member, memberEntity) .where(builder) .fetch().size(); return new PageImpl<>(result, pageable, total); From 0b5c07f7b5c29be2475956124d4bf35962f4478b Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Mon, 10 Feb 2025 16:12:23 +0900 Subject: [PATCH 2/3] =?UTF-8?q?CLAP-365=20Fix:=20logout=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outbound/persistense/entity/log/constant/LogStatus.java | 1 - .../dev/V20250210365__Modify_Log_Status_From_Api_Log.sql | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/db/migration/dev/V20250210365__Modify_Log_Status_From_Api_Log.sql diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/log/constant/LogStatus.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/log/constant/LogStatus.java index 849cb05b..34a99aba 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/entity/log/constant/LogStatus.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/log/constant/LogStatus.java @@ -7,7 +7,6 @@ @RequiredArgsConstructor public enum LogStatus { LOGIN("로그인"), - LOGOUT("로그아웃"), REQUEST_CREATED("요청 생성"), REQUEST_UPDATED("요청 수정"), REQUEST_CANCELLED("요청 취소"), diff --git a/src/main/resources/db/migration/dev/V20250210365__Modify_Log_Status_From_Api_Log.sql b/src/main/resources/db/migration/dev/V20250210365__Modify_Log_Status_From_Api_Log.sql new file mode 100644 index 00000000..b9b69e64 --- /dev/null +++ b/src/main/resources/db/migration/dev/V20250210365__Modify_Log_Status_From_Api_Log.sql @@ -0,0 +1,4 @@ +ALTER TABLE api_log + MODIFY COLUMN log_status ENUM('LOGIN', 'REQUEST_CREATED', 'REQUEST_UPDATED', 'REQUEST_CANCELLED', + 'REQUEST_APPROVED', 'ASSIGNER_CHANGED', 'COMMENT_ADDED', + 'COMMENT_UPDATED', 'STATUS_CHANGED', 'TASK_VIEWED') NOT NULL; \ No newline at end of file From 2c8c73b6a5de30cbec44f56bbf6474b32b9c69ed Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Mon, 10 Feb 2025 16:20:09 +0900 Subject: [PATCH 3/3] =?UTF-8?q?CLAP-365=20Fix:=20startsWith=20=EC=86=8D?= =?UTF-8?q?=EC=84=B1=20=EB=B3=80=EA=B2=BD=ED=95=98=EC=97=AC=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=ED=94=BC=20=EA=B2=80=EC=83=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/log/AnonymousLogCustomRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepositoryImpl.java index cc9aefea..80cc61b2 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepositoryImpl.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepositoryImpl.java @@ -36,7 +36,7 @@ public Page filterAnonymousLogs(FilterLogRequest request, Pa builder.and(anonymousLogEntity.loginNickname.contains(request.nickName())); } if (!request.clientIp().isEmpty()) { - builder.and(anonymousLogEntity.clientIp.contains(request.clientIp())); + builder.and(anonymousLogEntity.clientIp.startsWith(request.clientIp())); } OrderSpecifier orderSpecifier = sortDirection.equalsIgnoreCase("ASC") ? anonymousLogEntity.requestAt.asc()