dev add check for change status
Test Workflow / test (push) Has been cancelled

This commit is contained in:
2026-04-27 12:21:26 +07:00
parent 3f0a514660
commit dc27e2ccf2
7 changed files with 51 additions and 2 deletions
@@ -85,12 +85,22 @@ public class ComplaintEntityService {
if (!violationRepository.existsById(violationId)) {
throw new ViolationNotFoundException("Violation not found: " + violationId);
}
return complaintRepository.findByViolationId(violationId)
.stream()
.map(this::mapToResponse)
.collect(Collectors.toList());
}
public List<ComplaintEntity> fetchComplaintByViolation(Long violationId) {
if (!violationRepository.existsById(violationId)) {
return null;
}
return complaintRepository.findByViolationIdAndStatuses(violationId, List.of(ComplaintStatus.CREATED.name(),
ComplaintStatus.SHOWED.name(), ComplaintStatus.IN_WORK.name()));
}
public ComplaintResponse updateComplaintStatus(Long id, ComplaintStatus status) {
ComplaintEntity complaint = complaintRepository.findById(id)
.orElseThrow(() -> new ComplaintNotFoundException("Complaint not found: " + id));
@@ -13,7 +13,7 @@ import ru.soune.nocopy.entity.user.User;
import ru.soune.nocopy.repository.LawCaseRepository;
import java.math.BigDecimal;
import java.util.List;
import java.util.Optional;
@Service
@RequiredArgsConstructor
@@ -70,6 +70,13 @@ public class LawCaseService {
return lawCaseRepository.save(lawCase);
}
public LawCase fetchByViolationId(Long violationId) {
Optional<LawCase> lawCaseByViolationIdAndType =
lawCaseRepository.getLawCaseByViolationIdAndType(violationId, LawCaseType.ACTIVE.getName());
return lawCaseByViolationIdAndType.orElse(null);
}
public Page<LawCase> getAllUserLawCases(Long userId, int pageSize, int pageNumber,
LawCaseType lawCaseType, String lawyer,
LawCasePriority lawCasePriority,
@@ -11,11 +11,14 @@ 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.ViolationStatisticsResponse;
import ru.soune.nocopy.entity.complaint.ComplaintEntity;
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.repository.FileEntityRepository;
import ru.soune.nocopy.repository.ViolationRepository;
import ru.soune.nocopy.service.complaint.ComplaintEntityService;
import ru.soune.nocopy.service.complaint.LawCaseService;
import ru.soune.nocopy.service.file.FileEntityService;
import java.time.LocalDateTime;
@@ -32,6 +35,10 @@ public class ViolationService {
private final FileEntityService fileEntityService;
private final ComplaintEntityService complaintEntityService;
private final LawCaseService lawCaseService;
public void processViolation(YandexSearchResponse.ImageResult imageResult, FileEntity file,
GlobalSearchResult result) {
String url = imageResult.getUrl();
@@ -170,6 +177,12 @@ public class ViolationService {
LinkedHashMap::new));
}
public boolean validateChangeStatus(Long violationId) {
List<ComplaintEntity> complaintEntities = complaintEntityService.fetchComplaintByViolation(violationId);
return complaintEntities == null && lawCaseService.fetchByViolationId(violationId) == null;
}
public ViolationStatisticsResponse getViolationStatistics(Long userId, String fileId,
LocalDateTime startDate, LocalDateTime endDate) {