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

Extracted mergeUnitData(); removed redundant name initializer from Column for most calls

This commit is contained in:
dankito 2024-12-13 04:37:45 +01:00
parent f0c57cd3ee
commit 4df26488e3
3 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
e-invoice-spec-parser/src/main/kotlin/net/codinux/invoicing/parser/CodeGenerator.kt
View File

@ -25,6 +25,7 @@ class CodeGenerator {
matchedCodeLists.forEach { (type, codeLists) -> matchedCodeLists.forEach { (type, codeLists) ->
val (columns, rows) = (if (type == CodeListType.IsoCountryCodes) mergeCountryData(codeLists.first, codeLists.second!!) val (columns, rows) = (if (type == CodeListType.IsoCountryCodes) mergeCountryData(codeLists.first, codeLists.second!!)
else if (type == CodeListType.IsoCurrencyCodes) mergeCurrencyData(codeLists.first, codeLists.second!!) else if (type == CodeListType.IsoCurrencyCodes) mergeCurrencyData(codeLists.first, codeLists.second!!)
else if (type == CodeListType.Units) mergeUnitData(codeLists.first, codeLists.second!!)
else { else {
addFrequentlyUsedColumn(reorder(map(filter( addFrequentlyUsedColumn(reorder(map(filter(
// Factur-X (= codeLists.second) has the better column names and often also a Description column // Factur-X (= codeLists.second) has the better column names and often also a Description column
@ -73,7 +74,7 @@ class CodeGenerator {
val index = columns.indexOf(useForColumn) val index = columns.indexOf(useForColumn)
val modifiedColumns = columns.toMutableList().apply { val modifiedColumns = columns.toMutableList().apply {
removeAt(index) removeAt(index)
add(Column(columns.last().index + 1, "UseFor", "InvoiceTypeUseFor", "UseFor")) add(Column(columns.last().index + 1, "UseFor", "InvoiceTypeUseFor"))
} }
val modifiedRows = rows.onEach { val modifiedRows = rows.onEach {
val useFor = it.removeValueAtIndex(index)?.toString() val useFor = it.removeValueAtIndex(index)?.toString()
@ -112,11 +113,11 @@ class CodeGenerator {
private fun mergeCountryData(cefCodeList: CodeList, zugferdCodeList: net.codinux.invoicing.parser.excel.CodeList): Pair<List<Column>, List<Row>> { private fun mergeCountryData(cefCodeList: CodeList, zugferdCodeList: net.codinux.invoicing.parser.excel.CodeList): Pair<List<Column>, List<Row>> {
val columns = listOf( val columns = listOf(
Column(0, "alpha2Code", "String", "alpha2Code"), Column(0, "alpha2Code", "String"),
Column(1, "alpha3Code", "String", "alpha3Code"), Column(1, "alpha3Code", "String"),
Column(2, "numericCode", "Int", "numericCode"), Column(2, "numericCode", "Int"),
Column(3, "numericCodeAsString", "String", "numericCodeAsString"), Column(3, "numericCodeAsString", "String"),
Column(4, "englishName", "String", "englishName"), Column(4, "englishName", "String"),
) )
val cefByIsoCode = cefCodeList.rows.associateBy { it.values[0] } val cefByIsoCode = cefCodeList.rows.associateBy { it.values[0] }
@ -133,12 +134,12 @@ class CodeGenerator {
private fun mergeCurrencyData(cefCodeList: CodeList, zugferdCodeList: net.codinux.invoicing.parser.excel.CodeList): Pair<List<Column>, List<Row>> { private fun mergeCurrencyData(cefCodeList: CodeList, zugferdCodeList: net.codinux.invoicing.parser.excel.CodeList): Pair<List<Column>, List<Row>> {
val columns = listOf( val columns = listOf(
Column(0, "alpha3Code", "String", "alpha3Code"), Column(0, "alpha3Code", "String"),
Column(1, "numericCode", "Int", "numericCode"), Column(1, "numericCode", "Int"),
Column(2, "currencySymbol", "String", "currencySymbol"), Column(2, "currencySymbol", "String"),
Column(3, "englishName", "String", "englishName"), Column(3, "englishName", "String"),
Column(4, "countries", "Set<String>", "countries"), Column(4, "countries", "Set<String>"),
Column(Int.MAX_VALUE, "isFrequentlyUsedValue", "Boolean", "isFrequentlyUsedValue") Column(Int.MAX_VALUE, "isFrequentlyUsedValue", "Boolean")
) )
val cefByIsoCode = cefCodeList.rows.associateBy { it.values[0] } val cefByIsoCode = cefCodeList.rows.associateBy { it.values[0] }
@ -156,11 +157,31 @@ class CodeGenerator {
return columns to rows.sortedBy { it.enumName!! } // sort by English name return columns to rows.sortedBy { it.enumName!! } // sort by English name
} }
private fun mergeUnitData(cefCodeList: CodeList, zugferdCodeList: net.codinux.invoicing.parser.excel.CodeList): Pair<List<Column>, List<Row>> {
val columns = listOf(
Column(0, "code", "String"),
Column(1, "englishName", "String"),
Column(3, "isFrequentlyUsedValue", "Boolean"),
)
val cefByIsoCode = cefCodeList.rows.associateBy { it.values[0] }
val zugferdByIsoCode = zugferdCodeList.rows.groupBy { it.values[0] }
val rows = cefByIsoCode.map { (code, cefRow) ->
val row = zugferdByIsoCode[code]!!.first()
val values = row.values
Row(listOf(code, values[0], row.isFrequentlyUsedValue), row.isFrequentlyUsedValue)
}
return columns to rows
}
private fun addFrequentlyUsedColumn(columnsToRows: Pair<List<Column>, List<Row>>): Pair<List<Column>, List<Row>> { private fun addFrequentlyUsedColumn(columnsToRows: Pair<List<Column>, List<Row>>): Pair<List<Column>, List<Row>> {
val hasFrequentlyUsedValue = columnsToRows.second.any { it.isFrequentlyUsedValue } val hasFrequentlyUsedValue = columnsToRows.second.any { it.isFrequentlyUsedValue }
return if (hasFrequentlyUsedValue) { return if (hasFrequentlyUsedValue) {
(columnsToRows.first + Column(Int.MAX_VALUE, "isFrequentlyUsedValue", "Boolean", "isFrequentlyUsedValue")) to (columnsToRows.first + Column(Int.MAX_VALUE, "isFrequentlyUsedValue", "Boolean")) to
columnsToRows.second.onEach { it.addIsFrequentlyUsedValueCell() } columnsToRows.second.onEach { it.addIsFrequentlyUsedValueCell() }
} else { } else {
columnsToRows columnsToRows

4
e-invoice-spec-parser/src/main/kotlin/net/codinux/invoicing/parser/excel/ZugferdExcelCodeListsParser.kt
View File

@ -88,7 +88,7 @@ class ZugferdExcelCodeListsParser {
}.filterNot { it.values.all { it == null } } // filter out empty rows }.filterNot { it.values.all { it == null } } // filter out empty rows
if (isTypeWithDescription) { if (isTypeWithDescription) {
columns.add(Column(indexOfNextEmptyCell!! - 1, "Description", "String", "Description")) columns.add(Column(indexOfNextEmptyCell!! - 1, "Description", "String"))
} }
return CodeList(type, name, url, usedInInvoiceFields, additionalUsedInInvoiceFields, columns, rows) return CodeList(type, name, url, usedInInvoiceFields, additionalUsedInInvoiceFields, columns, rows)
@ -122,7 +122,7 @@ class ZugferdExcelCodeListsParser {
private fun mapColumn(cell: Cell?): Column? = cell?.let { private fun mapColumn(cell: Cell?): Column? = cell?.let {
val name = cell.stringCellValue ?: "" val name = cell.stringCellValue ?: ""
return Column(cell.columnIndex, name, "String", name) return Column(cell.columnIndex, name, "String")
} }
private fun getCellValue(cell: Cell?, type: CodeListType? = null) = when (cell?.cellType) { private fun getCellValue(cell: Cell?, type: CodeListType? = null) = when (cell?.cellType) {

2
e-invoice-spec-parser/src/main/kotlin/net/codinux/invoicing/parser/model/Column.kt
View File

@ -4,7 +4,7 @@ data class Column(
val index: Int, val index: Int,
val id: String, val id: String,
val dataType: String, val dataType: String,
val name: String, val name: String = id,
) { ) {
override fun toString() = "$dataType $name ($id)" override fun toString() = "$dataType $name ($id)"
} }