treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-258

Browse source 
Поменял Double на BigDecimal в полях nominalValue и lotSize.
This commit is contained in:
psemenkov 2023-04-06 10:13:17 +03:00
parent cd093c81eb
commit eb4e730bdf
3 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java
View file

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

13
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityUpdateAction.java
View file

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

8
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityControllerTest.java
View file

@ -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