From eb4e730bdf93581d56e805109db5a5e0d4a52658 Mon Sep 17 00:00:00 2001
From: psemenkov <psemenkov@mfd.ru>
Date: Thu, 6 Apr 2023 10:13:17 +0300
Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-258=20?=
 =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20Double=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20BigDecimal=20=D0=B2=20=D0=BF=D0=BE=D0=BB=D1=8F=D1=85?=
 =?UTF-8?q?=20nominalValue=20=D0=B8=20lotSize.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../securities/MoneyMarketSecurityNewAction.java    | 13 +++++++------
 .../securities/MoneyMarketSecurityUpdateAction.java | 13 +++++++------
 .../CudMoneyMarketSecurityControllerTest.java       |  8 ++++----
 3 files changed, 18 insertions(+), 16 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 f96db5e09..4fd684ba6 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
@@ -13,6 +13,7 @@ import ru.spcex.platform.classes.base.interfaces.WithSecuritySymbol;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.text.TextUtil;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,7 +33,7 @@ public class MoneyMarketSecurityNewAction implements IAction<MoneyMarketSecurity
     public LocalDate endDate;
     @ApiModelProperty(value = "Номинал", example = "20.5")
     @JsonProperty
-    public Double nominalValue;
+    public BigDecimal nominalValue;
     @ApiModelProperty(value = "Идентификатор валюты номинала", example = "1000")
     @JsonProperty
     public String nominalCurrency;
@@ -47,7 +48,7 @@ public class MoneyMarketSecurityNewAction implements IAction<MoneyMarketSecurity
     public String securitySymbol;
     @ApiModelProperty(value = "Размер лота", example = "300.5")
     @JsonProperty
-    public Double lotSize;
+    public BigDecimal lotSize;
 
     @Override
     public Collection<EnumMessage> validate() {
@@ -107,11 +108,11 @@ public class MoneyMarketSecurityNewAction implements IAction<MoneyMarketSecurity
         this.endDate = endDate;
     }
 
-    public Double getNominalValue() {
+    public BigDecimal getNominalValue() {
         return nominalValue;
     }
 
-    public void setNominalValue(Double nominalValue) {
+    public void setNominalValue(BigDecimal nominalValue) {
         this.nominalValue = nominalValue;
     }
 
@@ -147,11 +148,11 @@ public class MoneyMarketSecurityNewAction implements IAction<MoneyMarketSecurity
         this.securitySymbol = securitySymbol;
     }
 
-    public Double getLotSize() {
+    public BigDecimal getLotSize() {
         return lotSize;
     }
 
-    public void setLotSize(Double lotSize) {
+    public void setLotSize(BigDecimal lotSize) {
         this.lotSize = lotSize;
     }
 }
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityUpdateAction.java
index cc1eb8461..87a0ee979 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityUpdateAction.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityUpdateAction.java
@@ -13,6 +13,7 @@ import ru.spcex.platform.classes.base.interfaces.WithId;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.text.TextUtil;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -35,7 +36,7 @@ public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecur
     public LocalDate endDate;
     @ApiModelProperty(value = "Номинал", example = "20.5")
     @JsonProperty
-    public Double nominalValue;
+    public BigDecimal nominalValue;
     @ApiModelProperty(value = "Валюта номинала", example = "RUB")
     @JsonProperty
     public String nominalCurrency;
@@ -47,7 +48,7 @@ public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecur
     public String fullName;
     @ApiModelProperty(value = "Размер лота", example = "300.5")
     @JsonProperty
-    public Double lotSize;
+    public BigDecimal lotSize;
 
     @Override
     public MoneyMarketSecurityUpdateRequest toRequest() {
@@ -98,11 +99,11 @@ public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecur
         this.endDate = endDate;
     }
 
-    public Double getNominalValue() {
+    public BigDecimal getNominalValue() {
         return nominalValue;
     }
 
-    public void setNominalValue(Double nominalValue) {
+    public void setNominalValue(BigDecimal nominalValue) {
         this.nominalValue = nominalValue;
     }
 
@@ -130,11 +131,11 @@ public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecur
         this.fullName = fullName;
     }
 
-    public Double getLotSize() {
+    public BigDecimal getLotSize() {
         return lotSize;
     }
 
-    public void setLotSize(Double lotSize) {
+    public void setLotSize(BigDecimal lotSize) {
         this.lotSize = lotSize;
     }
 
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityControllerTest.java
index 4c9656656..13a606443 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityControllerTest.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityControllerTest.java
@@ -28,12 +28,12 @@ class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest {
         MoneyMarketSecurityNewAction moneyMarketSecurityNewAction = new MoneyMarketSecurityNewAction();
         moneyMarketSecurityNewAction.setStartDate(LocalDate.now());
         moneyMarketSecurityNewAction.setEndDate(LocalDate.now());
-        moneyMarketSecurityNewAction.setNominalValue(2D);
+        moneyMarketSecurityNewAction.setNominalValue(new BigDecimal("2.6"));
         moneyMarketSecurityNewAction.setNominalCurrency("nominal");
         moneyMarketSecurityNewAction.setInstrumentType("status");
         moneyMarketSecurityNewAction.setFullName("fname");
         moneyMarketSecurityNewAction.setSecuritySymbol("sname");
-        moneyMarketSecurityNewAction.setLotSize(3D);
+        moneyMarketSecurityNewAction.setLotSize(new BigDecimal("3.5"));
 
         //ACT and ASSERT
         checkAddingByRestApi(REST_URL, moneyMarketSecurityNewAction);
@@ -53,11 +53,11 @@ class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest {
         moneyMarketSecurityUpdateAction.setId(id);
         moneyMarketSecurityUpdateAction.setStartDate(LocalDate.now());
         moneyMarketSecurityUpdateAction.setEndDate(LocalDate.now());
-        moneyMarketSecurityUpdateAction.setNominalValue(2D);
+        moneyMarketSecurityUpdateAction.setNominalValue(new BigDecimal("2.6"));
         moneyMarketSecurityUpdateAction.setNominalCurrency("nominal");
         moneyMarketSecurityUpdateAction.setInstrumentType("status");
         moneyMarketSecurityUpdateAction.setFullName("fname");
-        moneyMarketSecurityUpdateAction.setLotSize(3D);
+        moneyMarketSecurityUpdateAction.setLotSize(new BigDecimal("3.5"));
         MoneyMarketSecurity moneyMarketSecurity = getMoneyMarketSecurity(id);
 
         //ACT and ASSERT