add custom pagination in events

FINTLabs · Oct 15, 2024 · 9ebae84 · 9ebae84
1 parent a7d37b9
commit 9ebae84
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/main/java/no/fintlabs/EventService.java b/src/main/java/no/fintlabs/EventService.java
@@ -55,6 +55,7 @@ public Page<EventDto> getMergedLatestEventsWhereSourceApplicationIdIn(
             List<Long> sourceApplicationIds,
             Pageable pageable
     ) {
+        // Fetch the paginated results for the first query
         Page<Event> latestEventsPage = eventRepository
                 .findLatestEventPerSourceApplicationInstanceIdAndSourceApplicationIdIn(
                         sourceApplicationIds,
@@ -64,23 +65,32 @@ public Page<EventDto> getMergedLatestEventsWhereSourceApplicationIdIn(
         List<Event> latestNonDeletedEvents = eventRepository
                 .findLatestEventNotDeletedPerSourceApplicationInstanceIdAndSourceApplicationIdIn(
                         sourceApplicationIds,
-                        Pageable.unpaged()  // Fetch all results, no pagination
+                        Pageable.unpaged()
                 ).getContent();
 
         long totalLatestEvents = eventRepository.countLatestEventPerSourceApplicationInstanceIdAndSourceApplicationIdIn(sourceApplicationIds);
         long totalLatestNonDeletedEvents = eventRepository.countLatestEventNotDeletedPerSourceApplicationInstanceIdAndSourceApplicationIdIn(sourceApplicationIds);
 
         long totalElements = totalLatestEvents + totalLatestNonDeletedEvents;
 
-        log.info("Total Elements: {}", totalElements);
+        if (totalElements == 0) {
+            return new PageImpl<>(new ArrayList<>(), pageable, totalElements);
+        }
 
         List<EventDto> mergedEvents = mergeEvents(latestEventsPage.getContent(), latestNonDeletedEvents);
 
-        totalElements = Math.min(totalElements, mergedEvents.size());
+        int start = (int) pageable.getOffset();
+        int end = Math.min(start + pageable.getPageSize(), mergedEvents.size());
 
-        return new PageImpl<>(mergedEvents, pageable, totalElements);
+        if (start > mergedEvents.size()) {
+            return new PageImpl<>(new ArrayList<>(), pageable, totalElements);
+        }
+
+        List<EventDto> paginatedList = mergedEvents.subList(start, end);
+        return new PageImpl<>(paginatedList, pageable, totalElements);
     }
 
+
     private List<EventDto> mergeEvents(List<Event> latestEvents, List<Event> latestNonDeletedEvents) {
         Map<String, Event> nonDeletedEventMap = latestNonDeletedEvents.stream()
                 .collect(Collectors.toMap(