Skip to content

[KW-681] refactor: 로그 조회 최신순 정렬 #6

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
midday2612 merged 1 commit into from
Jun 16, 2025
Merged

[KW-681] refactor: 로그 조회 최신순 정렬 #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 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 @@ -19,7 +19,9 @@
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand All @@ -40,6 +42,13 @@ public class LogServiceImpl implements LogService {
@Override
public Page<IssuedLogResponse> getAllIssuedLog(String keyword, Pageable pageable) {
String tenantId = tenantValidator.getTenantId();

pageable =
PageRequest.of(
pageable.getPageNumber(),
pageable.getPageSize(),
Sort.by(Sort.Direction.DESC, "createdDt"));

Page<IssuedLog> issuedLogs;
if (keyword == null || keyword.isBlank()) {
issuedLogs = issuedLogRepository.findAllByTenantId(tenantId, pageable);
Expand Down Expand Up @@ -79,6 +88,13 @@ public Page<IssuedLogResponse> getAllIssuedLog(String keyword, Pageable pageable
@Override
public Page<EnterLogResponse> getAllEnterLog(String keyword, Pageable pageable) {
String tenantId = tenantValidator.getTenantId();

pageable =
PageRequest.of(
pageable.getPageNumber(),
pageable.getPageSize(),
Sort.by(Sort.Direction.DESC, "createdDt"));

Page<EnterLog> enterLogs;
if (keyword == null || keyword.isBlank()) {
enterLogs = enterLogRepository.findAllByTenantId(tenantId, pageable);
Expand Down