treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

company-service поправил текст ошибок для company-new/update

Browse source
This commit is contained in:
AKurakin 2023-06-21 13:38:51 +03:00
parent 28006c3a33
commit e3cbd73807
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java
View file

@ -112,29 +112,23 @@ public class CompanyService extends QueueConsumer implements InitializingBean {
init(); init();
} }
private RequestInfoUpdate processBaseRequest(BaseRequest<?> request) { private RequestInfoUpdate processBaseRequest(BaseRequest<?> request) throws ValidationException {
RequestInfoUpdate requestInfoUpdate = null;
// Валидация // Валидация
requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(request); RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(request);
if (requestInfoUpdate != null) return requestInfoUpdate; if (requestInfoUpdate != null) return requestInfoUpdate;
try {
ActionType actionType = request.getActionType(); ActionType actionType = request.getActionType();
switch (actionType) { switch (actionType) {
case NEW -> { case NEW -> {
CompanyNewRequest companyNewRequest = (CompanyNewRequest) request.getRequestPayload(); CompanyNewRequest companyNewRequest = (CompanyNewRequest) request.getRequestPayload();
IValidator validator = companyNewRequestValidator.apply(companyNewRequest); IValidator validator = companyNewRequestValidator.apply(companyNewRequest);
Optional<EnumMessage> error = validator.tillFirstError(); Optional<EnumMessage> error = validator.tillFirstError();
if (error.isPresent()){ if (error.isPresent()) {
return new RequestInfoUpdate(request.getId(), Status.Error, error.get().toString()); throw new ValidationException(error.get());
} }
create(companyNewRequest); create(companyNewRequest);
} }
case UPDATE -> update((CompanyNewRequest) request.getRequestPayload()); case UPDATE -> update((CompanyNewRequest) request.getRequestPayload());
} }
} catch (ValidationException e) {
requestInfoUpdate = new RequestInfoUpdate(request.getId(), Status.Error, e.getMessage());
}
return requestInfoUpdate; return requestInfoUpdate;
} }