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/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() 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); 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