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

Made remainder nullable to signal there is no remainder

This commit is contained in:
dankito 2024-09-10 18:21:12 +02:00
parent e260eaa535
commit 2031cb9e9f
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fints4k/src/commonMain/kotlin/net/codinux/banking/fints/FinTsJobExecutor.kt
View File

@ -217,7 +217,7 @@ open class FinTsJobExecutor(
context.bank, parameter.account) context.bank, parameter.account)
bookedTransactions.addAll(chunkTransaction) bookedTransactions.addAll(chunkTransaction)
remainingMt940String = remainder remainingMt940String = remainder ?: ""
parameter.retrievedChunkListener?.invoke(bookedTransactions) parameter.retrievedChunkListener?.invoke(bookedTransactions)
} }

2
fints4k/src/commonMain/kotlin/net/codinux/banking/fints/transactions/IAccountTransactionsParser.kt
View File

@ -13,6 +13,6 @@ interface IAccountTransactionsParser {
fun parseTransactions(transactionsString: String, bank: BankData, account: AccountData): List<AccountTransaction> fun parseTransactions(transactionsString: String, bank: BankData, account: AccountData): List<AccountTransaction>
fun parseTransactionsChunk(transactionsChunk: String, bank: BankData, account: AccountData): Pair<List<AccountTransaction>, String> fun parseTransactionsChunk(transactionsChunk: String, bank: BankData, account: AccountData): Pair<List<AccountTransaction>, String?>
} }

2
fints4k/src/commonMain/kotlin/net/codinux/banking/fints/transactions/Mt940AccountTransactionsParser.kt
View File

@ -25,7 +25,7 @@ open class Mt940AccountTransactionsParser(
return accountStatements.flatMap { mapToAccountTransactions(it, bank, account) } return accountStatements.flatMap { mapToAccountTransactions(it, bank, account) }
} }
override fun parseTransactionsChunk(transactionsChunk: String, bank: BankData, account: AccountData): Pair<List<AccountTransaction>, String> { override fun parseTransactionsChunk(transactionsChunk: String, bank: BankData, account: AccountData): Pair<List<AccountTransaction>, String?> {
val (accountStatements, remainder) = mt940Parser.parseMt940Chunk(transactionsChunk) val (accountStatements, remainder) = mt940Parser.parseMt940Chunk(transactionsChunk)
return Pair(accountStatements.flatMap { mapToAccountTransactions(it, bank, account) }, remainder) return Pair(accountStatements.flatMap { mapToAccountTransactions(it, bank, account) }, remainder)

2
fints4k/src/commonMain/kotlin/net/codinux/banking/fints/transactions/mt940/IMt940Parser.kt
View File

@ -25,6 +25,6 @@ interface IMt940Parser {
* be displayed immediately to user and the remainder then be passed together with next partial * be displayed immediately to user and the remainder then be passed together with next partial
* HKKAZ response to this method till this whole MT 940 statement is parsed. * HKKAZ response to this method till this whole MT 940 statement is parsed.
*/ */
fun parseMt940Chunk(mt940Chunk: String): Pair<List<AccountStatement>, String> fun parseMt940Chunk(mt940Chunk: String): Pair<List<AccountStatement>, String?>
} }

4
fints4k/src/commonMain/kotlin/net/codinux/banking/fints/transactions/mt940/Mt940Parser.kt
View File

@ -95,11 +95,11 @@ open class Mt940Parser(
* be displayed immediately to user and the remainder then be passed together with next partial * be displayed immediately to user and the remainder then be passed together with next partial
* HKKAZ response to this method till this whole MT 940 statement is parsed. * HKKAZ response to this method till this whole MT 940 statement is parsed.
*/ */
override fun parseMt940Chunk(mt940Chunk: String): Pair<List<AccountStatement>, String> { override fun parseMt940Chunk(mt940Chunk: String): Pair<List<AccountStatement>, String?> {
try { try {
val singleAccountStatementsStrings = splitIntoSingleAccountStatements(mt940Chunk).toMutableList() val singleAccountStatementsStrings = splitIntoSingleAccountStatements(mt940Chunk).toMutableList()
var remainder = "" var remainder: String? = null
if (singleAccountStatementsStrings.isNotEmpty() && singleAccountStatementsStrings.last().isEmpty() == false) { if (singleAccountStatementsStrings.isNotEmpty() && singleAccountStatementsStrings.last().isEmpty() == false) {
remainder = singleAccountStatementsStrings.removeAt(singleAccountStatementsStrings.lastIndex) remainder = singleAccountStatementsStrings.removeAt(singleAccountStatementsStrings.lastIndex)
} }

2
fints4k/src/commonTest/kotlin/net/codinux/banking/fints/transactions/Mt940ParserTest.kt
View File

@ -110,7 +110,7 @@ class Mt940ParserTest : FinTsTestBase() {
// then // then
assertEmpty(remainder) assertNull(remainder)
assertSize(1, statements) assertSize(1, statements)