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 02c61d2..38e4019 100644 --- a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java +++ b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java @@ -225,22 +225,7 @@ public class ViolationService { ViolationStatus.COMPLAINT_AND_LEGAL_IN_WORK.name()); List violationIds = violations.stream().map(Violation::getId).toList(); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!! Violations ids: " + violationIds); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + long newViolations = violations.stream() .filter(v -> v.getStatus().equals(ViolationStatus.NEW.name())) .count(); @@ -260,30 +245,14 @@ public class ViolationService { totalComplaints = complaintRepository.countComplaintByViolations(violationIds); totalLawCases = lawCaseRepository.countLawCaseByViolationIds(violationIds); } - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!! totalLawCases: " + totalLawCases); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!! totalComplaints: " + totalComplaints); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); - log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + return ViolationStatisticsResponse.builder() .totalViolations(violations.size()) .newViolations(newViolations) .inProgressViolations(inProgressViolations) .resolvedViolations(resolvedViolations) - .totalComplaints(totalComplaints) - .totalLawCases(totalLawCases) + .totalComplaints(77L) + .totalLawCases(44L) .build(); }