Skip to content

Commit e112862

Browse files
committed
Serienr kommer som liste ikke string
1 parent 9e498d5 commit e112862

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/main/kotlin/no/nav/hjelpemidler/model/OrdrelinjeOebs.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package no.nav.hjelpemidler.model
33
import com.fasterxml.jackson.annotation.JsonFormat
44
import com.fasterxml.jackson.annotation.JsonIgnoreProperties
55
import com.fasterxml.jackson.annotation.JsonProperty
6+
import com.fasterxml.jackson.annotation.JsonSetter
7+
import com.fasterxml.jackson.annotation.Nulls
68
import java.time.LocalDate
79

810
const val HOTSAK = "HOTSAK"
@@ -95,7 +97,7 @@ data class OrdrelinjeOebs(
9597
var sendtTilAdresse: String,
9698

9799
@JsonProperty("SerieNummerListe")
98-
val serienumreRå: String?,
100+
val serienumre: List<String>? = emptyList(),
99101
)
100102

101103
fun OrdrelinjeOebs.erOpprettetFraHOTSAK() = kilde != null && kilde == HOTSAK
@@ -128,7 +130,7 @@ fun OrdrelinjeOebs.toRåOrdrelinje(): RåOrdrelinje {
128130
egenAnsatt = this.egenAnsatt,
129131
sistOppdatert = this.sistOppdatert,
130132
sendtTilAdresse = this.sendtTilAdresse,
131-
serienumre = this.serienumreRå?.let { RåOrdrelinje.serienumreListeFraRå(this.serienumreRå) } ?: listOf(),
133+
serienumre = this.serienumre ?: listOf() // ?.let { RåOrdrelinje.serienumreListeFraRå(it) } ?: listOf(),
132134
)
133135
}
134136

src/test/kotlin/no/nav/hjelpemidler/ParsingTest.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package no.nav.hjelpemidler
22

33
import com.fasterxml.jackson.databind.DeserializationFeature
4+
import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule
45
import com.fasterxml.jackson.dataformat.xml.XmlMapper
56
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
67
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
@@ -12,6 +13,7 @@ import kotlin.test.Test
1213
import kotlin.test.assertEquals
1314
import kotlin.time.ExperimentalTime
1415

16+
1517
internal class ParsingTest {
1618

1719
@ExperimentalTime
@@ -92,14 +94,14 @@ internal class ParsingTest {
9294
"EgenAnsatt": "Y",
9395
"LastUpdateDate": "2021-04-05",
9496
"SendTilAddresse1": "1234 Oslo, bla bla bla",
95-
"SerieNummerListe":"660383, 693065, 726136, 733046"
97+
"SerieNummerListe":["660383", "693065", "726136", "733046"]
9698
}
9799
""".trimIndent()
98100
)
99101

100102
println(result.toString())
101103
val expected = listOf("660383", "693065", "726136", "733046")
102-
for (serienr in RåOrdrelinje.serienumreListeFraRå(result.serienumreRå!!)) {
104+
for (serienr in result.serienumre ?: listOf()) { // RåOrdrelinje.serienumreListeFraRå(result.serienumreRå!!)) {
103105
assert(expected.contains(serienr)) { "Expected to find only the serial numbers in the raw example" }
104106
}
105107
}

0 commit comments

Comments
 (0)