Fix pageable sort and sort dir on event type/plant filter

MDeLuise · Jul 12, 2023 · c61c571 · c61c571
1 parent 0ad4aa8
commit c61c571
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/backend/src/main/java/com/github/mdeluise/plantit/diary/entry/DiaryEntryService.java b/backend/src/main/java/com/github/mdeluise/plantit/diary/entry/DiaryEntryService.java
@@ -7,6 +7,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
@@ -34,9 +35,10 @@ public Page<DiaryEntry> getAll(Pageable pageable, List<Long> plantIds, List<Stri
  return diaryEntryRepository.findAllByDiaryOwner(authenticatedUserService.getAuthenticatedUser(), pageable);
  }
 
+ final Pageable pageableToUse = PageRequest.of(0, count().intValue(), pageable.getSort());
  final List<DiaryEntry> filteredResult =
  diaryEntryRepository.findAllByDiaryOwner(
- authenticatedUserService.getAuthenticatedUser(), Pageable.unpaged()).stream()
+ authenticatedUserService.getAuthenticatedUser(), pageableToUse).stream()
  .filter(entry -> plantIds.isEmpty() || plantIds.contains(entry.getDiary().getTarget().getId()))
  .filter(entry -> eventTypes.isEmpty() || eventTypes.contains(entry.getType().name()))
  .toList();