From 3223ad37f04c9e134fee349e668d37119a594e58 Mon Sep 17 00:00:00 2001 From: Qadeer Khan Date: Sat, 26 Aug 2023 16:52:24 +0200 Subject: [PATCH] =?UTF-8?q?sjekker=20ogs=C3=A5=20JOURNALF=C3=98RT=20status?= =?UTF-8?q?=20som=20ferdig=20(#983)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/no/nav/k9punsj/journalpost/JournalpostRoutes.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/no/nav/k9punsj/journalpost/JournalpostRoutes.kt b/src/main/kotlin/no/nav/k9punsj/journalpost/JournalpostRoutes.kt index 882943c6c..dd082d640 100644 --- a/src/main/kotlin/no/nav/k9punsj/journalpost/JournalpostRoutes.kt +++ b/src/main/kotlin/no/nav/k9punsj/journalpost/JournalpostRoutes.kt @@ -417,7 +417,8 @@ internal class JournalpostRoutes( } val medSafStatus = uferdigePunsj.associateWith { journalpostService.hentSafJournalPost(it)!!.journalstatus } - val ferdigeSaf = medSafStatus.filter { it.value == SafDtos.Journalstatus.FERDIGSTILT.name }.keys + val ferdigStatuser = arrayOf(SafDtos.Journalstatus.FERDIGSTILT.name, SafDtos.Journalstatus.JOURNALFOERT.name) + val ferdigeSaf = medSafStatus.filter { it.value in ferdigStatuser }.keys if (ferdigeSaf.isEmpty()) { return@RequestContext ServerResponse .status(HttpStatus.BAD_REQUEST) @@ -443,7 +444,7 @@ internal class JournalpostRoutes( return@RequestContext ServerResponse.status(HttpStatus.OK) .bodyValueAndAwait(ResultatDto( - """Lukket journalposter: ${ferdigeSaf.joinToString()}. $fantIkkeIPunsjTekst. $alleredeLukketIPunsjTekst. $ikkeLukketISafTekst. """)) + """Lukket journalposter: $ferdigeSaf. $fantIkkeIPunsjTekst. $alleredeLukketIPunsjTekst. $ikkeLukketISafTekst. """)) } }