diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java index 055f86433..9ea5dfa50 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java @@ -186,6 +186,11 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin if (InstrumentType.BOND.equalsByKey(req.getSecurityType())) { FixedIncomeGatewayRequest fixedIncomeGatewayRequest = (FixedIncomeGatewayRequest) req; FixedIncomeSecurityNewRequest fixedIncomeRequest = fixedIncomeGatewayRequest.getSecurity(); + if (StringUtils.isEmpty(fixedIncomeRequest.getSecuritySymbol())){ + log.warn("Skip creating eqtySecurtity without securityId: uuid: {}", req.getUuid()); + return null; + } + log.debug("Processed request with securitySymbol: {}", fixedIncomeRequest.getSecuritySymbol()); fixedIncomeRequest.setIssuerId(companyId); log.trace("FixedIncomeSecurityNewRequest - BOND"); String securitySymbol = fixedIncomeRequest.getSecuritySymbol(); @@ -198,6 +203,26 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin security = fixedIncomeSecurityService.updateFixedIncome0(updateRequest); } } + if (InstrumentType.EQTY.equalsByKey(req.getSecurityType())) { + EquitySecurityGatewayRequest equitySecurityGatewayRequest = (EquitySecurityGatewayRequest) req; + EquitySecurityNewRequest equityRequest = equitySecurityGatewayRequest.getSecurity(); + if (StringUtils.isEmpty(equityRequest.getSecuritySymbol())){ + log.warn("Skip creating eqtySecurtity without securityId: uuid: {}", req.getUuid()); + return null; + } + log.debug("Processed request with securitySymbol: {}", equityRequest.getSecuritySymbol()); + equityRequest.setIssuerId(companyId); + log.trace("EquitySecurityNewRequest - FOND"); + String securitySymbol = equityRequest.getSecuritySymbol(); + security = findSecurityBySecuritySymbol(equitySecurityImdg, securitySymbol); + + if (security == null) { + security = equitySecurityService.newEquity0(equityRequest); + } else { + EquitySecurityUpdateRequest updateRequest = toUpdateRequest(security, equityRequest); + security = equitySecurityService.updateEquity0(updateRequest); + } + } } catch (ValidationException expected) { log.warn("Error create or update issue: {}", expected.toString()); return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg());