dev fix sort

2026-04-24 13:11:49 +07:00
parent cdaa6c7ce2
commit 0047cfd4f6
3 changed files with 22 additions and 7 deletions
@@ -106,22 +106,29 @@ public class ViolationService {
    }

    public Page<Violation> getViolationsByFiles(List<FileEntity> files, int page, int size, String sortDirection) {
-        Sort sort = Sort.by(sortDirection.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC, "createdDate");
+        Sort sort = Sort.by(sortDirection.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC,
+                "createdDate");
        Pageable pageable = PageRequest.of(page, size, sort);
-        return violationRepository.findByFileEntityIn(files, pageable);
+
+        return violationRepository.findByFileEntityInAndStatusNot(files, ViolationStatus.NOT_OWNER_FILE.name(), pageable);
    }

    public Page<Violation> getViolationsByFilesAndStatus(List<FileEntity> files, String status, int page, int size, String sortDirection) {
-        Sort sort = Sort.by(sortDirection.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC, "createdDate");
+        Sort sort = Sort.by(sortDirection.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC,
+                "createdDate");
        Pageable pageable = PageRequest.of(page, size, sort);
+
        return violationRepository.findByFileEntityInAndStatus(files, status, pageable);
    }

    public Page<Violation> getViolationsByFilesAndDateRange(List<FileEntity> files, LocalDateTime startDate, LocalDateTime endDate,
                                                            int page, int size, String sortDirection) {
-        Sort sort = Sort.by(sortDirection.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC, "createdDate");
+        Sort sort = Sort.by(sortDirection.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC,
+                "createdDate");
        Pageable pageable = PageRequest.of(page, size, sort);
-        return violationRepository.findByFileEntityInAndCreatedDateBetween(files, startDate, endDate, pageable);
+
+        return violationRepository.findByFileEntityInAndStatusNotAndCreatedDateBetween(files,
+                ViolationStatus.NOT_OWNER_FILE.name(), startDate, endDate, pageable);
    }

    public Map<String, Long> getGroupedViolations(List<FileEntity> files, String groupBy, String status,