From 5f42c6df63d2dbe8530cf16370613355ac95ba55 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Mon, 16 Jun 2025 17:02:50 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-863 --- .../gatewayapi/service/DigitalSecurityService.java | 8 ++++++++ .../service/adapter/DigitalSecurityRequestAdapter.java | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/DigitalSecurityService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/DigitalSecurityService.java index 3f8e3bf96..6291bf571 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/DigitalSecurityService.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/DigitalSecurityService.java @@ -1,11 +1,13 @@ package ru.spcex.clearing.gatewayapi.service; import java.util.List; +import java.util.Optional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.DigitalCertificate; import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.FondDigitalListingsRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.IssuerCompanySymbols; import ru.spcex.clearing.gatewayapi.service.adapter.DigitalSecurityRequestAdapter; import ru.spcex.clearing.gatewayapi.service.adapter.SecurityRequestAdapter; import ru.spcex.clearing.platform.messaging.domain.Consts; @@ -49,6 +51,12 @@ public class DigitalSecurityService { List listingRequests = request.getListingList().stream() .filter(incomeListing -> incomeListing.getSymbolCode().equals(security.getSecuritySymbol())) .map(securityRequestAdapter::toIncomeListing).toList(); + Optional innVal = request.getIssuerCompanySymbolsList().stream() + .filter(issuerCompanySymbols -> issuerCompanySymbols.getCompanyId().equals(security.getIssuerId()) + && issuerCompanySymbols.getCompanySymbol().equals("INN")) + .findFirst() + .map(IssuerCompanySymbols::getCompanySymbolValue); + innVal.ifPresent(digitalCertificateSecurityRequest::setInn); digitalCertificateSecurityRequest.setListing(listingRequests); kafkaSender.sendRequestToQueue(Consts.DESTINATION_SECURITY_DGCT_GATEWAY, digitalCertificateSecurityRequest); } catch (Throwable e) { 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 66be9e235..fd2e769ff 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 @@ -15,7 +15,6 @@ public class DigitalSecurityRequestAdapter { gatewayRequest.setDepoDcId(digitalCertificate.getDepoDcId()); gatewayRequest.setInstrumentType(digitalCertificate.getInstrumentType()); gatewayRequest.setIssuerId(digitalCertificate.getIssuerId()); - gatewayRequest.setInn(digitalCertificate.getUcp().getCompanyInn()); gatewayRequest.setShortName(digitalCertificate.getShortName()); gatewayRequest.setFullName(digitalCertificate.getFullName()); gatewayRequest.setFullNameEng(digitalCertificate.getFullNameEng());