Fix deserialization of BA-details.

navikt · Aug 30, 2023 · 1b58117 · 1b58117
1 parent 88c80f4
commit 1b58117
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 20 deletions.
diff --git a/.../nav/pensjon/opptjening/omsorgsopptjening/start/innlesning/barnetrygd/BarnetrygdClient.kt b/.../nav/pensjon/opptjening/omsorgsopptjening/start/innlesning/barnetrygd/BarnetrygdClient.kt
@@ -132,9 +132,9 @@ class BarnetrygdClient(
                     }
 
                     else -> {
-                        deserialize<List<Barnetrygdmelding.Sak>>(it.body!!).let {
+                        deserialize<FagsakWrapper>(it.body!!).let {
                             when {
-                                it.isEmpty() -> {
+                                it.fagsaker.isEmpty() -> {
                                     HentBarnetrygdResponse.Feil(
                                         status = status.value(),
                                         body = "Liste med barnetrygdsaker er tom"
@@ -143,7 +143,7 @@ class BarnetrygdClient(
 
                                 else -> {
                                     HentBarnetrygdResponse.Ok(
-                                        barnetrygdsaker = it
+                                        barnetrygdsaker = it.fagsaker
                                     )
                                 }
                             }
@@ -167,6 +167,10 @@ sealed class HentBarnetygdmottakereResponse {
     data class Feil(val status: Int?, val body: String?) : HentBarnetygdmottakereResponse()
 }
 
+data class FagsakWrapper(
+    val fagsaker: List<Barnetrygdmelding.Sak>
+)
+
 sealed class HentBarnetrygdResponse {
     data class Ok(val barnetrygdsaker: List<Barnetrygdmelding.Sak>) : HentBarnetrygdResponse()
     data class Feil(val status: Int?, val body: String?) : HentBarnetrygdResponse()

diff --git a/.../pensjon/opptjening/omsorgsopptjening/start/innlesning/barnetrygd/BarnetrygdClientTest.kt b/.../pensjon/opptjening/omsorgsopptjening/start/innlesning/barnetrygd/BarnetrygdClientTest.kt
@@ -140,11 +140,13 @@ class BarnetrygdClientTest : SpringContextTest.NoKafka() {
                                 .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                                 .withBody(
                                     serialize(
-                                        listOf(
-                                            Barnetrygdmelding.Sak(
-                                                fagsakId = "1",
-                                                fagsakEiersIdent = "11",
-                                                barnetrygdPerioder = emptyList()
+                                        FagsakWrapper(
+                                            listOf(
+                                                Barnetrygdmelding.Sak(
+                                                    fagsakId = "1",
+                                                    fagsakEiersIdent = "11",
+                                                    barnetrygdPerioder = emptyList()
+                                                )
                                             )
                                         )
                                     )

diff --git a/.../pensjon/opptjening/omsorgsopptjening/start/innlesning/barnetrygd/KafkaIntegrationTest.kt b/.../pensjon/opptjening/omsorgsopptjening/start/innlesning/barnetrygd/KafkaIntegrationTest.kt
@@ -49,11 +49,13 @@ class KafkaIntegrationTest : SpringContextTest.WithKafka() {
                         .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                         .withBody(
                             serialize(
-                                listOf(
-                                    Barnetrygdmelding.Sak(
-                                        fagsakId = "1",
-                                        fagsakEiersIdent = "12345678910",
-                                        barnetrygdPerioder = emptyList()
+                                FagsakWrapper(
+                                    listOf(
+                                        Barnetrygdmelding.Sak(
+                                            fagsakId = "1",
+                                            fagsakEiersIdent = "12345678910",
+                                            barnetrygdPerioder = emptyList()
+                                        )
                                     )
                                 )
                             )

diff --git a/...tlin/no/nav/pensjon/opptjening/omsorgsopptjening/start/innlesning/barnetrygd/RetryTest.kt b/...tlin/no/nav/pensjon/opptjening/omsorgsopptjening/start/innlesning/barnetrygd/RetryTest.kt
@@ -1,6 +1,6 @@
 package no.nav.pensjon.opptjening.omsorgsopptjening.start.innlesning.barnetrygd
 
-import com.fasterxml.jackson.databind.exc.MismatchedInputException
+import com.fasterxml.jackson.core.JsonParseException
 import com.github.tomakehurst.wiremock.client.WireMock
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration
 import com.github.tomakehurst.wiremock.junit5.WireMockExtension
@@ -124,11 +124,13 @@ class RetryTest : SpringContextTest.NoKafka() {
                         .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                         .withBody(
                             serialize(
-                                listOf(
-                                    Barnetrygdmelding.Sak(
-                                        fagsakId = "1",
-                                        fagsakEiersIdent = "12345678910",
-                                        barnetrygdPerioder = emptyList()
+                                FagsakWrapper(
+                                    listOf(
+                                        Barnetrygdmelding.Sak(
+                                            fagsakId = "1",
+                                            fagsakEiersIdent = "12345678910",
+                                            barnetrygdPerioder = emptyList()
+                                        )
                                     )
                                 )
                             )
@@ -201,7 +203,7 @@ class RetryTest : SpringContextTest.NoKafka() {
             barnetrygdmottakerRepository.find(barnetrygdmottaker.id!!)!!.status
         )
 
-        assertThrows<MismatchedInputException> {
+        assertThrows<JsonParseException> {
             barnetrygdService.process()
         }