codinux
/
fints4k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed detecting when dash at start of line is not a statement separator

This commit is contained in:
dankito 2020-05-20 21:05:14 +02:00
parent 08b21980f9
commit b89414b1f1
2 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fints4k/src/main/kotlin/net/dankito/banking/fints/transactions/mt940/Mt940Parser.kt
View File

@ -24,6 +24,8 @@ None of lines include only Space.
open class Mt940Parser : IMt940Parser { open class Mt940Parser : IMt940Parser {
companion object { companion object {
val AccountStatementsSeparatorPattern = Regex("^\\s*-\\s*\$", RegexOption.MULTILINE) // a line only with '-' and may other white space characters
val AccountStatementFieldSeparatorPattern = Pattern.compile(":\\d\\d\\w?:") val AccountStatementFieldSeparatorPattern = Pattern.compile(":\\d\\d\\w?:")
@ -73,7 +75,7 @@ open class Mt940Parser : IMt940Parser {
protected open fun splitIntoSingleAccountStatements(mt940String: String): List<String> { protected open fun splitIntoSingleAccountStatements(mt940String: String): List<String> {
return mt940String.split("\n-") return mt940String.split(AccountStatementsSeparatorPattern)
.map { it.replace("\n", "").replace("\r", "") } .map { it.replace("\n", "").replace("\r", "") }
} }

63
fints4k/src/test/kotlin/net/dankito/banking/fints/transactions/Mt940ParserTest.kt
View File

@ -158,6 +158,69 @@ class Mt940ParserTest : FinTsTestBase() {
assertThat(result.first().transactions[1].turnover.valueDate).isEqualTo(Date(120, 0, 1)) assertThat(result.first().transactions[1].turnover.valueDate).isEqualTo(Date(120, 0, 1))
} }
@Test
fun `Fix line starts with dash but is not a statement separator`() {
// given
val transactionsString = "\n" +
":20:MT940-2005200849\n" +
":21:NONREF\n" +
":25:20041111/369300900EUR\n" +
":28C:0/1\n" +
":60F:C200512EUR0,00\n" +
":61:2005120512CR100,00NMSCNONREF//POS 7\n" +
":86:820?20ÜBERTRAG / ÜBERWEISUNG?21EROEFFNUNGSBETRAG?22END-TO-END-REF\n" +
".:?23NICHT ANGEGEBEN?24Ref. HW220133C3232360/15499?32DAN\n" +
"NKITO\n" +
":62M:C200513EUR100,00\n" +
"-\n" +
":20:MT940-2005200849\n" +
":21:NONREF\n" +
":25:20041111/369300900EUR\n" +
":28C:0/2\n" +
":60M:C200513EUR100,00\n" +
":61:2005130513CR0,10NMSCNONREF//POS 6\n" +
":86:820?20ÜBERTRAG / ÜBERWEISUNG?21TEST?22END-TO-END-REF.:?23NICHT AN\n" +
"GEGEBEN?24Ref. 7T2C0YTD0BZL4V9S/1?32DANKITO\n" +
":61:2005130513CR0,15NMSCNONREF//POS 5\n" +
":86:820?20ÜBERTRAG / ÜBERWEISUNG?21ECHTZEITUEBERWEISUNGSTEST?22END-TO\n" +
"-END-REF.:?23NICHT ANGEGEBEN?24Ref. 402C0YTD0GLPFDFV/1?32DANKI\n" +
"TO\n" +
":61:2005130513CR0,30NMSCNONREF//POS 4\n" +
":86:820?20ÜBERTRAG / ÜBERWEISUNG?21UND NOCH EIN TEST FUER JAVA?22FX?2\n" +
"3END-TO-END-REF.:?24NICHT ANGEGEBEN?25Ref. 5D2C0YTD0HVAB3X3/1?32D\n" +
"ANKITO\n" +
":61:2005130513CR0,10NMSCNONREF//POS 3\n" +
":86:820?20ÜBERTRAG / ÜBERWEISUNG?21LASS DIE KOHLE RUEBER WACHS?22EN?2\n" +
"3END-TO-END-REF.:?24NICHT ANGEGEBEN?25Ref. J3220134C3451151/6200?\n" +
"32DANKITO\n" +
":61:2005130513CR0,01NMSCNONREF//POS 2\n" +
":86:820?20ÜBERTRAG / ÜBERWEISUNG?21TEST?22END-TO-END-REF.:?23NICHT AN\n" +
"GEGEBEN?24Ref. J3220134C3451151/6201?32DANKITO\n" +
":62M:C200514EUR100,66\n" +
"-\n" +
":20:MT940-2005200849\n" +
":21:NONREF\n" +
":25:20041111/369300900EUR\n" +
":28C:0/3\n" +
":60M:C200514EUR100,66\n" +
":61:2005140514DR0,01NMSCNONREF//POS 1\n" +
":86:820?20ÜBERTRAG / ÜBERWEISUNG?21END-TO-END-REF.:?22NICHT ANGEGEBEN\n" +
"?23Ref. J022013510234936/2?30ABCDEFGHIJK?31DE1112345679876543210\n" +
"?32DANKITO\n" +
":62F:C200520EUR100,65\n" +
"-"
// when
val result = underTest.parseMt940String(transactionsString)
// then
assertThat(result).hasSize(3)
assertThat(result.flatMap { it.transactions }).hasSize(7)
}
@Test @Test
fun parseTransactions() { fun parseTransactions() {