legger på mottaks-tidspunkt av klagen for klageinstans til json

navikt · Aug 26, 2024 · bdeb406 · bdeb406
1 parent b558d7b
commit bdeb406
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/...tlin/no/nav/su/se/bakover/database/klage/klageinstans/KlageinstanshendelsePostgresRepo.kt b/...tlin/no/nav/su/se/bakover/database/klage/klageinstans/KlageinstanshendelsePostgresRepo.kt
@@ -13,6 +13,7 @@ import no.nav.su.se.bakover.common.infrastructure.persistence.hentListe
 import no.nav.su.se.bakover.common.infrastructure.persistence.insert
 import no.nav.su.se.bakover.common.infrastructure.persistence.oppdatering
 import no.nav.su.se.bakover.common.infrastructure.persistence.tidspunkt
+import no.nav.su.se.bakover.common.infrastructure.persistence.tidspunktOrNull
 import no.nav.su.se.bakover.common.journal.JournalpostId
 import no.nav.su.se.bakover.common.persistence.TransactionContext
 import no.nav.su.se.bakover.domain.klage.KlageinstanshendelseRepo
@@ -162,7 +163,7 @@ internal class KlageinstanshendelsePostgresRepo(
                         opprettet = opprettet,
                         klageId = klageId,
                         oppgaveId = oppgaveId,
-                        mottattKlageinstans = row.tidspunkt("utlest_mottattKlageinstans"),
+                        mottattKlageinstans = row.tidspunktOrNull("utlest_mottattKlageinstans"),
                     )
                 }
             }

diff --git a/domain/src/main/kotlin/no/nav/su/se/bakover/domain/klage/Klageinstansvedtak.kt b/domain/src/main/kotlin/no/nav/su/se/bakover/domain/klage/Klageinstansvedtak.kt
@@ -92,7 +92,7 @@ sealed interface ProsessertKlageinstanshendelse {
         override val id: UUID,
         override val opprettet: Tidspunkt,
         override val klageId: KlageId,
-        val mottattKlageinstans: Tidspunkt,
+        val mottattKlageinstans: Tidspunkt?,
         override val oppgaveId: OppgaveId,
     ) : ProsessertKlageinstanshendelse
 }

diff --git a/web/src/main/kotlin/no/nav/su/se/bakover/web/routes/klage/KlageJson.kt b/web/src/main/kotlin/no/nav/su/se/bakover/web/routes/klage/KlageJson.kt
@@ -118,6 +118,7 @@ internal data class KlageJson(
     data class VedtattUtfallJson(
         val utfall: String?,
         val opprettet: String,
+        val klageinstansMottok: String?,
     )
 }
 
@@ -554,5 +555,6 @@ internal fun ProsessertKlageinstanshendelse.toJson(): KlageJson.VedtattUtfallJso
             null -> null
         },
         opprettet = this.opprettet.toString(),
+        klageinstansMottok = (this as? ProsessertKlageinstanshendelse.AnkebehandlingOpprettet)?.mottattKlageinstans?.toString(),
     )
 }