diff --git a/src/main/java/de/tum/in/www1/artemis/repository/PersistenceAuditEventRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/PersistenceAuditEventRepository.java index 815b57746081..172de00d1839 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/PersistenceAuditEventRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/PersistenceAuditEventRepository.java @@ -3,6 +3,7 @@ import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.Instant; +import java.util.Comparator; import java.util.List; import java.util.Optional; @@ -52,6 +53,7 @@ default Page findAllWithDataByAuditEventDateBetween(Instan return Page.empty(pageable); } List result = findWithDataByIdIn(ids); + result.sort(Comparator.comparing(event -> ids.indexOf(event.getId()))); return new PageImpl<>(result, pageable, countByAuditEventDateBetween(fromDate, toDate)); } @@ -73,6 +75,7 @@ default Page findAllWithData(@NotNull Pageable pageable) { return Page.empty(pageable); } List result = findWithDataByIdIn(ids); + result.sort(Comparator.comparing(event -> ids.indexOf(event.getId()))); return new PageImpl<>(result, pageable, count()); }