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

ExecutionDeposit#SecondLegSettlementDate fix

Browse source
This commit is contained in:
ialbert 2023-05-29 13:38:47 +03:00
parent d57001d705
commit 0873f7a166
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java
View file

@ -217,9 +217,13 @@ public class ExecutionDepositComponent {
eDeposit.setFirstLegSettlementDate(sTrades.getTradeDate()); eDeposit.setFirstLegSettlementDate(sTrades.getTradeDate());
{ {
LocalDate sTrdSettleDate = sTrades.getSettleDate(); LocalDate sTrdSettleDate = sTrades.getSettleDate();
if (sTrdSettleDate != null) { if (sTrdSettleDate != null && sTrades.getRepoTerm() != null) {
long repoTerm = sTrades.getRepoTerm() != null ? sTrades.getRepoTerm().longValue() : 0; eDeposit.setSecondLegSettlementDate(sTrdSettleDate.plusDays(sTrades.getRepoTerm()));
eDeposit.setSecondLegSettlementDate(sTrdSettleDate.plusDays(repoTerm)); } else if (sTrdSettleDate != null && sTrades.getSecCode() != null && (sTrades.getSecCode().length() > 7)) {
Optional<Long> daysNumber = stripDaysFromSecCode(sTrades.getSecCode());
daysNumber.ifPresentOrElse(
days -> eDeposit.setSecondLegSettlementDate(sTrdSettleDate.plusDays(days)),
() -> log.info("couldn't extract #days for secondLegSettlementDate from secCode {}", sTrades.getSecCode()));
} }
} }
eDeposit.setFirstLegSettlementCode(sTrades.getSettleCode()); eDeposit.setFirstLegSettlementCode(sTrades.getSettleCode());
@ -237,6 +241,22 @@ public class ExecutionDepositComponent {
return eDeposit; return eDeposit;
} }
private Optional<Long> stripDaysFromSecCode(String secCode) {
if (secCode == null || secCode.length() <= 7) {
return Optional.empty();
}
String digitsFromSecCode = secCode.substring(7).replaceAll("[^\\d]", "");
if (digitsFromSecCode.length() == 0) {
return Optional.empty();
}
try {
Long days = Long.valueOf(digitsFromSecCode);
return Optional.of(days);
} catch (Throwable e) {
return Optional.empty();
}
}
private void logError(IEnumId subject, Object... args) { private void logError(IEnumId subject, Object... args) {
log.warn("{}", msgResolver.resolve(new EnumMessage(subject, args))); log.warn("{}", msgResolver.resolve(new EnumMessage(subject, args)));
} }