From ddaf729e184033dd3453f2cf83fd3b9ba98ebbf8 Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Wed, 29 Apr 2026 13:33:48 +0700 Subject: [PATCH] dev add violation id like required parameters --- .../ru/soune/nocopy/dto/violation/FileViolationSummaryDTO.java | 2 ++ .../ru/soune/nocopy/service/violation/ViolationService.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/ru/soune/nocopy/dto/violation/FileViolationSummaryDTO.java b/src/main/java/ru/soune/nocopy/dto/violation/FileViolationSummaryDTO.java index e4a5129..89102b3 100644 --- a/src/main/java/ru/soune/nocopy/dto/violation/FileViolationSummaryDTO.java +++ b/src/main/java/ru/soune/nocopy/dto/violation/FileViolationSummaryDTO.java @@ -18,5 +18,7 @@ public class FileViolationSummaryDTO { private FileStatus status; private LocalDateTime createdAt; private long violationCount; + private long countLawCase; + private long countComplaint; private LocalDateTime latestViolationDate; } diff --git a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java index 45572cd..fc6e56c 100644 --- a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java +++ b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java @@ -92,6 +92,7 @@ public class ViolationService { List allDTOs = violationsByFileId.entrySet().stream() .map(entry -> { List fileViolations = entry.getValue(); + List violationIds = fileViolations.stream().map(Violation::getId).toList(); FileEntity file = fileViolations.get(0).getFileEntity(); LocalDateTime latestDate = fileViolations.stream() @@ -109,6 +110,8 @@ public class ViolationService { .createdAt(file.getCreatedAt()) .violationCount(fileViolations.size()) .latestViolationDate(latestDate) + .countComplaint(complaintRepository.countComplaintByViolations(violationIds)) + .countLawCase(lawCaseRepository.countLawCaseByViolationIds(violationIds)) .build(); }) .collect(Collectors.toList());