Skip to content

Commit f3ca3c0

Browse files
committed
Pick up the new "SendTilAddresse1" field, pass it along as "sendtTilAdresse"
1 parent 9bf8dd8 commit f3ca3c0

File tree

4 files changed

+24
-7
lines changed

4 files changed

+24
-7
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,6 @@ data class HotsakOrdrelinje(
3333

3434
@JsonFormat(shape = JsonFormat.Shape.STRING)
3535
val sistOppdatert: LocalDate,
36+
37+
val sendtTilAdresse: String,
3638
) : Ordrelinje

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,6 @@ data class InfotrygdOrdrelinje(
3333

3434
@JsonFormat(shape = JsonFormat.Shape.STRING)
3535
val sistOppdatert: LocalDate,
36+
37+
val sendtTilAdresse: String,
3638
) : Ordrelinje

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ data class OrdrelinjeOebs(
9090
@JsonFormat(shape = JsonFormat.Shape.STRING)
9191
@JsonProperty("LastUpdateDate")
9292
val sistOppdatert: LocalDate,
93+
94+
@JsonProperty("SendTilAddresse1")
95+
val sendtTilAdresse: String,
9396
)
9497

9598
fun OrdrelinjeOebs.erOpprettetFraHOTSAK() = kilde != null && kilde == HOTSAK
@@ -118,7 +121,8 @@ fun OrdrelinjeOebs.toHotsakOrdrelinje(): HotsakOrdrelinje {
118121
enhet = this.enhet,
119122
fnrBruker = this.fnrBruker,
120123
egenAnsatt = this.egenAnsatt,
121-
sistOppdatert = this.sistOppdatert
124+
sistOppdatert = this.sistOppdatert,
125+
sendtTilAdresse = this.sendtTilAdresse,
122126
)
123127
}
124128

@@ -146,6 +150,7 @@ fun OrdrelinjeOebs.toOrdrelinje(): InfotrygdOrdrelinje {
146150
this.enhet,
147151
this.fnrBruker,
148152
this.egenAnsatt,
149-
this.sistOppdatert
153+
this.sistOppdatert,
154+
this.sendtTilAdresse,
150155
)
151156
}

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ internal class ParsingTest {
4343
"ShippingQuantityUom": "STK",
4444
"AccountNumber": "XXXXXXXXXXX",
4545
"EgenAnsatt": "Y",
46-
"LastUpdateDate": "2021-04-05"
46+
"LastUpdateDate": "2021-04-05",
47+
"SendTilAddresse1": "1234 Oslo, bla bla bla"
4748
}
4849
""".trimIndent()
4950
)
@@ -85,7 +86,8 @@ internal class ParsingTest {
8586
"ShippingQuantityUom": "STK",
8687
"AccountNumber": "XXXXXXXXXXX",
8788
"EgenAnsatt": "N",
88-
"LastUpdateDate": "2021-04-05"
89+
"LastUpdateDate": "2021-04-05",
90+
"SendTilAddresse1": "1234 Oslo, bla bla bla"
8991
}
9092
""".trimIndent()
9193
)
@@ -127,7 +129,8 @@ internal class ParsingTest {
127129
"ShippingQuantityUom": "STK",
128130
"AccountNumber": "XXXXXXXXXXX",
129131
"EgenAnsatt": "Y",
130-
"LastUpdateDate": "2021-04-05"
132+
"LastUpdateDate": "2021-04-05",
133+
"SendTilAddresse1": "1234 Oslo, bla bla bla"
131134
}
132135
""".trimIndent()
133136
)
@@ -168,6 +171,7 @@ internal class ParsingTest {
168171
<ki:AccountNumber>01127622634</ki:AccountNumber>
169172
<ki:EgenAnsatt>N</ki:EgenAnsatt>
170173
<ki:LastUpdateDate>2021-04-15</ki:LastUpdateDate>
174+
<ki:SendTilAddresse1>1234 Oslo, bla bla bla</ki:SendTilAddresse1>
171175
</ki:StatusInfo>
172176
""".trimIndent()
173177
)
@@ -208,7 +212,8 @@ internal class ParsingTest {
208212
"ShippingQuantityUom": "STK",
209213
"AccountNumber": "XXXXXXXXXXX",
210214
"EgenAnsatt": "N",
211-
"LastUpdateDate": "2021-04-05"
215+
"LastUpdateDate": "2021-04-05",
216+
"SendTilAddresse1": "1234 Oslo, bla bla bla"
212217
}
213218
""".trimIndent()
214219
)
@@ -247,6 +252,7 @@ internal class ParsingTest {
247252
<ki:AccountNumber>01127622634</ki:AccountNumber>
248253
<ki:EgenAnsatt>N</ki:EgenAnsatt>
249254
<ki:LastUpdateDate>2021-04-15</ki:LastUpdateDate>
255+
<ki:SendTilAddresse1>1234 Oslo, bla bla bla</ki:SendTilAddresse1>
250256
</ki:StatusInfo>
251257
""".trimIndent()
252258
)
@@ -285,7 +291,8 @@ internal class ParsingTest {
285291
"ShippingQuantityUom": "STK",
286292
"AccountNumber": "XXXXXXXXXXX",
287293
"EgenAnsatt": "Y",
288-
"LastUpdateDate": "2021-04-05"
294+
"LastUpdateDate": "2021-04-05",
295+
"SendTilAddresse1": "1234 Oslo, bla bla bla"
289296
}
290297
""".trimIndent()
291298
)
@@ -324,6 +331,7 @@ internal class ParsingTest {
324331
<ki:AccountNumber>01127622634</ki:AccountNumber>
325332
<ki:EgenAnsatt>N</ki:EgenAnsatt>
326333
<ki:LastUpdateDate>2021-04-15</ki:LastUpdateDate>
334+
<ki:SendTilAddresse1>1234 Oslo, bla bla bla</ki:SendTilAddresse1>
327335
</ki:StatusInfo>
328336
""".trimIndent()
329337
)

0 commit comments

Comments
 (0)