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
@@ -32,7 +32,7 @@ public enum MessageCode {
FILE_ENTITY_ERROR(2, "File entity error"), FILE_ENTITY_ERROR(2, "File entity error"),
NOT_VALID_FIELD(2, "Not valid field"), NOT_VALID_FIELD(2, "Not valid field"),
ACCESS_DENIED(2, "Access denied"), ACCESS_DENIED(2, "Access denied"),
AUTH_EMAIL_NOT_FOUND(4, "Email not found"), AUTH_EMAIL_NOT_FOUND(4, "Email not COMPLAINT_OR_LAW_CASE_IN_WORK"),
AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "), AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
AUTH_TOKEN_MISMATCH(4, "Token mismatch"), AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
AUTH_TOKEN_NOT_FOUND(4, "Token not found"), AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
@@ -65,8 +65,10 @@ public enum MessageCode {
NOT_FOUND(4, "Notion not found"), NOT_FOUND(4, "Notion not found"),
MESSAGE_IS_REQUIRED_FOR_NOTION(4, "Message is required for notion"), MESSAGE_IS_REQUIRED_FOR_NOTION(4, "Message is required for notion"),
USER_VERIFICATIONS_NOT_FOUND(4, "Verifications not found"), USER_VERIFICATIONS_NOT_FOUND(4, "Verifications not found"),
COMPLAINT_OR_LAW_CASE_IN_WORK(2, "Complaint or lawcase in work"),
ADMIN_USER_NOT_FOUND(4, "Verifications ,user or admin not found"); ADMIN_USER_NOT_FOUND(4, "Verifications ,user or admin not found");
private final Integer code; private final Integer code;
private final String description; private final String description;
@@ -7,6 +7,7 @@ import org.springframework.data.domain.Page;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.soune.nocopy.dto.BaseRequest; import ru.soune.nocopy.dto.BaseRequest;
import ru.soune.nocopy.dto.BaseResponse; import ru.soune.nocopy.dto.BaseResponse;
import ru.soune.nocopy.dto.MessageCode;
import ru.soune.nocopy.dto.violation.ViolationRequest; import ru.soune.nocopy.dto.violation.ViolationRequest;
import ru.soune.nocopy.dto.violation.ViolationResponse; import ru.soune.nocopy.dto.violation.ViolationResponse;
import ru.soune.nocopy.entity.file.FileEntity; import ru.soune.nocopy.entity.file.FileEntity;
@@ -76,6 +77,17 @@ public class ViolationHandler implements RequestHandler {
String status = violationRequest.getStatus(); String status = violationRequest.getStatus();
Long violationId = violationRequest.getViolationId(); Long violationId = violationRequest.getViolationId();
if (status.equals(ViolationStatus.NOT_OWNER_FILE.name()) &&
!violationService.validateChangeStatus(violationId)) {
return BaseResponse.builder()
.messageCode(MessageCode.COMPLAINT_OR_LAW_CASE_IN_WORK.getCode())
.messageCode(MessageCode.COMPLAINT_OR_LAW_CASE_IN_WORK.getCode())
.msgId(request.getMsgId())
.messageBody(Map.of("status", status))
.build();
}
violationService.changeStatus(ViolationStatus.valueOf(status), violationId); violationService.changeStatus(ViolationStatus.valueOf(status), violationId);
return BaseResponse.builder() return BaseResponse.builder()
@@ -20,6 +20,8 @@ public interface ComplaintEntityRepository extends JpaRepository<ComplaintEntity
Page<ComplaintEntity> findAll(Pageable pageable); Page<ComplaintEntity> findAll(Pageable pageable);
Page<ComplaintEntity> findByStatus(ComplaintStatus status, Pageable pageable); Page<ComplaintEntity> findByStatus(ComplaintStatus status, Pageable pageable);
List<ComplaintEntity> findByViolationId(Long violationId); List<ComplaintEntity> findByViolationId(Long violationId);
@Query("SELECT c FROM ComplaintEntity c WHERE c.violation.id = :violationId AND c.status IN :statuses")
List<ComplaintEntity> findByViolationIdAndStatuses(@Param("violationId") Long violationId, @Param("statuses") List<String> statuses);
boolean existsByViolationId(Long violationId); boolean existsByViolationId(Long violationId);
@Modifying @Modifying
@@ -11,6 +11,7 @@ import ru.soune.nocopy.entity.complaint.LawCasePriority;
import ru.soune.nocopy.entity.complaint.LawCaseType; import ru.soune.nocopy.entity.complaint.LawCaseType;
import java.util.List; import java.util.List;
import java.util.Optional;
@Repository @Repository
public interface LawCaseRepository extends JpaRepository<LawCase, Long> { public interface LawCaseRepository extends JpaRepository<LawCase, Long> {
@@ -42,4 +43,6 @@ public interface LawCaseRepository extends JpaRepository<LawCase, Long> {
@Query("SELECT COUNT(lc.id) FROM LawCase lc") @Query("SELECT COUNT(lc.id) FROM LawCase lc")
Long getTotalLawCasesCount(); Long getTotalLawCasesCount();
Optional<LawCase> getLawCaseByViolationIdAndType(Long violationId, String lawCaseType);
} }
@@ -85,12 +85,22 @@ public class ComplaintEntityService {
if (!violationRepository.existsById(violationId)) { if (!violationRepository.existsById(violationId)) {
throw new ViolationNotFoundException("Violation not found: " + violationId); throw new ViolationNotFoundException("Violation not found: " + violationId);
} }
return complaintRepository.findByViolationId(violationId) return complaintRepository.findByViolationId(violationId)
.stream() .stream()
.map(this::mapToResponse) .map(this::mapToResponse)
.collect(Collectors.toList()); .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) { public ComplaintResponse updateComplaintStatus(Long id, ComplaintStatus status) {
ComplaintEntity complaint = complaintRepository.findById(id) ComplaintEntity complaint = complaintRepository.findById(id)
.orElseThrow(() -> new ComplaintNotFoundException("Complaint not found: " + 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 ru.soune.nocopy.repository.LawCaseRepository;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.Optional;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@@ -70,6 +70,13 @@ public class LawCaseService {
return lawCaseRepository.save(lawCase); 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, public Page<LawCase> getAllUserLawCases(Long userId, int pageSize, int pageNumber,
LawCaseType lawCaseType, String lawyer, LawCaseType lawCaseType, String lawyer,
LawCasePriority lawCasePriority, LawCasePriority lawCasePriority,
@@ -11,11 +11,14 @@ 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.ViolationStatisticsResponse; 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.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.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.complaint.ComplaintEntityService;
import ru.soune.nocopy.service.complaint.LawCaseService;
import ru.soune.nocopy.service.file.FileEntityService; import ru.soune.nocopy.service.file.FileEntityService;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -32,6 +35,10 @@ public class ViolationService {
private final FileEntityService fileEntityService; private final FileEntityService fileEntityService;
private final ComplaintEntityService complaintEntityService;
private final LawCaseService lawCaseService;
public void processViolation(YandexSearchResponse.ImageResult imageResult, FileEntity file, public void processViolation(YandexSearchResponse.ImageResult imageResult, FileEntity file,
GlobalSearchResult result) { GlobalSearchResult result) {
String url = imageResult.getUrl(); String url = imageResult.getUrl();
@@ -170,6 +177,12 @@ public class ViolationService {
LinkedHashMap::new)); 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, public ViolationStatisticsResponse getViolationStatistics(Long userId, String fileId,
LocalDateTime startDate, LocalDateTime endDate) { LocalDateTime startDate, LocalDateTime endDate) {