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

securities-service http://jira.mfd.msk:8088/browse/CLS-420 GatewaySecurityService будет пытаться делать, несмотря на ошибки.

Browse source
This commit is contained in:
AKurakin 2023-08-25 10:55:54 +03:00
parent f5831500c8
commit 4763724315
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java
View file

@ -37,6 +37,7 @@ import ru.spcex.platform.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgId;
import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.utils.enumeration.IMessageResolver;
import ru.spcex.platform.utils.error.ValidationException;
import java.util.*;
@ -66,6 +67,7 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin
private final ValidationProvider validation;
private final UserRoleVerification userRoleVerification;
private final ValidationHelper validationHelper;
private final IMessageResolver messageResolver;
private final RequestHelper requestHelper;
@Autowired
@ -76,6 +78,7 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin
UserRoleVerification userRoleVerification,
ValidationHelper validationHelper,
RequestHelper requestHelper,
IMessageResolver messageResolver,
FixedIncomeSecurityService fixedIncomeSecurityService,
EquitySecurityService equitySecurityService,
@ -98,6 +101,7 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin
this.userRoleVerification = userRoleVerification.setRoleForVerification(UserRole.Admin);
this.validationHelper = validationHelper;
this.requestHelper = requestHelper;
this.messageResolver = messageResolver;
this.fixedIncomeSecurityService = fixedIncomeSecurityService;
this.equitySecurityService = equitySecurityService;
@ -177,7 +181,6 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin
} else {
log.debug("CompanyId (issuer) found: {}", companyId);
}
// ImdgTransaction transaction = imdgProvider.newTransaction(); todo transaction
Security security = null;
@ -206,7 +209,7 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin
EquitySecurityGatewayRequest equitySecurityGatewayRequest = (EquitySecurityGatewayRequest) req;
EquitySecurityNewRequest equityRequest = equitySecurityGatewayRequest.getSecurity();
if (StringUtils.isEmpty(equityRequest.getSecuritySymbol())) {
log.warn("Skip creating eqtySecurtity without securityId: uuid: {}", req.getUuid());
log.warn("Skip creating equitySecurity without securityId: uuid: {}", req.getUuid());
return null;
}
log.debug("Processed request with securitySymbol: {}", equityRequest.getSecuritySymbol());
@ -223,8 +226,13 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin
}
}
} catch (ValidationException expected) {
log.warn("Error create or update issue: {}", expected.toString());
return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg());
if (security == null) {
log.error("Error create or update issue: {}", messageResolver.resolve(expected.getEnumMsg()));
return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg());
} else {
log.warn("Error create or update issue: {}. But issue id={} found, try continue...",
messageResolver.resolve(expected.getEnumMsg()), security.getId());
}
}
Long securityId;
@ -259,8 +267,9 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin
log.debug("Has updated listing.id={}", listing.getId());
}
} catch (ValidationException expected) {
log.warn("Error create or update listing: {}", expected.toString());
return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg());
log.warn("At request {} for securityId={} has error when create or update listing: {}",
baseRequest.getId(), securityId, messageResolver.resolve(expected.getEnumMsg()));
// return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg());
}
}
@ -280,8 +289,9 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin
log.debug("Has update couponPeriod.id={}", couponPeriod.getId());
}
} catch (ValidationException expected) {
log.warn("Error create or update couponPeriod: {}", expected.toString());
return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg());
log.warn("At request {} for securityId={} has error when create or update couponPeriod: {}",
baseRequest.getId(), securityId, messageResolver.resolve(expected.getEnumMsg()));
// return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg());
}
}
@ -300,8 +310,9 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin
log.debug("Has update fixedIncomeCashFlow.id={}", fixedIncomeCashFlow.getId());
}
} catch (ValidationException expected) {
log.warn("Error create or update fixedIncomeCashFlow: {}", expected.toString());
return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg());
log.warn("At request {} for securityId={} has error when create or update fixedIncomeCashFlow: {}",
baseRequest.getId(), securityId, messageResolver.resolve(expected.getEnumMsg()));
// return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg());
}
}