Skip to content

[KW-677] feat/log에 keyword 검색 기능 추가 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coffeesigma merged 2 commits into from
Jun 16, 2025
Merged

[KW-677] feat/log에 keyword 검색 기능 추가 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b72633
KW-677/feat: 출입 로그, 출입증 발급 로그 조회에 keyword(membername) 추가
coffeesigma Jun 16, 2025
b0ddd4b
refactor: spotless
coffeesigma Jun 16, 2025
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
12 changes: 8 additions & 4 deletions src/main/java/com/doubleo/logservice/domain/log/controller/LogController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,19 @@ public String HealthCheck() {
@Operation(summary = "All issued log get API", description = "모든 출입증 발급 로그 조회 API")
@GetMapping("/issued")
public Page<IssuedLogResponse> 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<EnterLogResponse> 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")
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/doubleo/logservice/domain/log/repository/EnterLogRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ public interface EnterLogRepository extends JpaRepository<EnterLog, Long> {
List<EnterLog> findAllByTenantId(String tenantId);

Page<EnterLog> findAllByTenantId(String tenantId, Pageable pageable);

Page<EnterLog> findAllByMemberNameAndTenantId(
String memberName, String tenantId, Pageable pageable);
}
3 changes: 3 additions & 0 deletions src/main/java/com/doubleo/logservice/domain/log/repository/IssuedLogRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ int countInLogsAtHour(
@Param("start") LocalDateTime start,
@Param("end") LocalDateTime end,
@Param("tenantId") String tenantId);

Page<IssuedLog> findAllByMemberNameAndTenantId(
String memberName, String tenantId, Pageable pageable);
}
4 changes: 2 additions & 2 deletions src/main/java/com/doubleo/logservice/domain/log/service/LogService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import org.springframework.data.domain.Pageable;

public interface LogService {
Page<IssuedLogResponse> getAllIssuedLog(Pageable pageable);
Page<IssuedLogResponse> getAllIssuedLog(String keyword, Pageable pageable);

Page<EnterLogResponse> getAllEnterLog(Pageable pageable);
Page<EnterLogResponse> getAllEnterLog(String keyword, Pageable pageable);

List<HourlyIssuanceResponse> getHourlyIssuanceList();
}
20 changes: 16 additions & 4 deletions src/main/java/com/doubleo/logservice/domain/log/service/LogServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,15 @@ public class LogServiceImpl implements LogService {
private final RedisTemplate<String, String> redisTemplate;

@Override
public Page<IssuedLogResponse> getAllIssuedLog(Pageable pageable) {
public Page<IssuedLogResponse> getAllIssuedLog(String keyword, Pageable pageable) {
String tenantId = tenantValidator.getTenantId();
Page<IssuedLog> issuedLogs = issuedLogRepository.findAllByTenantId(tenantId, pageable);
Page<IssuedLog> issuedLogs;
if (keyword == null || keyword.isBlank()) {
issuedLogs = issuedLogRepository.findAllByTenantId(tenantId, pageable);
} else {
issuedLogs =
issuedLogRepository.findAllByMemberNameAndTenantId(keyword, tenantId, pageable);
}

return issuedLogs.map(
issuedLog -> {
Expand Down Expand Up @@ -71,9 +77,15 @@ public Page<IssuedLogResponse> getAllIssuedLog(Pageable pageable) {
}

@Override
public Page<EnterLogResponse> getAllEnterLog(Pageable pageable) {
public Page<EnterLogResponse> getAllEnterLog(String keyword, Pageable pageable) {
String tenantId = tenantValidator.getTenantId();
Page<EnterLog> enterLogs = enterLogRepository.findAllByTenantId(tenantId, pageable);
Page<EnterLog> enterLogs;
if (keyword == null || keyword.isBlank()) {
enterLogs = enterLogRepository.findAllByTenantId(tenantId, pageable);
} else {
enterLogs =
enterLogRepository.findAllByMemberNameAndTenantId(keyword, tenantId, pageable);
}
return enterLogs.map(
enterLog ->
new EnterLogResponse(
Expand Down