gateway-api и др. http://jira.mfd.msk:8088/browse/CLS-506 (отменчет правку по CLS-496)

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());

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) {

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());

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;
     }

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());
             }

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;
+    }
 }

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;
+    }
 }