CLAP-81 Refactor: PageResponse를 통해 페이징 정보 전달

Author: parkjaehak

src/main/java/clap/server/adapter/inbound/web/dto/common/PageResponse.java

@@ -0,0 +1,27 @@
+package clap.server.adapter.inbound.web.dto.common;
+
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+public record PageResponse<T>(
+        List<T> content,
+        long totalElements,
+        int totalPages,
+        int pageNumber,
+        int pageSize,
+        boolean isFirst,
+        boolean isLast
+) {
+    public static <T> PageResponse<T> from(Page<T> page) {
+        return new PageResponse<>(
+                page.getContent(),
+                page.getTotalElements(),
+                page.getTotalPages(),
+                page.getNumber() + 1,
+                page.getSize(),
+                page.isFirst(),
+                page.isLast()
+        );
+    }
+}

src/main/java/clap/server/adapter/inbound/web/log/LogController.java

@@ -1,6 +1,7 @@
 package clap.server.adapter.inbound.web.log;
 
 import clap.server.adapter.inbound.security.SecurityUserDetails;
+import clap.server.adapter.inbound.web.dto.common.PageResponse;
 import clap.server.adapter.inbound.web.dto.log.AnonymousLogResponse;
 import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
 import clap.server.adapter.inbound.web.dto.log.MemberLogResponse;
@@ -10,6 +11,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -26,23 +28,23 @@ public class LogController {
 
     @Secured({"ROLE_ADMIN"})
     @GetMapping("/login")
-    public Page<AnonymousLogResponse> getLoginAttempts(
+    public ResponseEntity<PageResponse<AnonymousLogResponse>> getLoginAttempts(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "20") int pageSize,
             @ModelAttribute FilterLogRequest anonymousLogRequest,
             @AuthenticationPrincipal SecurityUserDetails userInfo) {
         Pageable pageable = PageRequest.of(page, pageSize);
-        return findApiLogsUsecase.filterAnonymousLogs(anonymousLogRequest, pageable);
+        return ResponseEntity.ok(findApiLogsUsecase.filterAnonymousLogs(anonymousLogRequest, pageable));
     }
 
     @Secured({"ROLE_ADMIN"})
     @GetMapping("/general")
-    public Page<MemberLogResponse> getApiCalls(
+    public ResponseEntity<PageResponse<MemberLogResponse>> getApiCalls(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "20") int pageSize,
             @ModelAttribute FilterLogRequest memberLogRequest,
             @AuthenticationPrincipal SecurityUserDetails userInfo) {
         Pageable pageable = PageRequest.of(page, pageSize);
-        return findApiLogsUsecase.filterMemberLogs(memberLogRequest, pageable);
+        return ResponseEntity.ok(findApiLogsUsecase.filterMemberLogs(memberLogRequest, pageable));
     }
 }

src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java

@@ -52,10 +52,9 @@ public List<ApiLog> findAllLogs() {
     }
 
     @Override
-    public Page<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable) {
-        Page<MemberLog> memberLogs = memberLogRepository.filterMemberLogs(memberLogRequest, pageable)
+    public Page<MemberLog> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable) {
+        return memberLogRepository.filterMemberLogs(memberLogRequest, pageable)
                 .map(apiLogPersistenceMapper::mapMemberLogEntityToDomain);
-        return memberLogs.map(LogMapper::toMemberLogResponse);
     }
 
     @Override

src/main/java/clap/server/application/port/inbound/log/FindApiLogsUsecase.java

@@ -1,6 +1,7 @@
 package clap.server.application.port.inbound.log;
 
 
+import clap.server.adapter.inbound.web.dto.common.PageResponse;
 import clap.server.adapter.inbound.web.dto.log.AnonymousLogResponse;
 import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
 import clap.server.adapter.inbound.web.dto.log.MemberLogResponse;
@@ -11,7 +12,7 @@
 import java.util.List;
 
 public interface FindApiLogsUsecase {
-    Page<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest anonymousLogsRequest, Pageable pageable);
-    Page<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);
+    PageResponse<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest anonymousLogsRequest, Pageable pageable);
+    PageResponse<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);
     List<ApiLog> getApiLogs();
 }

src/main/java/clap/server/application/port/outbound/log/LoadLogPort.java

@@ -5,6 +5,7 @@
 import clap.server.adapter.inbound.web.dto.log.MemberLogResponse;
 import clap.server.domain.model.log.AnonymousLog;
 import clap.server.domain.model.log.ApiLog;
+import clap.server.domain.model.log.MemberLog;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -14,5 +15,5 @@ public interface LoadLogPort {
     List<ApiLog> findAllLogs();
     Page<AnonymousLog> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable);
 
-    Page<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);
+    Page<MemberLog> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);
 }

src/main/java/clap/server/application/service/log/FindApiLogsService.java

@@ -1,5 +1,6 @@
 package clap.server.application.service.log;
 
+import clap.server.adapter.inbound.web.dto.common.PageResponse;
 import clap.server.adapter.inbound.web.dto.log.AnonymousLogResponse;
 import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
 import clap.server.adapter.inbound.web.dto.log.MemberLogResponse;
@@ -11,6 +12,7 @@
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.log.AnonymousLog;
 import clap.server.domain.model.log.ApiLog;
+import clap.server.domain.model.log.MemberLog;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -28,17 +30,20 @@ public class FindApiLogsService implements FindApiLogsUsecase {
     private final LoadLogPort loadLogPort;
 
     @Override
-    public Page<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable) {
+    public PageResponse<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable) {
         Page<AnonymousLog> anonymousLogs = loadLogPort.filterAnonymousLogs(anonymousLogRequest, pageable);
-        return anonymousLogs.map(anonymousLog -> {
+        Page<AnonymousLogResponse> anonymousLogResponses = anonymousLogs.map(anonymousLog -> {
             int failedAttempts = loginDomainService.getFailedAttemptCount(anonymousLog.getLoginNickname());
             return LogMapper.toAnonymounsLogResponse(anonymousLog, failedAttempts);
         });
+        return PageResponse.from(anonymousLogResponses);
     }
 
     @Override
-    public Page<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable) {
-        return loadLogPort.filterMemberLogs(memberLogRequest, pageable);
+    public PageResponse<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable) {
+        Page<MemberLog> memberLogs = loadLogPort.filterMemberLogs(memberLogRequest, pageable);
+        Page<MemberLogResponse> memberLogResponses = memberLogs.map(LogMapper::toMemberLogResponse);
+        return PageResponse.from(memberLogResponses);
     }
 
     //테스트용