From 53b0487e1fc5af2621eb5edf4b7477aa2eb7ce01 Mon Sep 17 00:00:00 2001 From: psemenkov Date: Wed, 7 Dec 2022 11:18:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=D0=B8=D1=81=D1=8C=20MoneyMarketSecurityNewRequest,=20MoneyMark?= =?UTF-8?q?etSecurityServiceDisabled,=20MoneyMarketSecurityFactory,=20Mone?= =?UTF-8?q?yMarketSecurityNewAction,=20MoneyMarketSecurityUpdateAction,=20?= =?UTF-8?q?MoneyMarketSecurityUpdateRequest=20=D0=B2=20=D1=8D=D1=82=D0=B8?= =?UTF-8?q?=D1=85=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=D1=85=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20Long=20nominalCurrencyId?= =?UTF-8?q?=20=D0=BD=D0=B0=20String=20nominalCurrency=20(=D0=B2=20=D0=BC?= =?UTF-8?q?=D0=B5=D1=82=D0=B0=20=D0=BD=D0=B5=D1=82=20nominalCurrencyId=20?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B5=D1=81=D1=82=D1=8C=20nominalCurrency=20)?= =?UTF-8?q?=20=D1=81=D1=8E=D0=B4=D0=B0=20=D0=BD=D0=B5=20=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D0=BB=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F=D1=82=D1=8C?= =?UTF-8?q?=20termType=20=D1=82.=D0=BA.=20=D0=B5=D0=B3=D0=BE=20=D0=BD?= =?UTF-8?q?=D0=B5=D1=82=20=D0=B2=20=D0=BC=D0=B5=D1=82=D0=B0=20post=20?= =?UTF-8?q?=D0=B8=20put.=20=20MoneyMarketSecurityBackendGetFields,=20Money?= =?UTF-8?q?MarketSecurity,=20MoneyMarketSecurityBackendGetAllOld,=20=20Mon?= =?UTF-8?q?eyMarketSecurityMapStore=20=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F?= =?UTF-8?q?=D0=BB=20Long=20=D0=BD=D0=B0=20String=20nominalCurrency=20?= =?UTF-8?q?=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20termType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MoneyMarketSecurityNewAction.java | 12 ++++----- .../MoneyMarketSecurityUpdateAction.java | 14 +++++------ .../MoneyMarketSecurityBackendGetAllOld.java | 25 ++++++++++--------- .../MoneyMarketSecurityBackendGetFields.java | 16 +++++++++--- .../data/misc/MoneyMarketSecurity.java | 15 ++++++++--- .../object/MoneyMarketSecurityMapStore.java | 12 +++++---- .../cud/MoneyMarketSecurityService.java | 4 +-- .../service/MoneyMarketSecurityFactory.java | 18 +++---------- .../MoneyMarketSecurityServiceDisabled.java | 12 ++++----- .../MoneyMarketSecurityNewRequest.java | 10 ++++---- .../MoneyMarketSecurityUpdateRequest.java | 10 ++++---- 11 files changed, 80 insertions(+), 68 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java index 829b85d86..69059d4d1 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java @@ -32,7 +32,7 @@ public class MoneyMarketSecurityNewAction implements IAction items = new ArrayList<>(); - - public List getItems() { - return items; - } - - public void setItems(List items) { - this.items = items; - } - } - public MoneyMarketSecurityBackendPayload getPayload() { return payload; } @@ -52,8 +40,21 @@ public class MoneyMarketSecurityBackendGetAllOld extends BasicSpcexResponse { singleItem.setInstrumentType(moneyMarketSecurity.getInstrumentType()); singleItem.setFullName(moneyMarketSecurity.getFullName()); singleItem.setSecuritySymbol(moneyMarketSecurity.getSecuritySymbol()); + singleItem.setTermType(moneyMarketSecurity.getTermType()); payload.getItems().add(singleItem); } } + private static class MoneyMarketSecurityBackendPayload { + private List items = new ArrayList<>(); + + public List getItems() { + return items; + } + + public void setItems(List items) { + this.items = items; + } + } + } \ No newline at end of file diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetFields.java index 5699d9e0c..f32ba9f5b 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetFields.java @@ -23,13 +23,15 @@ public class MoneyMarketSecurityBackendGetFields { @JsonProperty private BigDecimal nominalValue; @JsonProperty - private Long nominalCurrency; // (linked to currencyCode) + private String nominalCurrency; // (linked to currencyCode) @JsonProperty private String instrumentType; // (linked to instrumentType) @JsonProperty private String fullName; @JsonProperty private String securitySymbol; + @JsonProperty + private String termType; public Long getId() { return id; @@ -79,11 +81,11 @@ public class MoneyMarketSecurityBackendGetFields { this.nominalValue = nominalValue; } - public Long getNominalCurrency() { + public String getNominalCurrency() { return nominalCurrency; } - public void setNominalCurrency(Long nominalCurrency) { + public void setNominalCurrency(String nominalCurrency) { this.nominalCurrency = nominalCurrency; } @@ -110,4 +112,12 @@ public class MoneyMarketSecurityBackendGetFields { public void setSecuritySymbol(String securitySymbol) { this.securitySymbol = securitySymbol; } + + public String getTermType() { + return termType; + } + + public void setTermType(String termType) { + this.termType = termType; + } } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MoneyMarketSecurity.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MoneyMarketSecurity.java index 4327af478..61eb9ee25 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MoneyMarketSecurity.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MoneyMarketSecurity.java @@ -16,7 +16,8 @@ public class MoneyMarketSecurity extends Security { private LocalDate startDate; private LocalDate endDate; private BigDecimal nominalValue; - private Long nominalCurrency; // (linked to currencyCode) + private String nominalCurrency; // (linked to currencyCode) + private String termType; public Long getSecurityId() { return securityId; @@ -58,11 +59,19 @@ public class MoneyMarketSecurity extends Security { this.nominalValue = nominalValue; } - public Long getNominalCurrency() { + public String getNominalCurrency() { return nominalCurrency; } - public void setNominalCurrency(Long nominalCurrency) { + public void setNominalCurrency(String nominalCurrency) { this.nominalCurrency = nominalCurrency; } + + public String getTermType() { + return termType; + } + + public void setTermType(String termType) { + this.termType = termType; + } } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java index 48c86d863..2d3aa7bc0 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java @@ -17,13 +17,13 @@ import java.util.Map; @Component public class MoneyMarketSecurityMapStore extends TemplateMapStore { + private final String insertToSecurityStatement = makeInsertSql("SECURITY", + getFieldsSecurity(), "id"); + public MoneyMarketSecurityMapStore(JdbcTemplate jdbcTemplate) { super(jdbcTemplate); } - private final String insertToSecurityStatement = makeInsertSql("SECURITY", - getFieldsSecurity(), "id"); - @Override public String getTableName() { return "MONEY_MARKET_SECURITY"; @@ -41,7 +41,7 @@ public class MoneyMarketSecurityMapStore extends TemplateMapStore kafkaMockQueue; - private MockProducer mockProducer = new MockProducer<>(); -// @Autowired + private final MockProducer mockProducer = new MockProducer<>(); + // @Autowired // @Qualifier("hazelcastServiceTest") private HazelcastService hazelcastService; -// @Autowired + // @Autowired // @Qualifier("hazelcastInstance") private HazelcastInstance hz; @@ -96,7 +96,7 @@ public class MoneyMarketSecurityServiceDisabled { * {@link MoneyMarketSecurityNewRequest#startDate} - текущее колличество секунд с 1970-01-01T00:00:00Z.
* {@link MoneyMarketSecurityNewRequest#endDate} - текущее колличество секунд с 1970-01-01T00:00:00Z.
* {@link MoneyMarketSecurityNewRequest#nominalValue} - 1.0
- * {@link MoneyMarketSecurityNewRequest#nominalCurrencyId} - 1L
+ * {@link MoneyMarketSecurityNewRequest#nominalCurrency} - 1L
* {@link MoneyMarketSecurityNewRequest#instrumentType} - "sdgaga"
* {@link MoneyMarketSecurityNewRequest#fullName} - "estat"
*/ @@ -236,7 +236,7 @@ public class MoneyMarketSecurityServiceDisabled { * Входной запрос {@link MoneyMarketSecurityUpdateRequest}:
* {@link MoneyMarketSecurityUpdateRequest#fullName} - sfgsdfg
* {@link MoneyMarketSecurityUpdateRequest#instrumentType} - qwerqwe
- * {@link MoneyMarketSecurityUpdateRequest#nominalCurrencyId} - 2L
+ * {@link MoneyMarketSecurityUpdateRequest#nominalCurrency} - RUB
* {@link MoneyMarketSecurityUpdateRequest#nominalValue} - 2.0
* {@link MoneyMarketSecurityUpdateRequest#endDate} - текущее колличество секунд с 1970-01-01T00:00:00Z + (24 * 3600)
*/ @@ -260,7 +260,7 @@ public class MoneyMarketSecurityServiceDisabled { moneyMarketSecurityFactory .setFullName("sfgsdfg") .setInstrumentType("qwerqwe") - .setNominalCurrencyId(2L) + .setNominalCurrency("RUB") .setNominalValue(BigDecimal.valueOf(2.0)) .setEndDate(LocalDate.ofEpochDay(24 * 3600)); 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 58b5db789..979f8b28e 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 @@ -20,7 +20,7 @@ public class MoneyMarketSecurityNewRequest { @JsonProperty public Double nominalValue; @JsonProperty - public Long nominalCurrencyId; + public String nominalCurrency; @JsonProperty public String instrumentType; @JsonProperty @@ -54,12 +54,12 @@ public class MoneyMarketSecurityNewRequest { this.nominalValue = nominalValue; } - public Long getNominalCurrencyId() { - return nominalCurrencyId; + public String getNominalCurrency() { + return nominalCurrency; } - public void setNominalCurrencyId(Long nominalCurrencyId) { - this.nominalCurrencyId = nominalCurrencyId; + public void setNominalCurrency(String nominalCurrency) { + this.nominalCurrency = nominalCurrency; } public String getInstrumentType() { 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 35542a640..2ec1444e2 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 @@ -20,7 +20,7 @@ public class MoneyMarketSecurityUpdateRequest { @JsonProperty public Double nominalValue; @JsonProperty - public Long nominalCurrencyId; + public String nominalCurrency; @JsonProperty public String instrumentType; @JsonProperty @@ -52,12 +52,12 @@ public class MoneyMarketSecurityUpdateRequest { this.nominalValue = nominalValue; } - public Long getNominalCurrencyId() { - return nominalCurrencyId; + public String getNominalCurrency() { + return nominalCurrency; } - public void setNominalCurrencyId(Long nominalCurrencyId) { - this.nominalCurrencyId = nominalCurrencyId; + public void setNominalCurrency(String nominalCurrency) { + this.nominalCurrency = nominalCurrency; } public String getInstrumentType() {