diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java index 333e2bc34..50d275afa 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java @@ -66,11 +66,11 @@ public class CompanyService extends QueueConsumer implements InitializingBean { ValidationHelper validationHelper, UserRoleVerification userRoleVerification, @Qualifier("companyNewRequestValidator") - Function companyNewRequestValidator, + Function companyNewRequestValidator, @Qualifier("companyUpdateRequestValidator") - Function companyUpdateRequestValidator, + Function companyUpdateRequestValidator, @Qualifier("CompanyDeleteRequestValidator") - Function companyDeleteRequestValidator, + Function companyDeleteRequestValidator, CompanySymbolService companySymbolService, AccountNotificationHelper accountNotification, RelationService relationService) { @@ -112,28 +112,22 @@ public class CompanyService extends QueueConsumer implements InitializingBean { init(); } - private RequestInfoUpdate processBaseRequest(BaseRequest request) { - RequestInfoUpdate requestInfoUpdate = null; + private RequestInfoUpdate processBaseRequest(BaseRequest request) throws ValidationException { // Валидация - requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(request); + RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(request); if (requestInfoUpdate != null) return requestInfoUpdate; - - try { - ActionType actionType = request.getActionType(); - switch (actionType) { - case NEW -> { - CompanyNewRequest companyNewRequest = (CompanyNewRequest) request.getRequestPayload(); - IValidator validator = companyNewRequestValidator.apply(companyNewRequest); - Optional error = validator.tillFirstError(); - if (error.isPresent()){ - return new RequestInfoUpdate(request.getId(), Status.Error, error.get().toString()); - } - create(companyNewRequest); + ActionType actionType = request.getActionType(); + switch (actionType) { + case NEW -> { + CompanyNewRequest companyNewRequest = (CompanyNewRequest) request.getRequestPayload(); + IValidator validator = companyNewRequestValidator.apply(companyNewRequest); + Optional error = validator.tillFirstError(); + if (error.isPresent()) { + throw new ValidationException(error.get()); } - case UPDATE -> update((CompanyNewRequest) request.getRequestPayload()); + create(companyNewRequest); } - } catch (ValidationException e) { - requestInfoUpdate = new RequestInfoUpdate(request.getId(), Status.Error, e.getMessage()); + case UPDATE -> update((CompanyNewRequest) request.getRequestPayload()); } return requestInfoUpdate; }