@@ -218,49 +218,22 @@ class InvoiceIntegrationTest : FullApplicationTest(resetDbBeforeEach = true) {
218
218
assertEqualEnough(sent.map(::toSummary), result)
219
219
}
220
220
221
- @Test
222
- fun `search works with canceled status parameter` () {
223
- db.transaction { tx -> tx.insert(testInvoices) }
224
- val canceled = testInvoices.filter { it.status == InvoiceStatus .CANCELED }
225
-
226
- val result =
227
- searchInvoices(SearchInvoicesRequest (page = 1 , status = listOf (InvoiceStatus .CANCELED )))
228
-
229
- assertEqualEnough(canceled.map(::toSummary), result)
230
- }
231
-
232
221
@Test
233
222
fun `search works with multiple status parameters` () {
234
223
db.transaction { tx -> tx.insert(testInvoices) }
235
- val sentAndCanceled =
224
+ val sentAndDraft =
236
225
testInvoices.filter {
237
- it.status == InvoiceStatus .SENT || it.status == InvoiceStatus .CANCELED
226
+ it.status == InvoiceStatus .SENT || it.status == InvoiceStatus .DRAFT
238
227
}
239
228
240
229
val result =
241
230
searchInvoices(
242
231
SearchInvoicesRequest (
243
232
page = 1 ,
244
- status = listOf (InvoiceStatus .SENT , InvoiceStatus .CANCELED ),
245
- )
246
- )
247
- assertEqualEnough(sentAndCanceled.map(::toSummary), result)
248
- }
249
-
250
- @Test
251
- fun `search works with all status parameters` () {
252
- val testInvoiceSubset = testInvoices.take(2 )
253
- db.transaction { tx -> tx.insert(testInvoiceSubset) }
254
- val invoices = testInvoiceSubset.sortedBy { it.status }.reversed()
255
-
256
- val result =
257
- searchInvoices(
258
- SearchInvoicesRequest (
259
- page = 1 ,
260
- status = listOf (InvoiceStatus .DRAFT , InvoiceStatus .SENT , InvoiceStatus .CANCELED ),
233
+ status = listOf (InvoiceStatus .SENT , InvoiceStatus .DRAFT ),
261
234
)
262
235
)
263
- assertEqualEnough(invoices .map(::toSummary), result)
236
+ assertEqualEnough(sentAndDraft .map(::toSummary), result)
264
237
}
265
238
266
239
@Test
@@ -803,6 +776,8 @@ class InvoiceIntegrationTest : FullApplicationTest(resetDbBeforeEach = true) {
803
776
InvoiceDetailed (
804
777
id = invoice.id,
805
778
status = invoice.status,
779
+ revisionNumber = invoice.revisionNumber,
780
+ replacedInvoiceId = invoice.replacedInvoiceId,
806
781
periodStart = invoice.periodStart,
807
782
periodEnd = invoice.periodEnd,
808
783
dueDate = invoice.dueDate,
@@ -850,6 +825,7 @@ class InvoiceIntegrationTest : FullApplicationTest(resetDbBeforeEach = true) {
850
825
InvoiceSummary (
851
826
id = invoice.id,
852
827
status = invoice.status,
828
+ revisionNumber = invoice.revisionNumber,
853
829
periodStart = invoice.periodStart,
854
830
periodEnd = invoice.periodEnd,
855
831
headOfFamily = allAdults.find { it.id == invoice.headOfFamilyId }!! .toPersonDetailed(),
0 commit comments