File tree Expand file tree Collapse file tree 2 files changed +7
-8
lines changed
main/kotlin/no/nav/tms/varsel/api/varsel
test/kotlin/no/nav/tms/varsel/api Expand file tree Collapse file tree 2 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -32,8 +32,8 @@ data class Varsel(
32
32
}
33
33
34
34
data class AlleVarsler (
35
- val aktiveVarsler : AktivtVarselV2 ,
36
- val inaktivtVarseler : List <Varsel >,
35
+ val aktive : AktivtVarselV2 ,
36
+ val inaktive : List <Varsel >,
37
37
) {
38
38
companion object {
39
39
fun fromVarsler (varsler : List <VarselAuthority .Varsel >): AlleVarsler {
@@ -53,8 +53,8 @@ data class AlleVarsler(
53
53
}
54
54
}
55
55
return AlleVarsler (
56
- aktiveVarsler = AktivtVarselV2 (aktivBeskjeder, aktivOppgaver),
57
- inaktivtVarseler = inaktivtVarseler
56
+ aktive = AktivtVarselV2 (aktivBeskjeder, aktivOppgaver),
57
+ inaktive = inaktivtVarseler
58
58
)
59
59
}
60
60
}
Original file line number Diff line number Diff line change @@ -4,7 +4,6 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
4
4
import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder
5
5
import io.kotest.matchers.shouldBe
6
6
import io.ktor.client.*
7
- import io.ktor.client.call.*
8
7
import io.ktor.client.request.get
9
8
import io.ktor.client.request.header
10
9
import io.ktor.client.request.post
@@ -64,9 +63,9 @@ class VarselRoutesTest {
64
63
response.status shouldBe HttpStatusCode .OK
65
64
66
65
val alleVarsler: AlleVarsler = response.bodyFromJson()
67
- alleVarsler.aktiveVarsler .beskjeder.size shouldBe 4
68
- alleVarsler.aktiveVarsler .oppgaver.size shouldBe 2
69
- alleVarsler.inaktivtVarseler .size shouldBe 6
66
+ alleVarsler.aktive .beskjeder.size shouldBe 4
67
+ alleVarsler.aktive .oppgaver.size shouldBe 2
68
+ alleVarsler.inaktive .size shouldBe 6
70
69
71
70
}
72
71
You can’t perform that action at this time.
0 commit comments