backdev/no-copy
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

dev add new status fo file
Test Workflow / test (push) Successful in 3s
Details

Browse Source
This commit is contained in:
vladp
2026-03-26 14:42:38 +07:00
parent 8965ffdd1f
commit a01adfc848
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/service/violation/ViolationService.java
+10 -11
View File
@@ -10,12 +10,10 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import ru.soune.nocopy.dto.file.YandexSearchResponse; import ru.soune.nocopy.dto.file.YandexSearchResponse;
import ru.soune.nocopy.dto.violation.FileViolationSummaryDTO; 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.dto.violation.ViolationStatisticsResponse;
import ru.soune.nocopy.entity.file.FileEntity; import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.search.GlobalSearchResult; import ru.soune.nocopy.entity.search.GlobalSearchResult;
import ru.soune.nocopy.entity.violation.Violation; import ru.soune.nocopy.entity.violation.Violation;
import ru.soune.nocopy.exception.ViolationNotFoundException;
import ru.soune.nocopy.repository.FileEntityRepository; import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.repository.ViolationRepository; import ru.soune.nocopy.repository.ViolationRepository;
import ru.soune.nocopy.service.file.FileEntityService; import ru.soune.nocopy.service.file.FileEntityService;
@@ -192,22 +190,23 @@ public class ViolationService {
violations = violationRepository.findByFileEntityIn(userFiles); violations = violationRepository.findByFileEntityIn(userFiles);
} }
Set<String> 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() long newViolations = violations.stream()
.filter(v -> "CREATED".equalsIgnoreCase(v.getStatus()) || .filter(v -> v.getStatus().equals(ViolationStatus.NEW.name()))
"NEW".equalsIgnoreCase(v.getStatus()))
.count(); .count();
long inProgressViolations = violations.stream() long inProgressViolations = violations.stream()
.filter(v -> "IN_PROGRESS".equalsIgnoreCase(v.getStatus()) || .filter(v -> inProgressStatuses.contains(v.getStatus()))
"PROCESSING".equalsIgnoreCase(v.getStatus()) ||
"IN_WORK".equalsIgnoreCase(v.getStatus()))
.count(); .count();
long resolvedViolations = violations.stream() long resolvedViolations = violations.stream()
.filter(v -> "RESOLVED".equalsIgnoreCase(v.getStatus()) || .filter(v -> v.getStatus().equals(ViolationStatus.AUTHORIZED_USE.name()))
"COMPLETED".equalsIgnoreCase(v.getStatus()) ||
"SOLVED".equalsIgnoreCase(v.getStatus()) ||
"DONE".equalsIgnoreCase(v.getStatus()))
.count(); .count();
return ViolationStatisticsResponse.builder() return ViolationStatisticsResponse.builder()