From b79f2a49697d61cee2926b5513d6ef00198b8e8b Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Mon, 4 May 2026 11:23:33 +0700 Subject: [PATCH] dev add method link --- .../nocopy/dto/complaint/LawCaseRequest.java | 4 +- .../soune/nocopy/handler/LawCaseHandler.java | 51 ++++--------------- 2 files changed, 11 insertions(+), 44 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/dto/complaint/LawCaseRequest.java b/src/main/java/ru/soune/nocopy/dto/complaint/LawCaseRequest.java index 45db607..f8830f9 100644 --- a/src/main/java/ru/soune/nocopy/dto/complaint/LawCaseRequest.java +++ b/src/main/java/ru/soune/nocopy/dto/complaint/LawCaseRequest.java @@ -24,9 +24,9 @@ public class LawCaseRequest { private String sortBy = "updatedAt"; private String sortDir = "desc"; private String action; - private LawCaseType filterType; + private String filterType; private String filterLawyer; - private LawCasePriority filterPriority; + private String filterPriority; @JsonProperty("violation_id") private Long violationId; diff --git a/src/main/java/ru/soune/nocopy/handler/LawCaseHandler.java b/src/main/java/ru/soune/nocopy/handler/LawCaseHandler.java index b3af151..fd191d2 100644 --- a/src/main/java/ru/soune/nocopy/handler/LawCaseHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/LawCaseHandler.java @@ -52,7 +52,6 @@ public class LawCaseHandler implements RequestHandler { @Override public BaseResponse handle(BaseRequest request) throws Exception { - LawCaseRequest lawCaseRequest = objectMapper.convertValue(request.getMessageBody(), LawCaseRequest.class); Long userId = authService.useUserAuthToken(lawCaseRequest.getToken()); @@ -83,9 +82,9 @@ public class LawCaseHandler implements RequestHandler { userId, lawCaseRequest.getPageSize(), lawCaseRequest.getPageNumber(), - lawCaseRequest.getFilterType(), + LawCaseType.valueOf(lawCaseRequest.getFilterType().toUpperCase()), lawCaseRequest.getFilterLawyer(), - lawCaseRequest.getFilterPriority(), + LawCasePriority.valueOf(lawCaseRequest.getFilterPriority().toUpperCase()), lawCaseRequest.getViolationId(), lawCaseRequest.getSortBy(), lawCaseRequest.getSortDir()); @@ -116,43 +115,10 @@ public class LawCaseHandler implements RequestHandler { } private void validateLawCaseRequestFilters(LawCaseRequest lawCaseRequest) { -// if (lawCaseRequest.getFilterType() != null && !lawCaseRequest.getFilterType().getName().isEmpty()) { -// boolean isValidType = Arrays.stream(LawCaseType.values()) -// .anyMatch(type -> type.getName().equalsIgnoreCase(lawCaseRequest.getFilterType().name())); -// -// if (!isValidType) { -// throw new NotValidFieldException("Not valid filter type", -// new BaseResponse(null, MessageCode.NOT_VALID_FIELD.getCode(), -// MessageCode.NOT_VALID_FIELD.getDescription(), -// Map.of("field", "filterType", -// "valid_values", Arrays.stream(LawCaseType.values()) -// .map(LawCaseType::getName) -// .collect(Collectors.toList()), -// "received_value", lawCaseRequest.getFilterType()))); -// } -// } -// -// if (lawCaseRequest.getFilterPriority() != null && !lawCaseRequest.getFilterPriority().name().isEmpty()) { -// boolean isValidPriority = Arrays.stream(LawCasePriority.values()) -// .anyMatch(priority -> -// priority.name().equalsIgnoreCase(lawCaseRequest.getFilterPriority().name())); -// -// if (!isValidPriority) { -// throw new NotValidFieldException("Not valid filter priority", -// new BaseResponse(null, MessageCode.NOT_VALID_FIELD.getCode(), -// MessageCode.NOT_VALID_FIELD.getDescription(), -// Map.of("field", "filterPriority", -// "valid_values", Arrays.stream(LawCasePriority.values()) -// .map(LawCasePriority::name) -// .collect(Collectors.toList()), -// "received_value", lawCaseRequest.getFilterPriority()))); -// } -// } - - if (lawCaseRequest.getFilterPriority() != null && lawCaseRequest.getFilterPriority() != LawCasePriority.HIGH && - lawCaseRequest.getFilterPriority() != LawCasePriority.MIDDLE && - lawCaseRequest.getFilterPriority() != LawCasePriority.LOW && - lawCaseRequest.getFilterPriority() != LawCasePriority.CRITICAL) { + if (lawCaseRequest.getFilterPriority() != null && !lawCaseRequest.getFilterPriority().equals(LawCasePriority.HIGH.name()) && + !lawCaseRequest.getFilterPriority().equals(LawCasePriority.MIDDLE.name()) && + !lawCaseRequest.getFilterPriority().equals(LawCasePriority.LOW.name()) && + !lawCaseRequest.getFilterPriority().equals(LawCasePriority.CRITICAL.name())) { throw new NotValidFieldException("Not valid filter priority", new BaseResponse(null, MessageCode.NOT_VALID_FIELD.getCode(), @@ -164,8 +130,9 @@ public class LawCaseHandler implements RequestHandler { "received_value", lawCaseRequest.getFilterPriority()))); } - if (lawCaseRequest.getFilterType() != null && lawCaseRequest.getFilterType() != LawCaseType.CLOSED && - lawCaseRequest.getFilterType() != LawCaseType.ACTIVE && lawCaseRequest.getFilterType() != LawCaseType.COMPLETED) { + if (lawCaseRequest.getFilterType() != null && !lawCaseRequest.getFilterType().equals(LawCaseType.CLOSED.getName()) && + !lawCaseRequest.getFilterType().equals(LawCaseType.ACTIVE.getName()) && + !lawCaseRequest.getFilterType().equals(LawCaseType.COMPLETED.getName())) { throw new NotValidFieldException("Not valid filter type", new BaseResponse(null, MessageCode.NOT_VALID_FIELD.getCode(), MessageCode.NOT_VALID_FIELD.getDescription(),