diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/MoneyMarketSecurityRequestAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/MoneyMarketSecurityRequestAdapter.java index 3ed16ff17..846f56cea 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/MoneyMarketSecurityRequestAdapter.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/MoneyMarketSecurityRequestAdapter.java @@ -17,6 +17,7 @@ public class MoneyMarketSecurityRequestAdapter { moneyMarketSecurityNewRequest.setSecuritySymbol(code.substring(0, Math.min(7, code.length()))); moneyMarketSecurityNewRequest.setConvention(code); moneyMarketSecurityNewRequest.setNominalCurrency(exchangeInstrument.getSettlementCurrencyLetterCode()); + moneyMarketSecurityNewRequest.setClearingOrganization(exchangeInstrument.getClearingOrganization()); moneyMarketSecurityNewRequest.setInstrumentType(InstrumentType.RATE.getKey()); moneyMarketSecurityNewRequest.setShortName(exchangeInstrument.getName()); moneyMarketSecurityNewRequest.setLotSize(exchangeInstrument.getLot()); diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/SecurityRequestAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/SecurityRequestAdapter.java index cfe882826..d71ddaf0e 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/SecurityRequestAdapter.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/SecurityRequestAdapter.java @@ -18,7 +18,8 @@ public class SecurityRequestAdapter { fixedIncomeSecurityNewRequest.setFullName(fondSecurity.getFullName()); fixedIncomeSecurityNewRequest.setIsin(fondSecurity.getIsin()); fixedIncomeSecurityNewRequest.setBondType(fondSecurity.getBondType()); - fixedIncomeSecurityNewRequest.setNominalValue(fondSecurity.getNominalForDate()); + fixedIncomeSecurityNewRequest.setNominalValue(fondSecurity.getNominalValue()); + fixedIncomeSecurityNewRequest.setNominalForDate(fondSecurity.getNominalForDate()); fixedIncomeSecurityNewRequest.setNominalCurrency(fondSecurity.getNominalCurrency()); fixedIncomeSecurityNewRequest.setMaturityDate(fondSecurity.getMaturityDate()); if (fondSecurity.getCouponFrequency() != null) { diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java index 16b98eafc..14a9bc6a2 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java @@ -108,6 +108,7 @@ public class FixedIncomeSecurityService extends QueueConsumer implements Initial fixedIncome.setBondType(req.getBondType()); fixedIncome.setLotSize(req.getLotSize()); fixedIncome.setNominalValue(req.getNominalValue()); + fixedIncome.setNominalForDate(req.getNominalForDate()); fixedIncome.setNominalCurrency(req.getNominalCurrency()); fixedIncome.setMaturityDate(req.getMaturityDate()); fixedIncome.setCoupon(req.getCoupon()); @@ -153,6 +154,7 @@ public class FixedIncomeSecurityService extends QueueConsumer implements Initial fixedIncome.setBondType(req.getBondType()); fixedIncome.setLotSize(req.getLotSize()); fixedIncome.setNominalValue(req.getNominalValue()); + fixedIncome.setNominalForDate(req.getNominalForDate()); fixedIncome.setNominalCurrency(req.getNominalCurrency()); fixedIncome.setMaturityDate(req.getMaturityDate()); fixedIncome.setCoupon(req.getCoupon()); 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 8c310db84..9bed9e6a4 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 @@ -380,6 +380,7 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin updateRequest.setBondType(newRequest.getBondType()); updateRequest.setLotSize(newRequest.getLotSize()); updateRequest.setNominalValue(newRequest.getNominalValue()); + updateRequest.setNominalForDate(newRequest.getNominalForDate()); updateRequest.setNominalCurrency(newRequest.getNominalCurrency()); updateRequest.setMaturityDate(newRequest.getMaturityDate()); updateRequest.setCoupon(newRequest.getCoupon()); @@ -489,6 +490,7 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin updateRequest.setDescription(newRequest.getDescription()); updateRequest.setIssuerId(newRequest.getIssuerId()); updateRequest.setIsin(newRequest.getIsin()); + updateRequest.setClearingOrganization(newRequest.getClearingOrganization()); updateRequest.setWorkflowStatus(newRequest.getWorkflowStatus()); return updateRequest; } diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java index 7af5c686c..f548609ee 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java @@ -142,6 +142,7 @@ public class MoneyMarketSecurityService extends QueueConsumer implements Initial mms.setSecurityId(mms.getId()); mms.setDescription(req.getDescription()); mms.setConvention(req.getConvention()); + mms.setClearingOrganization(req.getClearingOrganization()); mms.setCreated(Instant.now()); mms.setUpdated(mms.getCreated()); if (req.getWorkflowStatus() == null) { @@ -211,6 +212,7 @@ public class MoneyMarketSecurityService extends QueueConsumer implements Initial mms.setSecurityId(mms.getId()); mms.setDescription(req.getDescription()); mms.setConvention(req.getConvention()); + mms.setClearingOrganization(req.getClearingOrganization()); if (req.getWorkflowStatus() != null) { mms.setWorkflowStatus(req.getWorkflowStatus()); } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityNewRequest.java index e4ade8daf..d0658ac9a 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityNewRequest.java @@ -52,6 +52,8 @@ public class MoneyMarketSecurityNewRequest implements WithStartDt, WithEndDt, Wi public String isin; @JsonProperty public String workflowStatus; + @JsonProperty + public String clearingOrganization; public LocalDate getStartDate() { return startDate; @@ -188,4 +190,12 @@ public class MoneyMarketSecurityNewRequest implements WithStartDt, WithEndDt, Wi public void setWorkflowStatus(String workflowStatus) { this.workflowStatus = workflowStatus; } + + public String getClearingOrganization() { + return clearingOrganization; + } + + public void setClearingOrganization(String clearingOrganization) { + this.clearingOrganization = clearingOrganization; + } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityUpdateRequest.java index c72a37527..3d4dcfce7 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityUpdateRequest.java @@ -53,6 +53,8 @@ public class MoneyMarketSecurityUpdateRequest implements WithId, WithStartDt, Wi @JsonProperty public String isin; @JsonProperty + public String clearingOrganization; + @JsonProperty public String workflowStatus; public Long getId() { @@ -199,4 +201,12 @@ public class MoneyMarketSecurityUpdateRequest implements WithId, WithStartDt, Wi public void setStartDate(LocalDate startDate) { this.startDate = startDate; } + + public String getClearingOrganization() { + return clearingOrganization; + } + + public void setClearingOrganization(String clearingOrganization) { + this.clearingOrganization = clearingOrganization; + } }