diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/DigitalCertificate.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/DigitalCertificate.java index f97fcfbbc..5443087c7 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/DigitalCertificate.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/DigitalCertificate.java @@ -86,7 +86,7 @@ public class DigitalCertificate extends WithMapId { ) private BigDecimal numberOfUcp; - @JsonProperty("deltaPrice") + @JsonProperty("delta_price") @ApiModelProperty( value = "Общая информация\\Пределы изменения цены", example = """ diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/DigitalSecurityRequestAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/DigitalSecurityRequestAdapter.java index 7ac886e8f..68f07c0b5 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/DigitalSecurityRequestAdapter.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/DigitalSecurityRequestAdapter.java @@ -17,6 +17,7 @@ public class DigitalSecurityRequestAdapter { gatewayRequest.setIssuerId(digitalCertificate.getIssuerId()); gatewayRequest.setShortName(digitalCertificate.getShortName()); gatewayRequest.setFullName(digitalCertificate.getFullName()); + gatewayRequest.setFullNameEng(digitalCertificate.getFullNameEng()); gatewayRequest.setShortNameEng(digitalCertificate.getShortNameEng()); gatewayRequest.setNumberOfUcp(digitalCertificate.getNumberOfUcp()); gatewayRequest.setDeltaPrice(digitalCertificate.getDeltaPrice()); diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/builder/DigitalCertificateRequestBuilder.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/builder/DigitalCertificateRequestBuilder.java index 1b2a92bd0..9cc58ae7d 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/builder/DigitalCertificateRequestBuilder.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/builder/DigitalCertificateRequestBuilder.java @@ -12,6 +12,7 @@ public class DigitalCertificateRequestBuilder { private final Logger log = LoggerFactory.getLogger(getClass()); private DigitalCertificateSecurityGatewayRequest gatewayRequest; private Long companyId; + private Long digitalSecurityId; private DigitalCertificateRequestBuilder() { } @@ -28,6 +29,11 @@ public class DigitalCertificateRequestBuilder { this.companyId = companyId; return this; } + + public DigitalCertificateRequestBuilder digitalSecurityId(final Long digitalSecurityId) { + this.digitalSecurityId = digitalSecurityId; + return this; + } public DigitalCertificateSecurityNewRequest buildNewRequest() { DigitalCertificateSecurityNewRequest newRequest = new DigitalCertificateSecurityNewRequest(); @@ -60,6 +66,7 @@ public class DigitalCertificateRequestBuilder { public DigitalCertificateSecurityUpdateRequest buildUpdateRequest() { DigitalCertificateSecurityUpdateRequest updateRequest = new DigitalCertificateSecurityUpdateRequest(); + updateRequest.setId(digitalSecurityId); InstrumentType clrInstrumentType = Arrays.asList("DC", "D") .contains(gatewayRequest.getInstrumentType()) ? InstrumentType.DGCT : null; if (clrInstrumentType == null) { 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 b08594122..3491cccac 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 @@ -500,7 +500,9 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin DigitalCertificateSecurityNewRequest newRequest = builder.buildNewRequest(); digitalCertificateSecurityFacade.newDigitalCertificate(newRequest); } else { - DigitalCertificateSecurityUpdateRequest updateRequest = builder.buildUpdateRequest(); + DigitalCertificateSecurityUpdateRequest updateRequest = builder + .digitalSecurityId(security.getId()) + .buildUpdateRequest(); digitalCertificateSecurityFacade.updateDigitalCertificate(updateRequest); }