@@ -283,10 +283,14 @@ public class FileEntityHandler implements RequestHandler {
|
||||
String[] searchTerms = searchQuery.split("\\s+");
|
||||
String filterType = fileRequest.getType();
|
||||
String dateFilter = fileRequest.getDateFilter();
|
||||
List<String> statuses = fileRequest.getStatuses();
|
||||
Boolean isAppeal = fileRequest.getIsAppeal();
|
||||
|
||||
List<FileEntityResponse> filteredFiles = allFiles.getFiles().stream()
|
||||
.filter(f -> matchesSearch(f, searchTerms, searchQuery, filterType))
|
||||
.filter(f -> matchesDateFilter(f, dateFilter))
|
||||
.filter(f -> matchesStatuses(f, statuses))
|
||||
.filter(f -> matchesAppeal(f, isAppeal))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
Comparator<FileEntityResponse> comparator = getComparator(sortBy, sortOrder);
|
||||
@@ -313,6 +317,8 @@ public class FileEntityHandler implements RequestHandler {
|
||||
.pageSize(pageSize)
|
||||
.sortBy(sortBy)
|
||||
.sortOrder(sortOrder.getValue())
|
||||
.statuses(List.of(FileStatus.BLOCKED.name(), FileStatus.ACTIVE.name(),
|
||||
FileStatus.MODERATION.name()))
|
||||
.build();
|
||||
|
||||
return new BaseResponse(request.getMsgId(),
|
||||
@@ -352,6 +358,22 @@ public class FileEntityHandler implements RequestHandler {
|
||||
}
|
||||
}
|
||||
|
||||
private boolean matchesStatuses(FileEntityResponse file, List<String> statuses) {
|
||||
if (statuses == null || statuses.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return statuses.contains(file.getStatus().name());
|
||||
}
|
||||
|
||||
private boolean matchesAppeal(FileEntityResponse file, Boolean isAppeal) {
|
||||
if (isAppeal == null) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return !file.getAppealInfos().isEmpty() == isAppeal;
|
||||
}
|
||||
|
||||
private boolean matchesSearch(FileEntityResponse file, String[] searchTerms, String fullQuery, String type) {
|
||||
String fileName = getSafeString(file.getFileName());
|
||||
String originalFileName = getSafeString(file.getOriginalFileName());
|
||||
|
||||
Reference in New Issue
Block a user