Skip to content

Commit

Permalink
U - Oppgraderer ep-personoppslag
Browse files Browse the repository at this point in the history
  • Loading branch information
@MariamPervez
MariamPervez committed Jan 30, 2024
1 parent a86d3fe commit e17bb58
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ dependencies {
implementation("no.nav.eessi.pensjon:ep-eux:2.2.14")
implementation("no.nav.eessi.pensjon:ep-metrics:2.0.51")
implementation("no.nav.eessi.pensjon:ep-logging:2.1.48")
implementation("no.nav.eessi.pensjon:ep-personoppslag:13.1.73"){
implementation("no.nav.eessi.pensjon:ep-personoppslag:13.1.75"){
exclude module: 'ep-eux'
exclude module: 'ep-logging'
exclude module: 'ep-metrics'
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/no/nav/eessi/pensjon/begrens/innsyn/BegrensInnsynService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class BegrensInnsynService(

logger.info("Fant ${fnrListe.size} unike fnr i SED (rinaNr: $rinaNr, sedDokId: $sedDokumentId)")

return personService.harAdressebeskyttelse(fnrListe, gradering)
return personService.harAdressebeskyttelse(fnrListe)
}

private fun trimFnrString(fnrAsString: String) = fnrAsString.replace("[^0-9]".toRegex(), "")
Expand Down
4 changes: 2 additions & 2 deletions src/test/kotlin/no/nav/eessi/pensjon/begrens/innsyn/BegrensInnsynIntegrationTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class BegrensInnsynIntegrationTest {
private fun initMocks() {

// Mock person
every { personService.harAdressebeskyttelse(any(), any()) } returns false andThen true
every { personService.harAdressebeskyttelse(any()) } returns false andThen true

// Mocker EUX sensitiv sak
every { euxService.settSensitivSak("147729") } returns true
Expand Down Expand Up @@ -168,7 +168,7 @@ class BegrensInnsynIntegrationTest {
verify(exactly = 1) { euxService.settSensitivSak("147729") }

// Verifisert at den er kjørt én gang pr. unike dokument.
verify(exactly = 2) { personService.harAdressebeskyttelse(any(), any()) }
verify(exactly = 2) { personService.harAdressebeskyttelse(any()) }
}

// Mocks the PersonService and EuxService
Expand Down
26 changes: 13 additions & 13 deletions src/test/kotlin/no/nav/eessi/pensjon/begrens/innsyn/BegrensInnsynServiceTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ internal class BegrensInnsynServiceTest {
val sedJson = javaClass.getResource("/sed/P2000-NAV_med_SPSF.json")!!.readText()

every { euxService.hentSedJson(any(), any()) } returns sedJson
every { personService.harAdressebeskyttelse(any(), any()) }.returns(true)
every { personService.harAdressebeskyttelse(any()) }.returns(true)

begrensInnsynService.begrensInnsyn(mapJsonToAny(hendelse))

verify(exactly = 1) { euxService.hentSedJson("147729", "4338515b6bed451798ba478c835409a3") }
verify(exactly = 1) { personService.harAdressebeskyttelse(any(), any()) }
verify(exactly = 1) { personService.harAdressebeskyttelse(any()) }
verify(exactly = 1) { euxService.settSensitivSak("147729") }
verify(exactly = 0) { euxService.hentBucDokumenter("147729") }
}
Expand All @@ -47,13 +47,13 @@ internal class BegrensInnsynServiceTest {
val sedJson = javaClass.getResource("/sed/R_BUC_02-R005-AP.json")!!.readText()

every { euxService.hentSedJson(any(), any()) } returns sedJson
every { personService.harAdressebeskyttelse(any(), any()) }.returns(true)
every { personService.harAdressebeskyttelse(any()) }.returns(true)

begrensInnsynService.begrensInnsyn(mapJsonToAny(hendelse))


verify(exactly = 1) { euxService.hentSedJson("147710", "4338515b6bed451798ba478c835409a3") }
verify(exactly = 1) { personService.harAdressebeskyttelse(any(), any()) }
verify(exactly = 1) { personService.harAdressebeskyttelse(any()) }
verify(exactly = 1) { euxService.settSensitivSak("147710") }
verify(exactly = 0) { euxService.hentBucDokumenter("147710") }
}
Expand All @@ -65,14 +65,14 @@ internal class BegrensInnsynServiceTest {
val sedJson = javaClass.getResource("/sed/R_BUC_02-R005-AP.json")!!.readText()

every { euxService.hentSedJson(any(), any()) } returns sedJson
every { personService.harAdressebeskyttelse(any(), any()) }.returns(false)
every { personService.harAdressebeskyttelse(any()) }.returns(false)
every { euxService.hentBucDokumenter(any()) } returns opprettDokumenter()

begrensInnsynService.begrensInnsyn(mapJsonToAny(hendelse))

verify(exactly = 1) { euxService.hentSedJson(any(), "4338515b6bed451798ba478c835409a3") }
verify(exactly = 1) { euxService.hentSedJson(any(), "4338515b6bed451798ba478c835409a3") }
verify(exactly = 2) { personService.harAdressebeskyttelse(any(), any()) }
verify(exactly = 2) { personService.harAdressebeskyttelse(any()) }
verify(exactly = 1) { euxService.hentBucDokumenter("147710") }
}

Expand All @@ -84,14 +84,14 @@ internal class BegrensInnsynServiceTest {
val sedJson = javaClass.getResource("/sed/P2000-NAV_med_SPSF.json")!!.readText()

every { euxService.hentSedJson(any(), any()) } returns sedJson
every { personService.harAdressebeskyttelse(any(), any()) } returns false andThen true
every { personService.harAdressebeskyttelse(any()) } returns false andThen true
every { euxService.hentBucDokumenter(any()) } returns opprettDokumenter()

begrensInnsynService.begrensInnsyn(mapJsonToAny(hendelse))

verify(exactly = 1) { euxService.hentSedJson(any(), "4338515b6bed451798ba478c835409a3") }
verify(exactly = 1) { euxService.hentSedJson(any(), "02249d3f5bdd4336999ccfbf7bb13c64") }
verify(exactly = 2) { personService.harAdressebeskyttelse(any(), any()) }
verify(exactly = 2) { personService.harAdressebeskyttelse(any()) }
verify(exactly = 1) { euxService.hentBucDokumenter("147729") }
verify(exactly = 1) { euxService.settSensitivSak("147729") }
}
Expand All @@ -103,13 +103,13 @@ internal class BegrensInnsynServiceTest {
val sedJson = javaClass.getResource("/sed/P2000-NAV_med_SPSF.json")!!.readText()

every { euxService.hentSedJson(any(), any()) } returns sedJson
every { personService.harAdressebeskyttelse(any(), any()) } returns false
every { personService.harAdressebeskyttelse(any()) } returns false
every { euxService.hentBucDokumenter(any()) } returns opprettDokumenter()

begrensInnsynService.begrensInnsyn(mapJsonToAny(hendelse))

verify(exactly = 2) { euxService.hentSedJson(any(), any()) }
verify(exactly = 2) { personService.harAdressebeskyttelse(any(), any()) }
verify(exactly = 2) { personService.harAdressebeskyttelse(any()) }
verify(exactly = 1) { euxService.hentBucDokumenter(any()) }
verify(exactly = 0) { euxService.settSensitivSak(any()) }
}
Expand All @@ -119,11 +119,11 @@ internal class BegrensInnsynServiceTest {

val hendelse = javaClass.getResource("/sed/P_BUC_06_X050.json")!!.readText()

every { personService.harAdressebeskyttelse(any(), any()) } returns false
every { personService.harAdressebeskyttelse(any()) } returns false
begrensInnsynService.begrensInnsyn(mapJsonToAny(hendelse))

verify(exactly = 0) { euxService.hentSedJson(any(), any()) }
verify(exactly = 0) { personService.harAdressebeskyttelse(any(), any()) }
verify(exactly = 0) { personService.harAdressebeskyttelse(any()) }
verify(exactly = 0) { euxService.settSensitivSak(any()) }
}

Expand Down Expand Up @@ -155,7 +155,7 @@ internal class BegrensInnsynServiceTest {

every { euxService.hentSedJson(any(), any()) } returns p8000
every { euxService.hentBucDokumenter(any()) } returns docs
every { personService.harAdressebeskyttelse(any(), any()) } returns false
every { personService.harAdressebeskyttelse(any()) } returns false

val hendelse = SedHendelse(sektorKode = "P", rinaSakId = rinaSakId, rinaDokumentId = rinaDokumentId, rinaDokumentVersjon = "4.25" ).toJson()
begrensInnsynService.begrensInnsyn(mapJsonToAny(hendelse))
Expand Down

0 comments on commit e17bb58

Please sign in to comment.