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

reports-service http://jira.mfd.msk:8088/browse/CLS-497 KSRepCashRegisterSumsReportBuilder поправил парсинг человекочитаемого формата данных

Browse source
This commit is contained in:
AKurakin 2023-09-22 15:45:54 +03:00
parent 57bbce07da
commit 53b71431ea
2 changed files with 50 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java
View file

@ -100,23 +100,19 @@ public class KSRepCashRegisterSumsReportBuilder extends CSVReportBuilder<EmptyPa
} }
TradingClearingRegistry tkr; TradingClearingRegistry tkr;
if (searchTCRAsInfo) { if (searchTCRAsInfo) {
String code = statement.getComment(); String code = parseCodeFromStatementComment(statement.getComment());
int i = code.lastIndexOf("ТКР"); if (code == null || code.isBlank()) {
if (i >= 0) {
code = code.substring(i + 3).trim();
}
if (i < 0 || code.isBlank()) {
log.warn("For statement id = {} empty or unparseable code=\"{}\" (comment \"{}\"), statement was skipped", log.warn("For statement id = {} empty or unparseable code=\"{}\" (comment \"{}\"), statement was skipped",
code, statement.getComment(), statement.getId()); code, statement.getComment(), statement.getId());
continue; continue;
} }
log.debug("Search TCR by code={}", code); log.debug("Search TradingClearingRegistry by code={}", code);
tkr = tradingClearingRegistryImdg.getFirstObjectByFieldValues(Map.of("code", code)); tkr = tradingClearingRegistryImdg.getFirstObjectByFieldValues(Map.of("code", code));
if (tkr == null) { if (tkr == null) {
log.warn( log.warn(
"For statement id = {} and code = {} not found TradingClearingRegistry", "For statement id = {} and code = {} (or unparseable comment=\"{}\") not found TradingClearingRegistry, statement was skipped",
statement.getId(), statement.getId(),
code code, statement.getComment()
); );
continue; continue;
} }
@ -130,7 +126,7 @@ public class KSRepCashRegisterSumsReportBuilder extends CSVReportBuilder<EmptyPa
tkr = tradingClearingRegistryImdg.getFirstObjectByFieldValues(Map.of("moneyAccountId", accountId)); tkr = tradingClearingRegistryImdg.getFirstObjectByFieldValues(Map.of("moneyAccountId", accountId));
if (tkr == null) { if (tkr == null) {
log.warn( log.warn(
"For statement id = {} and accountId = {} not found TradingClearingRegistry", "For statement id = {} and accountId = {} not found TradingClearingRegistry, statement was skipped",
statement.getId(), statement.getId(),
accountId accountId
); );
@ -238,4 +234,25 @@ public class KSRepCashRegisterSumsReportBuilder extends CSVReportBuilder<EmptyPa
} }
} }
} }
protected String parseCodeFromStatementComment(String comment) {
if (comment == null)
return null;
int i = comment.lastIndexOf("ТКР");
String code = comment;
if (i >= 0) {
code = code.substring(i + 3).trim();
} else {
return null;
}
i = -1;
for (String end : Arrays.asList(".", ";", " ")) {
int p = code.indexOf(end);
if (p > 0 && (i <= 0 || i > p)) i = p;
}
if (i > 0) {
code = code.substring(0, i);
}
return code;
}
} }

23
clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilderTest.java Normal file
View file

@ -0,0 +1,23 @@
package ru.spcex.clearing.reports.reports.ks;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import ru.spcex.platform.imdg.api.ImdgProvider;
import static org.junit.jupiter.api.Assertions.*;
class KSRepCashRegisterSumsReportBuilderTest {
@Test
void parseCodeFromStatementComment() {
KSRepCashRegisterSumsReportBuilder reportB = new KSRepCashRegisterSumsReportBuilder(Mockito.mock(ImdgProvider.class));
assertNull(reportB.parseCodeFromStatementComment(null));
assertEquals(null, reportB.parseCodeFromStatementComment(""));
assertEquals(null, reportB.parseCodeFromStatementComment(" TTTAAA "));
assertEquals("0045CAT00001", reportB.parseCodeFromStatementComment("Возврат на депозит №DSTAA10S003/150923/45/23091500000008 по ТКР 0045CAT00001"));
assertEquals("0574MAT00001", reportB.parseCodeFromStatementComment("Вывод средств по ТКР 0574MAT00001. Поручения 777."));
assertEquals("0574MAT00001", reportB.parseCodeFromStatementComment("ТКР 0574MAT00001"));
assertEquals("0574MAT00001", reportB.parseCodeFromStatementComment("ТКР0574MAT00001"));
assertEquals("", reportB.parseCodeFromStatementComment("ТКР"));
}
}