Skip to content
Snippets Groups Projects
Commit 1eb45ca0 authored by Ruben Backx's avatar Ruben Backx :coffee:
Browse files

Merge branch 'fix-thomas-feedback' into 'development'

Consider all feedback for anonymisation and lower feedback threshold

See merge request !616
parents 1066fa14 e1f385cc
No related branches found
No related tags found
2 merge requests!630New release,!616Consider all feedback for anonymisation and lower feedback threshold
......@@ -88,11 +88,12 @@ public interface FeedbackRepository
*/
default Page<Feedback> findByAssistantAnonymised(Long assistantId, Pageable pageable) {
var feedback = StreamSupport.stream(findAll(qf.id.assistantId.eq(assistantId)
.and(qf.feedback.isNotNull()).and(qf.feedback.isNotEmpty())
.and(qf.createdAt.before(LocalDateTime.now().minusMonths(1))), qf.createdAt.desc())
.and(qf.createdAt.before(LocalDateTime.now().minusWeeks(2))), qf.createdAt.desc())
.spliterator(),
false)
.skip(10).collect(Collectors.toList());
.skip(5)
.filter(f -> f.getFeedback() != null && !f.getFeedback().isEmpty())
.collect(Collectors.toList());
var page = feedback.subList(pageable.getPageNumber() * pageable.getPageSize(),
Math.min(feedback.size(), (pageable.getPageNumber() + 1) * pageable.getPageSize()));
return new PageImpl<>(page, pageable, feedback.size());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment