Review comment fixes

espoon-voltti · Nov 1, 2024 · 219aa17 · 219aa17
1 parent c3f7193
commit 219aa17
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/service/src/main/kotlin/fi/espoo/evaka/invoicing/data/InvoiceQueries.kt b/service/src/main/kotlin/fi/espoo/evaka/invoicing/data/InvoiceQueries.kt
@@ -410,6 +410,8 @@ fun Database.Transaction.insertDraftInvoices(
     relatedFeeDecisions: Map<PersonId, List<FeeDecisionId>> = emptyMap(),
 ): List<InvoiceId> {
     val invoiceIds = insertInvoicesWithoutRows(invoices)
+    check(invoiceIds.size == invoices.size)
+
     insertInvoiceRows(
         invoices.zip(invoiceIds).map { (invoice, invoiceId) -> invoiceId to invoice.rows }
     )

diff --git a/service/src/main/kotlin/fi/espoo/evaka/invoicing/service/InvoiceCorrection.kt b/service/src/main/kotlin/fi/espoo/evaka/invoicing/service/InvoiceCorrection.kt
@@ -34,7 +34,7 @@ data class InvoiceCorrection(
     val note: String,
     @Nested("invoice") val invoice: InvoiceWithCorrection?, // should later be a list?
 ) {
-    fun toInvoiceRow() =
+    fun toDraftInvoiceRow() =
         DraftInvoiceRow(
             childId = childId,
             amount = amount,

diff --git a/service/src/main/kotlin/fi/espoo/evaka/invoicing/service/InvoiceGenerator.kt b/service/src/main/kotlin/fi/espoo/evaka/invoicing/service/InvoiceGenerator.kt
@@ -210,7 +210,7 @@ class InvoiceGenerator(
                             .sortedByDescending { abs(it.amount * it.unitPrice) }
                             .partition { it.unitPrice > 0 }
                     val withAdditions =
-                        invoice.copy(rows = invoice.rows + additions.map { it.toInvoiceRow() })
+                        invoice.copy(rows = invoice.rows + additions.map { it.toDraftInvoiceRow() })
 
                     subtractions.fold(withAdditions) { invoiceWithSubtractions, subtraction ->
                         if (invoiceWithSubtractions.totalPrice == 0)
@@ -230,7 +230,7 @@ class InvoiceGenerator(
                             invoiceWithSubtractions.copy(
                                 rows =
                                     invoiceWithSubtractions.rows +
-                                        subtractionWithMaxApplicableAmount.toInvoiceRow()
+                                        subtractionWithMaxApplicableAmount.toDraftInvoiceRow()
                             )
                         } else { // apply partial unit price
                             val maxUnitPrice =
@@ -242,7 +242,7 @@ class InvoiceGenerator(
                             invoiceWithSubtractions.copy(
                                 rows =
                                     invoiceWithSubtractions.rows +
-                                        subtractionWithMaxUnitPrice.toInvoiceRow()
+                                        subtractionWithMaxUnitPrice.toDraftInvoiceRow()
                             )
                         }
                     }