IS-2271: WIP

Author: vetlesolgaard

src/main/kotlin/no/nav/syfo/App.kt

@@ -19,6 +19,7 @@ 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
+import no.nav.syfo.personstatus.infrastructure.database.PersonOversiktStatusRepository
 import org.slf4j.LoggerFactory
 import java.util.concurrent.TimeUnit
 
@@ -67,9 +68,11 @@ fun main() {
             databaseModule(
                 databaseEnvironment = environment.database,
             )
+            val personoversiktStatusRepository = PersonOversiktStatusRepository(database = database)
             personoversiktStatusService = PersonoversiktStatusService(
                 database = database,
                 pdlClient = pdlClient,
+                personoversiktStatusRepository = personoversiktStatusRepository,
             )
             personBehandlendeEnhetService = PersonBehandlendeEnhetService(
                 database = database,

src/main/kotlin/no/nav/syfo/personstatus/PersonoversiktStatusService.kt

@@ -5,6 +5,7 @@ import no.nav.syfo.client.pdl.PdlClient
 import no.nav.syfo.domain.PersonIdent
 import no.nav.syfo.oppfolgingstilfelle.domain.PersonOppfolgingstilfelleVirksomhet
 import no.nav.syfo.personoppgavehendelse.kafka.*
+import no.nav.syfo.personstatus.application.IPersonOversiktStatusRepository
 import no.nav.syfo.personstatus.db.*
 import no.nav.syfo.personstatus.domain.*
 import java.sql.Connection
@@ -13,6 +14,7 @@ import java.time.LocalDate
 class PersonoversiktStatusService(
     private val database: DatabaseInterface,
     private val pdlClient: PdlClient,
+    private val personoversiktStatusRepository: IPersonOversiktStatusRepository,
 ) {
     private val isUbehandlet = true
     private val isBehandlet = false
@@ -83,6 +85,10 @@ class PersonoversiktStatusService(
         }
     }
 
+    fun updateArbeidsuforhetVurderingStatus(personident: PersonIdent, isAktivVurdering: Boolean) {
+        personoversiktStatusRepository.updateArbeidsuforhetVurderingStatus(personident, isAktivVurdering)
+    }
+
     private fun createOrUpdatePersonOversiktStatus(
         connection: Connection,
         personident: PersonIdent,

src/main/kotlin/no/nav/syfo/personstatus/application/IPersonOversiktStatusRepository.kt

@@ -0,0 +1,8 @@
+package no.nav.syfo.personstatus.application
+
+import no.nav.syfo.domain.PersonIdent
+
+interface IPersonOversiktStatusRepository {
+
+    fun updateArbeidsuforhetVurderingStatus(personIdent: PersonIdent, isAktivVurdering: Boolean)
+}

src/main/kotlin/no/nav/syfo/personstatus/infrastructure/database/PersonOversiktStatusRepository.kt

@@ -0,0 +1,27 @@
+package no.nav.syfo.personstatus.infrastructure.database
+
+import no.nav.syfo.application.database.DatabaseInterface
+import no.nav.syfo.domain.PersonIdent
+import no.nav.syfo.personstatus.application.IPersonOversiktStatusRepository
+
+class PersonOversiktStatusRepository(private val database: DatabaseInterface) : IPersonOversiktStatusRepository {
+
+    override fun updateArbeidsuforhetVurderingStatus(personIdent: PersonIdent, isAktivVurdering: Boolean) {
+        database.connection.use { connection ->
+            connection.prepareStatement(UPDATE_ARBEIDSUFORHET_VURDERING_STATUS).use {
+                it.setBoolean(1, isAktivVurdering)
+                it.setString(2, personIdent.value)
+                it.executeQuery()
+                connection.commit()
+            }
+        }
+    }
+
+    companion object {
+        private const val UPDATE_ARBEIDSUFORHET_VURDERING_STATUS = """
+            UPDATE person_oversikt_status
+            SET arbeidsuforhet_aktiv_vurdering = ?
+            WHERE fnr = ?
+        """
+    }
+}

src/main/kotlin/no/nav/syfo/personstatus/infrastructure/kafka/ArbeidsuforhetVurderingConsumer.kt

@@ -3,6 +3,7 @@ package no.nav.syfo.personstatus.infrastructure.kafka
 import no.nav.syfo.application.ApplicationState
 import no.nav.syfo.application.kafka.KafkaEnvironment
 import no.nav.syfo.application.kafka.kafkaAivenConsumerConfig
+import no.nav.syfo.domain.PersonIdent
 import no.nav.syfo.kafka.KafkaConsumerService
 import no.nav.syfo.kafka.launchKafkaTask
 import no.nav.syfo.personstatus.PersonoversiktStatusService
@@ -35,11 +36,10 @@ class ArbeidsuforhetVurderingConsumer(
         val validRecords = records.requireNoNulls()
         validRecords.map { record ->
             val recordValue = record.value()
-            log.info("ArbeidsuforhetVurderingConsumer record value:\n$recordValue")
-            // personoversiktStatusService.updateArbeidsuforhetVurderingStatus(
-            //  personident = PersonIdent(recordValue.personident),
-            // isFinalVurdering = recordValue.isFinalVurdering,
-            // )
+            personoversiktStatusService.updateArbeidsuforhetVurderingStatus(
+                personident = PersonIdent(recordValue.personident),
+                isAktivVurdering = !recordValue.isFinalVurdering,
+            )
         }
     }
 

src/main/resources/db/migration/V16_5__add_column_arbeidsuforhet_is_final_vurdering.sql

@@ -0,0 +1,21 @@
+ALTER TABLE person_oversikt_status
+    ADD COLUMN arbeidsuforhet_aktiv_vurdering BOOLEAN DEFAULT FALSE;
+
+DROP INDEX IX_PERSON_OVERSIKT_STATUS_ENHETENS_OVERSIKT;
+
+CREATE INDEX IX_PERSON_OVERSIKT_STATUS_ENHETENS_OVERSIKT
+    ON PERSON_OVERSIKT_STATUS (tildelt_enhet, dialogmotekandidat_generated_at)
+    WHERE (motebehov_ubehandlet
+        OR oppfolgingsplan_lps_bistand_ubehandlet
+        OR dialogmotesvar_ubehandlet
+        OR dialogmotekandidat
+        OR ((aktivitetskrav = 'NY' OR aktivitetskrav = 'AVVENT') AND aktivitetskrav_stoppunkt > '2023-03-10')
+        OR behandlerdialog_svar_ubehandlet
+        OR behandlerdialog_ubesvart_ubehandlet
+        OR behandlerdialog_avvist_ubehandlet
+        OR aktivitetskrav_vurder_stans_ubehandlet
+        OR trenger_oppfolging
+        OR behandler_bistand_ubehandlet
+        OR arbeidsuforhet_vurder_avslag_ubehandlet
+        OR arbeidsuforhet_aktiv_vurdering
+        );