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

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

@ -66,11 +66,11 @@ public class CompanyService extends QueueConsumer implements InitializingBean {
ValidationHelper validationHelper,
UserRoleVerification userRoleVerification,
@Qualifier("companyNewRequestValidator")
Function<CompanyNewRequest, IValidator> companyNewRequestValidator,
Function<CompanyNewRequest, IValidator> companyNewRequestValidator,
@Qualifier("companyUpdateRequestValidator")
Function<CompanyNewRequest, IValidator> companyUpdateRequestValidator,
Function<CompanyNewRequest, IValidator> companyUpdateRequestValidator,
@Qualifier("CompanyDeleteRequestValidator")
Function<CommonDeleteRequest, IValidator> companyDeleteRequestValidator,
Function<CommonDeleteRequest, IValidator> 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<EnumMessage> 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<EnumMessage> 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;
}