From 9b72633b3ed19a1b79f9c25d8b54d95cdf67d390 Mon Sep 17 00:00:00 2001 From: coffeesigma Date: Mon, 16 Jun 2025 11:28:33 +0900 Subject: [PATCH 1/2] =?UTF-8?q?KW-677/feat:=20=EC=B6=9C=EC=9E=85=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8,=20=EC=B6=9C=EC=9E=85=EC=A6=9D=20=EB=B0=9C?= =?UTF-8?q?=EA=B8=89=20=EB=A1=9C=EA=B7=B8=20=EC=A1=B0=ED=9A=8C=EC=97=90=20?= =?UTF-8?q?keyword(membername)=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/log/controller/LogController.java | 8 ++++---- .../log/repository/EnterLogRepository.java | 2 ++ .../log/repository/IssuedLogRepository.java | 2 ++ .../domain/log/service/LogService.java | 4 ++-- .../domain/log/service/LogServiceImpl.java | 20 +++++++++++++++---- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/doubleo/logservice/domain/log/controller/LogController.java b/src/main/java/com/doubleo/logservice/domain/log/controller/LogController.java index 76c5923..3c803c1 100644 --- a/src/main/java/com/doubleo/logservice/domain/log/controller/LogController.java +++ b/src/main/java/com/doubleo/logservice/domain/log/controller/LogController.java @@ -29,15 +29,15 @@ public String HealthCheck() { @Operation(summary = "All issued log get API", description = "모든 출입증 발급 로그 조회 API") @GetMapping("/issued") public Page IssuedLogListGet( - @RequestHeader("X-Admin-Id") Long adminId, Pageable pageable) { - return logService.getAllIssuedLog(pageable); + @RequestHeader("X-Admin-Id") Long adminId, @RequestParam(required = false) String keyword, Pageable pageable) { + return logService.getAllIssuedLog(keyword, pageable); } @Operation(summary = "All issued log get API", description = "모든 출입 로그 조회 API") @GetMapping("/enter") public Page EnterLogListGet( - @RequestHeader("X-Admin-Id") Long adminId, Pageable pageable) { - return logService.getAllEnterLog(pageable); + @RequestHeader("X-Admin-Id") Long adminId, @RequestParam(required = false) String keyword, Pageable pageable) { + return logService.getAllEnterLog(keyword, pageable); } @Operation(summary = "Number of issues per hour", description = "시간대별 출입증 발급 수 API") diff --git a/src/main/java/com/doubleo/logservice/domain/log/repository/EnterLogRepository.java b/src/main/java/com/doubleo/logservice/domain/log/repository/EnterLogRepository.java index 57c5827..5599526 100644 --- a/src/main/java/com/doubleo/logservice/domain/log/repository/EnterLogRepository.java +++ b/src/main/java/com/doubleo/logservice/domain/log/repository/EnterLogRepository.java @@ -10,4 +10,6 @@ public interface EnterLogRepository extends JpaRepository { List findAllByTenantId(String tenantId); Page findAllByTenantId(String tenantId, Pageable pageable); + + Page findAllByMemberNameAndTenantId(String memberName, String tenantId, Pageable pageable); } diff --git a/src/main/java/com/doubleo/logservice/domain/log/repository/IssuedLogRepository.java b/src/main/java/com/doubleo/logservice/domain/log/repository/IssuedLogRepository.java index 094cae8..7bbf8cd 100644 --- a/src/main/java/com/doubleo/logservice/domain/log/repository/IssuedLogRepository.java +++ b/src/main/java/com/doubleo/logservice/domain/log/repository/IssuedLogRepository.java @@ -26,4 +26,6 @@ int countInLogsAtHour( @Param("start") LocalDateTime start, @Param("end") LocalDateTime end, @Param("tenantId") String tenantId); + + Page findAllByMemberNameAndTenantId(String memberName, String tenantId, Pageable pageable); } diff --git a/src/main/java/com/doubleo/logservice/domain/log/service/LogService.java b/src/main/java/com/doubleo/logservice/domain/log/service/LogService.java index da80745..c537723 100644 --- a/src/main/java/com/doubleo/logservice/domain/log/service/LogService.java +++ b/src/main/java/com/doubleo/logservice/domain/log/service/LogService.java @@ -8,9 +8,9 @@ import org.springframework.data.domain.Pageable; public interface LogService { - Page getAllIssuedLog(Pageable pageable); + Page getAllIssuedLog(String keyword, Pageable pageable); - Page getAllEnterLog(Pageable pageable); + Page getAllEnterLog(String keyword, Pageable pageable); List getHourlyIssuanceList(); } diff --git a/src/main/java/com/doubleo/logservice/domain/log/service/LogServiceImpl.java b/src/main/java/com/doubleo/logservice/domain/log/service/LogServiceImpl.java index 17ac98d..ea1755b 100644 --- a/src/main/java/com/doubleo/logservice/domain/log/service/LogServiceImpl.java +++ b/src/main/java/com/doubleo/logservice/domain/log/service/LogServiceImpl.java @@ -38,9 +38,15 @@ public class LogServiceImpl implements LogService { private final RedisTemplate redisTemplate; @Override - public Page getAllIssuedLog(Pageable pageable) { + public Page getAllIssuedLog(String keyword, Pageable pageable) { String tenantId = tenantValidator.getTenantId(); - Page issuedLogs = issuedLogRepository.findAllByTenantId(tenantId, pageable); + Page issuedLogs; + if (keyword == null || keyword.isBlank()) { + issuedLogs = issuedLogRepository.findAllByTenantId(tenantId, pageable); + } + else { + issuedLogs = issuedLogRepository.findAllByMemberNameAndTenantId(keyword, tenantId, pageable); + } return issuedLogs.map( issuedLog -> { @@ -71,9 +77,15 @@ public Page getAllIssuedLog(Pageable pageable) { } @Override - public Page getAllEnterLog(Pageable pageable) { + public Page getAllEnterLog(String keyword, Pageable pageable) { String tenantId = tenantValidator.getTenantId(); - Page enterLogs = enterLogRepository.findAllByTenantId(tenantId, pageable); + Page enterLogs; + if (keyword == null || keyword.isBlank()) { + enterLogs = enterLogRepository.findAllByTenantId(tenantId, pageable); + } + else { + enterLogs = enterLogRepository.findAllByMemberNameAndTenantId(keyword, tenantId, pageable); + } return enterLogs.map( enterLog -> new EnterLogResponse( From b0ddd4b4c000d947475931c64e822dd39b24094f Mon Sep 17 00:00:00 2001 From: coffeesigma Date: Mon, 16 Jun 2025 12:38:20 +0900 Subject: [PATCH 2/2] refactor: spotless --- .../domain/log/controller/LogController.java | 8 ++++++-- .../domain/log/repository/EnterLogRepository.java | 3 ++- .../domain/log/repository/IssuedLogRepository.java | 3 ++- .../domain/log/service/LogServiceImpl.java | 12 ++++++------ 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/doubleo/logservice/domain/log/controller/LogController.java b/src/main/java/com/doubleo/logservice/domain/log/controller/LogController.java index 3c803c1..8edeb08 100644 --- a/src/main/java/com/doubleo/logservice/domain/log/controller/LogController.java +++ b/src/main/java/com/doubleo/logservice/domain/log/controller/LogController.java @@ -29,14 +29,18 @@ public String HealthCheck() { @Operation(summary = "All issued log get API", description = "모든 출입증 발급 로그 조회 API") @GetMapping("/issued") public Page IssuedLogListGet( - @RequestHeader("X-Admin-Id") Long adminId, @RequestParam(required = false) String keyword, Pageable pageable) { + @RequestHeader("X-Admin-Id") Long adminId, + @RequestParam(required = false) String keyword, + Pageable pageable) { return logService.getAllIssuedLog(keyword, pageable); } @Operation(summary = "All issued log get API", description = "모든 출입 로그 조회 API") @GetMapping("/enter") public Page EnterLogListGet( - @RequestHeader("X-Admin-Id") Long adminId, @RequestParam(required = false) String keyword, Pageable pageable) { + @RequestHeader("X-Admin-Id") Long adminId, + @RequestParam(required = false) String keyword, + Pageable pageable) { return logService.getAllEnterLog(keyword, pageable); } diff --git a/src/main/java/com/doubleo/logservice/domain/log/repository/EnterLogRepository.java b/src/main/java/com/doubleo/logservice/domain/log/repository/EnterLogRepository.java index 5599526..244bef6 100644 --- a/src/main/java/com/doubleo/logservice/domain/log/repository/EnterLogRepository.java +++ b/src/main/java/com/doubleo/logservice/domain/log/repository/EnterLogRepository.java @@ -11,5 +11,6 @@ public interface EnterLogRepository extends JpaRepository { Page findAllByTenantId(String tenantId, Pageable pageable); - Page findAllByMemberNameAndTenantId(String memberName, String tenantId, Pageable pageable); + Page findAllByMemberNameAndTenantId( + String memberName, String tenantId, Pageable pageable); } diff --git a/src/main/java/com/doubleo/logservice/domain/log/repository/IssuedLogRepository.java b/src/main/java/com/doubleo/logservice/domain/log/repository/IssuedLogRepository.java index 7bbf8cd..fb9aced 100644 --- a/src/main/java/com/doubleo/logservice/domain/log/repository/IssuedLogRepository.java +++ b/src/main/java/com/doubleo/logservice/domain/log/repository/IssuedLogRepository.java @@ -27,5 +27,6 @@ int countInLogsAtHour( @Param("end") LocalDateTime end, @Param("tenantId") String tenantId); - Page findAllByMemberNameAndTenantId(String memberName, String tenantId, Pageable pageable); + Page findAllByMemberNameAndTenantId( + String memberName, String tenantId, Pageable pageable); } diff --git a/src/main/java/com/doubleo/logservice/domain/log/service/LogServiceImpl.java b/src/main/java/com/doubleo/logservice/domain/log/service/LogServiceImpl.java index ea1755b..bfce0d8 100644 --- a/src/main/java/com/doubleo/logservice/domain/log/service/LogServiceImpl.java +++ b/src/main/java/com/doubleo/logservice/domain/log/service/LogServiceImpl.java @@ -43,9 +43,9 @@ public Page getAllIssuedLog(String keyword, Pageable pageable Page issuedLogs; if (keyword == null || keyword.isBlank()) { issuedLogs = issuedLogRepository.findAllByTenantId(tenantId, pageable); - } - else { - issuedLogs = issuedLogRepository.findAllByMemberNameAndTenantId(keyword, tenantId, pageable); + } else { + issuedLogs = + issuedLogRepository.findAllByMemberNameAndTenantId(keyword, tenantId, pageable); } return issuedLogs.map( @@ -82,9 +82,9 @@ public Page getAllEnterLog(String keyword, Pageable pageable) Page enterLogs; if (keyword == null || keyword.isBlank()) { enterLogs = enterLogRepository.findAllByTenantId(tenantId, pageable); - } - else { - enterLogs = enterLogRepository.findAllByMemberNameAndTenantId(keyword, tenantId, pageable); + } else { + enterLogs = + enterLogRepository.findAllByMemberNameAndTenantId(keyword, tenantId, pageable); } return enterLogs.map( enterLog ->