From 0630ab917068c7bc86be288afacc2215677498f0 Mon Sep 17 00:00:00 2001 From: Julian Ravn Thrap-Meyer Date: Thu, 22 Jul 2021 11:26:39 +0200 Subject: [PATCH] r flytt RestUtils.toJsonRequestBody inn i hentFraPdl --- .../bruker/pdl/PdlOppslagClient.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/no/nav/fo/veilarbregistrering/bruker/pdl/PdlOppslagClient.kt b/src/main/java/no/nav/fo/veilarbregistrering/bruker/pdl/PdlOppslagClient.kt index bcd5992c7..d9db5be5c 100644 --- a/src/main/java/no/nav/fo/veilarbregistrering/bruker/pdl/PdlOppslagClient.kt +++ b/src/main/java/no/nav/fo/veilarbregistrering/bruker/pdl/PdlOppslagClient.kt @@ -43,16 +43,16 @@ open class PdlOppslagClient( } open fun hentIdenterRequest(personident: String, pdlHentIdenterRequest: PdlHentIdenterRequest): String { - val requestBody = RestUtils.toJsonRequestBody(pdlHentIdenterRequest) - return hentFraPdl(requestBody, ekstraHeaders = mapOf( + return hentFraPdl(pdlHentIdenterRequest, ekstraHeaders = mapOf( NAV_PERSONIDENT_HEADER to personident, )) } private fun hentFraPdl( - requestBody: RequestBody, + graphqlRequest: Any, ekstraHeaders: Map ): String { + val requestBody = RestUtils.toJsonRequestBody(graphqlRequest) val authHeaders = lagAuthHeaders() val request = Request.Builder() .url(UrlUtils.joinPaths(baseUrl, "/graphql")) @@ -82,8 +82,7 @@ open class PdlOppslagClient( fnr: String, pdlHentGeografiskTilknytningRequest: PdlHentGeografiskTilknytningRequest ): String { - val requestBody = RestUtils.toJsonRequestBody(pdlHentGeografiskTilknytningRequest) - return hentFraPdl(requestBody, ekstraHeaders = mapOf( + return hentFraPdl(pdlHentGeografiskTilknytningRequest, ekstraHeaders = mapOf( NAV_PERSONIDENT_HEADER to fnr, TEMA_HEADER to OPPFOLGING_TEMA_HEADERVERDI, )) @@ -98,8 +97,7 @@ open class PdlOppslagClient( } open fun hentPersonRequest(fnr: String, pdlHentPersonRequest: PdlHentPersonRequest): String { - val requestBody = RestUtils.toJsonRequestBody(pdlHentPersonRequest) - return hentFraPdl(requestBody, ekstraHeaders = mapOf( + return hentFraPdl(pdlHentPersonRequest, ekstraHeaders = mapOf( NAV_PERSONIDENT_HEADER to fnr, TEMA_HEADER to OPPFOLGING_TEMA_HEADERVERDI, ))