Skip to content

F - Endrer signaturen til apiRequest til å ta i mot PersonInfo i sted… #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 17, 2025
Merged

F - Endrer signaturen til apiRequest til å ta i mot PersonInfo i sted… #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/kotlin/no/nav/eessi/pensjon/fagmodul/api/PrefillController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import no.nav.eessi.pensjon.gcp.GjennySak
import no.nav.eessi.pensjon.logging.AuditLogger
import no.nav.eessi.pensjon.metrics.MetricsHelper
import no.nav.eessi.pensjon.shared.api.ApiRequest
import no.nav.eessi.pensjon.shared.api.PersonInfo
import no.nav.eessi.pensjon.shared.api.PrefillDataModel
import no.nav.eessi.pensjon.utils.mapJsonToAny
import no.nav.eessi.pensjon.utils.toJson
Expand Down Expand Up @@ -136,7 +137,7 @@ class PrefillController(

val norskIdent = innhentingService.hentFnrfraAktoerService(request.aktoerId) ?: throw HttpClientErrorException(HttpStatus.BAD_REQUEST)
val avdodaktoerID = innhentingService.getAvdodId(BucType.from(request.buc.name)!!, request.riktigAvdod())
val dataModel = ApiRequest.buildPrefillDataModelOnExisting(request, norskIdent.id, avdodaktoerID)
val dataModel = ApiRequest.buildPrefillDataModelOnExisting(request, PersonInfo(norskIdent.id, request.aktoerId), avdodaktoerID)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hvorfor har vi med request.aktoerId? Den brukes ikke videre?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tror den brukes i prefill


//Hente metadata for valgt BUC
val bucUtil = euxInnhentingService.kanSedOpprettes(dataModel)
Expand Down Expand Up @@ -195,7 +196,7 @@ class PrefillController(

val norskIdent = innhentingService.hentFnrfraAktoerService(request.aktoerId) ?: throw HttpClientErrorException(HttpStatus.BAD_REQUEST, "Mangler norsk fnr")
val avdodaktoerID = innhentingService.getAvdodId(BucType.from(request.buc.name)!!, request.riktigAvdod())
val dataModel = ApiRequest.buildPrefillDataModelOnExisting(request, norskIdent.id, avdodaktoerID)
val dataModel = ApiRequest.buildPrefillDataModelOnExisting(request, PersonInfo(norskIdent.id, request.aktoerId), avdodaktoerID)

//Hente metadata for valgt BUC
val bucUtil = addDocumentToParentBucUtils.measure {
Expand Down
10 changes: 5 additions & 5 deletions src/main/kotlin/no/nav/eessi/pensjon/shared/api/ApiRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ data class ApiRequest(
private val logger = LoggerFactory.getLogger(ApiRequest::class.java)

//validatate request and convert to PrefillDataModel
fun buildPrefillDataModelOnExisting(request: ApiRequest, fodselsnr: String, avdodaktoerID: String? = null): PrefillDataModel {
fun buildPrefillDataModelOnExisting(request: ApiRequest, personInfo: PersonInfo, avdodaktoerID: String? = null): PrefillDataModel {
logger.debug("*** apirequest: $request ***")
val sedType = if (request.sed == null)
throw ResponseStatusException(HttpStatus.BAD_REQUEST, "SedType mangler")
Expand All @@ -88,7 +88,7 @@ data class ApiRequest(
logger.info("ALL SED on existing Rina SED: ${request.sed} -> euxCaseId: ${request.euxCaseId} -> sakNr: ${request.sakId} ")
PrefillDataModel(
penSaksnummer = request.sakId,
bruker = PersonId(fodselsnr, request.aktoerId).also { logger.debug("FNR eller NPID: ${it.norskIdent}") },
bruker = personInfo.also { logger.debug("FNR eller NPID: ${it.norskIdent}") },
avdod = populerAvdodHvisGjenlevendePensjonSak(request, avdodaktoerID),
sedType = sedType,
buc = request.buc,
Expand All @@ -106,23 +106,23 @@ data class ApiRequest(
}
}

private fun populerAvdodHvisGjenlevendePensjonSak(request: ApiRequest, avdodaktoerID: String?): PersonId? {
private fun populerAvdodHvisGjenlevendePensjonSak(request: ApiRequest, avdodaktoerID: String?): PersonInfo? {
return when (request.buc) {
P_BUC_02 -> populerAvdodPersonId(request, avdodaktoerID, true)
P_BUC_05, P_BUC_06, P_BUC_10 -> populerAvdodPersonId(request, avdodaktoerID)
else -> null
}
}

private fun populerAvdodPersonId(request: ApiRequest, avdodaktoerID: String?, kreverAvdod: Boolean = false): PersonId? {
private fun populerAvdodPersonId(request: ApiRequest, avdodaktoerID: String?, kreverAvdod: Boolean = false): PersonInfo? {
if (kreverAvdod && avdodaktoerID == null) {
logger.error("Mangler fnr for avdød")
throw ResponseStatusException(HttpStatus.BAD_REQUEST, "Mangler fnr for avdød")
}
request.riktigAvdod() ?: return null
val avdodNorskIdent1 = request.riktigAvdod() ?: throw ResponseStatusException(HttpStatus.BAD_REQUEST, "Mangler Personnr på Avdød")
val avdodAktorId1 = avdodaktoerID ?: throw ResponseStatusException(HttpStatus.BAD_REQUEST, "Mangler AktoerId på Avdød")
return PersonId(avdodNorskIdent1, avdodAktorId1)
return PersonInfo(avdodNorskIdent1, avdodAktorId1)
}

}
Expand Down
8 changes: 4 additions & 4 deletions src/main/kotlin/no/nav/eessi/pensjon/shared/api/PrefillDataModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import no.nav.eessi.pensjon.utils.mapJsonToAny
*
* services: pdl, person, pen, maybe joark, eux-basis.
*/
data class PersonId(val norskIdent: String,
data class PersonInfo(val norskIdent: String,
val aktorId: String? = null,
val reservert: Boolean? = true,
val epostKrr: String? = null,
Expand All @@ -20,8 +20,8 @@ data class PersonId(val norskIdent: String,

data class PrefillDataModel(
val penSaksnummer: String? = null,
val bruker: PersonId,
val avdod: PersonId?,
val bruker: PersonInfo,
val avdod: PersonInfo?,
val sedType: SedType,
val buc: BucType,
val vedtakId: String? = null,
Expand All @@ -44,7 +44,7 @@ data class PrefillDataModel(
}

fun getBankOgArbeidFromRequest(): BankOgArbeid? {
val personInfo = getPartSEDasJson("PersonId") ?: return null
val personInfo = getPartSEDasJson("PersonInfo") ?: return null
return mapJsonToAny(personInfo)
}

Expand Down
11 changes: 6 additions & 5 deletions src/test/kotlin/no/nav/eessi/pensjon/fagmodul/api/PrefillControllerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import no.nav.eessi.pensjon.services.pensjonsinformasjon.PensjonsinformasjonServ
import no.nav.eessi.pensjon.services.statistikk.StatistikkHandler
import no.nav.eessi.pensjon.shared.api.ApiRequest
import no.nav.eessi.pensjon.shared.api.InstitusjonItem
import no.nav.eessi.pensjon.shared.api.PersonInfo
import no.nav.eessi.pensjon.utils.mapJsonToAny
import no.nav.eessi.pensjon.utils.toJson
import no.nav.eessi.pensjon.utils.toJsonSkipEmpty
Expand Down Expand Up @@ -295,7 +296,7 @@ internal class PrefillControllerTest {
)

val apirequest = apiRequestWith(euxCaseId, newParticipants, sed = SedType.P2000, P_BUC_01)
val dummyPrefillData = ApiRequest.buildPrefillDataModelOnExisting(apirequest, fnr )
val dummyPrefillData = ApiRequest.buildPrefillDataModelOnExisting(apirequest, PersonInfo(fnr) )

every { personService.hentIdent(eq(IdentGruppe.FOLKEREGISTERIDENT), any<AktoerId>()) } returns NorskIdent("12345")
every { mockEuxInnhentingService.getBuc(euxCaseId) } returns mockBuc
Expand Down Expand Up @@ -328,7 +329,7 @@ internal class PrefillControllerTest {
)

val apirequest = apiRequestWith(euxCaseId, newParticipants, sed = SedType.P2000, P_BUC_01)
val dummyPrefillData = ApiRequest.buildPrefillDataModelOnExisting(apirequest, fnr )
val dummyPrefillData = ApiRequest.buildPrefillDataModelOnExisting(apirequest, PersonInfo(fnr) )

every { personService.hentIdent(eq(IdentGruppe.FOLKEREGISTERIDENT), any<AktoerId>()) } returns NorskIdent("12345")
every { mockEuxInnhentingService.getBuc(any()) } returns mockBuc andThen mockDocBuc
Expand Down Expand Up @@ -356,7 +357,7 @@ internal class PrefillControllerTest {

val noNewParticipants = listOf<InstitusjonItem>()
val apiRequest = apiRequestWith(euxCaseId, institutions = noNewParticipants, buc = P_BUC_01)
val dummyPrefillData = ApiRequest.buildPrefillDataModelOnExisting(apiRequest, NorskIdent("12345").id, null)
val dummyPrefillData = ApiRequest.buildPrefillDataModelOnExisting(apiRequest, PersonInfo(NorskIdent("12345").id), null)

println(dummyPrefillData)

Expand Down Expand Up @@ -518,7 +519,7 @@ internal class PrefillControllerTest {
InstitusjonItem(country = "DE", institution = "DE:Tyskland", name="Tyskland test")
)
val apiRequest = apiRequestWith(euxCaseId, newParticipants, buc = P_BUC_01)
val dummyPrefillData = ApiRequest.buildPrefillDataModelOnExisting(apiRequestWith(euxCaseId), NorskIdent("12345").id, null)
val dummyPrefillData = ApiRequest.buildPrefillDataModelOnExisting(apiRequestWith(euxCaseId), PersonInfo(NorskIdent("12345").id), null)

justRun { mockEuxPrefillService.addInstitution(any(), any()) }
every { mockEuxPrefillService.opprettJsonSedOnBuc(any(), any(), eq(euxCaseId),dummyPrefillData.vedtakId) } returns BucSedResponse(euxCaseId, "3123123")
Expand Down Expand Up @@ -549,7 +550,7 @@ internal class PrefillControllerTest {
InstitusjonItem(country = "DE", institution = "DE:Tyskland", name="Tyskland test")
)
val apiRequest = apiRequestWith(euxCaseId, newParticipants, buc = P_BUC_01)
val dummyPrefillData = ApiRequest.buildPrefillDataModelOnExisting(apiRequest, NorskIdent("12345").id, null)
val dummyPrefillData = ApiRequest.buildPrefillDataModelOnExisting(apiRequest, PersonInfo(NorskIdent("12345").id), null)

every { prefillKlient.hentPreutfyltSed(any()) } returns SED(type = dummyPrefillData.sedType).toJson()
every { mockEuxPrefillService.opprettJsonSedOnBuc(any(), any(), eq(euxCaseId),dummyPrefillData.vedtakId) } throws SedDokumentIkkeOpprettetException("Expected!")
Expand Down
21 changes: 9 additions & 12 deletions src/test/kotlin/no/nav/eessi/pensjon/fagmodul/models/ApiRequestTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ import no.nav.eessi.pensjon.eux.model.BucType
import no.nav.eessi.pensjon.eux.model.BucType.*
import no.nav.eessi.pensjon.eux.model.SedType
import no.nav.eessi.pensjon.eux.model.SedType.*
import no.nav.eessi.pensjon.shared.api.ApiRequest
import no.nav.eessi.pensjon.shared.api.ApiSubject
import no.nav.eessi.pensjon.shared.api.InstitusjonItem
import no.nav.eessi.pensjon.shared.api.SubjectFnr
import no.nav.eessi.pensjon.shared.api.*
import no.nav.eessi.pensjon.utils.mapJsonToAny
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertNotNull
Expand Down Expand Up @@ -53,7 +50,7 @@ class ApiRequestTest {
" \"skipSEDkey\" : null,\n" +
" \"mockSED\" : true\n" +
"}"
val datamodel = ApiRequest.buildPrefillDataModelOnExisting( mapJsonToAny(req), "", "")
val datamodel = ApiRequest.buildPrefillDataModelOnExisting( mapJsonToAny(req), PersonInfo(""), "")
assertNotNull(datamodel)
assertEquals(P2000, datamodel.sedType)
assertEquals(P_BUC_01, datamodel.buc)
Expand All @@ -72,7 +69,7 @@ class ApiRequestTest {
aktoerId = "0105094340092"
)
assertThrows<ResponseStatusException> {
ApiRequest.buildPrefillDataModelOnExisting(mockData, "12345", null)
ApiRequest.buildPrefillDataModelOnExisting(mockData, PersonInfo("12345"), null)
}
}

Expand All @@ -87,7 +84,7 @@ class ApiRequestTest {
aktoerId = "0105094340092"
)
assertThrows< ResponseStatusException> {
ApiRequest.buildPrefillDataModelOnExisting(mockData, "12345", null)
ApiRequest.buildPrefillDataModelOnExisting(mockData, PersonInfo("12345"), null)
}
}

Expand All @@ -102,7 +99,7 @@ class ApiRequestTest {
institutions = emptyList()
)

val model = ApiRequest.buildPrefillDataModelOnExisting(mockData, "12345", null)
val model = ApiRequest.buildPrefillDataModelOnExisting(mockData, PersonInfo("12345", mockData.aktoerId), null)

assertEquals("12345", model.bruker.norskIdent)
assertEquals("12234", model.penSaksnummer)
Expand All @@ -122,7 +119,7 @@ class ApiRequestTest {
institutions = emptyList()
)

val model = ApiRequest.buildPrefillDataModelOnExisting(mockData, "12345", "2223312")
val model = ApiRequest.buildPrefillDataModelOnExisting(mockData, PersonInfo("12345", mockData.aktoerId), "2223312")

assertEquals("12345", model.bruker.norskIdent)
assertEquals("12234", model.penSaksnummer)
Expand All @@ -146,7 +143,7 @@ class ApiRequestTest {
subject = ApiSubject(gjenlevende = SubjectFnr("23123"), avdod = SubjectFnr("576567567567"))
)

val model = ApiRequest.buildPrefillDataModelOnExisting(mockData, "23123", "113123123123")
val model = ApiRequest.buildPrefillDataModelOnExisting(mockData, PersonInfo("23123", mockData.aktoerId), "113123123123")

assertEquals("23123", model.bruker.norskIdent)
assertEquals("12234", model.penSaksnummer)
Expand All @@ -169,7 +166,7 @@ class ApiRequestTest {
subject = null
)
assertThrows<ResponseStatusException> {
ApiRequest.buildPrefillDataModelOnExisting(mockData, "23123", null)
ApiRequest.buildPrefillDataModelOnExisting(mockData, PersonInfo("23123"), null)
}

}
Expand All @@ -183,7 +180,7 @@ class ApiRequestTest {
aktoerId = null
)
assertThrows<ResponseStatusException> {
ApiRequest.buildPrefillDataModelOnExisting(mockData, "12345", null)
ApiRequest.buildPrefillDataModelOnExisting(mockData, PersonInfo("12345"), null)
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/test/kotlin/no/nav/eessi/pensjon/fagmodul/models/PrefillDataModelMother.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package no.nav.eessi.pensjon.fagmodul.models
import no.nav.eessi.pensjon.eux.model.BucType
import no.nav.eessi.pensjon.eux.model.SedType
import no.nav.eessi.pensjon.shared.api.InstitusjonItem
import no.nav.eessi.pensjon.shared.api.PersonId
import no.nav.eessi.pensjon.shared.api.PersonInfo
import no.nav.eessi.pensjon.shared.api.PrefillDataModel
import no.nav.eessi.pensjon.shared.api.ReferanseTilPerson

Expand All @@ -14,7 +14,7 @@ object PrefillDataModelMother {
pinId: String,
vedtakId: String? = null,
penSaksnummer: String = "12345",
avdod: PersonId? = null,
avdod: PersonInfo? = null,
kravDato: String? = null,
kravId: String? = null,
refTilPerson: ReferanseTilPerson? = null,
Expand All @@ -23,7 +23,7 @@ object PrefillDataModelMother {
institution: List<InstitusjonItem> = listOf(InstitusjonItem(country = "NO", institution = "DUMMY"))) =
PrefillDataModel(
penSaksnummer,
bruker = PersonId(pinId, "123456789"),
bruker = PersonInfo(pinId, "123456789"),
avdod = avdod,
sedType = sedType,
vedtakId = vedtakId ?: "",
Expand Down
4 changes: 2 additions & 2 deletions src/test/kotlin/no/nav/eessi/pensjon/fagmodul/models/PrefillDataModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package no.nav.eessi.pensjon.fagmodul.models

import no.nav.eessi.pensjon.eux.model.SedType
import no.nav.eessi.pensjon.shared.api.PersonId
import no.nav.eessi.pensjon.shared.api.PersonInfo
import no.nav.eessi.pensjon.shared.api.PrefillDataModel
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertNotNull
Expand All @@ -20,7 +20,7 @@ class PrefillDataModelTest {
sedType = SedType.P2000,
vedtakId = "323232",
euxCaseId = "231233213123",
avdod = PersonId("12312312", "23123")
avdod = PersonInfo("12312312", "23123")
)
}

Expand Down
Loading