Поменял 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

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.enumeration.EnumMessage;
import ru.spcex.platform.utils.text.TextUtil; import ru.spcex.platform.utils.text.TextUtil;
import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -32,7 +33,7 @@ public class MoneyMarketSecurityNewAction implements IAction<MoneyMarketSecurity
public LocalDate endDate; public LocalDate endDate;
@ApiModelProperty(value = "Номинал", example = "20.5") @ApiModelProperty(value = "Номинал", example = "20.5")
@JsonProperty @JsonProperty
public Double nominalValue; public BigDecimal nominalValue;
@ApiModelProperty(value = "Идентификатор валюты номинала", example = "1000") @ApiModelProperty(value = "Идентификатор валюты номинала", example = "1000")
@JsonProperty @JsonProperty
public String nominalCurrency; public String nominalCurrency;
@ -47,7 +48,7 @@ public class MoneyMarketSecurityNewAction implements IAction<MoneyMarketSecurity
public String securitySymbol; public String securitySymbol;
@ApiModelProperty(value = "Размер лота", example = "300.5") @ApiModelProperty(value = "Размер лота", example = "300.5")
@JsonProperty @JsonProperty
public Double lotSize; public BigDecimal lotSize;
@Override @Override
public Collection<EnumMessage> validate() { public Collection<EnumMessage> validate() {
@ -107,11 +108,11 @@ public class MoneyMarketSecurityNewAction implements IAction<MoneyMarketSecurity
this.endDate = endDate; this.endDate = endDate;
} }
public Double getNominalValue() { public BigDecimal getNominalValue() {
return nominalValue; return nominalValue;
} }
public void setNominalValue(Double nominalValue) { public void setNominalValue(BigDecimal nominalValue) {
this.nominalValue = nominalValue; this.nominalValue = nominalValue;
} }
@ -147,11 +148,11 @@ public class MoneyMarketSecurityNewAction implements IAction<MoneyMarketSecurity
this.securitySymbol = securitySymbol; this.securitySymbol = securitySymbol;
} }
public Double getLotSize() { public BigDecimal getLotSize() {
return lotSize; return lotSize;
} }
public void setLotSize(Double lotSize) { public void setLotSize(BigDecimal lotSize) {
this.lotSize = lotSize; this.lotSize = lotSize;
} }
} }

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.enumeration.EnumMessage;
import ru.spcex.platform.utils.text.TextUtil; import ru.spcex.platform.utils.text.TextUtil;
import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -35,7 +36,7 @@ public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecur
public LocalDate endDate; public LocalDate endDate;
@ApiModelProperty(value = "Номинал", example = "20.5") @ApiModelProperty(value = "Номинал", example = "20.5")
@JsonProperty @JsonProperty
public Double nominalValue; public BigDecimal nominalValue;
@ApiModelProperty(value = "Валюта номинала", example = "RUB") @ApiModelProperty(value = "Валюта номинала", example = "RUB")
@JsonProperty @JsonProperty
public String nominalCurrency; public String nominalCurrency;
@ -47,7 +48,7 @@ public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecur
public String fullName; public String fullName;
@ApiModelProperty(value = "Размер лота", example = "300.5") @ApiModelProperty(value = "Размер лота", example = "300.5")
@JsonProperty @JsonProperty
public Double lotSize; public BigDecimal lotSize;
@Override @Override
public MoneyMarketSecurityUpdateRequest toRequest() { public MoneyMarketSecurityUpdateRequest toRequest() {
@ -98,11 +99,11 @@ public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecur
this.endDate = endDate; this.endDate = endDate;
} }
public Double getNominalValue() { public BigDecimal getNominalValue() {
return nominalValue; return nominalValue;
} }
public void setNominalValue(Double nominalValue) { public void setNominalValue(BigDecimal nominalValue) {
this.nominalValue = nominalValue; this.nominalValue = nominalValue;
} }
@ -130,11 +131,11 @@ public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecur
this.fullName = fullName; this.fullName = fullName;
} }
public Double getLotSize() { public BigDecimal getLotSize() {
return lotSize; return lotSize;
} }
public void setLotSize(Double lotSize) { public void setLotSize(BigDecimal lotSize) {
this.lotSize = lotSize; this.lotSize = lotSize;
} }

View file

@ -28,12 +28,12 @@ class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest {
MoneyMarketSecurityNewAction moneyMarketSecurityNewAction = new MoneyMarketSecurityNewAction(); MoneyMarketSecurityNewAction moneyMarketSecurityNewAction = new MoneyMarketSecurityNewAction();
moneyMarketSecurityNewAction.setStartDate(LocalDate.now()); moneyMarketSecurityNewAction.setStartDate(LocalDate.now());
moneyMarketSecurityNewAction.setEndDate(LocalDate.now()); moneyMarketSecurityNewAction.setEndDate(LocalDate.now());
moneyMarketSecurityNewAction.setNominalValue(2D); moneyMarketSecurityNewAction.setNominalValue(new BigDecimal("2.6"));
moneyMarketSecurityNewAction.setNominalCurrency("nominal"); moneyMarketSecurityNewAction.setNominalCurrency("nominal");
moneyMarketSecurityNewAction.setInstrumentType("status"); moneyMarketSecurityNewAction.setInstrumentType("status");
moneyMarketSecurityNewAction.setFullName("fname"); moneyMarketSecurityNewAction.setFullName("fname");
moneyMarketSecurityNewAction.setSecuritySymbol("sname"); moneyMarketSecurityNewAction.setSecuritySymbol("sname");
moneyMarketSecurityNewAction.setLotSize(3D); moneyMarketSecurityNewAction.setLotSize(new BigDecimal("3.5"));
//ACT and ASSERT //ACT and ASSERT
checkAddingByRestApi(REST_URL, moneyMarketSecurityNewAction); checkAddingByRestApi(REST_URL, moneyMarketSecurityNewAction);
@ -53,11 +53,11 @@ class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest {
moneyMarketSecurityUpdateAction.setId(id); moneyMarketSecurityUpdateAction.setId(id);
moneyMarketSecurityUpdateAction.setStartDate(LocalDate.now()); moneyMarketSecurityUpdateAction.setStartDate(LocalDate.now());
moneyMarketSecurityUpdateAction.setEndDate(LocalDate.now()); moneyMarketSecurityUpdateAction.setEndDate(LocalDate.now());
moneyMarketSecurityUpdateAction.setNominalValue(2D); moneyMarketSecurityUpdateAction.setNominalValue(new BigDecimal("2.6"));
moneyMarketSecurityUpdateAction.setNominalCurrency("nominal"); moneyMarketSecurityUpdateAction.setNominalCurrency("nominal");
moneyMarketSecurityUpdateAction.setInstrumentType("status"); moneyMarketSecurityUpdateAction.setInstrumentType("status");
moneyMarketSecurityUpdateAction.setFullName("fname"); moneyMarketSecurityUpdateAction.setFullName("fname");
moneyMarketSecurityUpdateAction.setLotSize(3D); moneyMarketSecurityUpdateAction.setLotSize(new BigDecimal("3.5"));
MoneyMarketSecurity moneyMarketSecurity = getMoneyMarketSecurity(id); MoneyMarketSecurity moneyMarketSecurity = getMoneyMarketSecurity(id);
//ACT and ASSERT //ACT and ASSERT