From 83b8ef664fce74cb4c923c47b96ea0ee875d730d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Rem=C3=B8y=20Solheim?= Date: Thu, 22 Aug 2024 13:48:06 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20H=C3=A5ndterer=20at=20gyldigTilO?= =?UTF-8?q?gMed=20kan=20v=C3=A6re=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Øyvind Hagen --- .../meldinger/l\303\270sninger/Fullmaktl\303\270sning.kt" | 3 ++- .../no/nav/helse/mediator/meldinger/Testmeldingfabrikk.kt | 2 +- .../mediator/meldinger/l\303\270sninger/FullmaktRiverTest.kt" | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git "a/spesialist-selve/src/main/kotlin/no/nav/helse/mediator/meldinger/l\303\270sninger/Fullmaktl\303\270sning.kt" "b/spesialist-selve/src/main/kotlin/no/nav/helse/mediator/meldinger/l\303\270sninger/Fullmaktl\303\270sning.kt" index e210b493c..cf5424a1e 100644 --- "a/spesialist-selve/src/main/kotlin/no/nav/helse/mediator/meldinger/l\303\270sninger/Fullmaktl\303\270sning.kt" +++ "b/spesialist-selve/src/main/kotlin/no/nav/helse/mediator/meldinger/l\303\270sninger/Fullmaktl\303\270sning.kt" @@ -7,6 +7,7 @@ import no.nav.helse.rapids_rivers.MessageContext import no.nav.helse.rapids_rivers.River import no.nav.helse.rapids_rivers.asLocalDate import no.nav.helse.rapids_rivers.asLocalDateTime +import no.nav.helse.rapids_rivers.asOptionalLocalDate import org.slf4j.LoggerFactory import java.time.LocalDate import java.util.UUID @@ -50,7 +51,7 @@ internal class Fullmaktløsning( val fullmakt = fullmaktNode.path("fullmakt") fullmakt.size() > 0 && fullmakt["gyldigFraOgMed"].asLocalDate().isSameOrBefore(nå) && - fullmakt["gyldigTilOgMed"].asLocalDate().isSameOrAfter(nå) + fullmakt["gyldigTilOgMed"].asOptionalLocalDate()?.isSameOrAfter(nå) ?: true } val fullmaktløsning = diff --git a/spesialist-selve/src/test/kotlin/no/nav/helse/mediator/meldinger/Testmeldingfabrikk.kt b/spesialist-selve/src/test/kotlin/no/nav/helse/mediator/meldinger/Testmeldingfabrikk.kt index 04363b6d6..686bb04ca 100644 --- a/spesialist-selve/src/test/kotlin/no/nav/helse/mediator/meldinger/Testmeldingfabrikk.kt +++ b/spesialist-selve/src/test/kotlin/no/nav/helse/mediator/meldinger/Testmeldingfabrikk.kt @@ -91,7 +91,7 @@ internal object Testmeldingfabrikk { fun lagFullmaktløsningMedFullmakt( fødselsnummer: String, fom: LocalDate, - tom: LocalDate + tom: LocalDate? ): String = nyHendelse( id = UUID.randomUUID(), "behov", mapOf( diff --git "a/spesialist-selve/src/test/kotlin/no/nav/helse/mediator/meldinger/l\303\270sninger/FullmaktRiverTest.kt" "b/spesialist-selve/src/test/kotlin/no/nav/helse/mediator/meldinger/l\303\270sninger/FullmaktRiverTest.kt" index 2155e2e1f..056bf1cfd 100644 --- "a/spesialist-selve/src/test/kotlin/no/nav/helse/mediator/meldinger/l\303\270sninger/FullmaktRiverTest.kt" +++ "b/spesialist-selve/src/test/kotlin/no/nav/helse/mediator/meldinger/l\303\270sninger/FullmaktRiverTest.kt" @@ -24,7 +24,7 @@ class FullmaktRiverTest { testRapid.sendTestMessage(Testmeldingfabrikk.lagFullmaktløsningMedFullmakt( fnr, fom = now(), - tom = now() + tom = null )) verify(exactly = 1) { mediator.løsning(any(), any(), any(), capture(slot), any()) } assertTrue(slot.captured.harFullmakt)