From a01adfc848cd30e222d922ee021b19c19bee577a Mon Sep 17 00:00:00 2001 From: vladp Date: Thu, 26 Mar 2026 14:42:38 +0700 Subject: [PATCH] dev add new status fo file --- .../service/violation/ViolationService.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) 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 57f9af5..8f8fad3 100644 --- a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java +++ b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java @@ -10,12 +10,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ru.soune.nocopy.dto.file.YandexSearchResponse; import ru.soune.nocopy.dto.violation.FileViolationSummaryDTO; -import ru.soune.nocopy.dto.violation.ViolationInfoDTO; import ru.soune.nocopy.dto.violation.ViolationStatisticsResponse; import ru.soune.nocopy.entity.file.FileEntity; import ru.soune.nocopy.entity.search.GlobalSearchResult; import ru.soune.nocopy.entity.violation.Violation; -import ru.soune.nocopy.exception.ViolationNotFoundException; import ru.soune.nocopy.repository.FileEntityRepository; import ru.soune.nocopy.repository.ViolationRepository; import ru.soune.nocopy.service.file.FileEntityService; @@ -192,22 +190,23 @@ public class ViolationService { violations = violationRepository.findByFileEntityIn(userFiles); } + Set inProgressStatuses = Set.of( + ViolationStatus.SHOWED.name(), + ViolationStatus.LEGAL_IN_WORK.name(), + ViolationStatus.COMPLAINT_IN_WORK.name(), + ViolationStatus.COMPLAINT_AND_LEGAL_IN_WORK.name() + ); + long newViolations = violations.stream() - .filter(v -> "CREATED".equalsIgnoreCase(v.getStatus()) || - "NEW".equalsIgnoreCase(v.getStatus())) + .filter(v -> v.getStatus().equals(ViolationStatus.NEW.name())) .count(); long inProgressViolations = violations.stream() - .filter(v -> "IN_PROGRESS".equalsIgnoreCase(v.getStatus()) || - "PROCESSING".equalsIgnoreCase(v.getStatus()) || - "IN_WORK".equalsIgnoreCase(v.getStatus())) + .filter(v -> inProgressStatuses.contains(v.getStatus())) .count(); long resolvedViolations = violations.stream() - .filter(v -> "RESOLVED".equalsIgnoreCase(v.getStatus()) || - "COMPLETED".equalsIgnoreCase(v.getStatus()) || - "SOLVED".equalsIgnoreCase(v.getStatus()) || - "DONE".equalsIgnoreCase(v.getStatus())) + .filter(v -> v.getStatus().equals(ViolationStatus.AUTHORIZED_USE.name())) .count(); return ViolationStatisticsResponse.builder()