IS-2732: Oppdatere spesifikk behandler fra Adresseregisteret (#367)

navikt · Oct 18, 2024 · b1d54a7 · b1d54a7
1 parent 5d9fec3
commit b1d54a7
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 3 deletions.
diff --git a/src/main/kotlin/no/nav/syfo/cronjob/CronjobModule.kt b/src/main/kotlin/no/nav/syfo/cronjob/CronjobModule.kt
@@ -11,6 +11,7 @@ import no.nav.syfo.cronjob.leaderelection.LeaderPodClient
 import no.nav.syfo.dialogmelding.DialogmeldingService
 import no.nav.syfo.dialogmelding.cronjob.DialogmeldingStatusCronjob
 import no.nav.syfo.dialogmelding.status.DialogmeldingStatusService
+import java.util.UUID
 
 fun cronjobModule(
     applicationState: ApplicationState,
@@ -53,6 +54,7 @@ fun cronjobModule(
         behandlerService = behandlerService,
         fastlegeClient = fastlegeClient,
         syfohelsenettproxyClient = syfohelsenettproxyClient,
+        behandlerToBeUpdated = listOf(UUID.fromString("3f5c938d-b16a-4474-a294-9e121e7efd17"))
     )
 
     listOf(

diff --git a/src/main/kotlin/no/nav/syfo/cronjob/VerifyBehandlereForKontorCronjob.kt b/src/main/kotlin/no/nav/syfo/cronjob/VerifyBehandlereForKontorCronjob.kt
@@ -25,6 +25,7 @@ class VerifyBehandlereForKontorCronjob(
     val behandlerService: BehandlerService,
     val fastlegeClient: FastlegeClient,
     val syfohelsenettproxyClient: SyfohelsenettproxyClient,
+    val behandlerToBeUpdated: List<UUID> = emptyList(),
 ) : DialogmeldingCronjob {
     private val runAtHour = 6
     private val runDay = DayOfWeek.SUNDAY
@@ -304,8 +305,10 @@ class VerifyBehandlereForKontorCronjob(
                     val hprPersonident = Personident(hprBehandlerFnr)
                     val existingPersonIdent = existingBehandler.personident?.let { Personident(it) }
 
-                    val doUpdatePersonident = existingPersonIdent == null || existingPersonIdent.isDnrMatchingFnr(hprPersonident)
-                    // TODO: handle remaining case: personident changed, but not DNR from before
+                    val doUpdatePersonident = existingPersonIdent == null ||
+                        existingPersonIdent.isDnrMatchingFnr(hprPersonident) ||
+                        behandlerToBeUpdated.contains(existingBehandler.behandlerRef)
+
                     if (doUpdatePersonident) {
                         behandlerService.updateBehandlerPersonident(
                             behandlerRef = existingBehandler.behandlerRef,

diff --git a/src/test/kotlin/no/nav/syfo/cronjob/VerifyBehandlereForKontorCronjobSpek.kt b/src/test/kotlin/no/nav/syfo/cronjob/VerifyBehandlereForKontorCronjobSpek.kt
@@ -19,6 +19,7 @@ import no.nav.syfo.testhelper.UserConstants.BEHANDLER_ETTERNAVN
 import no.nav.syfo.testhelper.UserConstants.BEHANDLER_FORNAVN
 import no.nav.syfo.testhelper.UserConstants.FASTLEGE_DNR
 import no.nav.syfo.testhelper.UserConstants.FASTLEGE_FNR
+import no.nav.syfo.testhelper.UserConstants.FASTLEGE_TREDJE_FNR
 import no.nav.syfo.testhelper.UserConstants.FASTLEGE_UTEN_KATEGORI_FNR
 import no.nav.syfo.testhelper.UserConstants.HERID
 import no.nav.syfo.testhelper.UserConstants.HERID_KONTOR_OK
@@ -75,10 +76,12 @@ class VerifyBehandlereForKontorCronjobSpek : Spek({
                 ),
                 database = database,
             )
+            val behandlerToBeUpdated = UUID.randomUUID()
             val cronJob = VerifyBehandlereForKontorCronjob(
                 behandlerService = behandlerService,
                 fastlegeClient = fastlegeClient,
                 syfohelsenettproxyClient = syfohelsenettproxyClient,
+                behandlerToBeUpdated = listOf(behandlerToBeUpdated),
             )
             beforeEachTest {
                 database.dropData()
@@ -258,6 +261,31 @@ class VerifyBehandlereForKontorCronjobSpek : Spek({
                     pBehandlerAfter.herId shouldBeEqualTo HERID.toString()
                     pBehandlerAfter.kategori shouldBeEqualTo BehandlerKategori.LEGE.name
                 }
+                it("Cronjob oppdaterer spesifikk behandler") {
+                    val kontorId = createKontor(HERID_KONTOR_OK)
+                    val pBehandler = createBehandler(
+                        behandlerRef = behandlerToBeUpdated,
+                        kontorId = kontorId,
+                        hprId = HPRID,
+                        personident = FASTLEGE_TREDJE_FNR,
+                        fornavn = "for",
+                        etternavn = "etter",
+                        kategori = BehandlerKategori.LEGE,
+                    )
+                    runBlocking {
+                        cronJob.verifyBehandlereForKontorJob()
+                    }
+                    val behandlerAfter = database.getBehandlereForKontor(kontorId)
+                    behandlerAfter.size shouldBeEqualTo 2
+                    val pBehandlerAfter = behandlerAfter.first { it.hprId == HPRID.toString() }
+                    pBehandlerAfter.id shouldBeEqualTo pBehandler.id
+                    pBehandlerAfter.personident shouldBeEqualTo FASTLEGE_FNR.value
+                    pBehandlerAfter.behandlerRef shouldBeEqualTo pBehandler.behandlerRef
+                    pBehandlerAfter.fornavn shouldBeEqualTo BEHANDLER_FORNAVN
+                    pBehandlerAfter.etternavn shouldBeEqualTo BEHANDLER_ETTERNAVN
+                    pBehandlerAfter.herId shouldBeEqualTo HERID.toString()
+                    pBehandlerAfter.kategori shouldBeEqualTo BehandlerKategori.LEGE.name
+                }
                 it("Cronjob legger til ny behandler og invaliderer eksisterende") {
                     val kontorId = createKontor(HERID_KONTOR_OK)
                     val pBehandler = createBehandler(kontorId)
@@ -316,9 +344,10 @@ private fun createBehandler(
     fornavn: String = BEHANDLER_FORNAVN,
     etternavn: String = BEHANDLER_ETTERNAVN,
     kategori: BehandlerKategori = BehandlerKategori.LEGE,
+    behandlerRef: UUID = UUID.randomUUID(),
 ) = database.createBehandler(
     behandler = Behandler(
-        behandlerRef = UUID.randomUUID(),
+        behandlerRef = behandlerRef,
         fornavn = fornavn,
         mellomnavn = null,
         etternavn = etternavn,

diff --git a/src/test/kotlin/no/nav/syfo/testhelper/UserConstants.kt b/src/test/kotlin/no/nav/syfo/testhelper/UserConstants.kt
@@ -46,6 +46,7 @@ object UserConstants {
     val FASTLEGE_FNR_SUSPENDERT = Personident("12125678912")
     val FASTLEGE_DNR = Personident("52125678911")
     val FASTLEGE_ANNEN_FNR = Personident(FASTLEGE_FNR.value.replace("2", "4"))
+    val FASTLEGE_TREDJE_FNR = Personident(FASTLEGE_FNR.value.replace("2", "5"))
     val FASTLEGE_UTEN_KATEGORI_FNR = Personident(FASTLEGE_FNR.value.replace("2", "5"))
 
     val BEHANDLER_FORNAVN = "Behandler"