[KAIZEN-0] fjern feature toggle for fnr i path

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

@@ -6,18 +6,12 @@ import io.ktor.server.netty.*
 import io.ktor.server.routing.*
 import no.nav.api.debug.configureDebugRoutes
 import no.nav.api.dialog.configureDialogRoutes
-import no.nav.api.dialog.configureDialogRoutesV2
 import no.nav.api.digdir.configureDigdirRoutes
-import no.nav.api.digdir.configureDigdirRoutesV2
 import no.nav.api.oppfolging.configureOppfolgingRoutes
-import no.nav.api.oppfolging.configureOppfolgingRoutesV2
 import no.nav.api.pdl.configurePdlRoutes
-import no.nav.api.pdl.configurePdlRoutesV2
 import no.nav.api.skrivestotte.configureSkrivestotteRoutes
 import no.nav.api.tps.configureTpsRoutes
-import no.nav.api.tps.configureTpsRoutesV2
 import no.nav.api.utbetalinger.configureUtbetalingerRoutes
-import no.nav.api.utbetalinger.configureUtbetalingerRoutesV2
 import no.nav.plugins.*
 
 fun startApplication(
@@ -39,18 +33,12 @@ fun startApplication(
                 route("api") {
                     configureDebugRoutes(consumers.tokenclient)
                     configureOppfolgingRoutes(services.oppfolgingService)
-                    configureOppfolgingRoutesV2(services.oppfolgingService)
                     configurePdlRoutes(services.pdlService)
-                    configurePdlRoutesV2(services.pdlService)
                     configureTpsRoutes(services.tpsService)
-                    configureTpsRoutesV2(services.tpsService)
                     configureDialogRoutes(services.dialogService)
-                    configureDialogRoutesV2(services.dialogService)
                     configureDigdirRoutes(services.digdirService)
-                    configureDigdirRoutesV2(services.digdirService)
                     configureSkrivestotteRoutes(services.skrivestotteService)
                     configureUtbetalingerRoutes(services.utbetalingerService)
-                    configureUtbetalingerRoutesV2(services.utbetalingerService)
                 }
             }
         }

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

@@ -14,19 +14,18 @@ import no.nav.utils.getJWTPrincipalSubject
 import kotlin.reflect.typeOf
 
 fun Route.configureDialogRoutes(dialogService: DialogService) {
-    route("dialog/{fnr}") {
+    route("dialog") {
         route("sendinfomelding") {
             install(NotarizedRoute()) {
-                post = Api.sendInfoMelding
+                post = ApiV2.sendInfoMelding
             }
             post {
                 val payload = call.getJWT()
-                val fnr = requireNotNull(call.parameters["fnr"])
-                val request: MeldingRequest = call.receive()
+                val request: MeldingRequestV2 = call.receive()
                 val ident = call.getJWTPrincipalSubject()
                 call.respond(
                     dialogService.sendInfomelding(
-                        fnr,
+                        request.fnr,
                         request,
                         ident,
                         payload,
@@ -36,16 +35,15 @@ fun Route.configureDialogRoutes(dialogService: DialogService) {
         }
         route("sendsporsmal") {
             install(NotarizedRoute()) {
-                post = Api.sendSporsmal
+                post = ApiV2.sendSporsmal
             }
             post {
                 val payload = call.getJWT()
-                val fnr = requireNotNull(call.parameters["fnr"])
-                val request: MeldingRequest = call.receive()
+                val request: MeldingRequestV2 = call.receive()
                 val ident = call.getJWTPrincipalSubject()
                 call.respond(
                     dialogService.sendSporsmal(
-                        fnr,
+                        request.fnr,
                         request,
                         ident,
                         payload,
@@ -56,16 +54,13 @@ fun Route.configureDialogRoutes(dialogService: DialogService) {
     }
 }
 
-private object Api {
+private object ApiV2 {
     val sendInfoMelding =
         PostInfo.builder {
             summary("Sender infomelding til bruker")
             description("")
             request {
-                requestType(typeOf<MeldingRequest>())
-                parameters {
-                    CommonModels.fnrParameter
-                }
+                requestType(typeOf<MeldingRequestV2>())
                 description(
                     """
                     Innholdet i meldingen, temaet meldingen skal knyttes til, og enheten som sender meldingen.
@@ -88,10 +83,7 @@ private object Api {
             summary("Sender spørsmål til bruker")
             description("")
             request {
-                requestType(typeOf<MeldingRequest>())
-                parameters {
-                    CommonModels.fnrParameter
-                }
+                requestType(typeOf<MeldingRequestV2>())
                 description(
                     """
                     Innholdet i meldingen, temaet meldingen skal knyttes til, og enheten som sender meldingen.

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

@@ -1,37 +1,39 @@
 package no.nav.api.digdir
 
-import io.bkbn.kompendium.core.metadata.GetInfo
+import io.bkbn.kompendium.core.metadata.PostInfo
 import io.bkbn.kompendium.core.plugin.NotarizedRoute
-import io.ktor.client.request.*
 import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import no.nav.api.CommonModels
 import no.nav.api.digdir.DigdirService.*
+import no.nav.models.FnrRequest
+import no.nav.models.deserializeFnr
 import no.nav.utils.getJWT
 import kotlin.reflect.typeOf
 
 fun Route.configureDigdirRoutes(digdirService: DigdirService) {
-    route("digdir/{fnr}/kontaktinformasjon") {
+    route("digdir/kontaktinformasjon") {
         install(NotarizedRoute()) {
-            get = Api.kontaktinformasjon
+            post = ApiV2.kontaktinformasjon
         }
-        get {
+        post {
             val payload = call.getJWT()
-            val ident = requireNotNull(call.parameters["fnr"])
+            val ident = call.deserializeFnr() ?: return@post call.respond(HttpStatusCode.BadRequest)
             call.respond(digdirService.hentKontaktinformasjon(ident, payload))
         }
     }
 }
 
-private object Api {
+private object ApiV2 {
     val kontaktinformasjon =
-        GetInfo.builder {
+        PostInfo.builder {
             summary("Brukers epost og mobiltelefonnummer")
             description("Hentes fra digdir-proxy")
             request {
-                parameters(CommonModels.fnrParameter)
+                requestType(typeOf<FnrRequest>())
+                description("Brukers ident")
             }
             response {
                 responseCode(HttpStatusCode.OK)

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

@@ -1,36 +1,38 @@
 package no.nav.api.oppfolging
 
-import io.bkbn.kompendium.core.metadata.GetInfo
+import io.bkbn.kompendium.core.metadata.PostInfo
 import io.bkbn.kompendium.core.plugin.NotarizedRoute
-import io.ktor.client.request.*
 import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import no.nav.api.CommonModels
+import no.nav.models.FnrRequest
+import no.nav.models.deserializeFnr
 import no.nav.utils.getJWT
 import kotlin.reflect.typeOf
 
 fun Route.configureOppfolgingRoutes(oppfolgingService: OppfolgingService) {
-    route("oppfolging/{fnr}/veileder") {
+    route("oppfolging/veileder") {
         install(NotarizedRoute()) {
-            get = Api.veileder
+            post = ApiV2.veileder
         }
-        get {
+        post {
             val payload = call.getJWT()
-            val fnr = requireNotNull(call.parameters["fnr"])
+            val fnr = call.deserializeFnr() ?: return@post call.respond(HttpStatusCode.BadRequest)
             call.respond(oppfolgingService.hentOppfolging(fnr, payload))
         }
     }
 }
 
-private object Api {
+private object ApiV2 {
     val veileder =
-        GetInfo.builder {
+        PostInfo.builder {
             summary("Brukers oppfølgingsveileder")
             description("Hentes fra veilarboppfølging")
             request {
-                parameters(CommonModels.fnrParameter)
+                requestType(typeOf<FnrRequest>())
+                description("Brukers ident")
             }
             response {
                 responseType(typeOf<OppfolgingService.Oppfolging>())