Tildel enhet on active oppfolgingsoppgave (#351)

andersrognstad · web-flow · commit b81bf00debb6 · 2024-02-20T12:28:18.000+01:00
diff --git a/src/main/kotlin/no/nav/syfo/App.kt b/src/main/kotlin/no/nav/syfo/App.kt
@@ -13,7 +13,9 @@ import no.nav.syfo.application.cache.RedisStore
 import no.nav.syfo.application.database.database
 import no.nav.syfo.application.database.databaseModule
 import no.nav.syfo.client.azuread.AzureAdClient
+import no.nav.syfo.client.behandlendeenhet.BehandlendeEnhetClient
 import no.nav.syfo.client.pdl.PdlClient
+import no.nav.syfo.cronjob.behandlendeenhet.PersonBehandlendeEnhetService
 import no.nav.syfo.cronjob.launchCronjobModule
 import no.nav.syfo.kafka.launchKafkaModule
 import no.nav.syfo.personstatus.PersonoversiktStatusService
@@ -45,7 +47,12 @@ fun main() {
         azureAdClient = azureAdClient,
         clientEnvironment = environment.clients.pdl,
     )
+    val behandlendeEnhetClient = BehandlendeEnhetClient(
+        azureAdClient = azureAdClient,
+        clientEnvironment = environment.clients.syfobehandlendeenhet,
+    )
 
+    lateinit var personBehandlendeEnhetService: PersonBehandlendeEnhetService
     lateinit var personoversiktStatusService: PersonoversiktStatusService
 
     val applicationEngineEnvironment = applicationEngineEnvironment {
@@ -64,6 +71,10 @@ fun main() {
                 database = database,
                 pdlClient = pdlClient,
             )
+            personBehandlendeEnhetService = PersonBehandlendeEnhetService(
+                database = database,
+                behandlendeEnhetClient = behandlendeEnhetClient,
+            )
             apiModule(
                 applicationState = applicationState,
                 database = database,
@@ -92,13 +103,15 @@ fun main() {
             environment = environment,
             azureAdClient = azureAdClient,
             personoversiktStatusService = personoversiktStatusService,
+            personBehandlendeEnhetService = personBehandlendeEnhetService,
         )
         launchCronjobModule(
             applicationState = applicationState,
             database = database,
             environment = environment,
             redisStore = redisStore,
             azureAdClient = azureAdClient,
+            personBehandlendeEnhetService = personBehandlendeEnhetService,
         )
     }
 
diff --git a/src/main/kotlin/no/nav/syfo/cronjob/CronjobModule.kt b/src/main/kotlin/no/nav/syfo/cronjob/CronjobModule.kt
@@ -6,7 +6,6 @@ import no.nav.syfo.application.backgroundtask.launchBackgroundTask
 import no.nav.syfo.application.cache.RedisStore
 import no.nav.syfo.application.database.DatabaseInterface
 import no.nav.syfo.client.azuread.AzureAdClient
-import no.nav.syfo.client.behandlendeenhet.BehandlendeEnhetClient
 import no.nav.syfo.client.ereg.EregClient
 import no.nav.syfo.client.veiledertilgang.VeilederTilgangskontrollClient
 import no.nav.syfo.cronjob.behandlendeenhet.PersonBehandlendeEnhetCronjob
@@ -24,6 +23,7 @@ fun launchCronjobModule(
     environment: Environment,
     redisStore: RedisStore,
     azureAdClient: AzureAdClient,
+    personBehandlendeEnhetService: PersonBehandlendeEnhetService,
 ) {
     val eregClient = EregClient(
         clientEnvironment = environment.clients.ereg,
@@ -37,14 +37,6 @@ fun launchCronjobModule(
         personOppfolgingstilfelleVirksomhetsnavnService = personOppfolgingstilfelleVirksomhetsnavnService,
     )
 
-    val behandlendeEnhetClient = BehandlendeEnhetClient(
-        azureAdClient = azureAdClient,
-        clientEnvironment = environment.clients.syfobehandlendeenhet,
-    )
-    val personBehandlendeEnhetService = PersonBehandlendeEnhetService(
-        database = database,
-        behandlendeEnhetClient = behandlendeEnhetClient,
-    )
     val personBehandlendeEnhetCronjob = PersonBehandlendeEnhetCronjob(
         personBehandlendeEnhetService = personBehandlendeEnhetService,
         intervalDelayMinutes = environment.cronjobBehandlendeEnhetIntervalDelayMinutes,
diff --git a/src/main/kotlin/no/nav/syfo/kafka/KafkaModule.kt b/src/main/kotlin/no/nav/syfo/kafka/KafkaModule.kt
@@ -4,6 +4,7 @@ import no.nav.syfo.aktivitetskravvurdering.kafka.launchKafkaTaskAktivitetskravVu
 import no.nav.syfo.application.ApplicationState
 import no.nav.syfo.application.Environment
 import no.nav.syfo.client.azuread.AzureAdClient
+import no.nav.syfo.cronjob.behandlendeenhet.PersonBehandlendeEnhetService
 import no.nav.syfo.dialogmotekandidat.kafka.launchKafkaTaskDialogmotekandidatEndring
 import no.nav.syfo.dialogmotestatusendring.kafka.launchKafkaTaskDialogmoteStatusendring
 import no.nav.syfo.trengeroppfolging.kafka.launchTrengerOppfolgingConsumer
@@ -18,6 +19,7 @@ fun launchKafkaModule(
     environment: Environment,
     azureAdClient: AzureAdClient,
     personoversiktStatusService: PersonoversiktStatusService,
+    personBehandlendeEnhetService: PersonBehandlendeEnhetService,
 ) {
     launchKafkaTaskPersonoppgavehendelse(
         applicationState = applicationState,
@@ -56,5 +58,6 @@ fun launchKafkaModule(
     launchTrengerOppfolgingConsumer(
         applicationState = applicationState,
         kafkaEnvironment = environment.kafka,
+        personBehandlendeEnhetService = personBehandlendeEnhetService,
     )
 }
diff --git a/src/main/kotlin/no/nav/syfo/trengeroppfolging/TrengerOppfolgingService.kt b/src/main/kotlin/no/nav/syfo/trengeroppfolging/TrengerOppfolgingService.kt
@@ -1,6 +1,11 @@
 package no.nav.syfo.trengeroppfolging
 
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import no.nav.syfo.application.database.DatabaseInterface
+import no.nav.syfo.cronjob.behandlendeenhet.PersonBehandlendeEnhetService
+import no.nav.syfo.domain.PersonIdent
 import no.nav.syfo.trengeroppfolging.domain.TrengerOppfolging
 import no.nav.syfo.trengeroppfolging.kafka.COUNT_KAFKA_CONSUMER_TRENGER_OPPFOLGING_READ
 import no.nav.syfo.personstatus.db.createPersonOversiktStatus
@@ -11,8 +16,19 @@ import org.slf4j.LoggerFactory
 
 class TrengerOppfolgingService(
     private val database: DatabaseInterface,
+    private val personBehandlendeEnhetService: PersonBehandlendeEnhetService,
 ) {
     fun processTrengerOppfolging(records: List<TrengerOppfolging>) {
+        createOrUpdatePersonOversiktStatus(records)
+        records.filter { it.isActive }.forEach {
+            val personOversiktStatus = database.getPersonOversiktStatusList(
+                fnr = it.personIdent.value,
+            ).first()
+            updateBehandlendeEnhet(it.personIdent, personOversiktStatus.enhet)
+        }
+    }
+
+    private fun createOrUpdatePersonOversiktStatus(records: List<TrengerOppfolging>) {
         database.connection.use { connection ->
             records.forEach { trengerOppfolging ->
                 val existingPersonOversiktStatus = connection.getPersonOversiktStatusList(
@@ -36,6 +52,25 @@ class TrengerOppfolgingService(
         }
     }
 
+    private fun updateBehandlendeEnhet(
+        personIdent: PersonIdent,
+        existingEnhet: String?
+    ) {
+        try {
+            runBlocking {
+                launch(Dispatchers.IO) {
+                    personBehandlendeEnhetService.updateBehandlendeEnhet(
+                        personIdent = personIdent,
+                        tildeltEnhet = existingEnhet
+                    )
+                    log.info("Updated Behandlende Enhet of person after received active oppfolgingsoppgave")
+                }
+            }
+        } catch (ex: Exception) {
+            log.error("Exception caught while attempting to update Behandlende Enhet of person after received active oppfolgingsoppgave", ex)
+        }
+    }
+
     companion object {
         val log: Logger = LoggerFactory.getLogger(this::class.java)
     }
diff --git a/src/main/kotlin/no/nav/syfo/trengeroppfolging/kafka/TrengerOppfolgingTask.kt b/src/main/kotlin/no/nav/syfo/trengeroppfolging/kafka/TrengerOppfolgingTask.kt
@@ -4,6 +4,7 @@ import no.nav.syfo.application.ApplicationState
 import no.nav.syfo.application.database.database
 import no.nav.syfo.application.kafka.KafkaEnvironment
 import no.nav.syfo.application.kafka.kafkaAivenConsumerConfig
+import no.nav.syfo.cronjob.behandlendeenhet.PersonBehandlendeEnhetService
 import no.nav.syfo.trengeroppfolging.TrengerOppfolgingService
 import no.nav.syfo.kafka.launchKafkaTask
 import no.nav.syfo.util.configuredJacksonMapper
@@ -17,9 +18,11 @@ const val HUSKELAPP_TOPIC =
 fun launchTrengerOppfolgingConsumer(
     applicationState: ApplicationState,
     kafkaEnvironment: KafkaEnvironment,
+    personBehandlendeEnhetService: PersonBehandlendeEnhetService,
 ) {
     val trengerOppfolgingService = TrengerOppfolgingService(
-        database = database
+        database = database,
+        personBehandlendeEnhetService = personBehandlendeEnhetService,
     )
     val trengerOppfolgingConsumer = TrengerOppfolgingConsumer(
         trengerOppfolgingService = trengerOppfolgingService,
diff --git a/src/test/kotlin/no/nav/syfo/testutil/InternalMockEnvironment.kt b/src/test/kotlin/no/nav/syfo/testutil/InternalMockEnvironment.kt
@@ -36,7 +36,7 @@ class InternalMockEnvironment private constructor() {
         redisStore = redisStore,
     )
 
-    private val personBehandlendeEnhetService = PersonBehandlendeEnhetService(
+    internal val personBehandlendeEnhetService = PersonBehandlendeEnhetService(
         database = database,
         behandlendeEnhetClient = behandlendeEnhetClient,
     )
diff --git a/src/test/kotlin/no/nav/syfo/trengeroppfolging/kafka/TrengerOppfolgingConsumerSpek.kt b/src/test/kotlin/no/nav/syfo/trengeroppfolging/kafka/TrengerOppfolgingConsumerSpek.kt
@@ -5,21 +5,14 @@ import io.mockk.clearMocks
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
-import kotlinx.coroutines.isActive
 import no.nav.syfo.trengeroppfolging.TrengerOppfolgingService
 import no.nav.syfo.personstatus.db.getPersonOversiktStatusList
 import no.nav.syfo.personstatus.domain.PersonOversiktStatus
-import no.nav.syfo.testutil.ExternalMockEnvironment
-import no.nav.syfo.testutil.UserConstants
-import no.nav.syfo.testutil.createPersonOversiktStatus
-import no.nav.syfo.testutil.dropData
+import no.nav.syfo.testutil.*
 import no.nav.syfo.testutil.generator.generateKafkaHuskelapp
 import no.nav.syfo.testutil.generator.huskelappConsumerRecord
 import no.nav.syfo.testutil.generator.huskelappTopicPartition
-import org.amshove.kluent.shouldBeEqualTo
-import org.amshove.kluent.shouldBeFalse
-import org.amshove.kluent.shouldBeNull
-import org.amshove.kluent.shouldBeTrue
+import org.amshove.kluent.*
 import org.apache.kafka.clients.consumer.ConsumerRecords
 import org.apache.kafka.clients.consumer.KafkaConsumer
 import org.spekframework.spek2.Spek
@@ -32,10 +25,14 @@ class TrengerOppfolgingConsumerSpek : Spek({
         start()
 
         val externalMockEnvironment = ExternalMockEnvironment.instance
+        val internalMockEnvironment = InternalMockEnvironment.instance
         val database = externalMockEnvironment.database
 
         val kafkaConsumerMock = mockk<KafkaConsumer<String, KafkaHuskelapp>>()
-        val trengerOppfolgingService = TrengerOppfolgingService(database)
+        val trengerOppfolgingService = TrengerOppfolgingService(
+            database = database,
+            personBehandlendeEnhetService = internalMockEnvironment.personBehandlendeEnhetService
+        )
         val trengerOppfolgingConsumer = TrengerOppfolgingConsumer(trengerOppfolgingService)
 
         val frist = LocalDate.now().plusWeeks(1)
@@ -95,6 +92,70 @@ class TrengerOppfolgingConsumerSpek : Spek({
                     pPersonOversiktStatus.trengerOppfolging.shouldBeTrue()
                     pPersonOversiktStatus.trengerOppfolgingFrist.shouldBeNull()
                 }
+                it("updates PersonOversiktStatus tildeltEnhet for personident from kafka record with active huskelapp") {
+                    val activeHuskelappNoFrist = generateKafkaHuskelapp(isActive = true, frist = null)
+                    mockIncomingKafkaRecord(
+                        kafkaRecord = activeHuskelappNoFrist,
+                        kafkaConsumerMock = kafkaConsumerMock,
+                    )
+
+                    trengerOppfolgingConsumer.pollAndProcessRecords(
+                        kafkaConsumer = kafkaConsumerMock,
+                    )
+
+                    verify(exactly = 1) {
+                        kafkaConsumerMock.commitSync()
+                    }
+
+                    val pPersonOversiktStatusList =
+                        database.connection.use { it.getPersonOversiktStatusList(UserConstants.ARBEIDSTAKER_FNR) }
+                    pPersonOversiktStatusList.size shouldBeEqualTo 1
+                    val pPersonOversiktStatus = pPersonOversiktStatusList.first()
+                    pPersonOversiktStatus.enhet.shouldNotBeNull()
+                }
+                it("does not update PersonOversiktStatus tildeltEnhet for personident from kafka record with inactive huskelapp") {
+                    val inactiveHuskelappNoFrist = generateKafkaHuskelapp(isActive = false, frist = null)
+                    mockIncomingKafkaRecord(
+                        kafkaRecord = inactiveHuskelappNoFrist,
+                        kafkaConsumerMock = kafkaConsumerMock,
+                    )
+
+                    trengerOppfolgingConsumer.pollAndProcessRecords(
+                        kafkaConsumer = kafkaConsumerMock,
+                    )
+
+                    verify(exactly = 1) {
+                        kafkaConsumerMock.commitSync()
+                    }
+
+                    val pPersonOversiktStatusList =
+                        database.connection.use { it.getPersonOversiktStatusList(UserConstants.ARBEIDSTAKER_FNR) }
+                    pPersonOversiktStatusList.size shouldBeEqualTo 1
+                    val pPersonOversiktStatus = pPersonOversiktStatusList.first()
+                    pPersonOversiktStatus.enhet.shouldBeNull()
+                }
+                it("does not update PersonOversiktStatus tildeltEnhet for personident from kafka record with active huskelapp and failing call to behandlende enhet") {
+                    val personIdent = UserConstants.ARBEIDSTAKER_ENHET_ERROR_PERSONIDENT.value
+                    val activeHuskelappNoFrist = generateKafkaHuskelapp(isActive = true, frist = null, personIdent = personIdent)
+                    mockIncomingKafkaRecord(
+                        kafkaRecord = activeHuskelappNoFrist,
+                        kafkaConsumerMock = kafkaConsumerMock,
+                    )
+
+                    trengerOppfolgingConsumer.pollAndProcessRecords(
+                        kafkaConsumer = kafkaConsumerMock,
+                    )
+
+                    verify(exactly = 1) {
+                        kafkaConsumerMock.commitSync()
+                    }
+
+                    val pPersonOversiktStatusList =
+                        database.connection.use { it.getPersonOversiktStatusList(personIdent) }
+                    pPersonOversiktStatusList.size shouldBeEqualTo 1
+                    val pPersonOversiktStatus = pPersonOversiktStatusList.first()
+                    pPersonOversiktStatus.enhet.shouldBeNull()
+                }
             }
             describe("existing PersonOversikStatus for personident") {
                 it("updates trenger_oppfolging and trenger_oppfolging_frist from kafka record with active huskelapp and frist") {
@@ -124,7 +185,7 @@ class TrengerOppfolgingConsumerSpek : Spek({
                     pPersonOversiktStatus.trengerOppfolgingFrist shouldBeEqualTo frist
                 }
                 it("updates to trenger_oppfolging false and trenger_oppfolging_frist null from kafka record with inactive huskelapp and frist") {
-                    val inActiveHuskelappWithFrist = generateKafkaHuskelapp(isActive = false, frist = frist)
+                    val inactiveHuskelappWithFrist = generateKafkaHuskelapp(isActive = false, frist = frist)
                     val personident = UserConstants.ARBEIDSTAKER_FNR
                     database.createPersonOversiktStatus(
                         personOversiktStatus = PersonOversiktStatus(
@@ -134,7 +195,7 @@ class TrengerOppfolgingConsumerSpek : Spek({
                         )
                     )
                     mockIncomingKafkaRecord(
-                        kafkaRecord = inActiveHuskelappWithFrist,
+                        kafkaRecord = inactiveHuskelappWithFrist,
                         kafkaConsumerMock = kafkaConsumerMock,
                     )
 
@@ -149,12 +210,12 @@ class TrengerOppfolgingConsumerSpek : Spek({
                         database.connection.use { it.getPersonOversiktStatusList(personident) }
                     pPersonOversiktStatusList.size shouldBeEqualTo 1
                     val pPersonOversiktStatus = pPersonOversiktStatusList.first()
-                    pPersonOversiktStatus.fnr shouldBeEqualTo inActiveHuskelappWithFrist.personIdent
+                    pPersonOversiktStatus.fnr shouldBeEqualTo inactiveHuskelappWithFrist.personIdent
                     pPersonOversiktStatus.trengerOppfolging.shouldBeFalse()
                     pPersonOversiktStatus.trengerOppfolgingFrist.shouldBeNull()
                 }
                 it("updates to trenger_oppfolging false and trenger_oppfolging_frist null from kafka record with inactive huskelapp and no frist") {
-                    val inActiveHuskelappNoFrist = generateKafkaHuskelapp(isActive = false, frist = null)
+                    val inactiveHuskelappNoFrist = generateKafkaHuskelapp(isActive = false, frist = null)
                     val personident = UserConstants.ARBEIDSTAKER_FNR
                     database.createPersonOversiktStatus(
                         personOversiktStatus = PersonOversiktStatus(
@@ -164,7 +225,7 @@ class TrengerOppfolgingConsumerSpek : Spek({
                         )
                     )
                     mockIncomingKafkaRecord(
-                        kafkaRecord = inActiveHuskelappNoFrist,
+                        kafkaRecord = inactiveHuskelappNoFrist,
                         kafkaConsumerMock = kafkaConsumerMock,
                     )
 
@@ -179,7 +240,7 @@ class TrengerOppfolgingConsumerSpek : Spek({
                         database.connection.use { it.getPersonOversiktStatusList(personident) }
                     pPersonOversiktStatusList.size shouldBeEqualTo 1
                     val pPersonOversiktStatus = pPersonOversiktStatusList.first()
-                    pPersonOversiktStatus.fnr shouldBeEqualTo inActiveHuskelappNoFrist.personIdent
+                    pPersonOversiktStatus.fnr shouldBeEqualTo inactiveHuskelappNoFrist.personIdent
                     pPersonOversiktStatus.trengerOppfolging.shouldBeFalse()
                     pPersonOversiktStatus.trengerOppfolgingFrist.shouldBeNull()
                 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class InternalMockEnvironment private constructor() {`
`36`	`36`	`redisStore = redisStore,`
`37`	`37`	`)`
`38`	`38`
`39`		`- private val personBehandlendeEnhetService = PersonBehandlendeEnhetService(`
	`39`	`+ internal val personBehandlendeEnhetService = PersonBehandlendeEnhetService(`
`40`	`40`	`database = database,`
`41`	`41`	`behandlendeEnhetClient = behandlendeEnhetClient,`
`42`	`42`	`)`