Skip to content

Commit f017865

Browse files
abrhanavabrhanav
committed
[KAIZEN-0] fjern feature toggle for fnr i path
1 parent 804d4e5 commit f017865

File tree

13 files changed

+72
-404
lines changed

13 files changed

+72
-404
lines changed

‎src/main/kotlin/no/nav/Application.kt‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,12 @@ import io.ktor.server.netty.*
66
import io.ktor.server.routing.*
77
import no.nav.api.debug.configureDebugRoutes
88
import no.nav.api.dialog.configureDialogRoutes
9-
import no.nav.api.dialog.configureDialogRoutesV2
109
import no.nav.api.digdir.configureDigdirRoutes
11-
import no.nav.api.digdir.configureDigdirRoutesV2
1210
import no.nav.api.oppfolging.configureOppfolgingRoutes
13-
import no.nav.api.oppfolging.configureOppfolgingRoutesV2
1411
import no.nav.api.pdl.configurePdlRoutes
15-
import no.nav.api.pdl.configurePdlRoutesV2
1612
import no.nav.api.skrivestotte.configureSkrivestotteRoutes
1713
import no.nav.api.tps.configureTpsRoutes
18-
import no.nav.api.tps.configureTpsRoutesV2
1914
import no.nav.api.utbetalinger.configureUtbetalingerRoutes
20-
import no.nav.api.utbetalinger.configureUtbetalingerRoutesV2
2115
import no.nav.plugins.*
2216

2317
fun startApplication(
@@ -39,18 +33,12 @@ fun startApplication(
3933
route("api") {
4034
configureDebugRoutes(consumers.tokenclient)
4135
configureOppfolgingRoutes(services.oppfolgingService)
42-
configureOppfolgingRoutesV2(services.oppfolgingService)
4336
configurePdlRoutes(services.pdlService)
44-
configurePdlRoutesV2(services.pdlService)
4537
configureTpsRoutes(services.tpsService)
46-
configureTpsRoutesV2(services.tpsService)
4738
configureDialogRoutes(services.dialogService)
48-
configureDialogRoutesV2(services.dialogService)
4939
configureDigdirRoutes(services.digdirService)
50-
configureDigdirRoutesV2(services.digdirService)
5140
configureSkrivestotteRoutes(services.skrivestotteService)
5241
configureUtbetalingerRoutes(services.utbetalingerService)
53-
configureUtbetalingerRoutesV2(services.utbetalingerService)
5442
}
5543
}
5644
}

‎src/main/kotlin/no/nav/api/dialog/DialogRoutes.kt‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,18 @@ import no.nav.utils.getJWTPrincipalSubject
1414
import kotlin.reflect.typeOf
1515

1616
fun Route.configureDialogRoutes(dialogService: DialogService) {
17-
route("dialog/{fnr}") {
17+
route("dialog") {
1818
route("sendinfomelding") {
1919
install(NotarizedRoute()) {
20-
post = Api.sendInfoMelding
20+
post = ApiV2.sendInfoMelding
2121
}
2222
post {
2323
val payload = call.getJWT()
24-
val fnr = requireNotNull(call.parameters["fnr"])
25-
val request: MeldingRequest = call.receive()
24+
val request: MeldingRequestV2 = call.receive()
2625
val ident = call.getJWTPrincipalSubject()
2726
call.respond(
2827
dialogService.sendInfomelding(
29-
fnr,
28+
request.fnr,
3029
request,
3130
ident,
3231
payload,
@@ -36,16 +35,15 @@ fun Route.configureDialogRoutes(dialogService: DialogService) {
3635
}
3736
route("sendsporsmal") {
3837
install(NotarizedRoute()) {
39-
post = Api.sendSporsmal
38+
post = ApiV2.sendSporsmal
4039
}
4140
post {
4241
val payload = call.getJWT()
43-
val fnr = requireNotNull(call.parameters["fnr"])
44-
val request: MeldingRequest = call.receive()
42+
val request: MeldingRequestV2 = call.receive()
4543
val ident = call.getJWTPrincipalSubject()
4644
call.respond(
4745
dialogService.sendSporsmal(
48-
fnr,
46+
request.fnr,
4947
request,
5048
ident,
5149
payload,
@@ -56,16 +54,13 @@ fun Route.configureDialogRoutes(dialogService: DialogService) {
5654
}
5755
}
5856

59-
private object Api {
57+
private object ApiV2 {
6058
val sendInfoMelding =
6159
PostInfo.builder {
6260
summary("Sender infomelding til bruker")
6361
description("")
6462
request {
65-
requestType(typeOf<MeldingRequest>())
66-
parameters {
67-
CommonModels.fnrParameter
68-
}
63+
requestType(typeOf<MeldingRequestV2>())
6964
description(
7065
"""
7166
Innholdet i meldingen, temaet meldingen skal knyttes til, og enheten som sender meldingen.
@@ -88,10 +83,7 @@ private object Api {
8883
summary("Sender spørsmål til bruker")
8984
description("")
9085
request {
91-
requestType(typeOf<MeldingRequest>())
92-
parameters {
93-
CommonModels.fnrParameter
94-
}
86+
requestType(typeOf<MeldingRequestV2>())
9587
description(
9688
"""
9789
Innholdet i meldingen, temaet meldingen skal knyttes til, og enheten som sender meldingen.

‎src/main/kotlin/no/nav/api/dialog/DialogRoutesV2.kt‎

Lines changed: 0 additions & 103 deletions
This file was deleted.

‎src/main/kotlin/no/nav/api/digdir/DigdirRoutes.kt‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,39 @@
11
package no.nav.api.digdir
22

3-
import io.bkbn.kompendium.core.metadata.GetInfo
3+
import io.bkbn.kompendium.core.metadata.PostInfo
44
import io.bkbn.kompendium.core.plugin.NotarizedRoute
5-
import io.ktor.client.request.*
65
import io.ktor.http.*
76
import io.ktor.server.application.*
87
import io.ktor.server.response.*
98
import io.ktor.server.routing.*
109
import no.nav.api.CommonModels
1110
import no.nav.api.digdir.DigdirService.*
11+
import no.nav.models.FnrRequest
12+
import no.nav.models.deserializeFnr
1213
import no.nav.utils.getJWT
1314
import kotlin.reflect.typeOf
1415

1516
fun Route.configureDigdirRoutes(digdirService: DigdirService) {
16-
route("digdir/{fnr}/kontaktinformasjon") {
17+
route("digdir/kontaktinformasjon") {
1718
install(NotarizedRoute()) {
18-
get = Api.kontaktinformasjon
19+
post = ApiV2.kontaktinformasjon
1920
}
20-
get {
21+
post {
2122
val payload = call.getJWT()
22-
val ident = requireNotNull(call.parameters["fnr"])
23+
val ident = call.deserializeFnr() ?: return@post call.respond(HttpStatusCode.BadRequest)
2324
call.respond(digdirService.hentKontaktinformasjon(ident, payload))
2425
}
2526
}
2627
}
2728

28-
private object Api {
29+
private object ApiV2 {
2930
val kontaktinformasjon =
30-
GetInfo.builder {
31+
PostInfo.builder {
3132
summary("Brukers epost og mobiltelefonnummer")
3233
description("Hentes fra digdir-proxy")
3334
request {
34-
parameters(CommonModels.fnrParameter)
35+
requestType(typeOf<FnrRequest>())
36+
description("Brukers ident")
3537
}
3638
response {
3739
responseCode(HttpStatusCode.OK)

‎src/main/kotlin/no/nav/api/digdir/DigdirRoutesV2.kt‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎src/main/kotlin/no/nav/api/oppfolging/OppfolgingRoutes.kt‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,38 @@
11
package no.nav.api.oppfolging
22

3-
import io.bkbn.kompendium.core.metadata.GetInfo
3+
import io.bkbn.kompendium.core.metadata.PostInfo
44
import io.bkbn.kompendium.core.plugin.NotarizedRoute
5-
import io.ktor.client.request.*
65
import io.ktor.http.*
76
import io.ktor.server.application.*
87
import io.ktor.server.response.*
98
import io.ktor.server.routing.*
109
import no.nav.api.CommonModels
10+
import no.nav.models.FnrRequest
11+
import no.nav.models.deserializeFnr
1112
import no.nav.utils.getJWT
1213
import kotlin.reflect.typeOf
1314

1415
fun Route.configureOppfolgingRoutes(oppfolgingService: OppfolgingService) {
15-
route("oppfolging/{fnr}/veileder") {
16+
route("oppfolging/veileder") {
1617
install(NotarizedRoute()) {
17-
get = Api.veileder
18+
post = ApiV2.veileder
1819
}
19-
get {
20+
post {
2021
val payload = call.getJWT()
21-
val fnr = requireNotNull(call.parameters["fnr"])
22+
val fnr = call.deserializeFnr() ?: return@post call.respond(HttpStatusCode.BadRequest)
2223
call.respond(oppfolgingService.hentOppfolging(fnr, payload))
2324
}
2425
}
2526
}
2627

27-
private object Api {
28+
private object ApiV2 {
2829
val veileder =
29-
GetInfo.builder {
30+
PostInfo.builder {
3031
summary("Brukers oppfølgingsveileder")
3132
description("Hentes fra veilarboppfølging")
3233
request {
33-
parameters(CommonModels.fnrParameter)
34+
requestType(typeOf<FnrRequest>())
35+
description("Brukers ident")
3436
}
3537
response {
3638
responseType(typeOf<OppfolgingService.Oppfolging>())

0 commit comments

Comments
 (0)