CLAP-236 Fix: 로깅 조회 정렬 수정

parkjaehak · parkjaehak · commit ec1461232f3e · 2025-02-03T13:22:23.000+09:00
diff --git a/src/main/java/clap/server/adapter/inbound/web/log/LogController.java b/src/main/java/clap/server/adapter/inbound/web/log/LogController.java
@@ -35,16 +35,11 @@ public class LogController {
     public ResponseEntity<PageResponse<AnonymousLogResponse>> getLoginAttempts(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "20") int pageSize,
-            @RequestParam(defaultValue = "requestAt") String sortBy,
-            @RequestParam(defaultValue = "desc") String sortDirection,
+            @RequestParam(defaultValue = "DESC") String sortDirection,
             @ModelAttribute @Valid FilterLogRequest anonymousLogRequest,
             @AuthenticationPrincipal SecurityUserDetails userInfo) {
-        Pageable pageable = PageRequest.of(
-                page,
-                pageSize,
-                "asc".equalsIgnoreCase(sortDirection) ? Sort.by(sortBy).ascending() : Sort.by(sortBy).descending()
-        );
-        return ResponseEntity.ok(findApiLogsUsecase.filterAnonymousLogs(anonymousLogRequest, pageable));
+        Pageable pageable = PageRequest.of(page, pageSize);
+        return ResponseEntity.ok(findApiLogsUsecase.filterAnonymousLogs(anonymousLogRequest, pageable, sortDirection));
     }
 
     @Operation(summary = "작업 로그 목록 조회")
@@ -53,15 +48,10 @@ public ResponseEntity<PageResponse<AnonymousLogResponse>> getLoginAttempts(
     public ResponseEntity<PageResponse<MemberLogResponse>> getApiCalls(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "20") int pageSize,
-            @RequestParam(defaultValue = "requestAt") String sortBy,
-            @RequestParam(defaultValue = "desc") String sortDirection,
+            @RequestParam(defaultValue = "DESC") String sortDirection,
             @ModelAttribute @Valid FilterLogRequest memberLogRequest,
             @AuthenticationPrincipal SecurityUserDetails userInfo) {
-        Pageable pageable = PageRequest.of(
-                page,
-                pageSize,
-                "asc".equalsIgnoreCase(sortDirection) ? Sort.by(sortBy).ascending() : Sort.by(sortBy).descending()
-        );
-        return ResponseEntity.ok(findApiLogsUsecase.filterMemberLogs(memberLogRequest, pageable));
+        Pageable pageable = PageRequest.of(page, pageSize);
+        return ResponseEntity.ok(findApiLogsUsecase.filterMemberLogs(memberLogRequest, pageable, sortDirection));
     }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java
@@ -41,14 +41,14 @@ public void saveAnonymousLog(AnonymousLog anonymousLog) {
 
 
     @Override
-    public Page<MemberLog> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable) {
-        return memberLogRepository.filterMemberLogs(memberLogRequest, pageable)
+    public Page<MemberLog> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable, String sortDirection) {
+        return memberLogRepository.filterMemberLogs(memberLogRequest, pageable, sortDirection)
                 .map(apiLogPersistenceMapper::mapMemberLogEntityToDomain);
     }
 
     @Override
-    public Page<AnonymousLog> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable) {
-        return anonymousLogRepository.filterAnonymousLogs(anonymousLogRequest, pageable)
+    public Page<AnonymousLog> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable, String sortDirection) {
+        return anonymousLogRepository.filterAnonymousLogs(anonymousLogRequest, pageable, sortDirection)
                 .map(apiLogPersistenceMapper::mapAnonymousLogEntityToDomain);
     }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepository.java
@@ -6,5 +6,5 @@
 import org.springframework.data.domain.Pageable;
 
 public interface AnonymousLogCustomRepository {
-    Page<AnonymousLogEntity> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable);
+    Page<AnonymousLogEntity> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable, String sortDirection);
 }
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
@@ -24,7 +24,7 @@ public class AnonymousLogCustomRepositoryImpl implements AnonymousLogCustomRepos
 
     private final JPAQueryFactory queryFactory;
     @Override
-    public Page<AnonymousLogEntity> filterAnonymousLogs(FilterLogRequest request, Pageable pageable) {
+    public Page<AnonymousLogEntity> filterAnonymousLogs(FilterLogRequest request, Pageable pageable, String sortDirection) {
         BooleanBuilder builder = new BooleanBuilder();
 
         if (request.term() != null) {
@@ -40,11 +40,14 @@ public Page<AnonymousLogEntity> filterAnonymousLogs(FilterLogRequest request, Pa
         if (!request.clientIp().isEmpty()) {
             builder.and(anonymousLogEntity.clientIp.contains(request.clientIp()));
         }
+        OrderSpecifier<LocalDateTime> orderSpecifier = sortDirection.equalsIgnoreCase("ASC")
+                ? anonymousLogEntity.requestAt.asc()
+                : anonymousLogEntity.requestAt.desc();
 
         List<AnonymousLogEntity> result = queryFactory
                 .selectFrom(anonymousLogEntity)
                 .where(builder)
-                .orderBy(getOrderSpecifiers(pageable))
+                .orderBy(orderSpecifier)
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())
                 .fetch();
@@ -54,21 +57,4 @@ public Page<AnonymousLogEntity> filterAnonymousLogs(FilterLogRequest request, Pa
                 .fetch().size();
         return new PageImpl<>(result, pageable, total);
     }
-
-    // Pageable의 Sort 조건을 확인하여 동적으로 OrderSpecifier를 생성
-    private OrderSpecifier<?>[] getOrderSpecifiers(Pageable pageable) {
-        if (!pageable.getSort().isSorted()) {
-            // 정렬 조건이 없으면 requestAt 내림차순
-            return new OrderSpecifier[]{ anonymousLogEntity.requestAt.desc() };
-        }
-        List<OrderSpecifier<?>> orderSpecifiers = new ArrayList<>();
-        pageable.getSort().forEach(order -> {
-            if ("requestAt".equalsIgnoreCase(order.getProperty())) {
-                orderSpecifiers.add(order.isAscending()
-                        ? anonymousLogEntity.requestAt.asc()
-                        : anonymousLogEntity.requestAt.desc());
-            }
-        });
-        return orderSpecifiers.toArray(new OrderSpecifier[0]);
-    }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepository.java
@@ -6,5 +6,5 @@
 import org.springframework.data.domain.Pageable;
 
 public interface MemberLogCustomRepository {
-    Page<MemberLogEntity> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);
+    Page<MemberLogEntity> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable, String sortDirection);
 }
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
@@ -27,7 +27,7 @@ public class MemberLogCustomRepositoryImpl implements MemberLogCustomRepository{
     private final JPAQueryFactory queryFactory;
 
     @Override
-    public Page<MemberLogEntity> filterMemberLogs(FilterLogRequest request, Pageable pageable) {
+    public Page<MemberLogEntity> filterMemberLogs(FilterLogRequest request, Pageable pageable, String sortDirection) {
         BooleanBuilder builder = new BooleanBuilder();
 
         if (request.term() != null) {
@@ -43,12 +43,15 @@ public Page<MemberLogEntity> filterMemberLogs(FilterLogRequest request, Pageable
         if (!request.clientIp().isEmpty()) {
             builder.and(memberLogEntity.clientIp.contains(request.clientIp()));
         }
+        OrderSpecifier<LocalDateTime> orderSpecifier = sortDirection.equalsIgnoreCase("ASC")
+                ? memberLogEntity.requestAt.asc()
+                : memberLogEntity.requestAt.desc();
 
         List<MemberLogEntity> result = queryFactory
                 .selectFrom(memberLogEntity)
                 .where(builder)
                 .leftJoin(memberLogEntity.member, memberEntity)
-                .orderBy(getOrderSpecifiers(pageable))
+                .orderBy(orderSpecifier)
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())
                 .fetch();
@@ -58,21 +61,4 @@ public Page<MemberLogEntity> filterMemberLogs(FilterLogRequest request, Pageable
                 .fetch().size();
         return new PageImpl<>(result, pageable, total);
     }
-
-    // Pageable의 Sort 조건을 확인하여 동적으로 OrderSpecifier를 생성
-    private OrderSpecifier<?>[] getOrderSpecifiers(Pageable pageable) {
-        if (!pageable.getSort().isSorted()) {
-            // 정렬 조건이 없으면 requestAt 내림차순
-            return new OrderSpecifier[]{ memberLogEntity.requestAt.desc() };
-        }
-        List<OrderSpecifier<?>> orderSpecifiers = new ArrayList<>();
-        pageable.getSort().forEach(order -> {
-            if ("requestAt".equalsIgnoreCase(order.getProperty())) {
-                orderSpecifiers.add(order.isAscending()
-                        ? memberLogEntity.requestAt.asc()
-                        : memberLogEntity.requestAt.desc());
-            }
-        });
-        return orderSpecifiers.toArray(new OrderSpecifier[0]);
-    }
 }
diff --git a/src/main/java/clap/server/application/port/inbound/log/FindApiLogsUsecase.java b/src/main/java/clap/server/application/port/inbound/log/FindApiLogsUsecase.java
@@ -12,6 +12,6 @@
 import java.util.List;
 
 public interface FindApiLogsUsecase {
-    PageResponse<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest anonymousLogsRequest, Pageable pageable);
-    PageResponse<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);
+    PageResponse<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest anonymousLogsRequest, Pageable pageable, String sortDirection);
+    PageResponse<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable, String sortDirection);
 }
diff --git a/src/main/java/clap/server/application/port/outbound/log/LoadLogPort.java b/src/main/java/clap/server/application/port/outbound/log/LoadLogPort.java
@@ -12,7 +12,7 @@
 import java.util.List;
 
 public interface LoadLogPort {
-    Page<AnonymousLog> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable);
+    Page<AnonymousLog> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable, String sortDirection);
 
-    Page<MemberLog> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);
+    Page<MemberLog> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable, String sortDirection);
 }
diff --git a/src/main/java/clap/server/application/service/log/FindApiLogsService.java b/src/main/java/clap/server/application/service/log/FindApiLogsService.java
@@ -29,8 +29,8 @@ public class FindApiLogsService implements FindApiLogsUsecase {
     private final LoadLogPort loadLogPort;
 
     @Override
-    public PageResponse<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable) {
-        Page<AnonymousLog> anonymousLogs = loadLogPort.filterAnonymousLogs(anonymousLogRequest, pageable);
+    public PageResponse<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable, String sortDirection) {
+        Page<AnonymousLog> anonymousLogs = loadLogPort.filterAnonymousLogs(anonymousLogRequest, pageable, sortDirection);
         Page<AnonymousLogResponse> anonymousLogResponses = anonymousLogs.map(anonymousLog -> {
             int failedAttempts = loginDomainService.getFailedAttemptCount(anonymousLog.getLoginNickname());
             return LogMapper.toAnonymousLogResponse(anonymousLog, failedAttempts);
@@ -39,8 +39,8 @@ public PageResponse<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest a
     }
 
     @Override
-    public PageResponse<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable) {
-        Page<MemberLog> memberLogs = loadLogPort.filterMemberLogs(memberLogRequest, pageable);
+    public PageResponse<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable, String sortDirection) {
+        Page<MemberLog> memberLogs = loadLogPort.filterMemberLogs(memberLogRequest, pageable, sortDirection);
         Page<MemberLogResponse> memberLogResponses = memberLogs.map(LogMapper::toMemberLogResponse);
         return PageResponse.from(memberLogResponses);
     }

Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,14 @@ public void saveAnonymousLog(AnonymousLog anonymousLog) {`
`41`	`41`
`42`	`42`
`43`	`43`	`@Override`
`44`		`- public Page<MemberLog> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable) {`
`45`		`- return memberLogRepository.filterMemberLogs(memberLogRequest, pageable)`
	`44`	`+ public Page<MemberLog> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable, String sortDirection) {`
	`45`	`+ return memberLogRepository.filterMemberLogs(memberLogRequest, pageable, sortDirection)`
`46`	`46`	`.map(apiLogPersistenceMapper::mapMemberLogEntityToDomain);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@Override`
`50`		`- public Page<AnonymousLog> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable) {`
`51`		`- return anonymousLogRepository.filterAnonymousLogs(anonymousLogRequest, pageable)`
	`50`	`+ public Page<AnonymousLog> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable, String sortDirection) {`
	`51`	`+ return anonymousLogRepository.filterAnonymousLogs(anonymousLogRequest, pageable, sortDirection)`
`52`	`52`	`.map(apiLogPersistenceMapper::mapAnonymousLogEntityToDomain);`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@`
`6`	`6`	`import org.springframework.data.domain.Pageable;`
`7`	`7`
`8`	`8`	`public interface AnonymousLogCustomRepository {`
`9`		`- Page<AnonymousLogEntity> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable);`
	`9`	`+ Page<AnonymousLogEntity> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable, String sortDirection);`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@`
`6`	`6`	`import org.springframework.data.domain.Pageable;`
`7`	`7`
`8`	`8`	`public interface MemberLogCustomRepository {`
`9`		`- Page<MemberLogEntity> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);`
	`9`	`+ Page<MemberLogEntity> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable, String sortDirection);`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@`
`12`	`12`	`import java.util.List;`
`13`	`13`
`14`	`14`	`public interface FindApiLogsUsecase {`
`15`		`- PageResponse<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest anonymousLogsRequest, Pageable pageable);`
`16`		`- PageResponse<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);`
	`15`	`+ PageResponse<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest anonymousLogsRequest, Pageable pageable, String sortDirection);`
	`16`	`+ PageResponse<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable, String sortDirection);`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`import java.util.List;`
`13`	`13`
`14`	`14`	`public interface LoadLogPort {`
`15`		`- Page<AnonymousLog> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable);`
	`15`	`+ Page<AnonymousLog> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable, String sortDirection);`
`16`	`16`
`17`		`- Page<MemberLog> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);`
	`17`	`+ Page<MemberLog> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable, String sortDirection);`
`18`	`18`	`}`