IS: Cleanup db folder into infrastructure (#502)

navikt · Jan 8, 2025 · 649a234 · 649a234
1 parent c775e4f
commit 649a234
Show file tree

Hide file tree

Showing 33 changed files with 69 additions and 53 deletions.
diff --git a/...main/kotlin/no/nav/syfo/dialogmotekandidat/kafka/KafkaDialogmotekandidatEndringService.kt b/...main/kotlin/no/nav/syfo/dialogmotekandidat/kafka/KafkaDialogmotekandidatEndringService.kt
@@ -1,8 +1,10 @@
 package no.nav.syfo.dialogmotekandidat.kafka
 
 import no.nav.syfo.personstatus.infrastructure.database.DatabaseInterface
+import no.nav.syfo.personstatus.infrastructure.database.queries.createPersonOversiktStatus
 import no.nav.syfo.personstatus.infrastructure.kafka.KafkaConsumerService
-import no.nav.syfo.personstatus.db.*
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
+import no.nav.syfo.personstatus.infrastructure.database.queries.updatePersonOversiktStatusKandidat
 import org.apache.kafka.clients.consumer.ConsumerRecords
 import org.apache.kafka.clients.consumer.KafkaConsumer
 import org.slf4j.LoggerFactory

diff --git a/...n/kotlin/no/nav/syfo/dialogmotestatusendring/kafka/KafkaDialogmoteStatusendringService.kt b/...n/kotlin/no/nav/syfo/dialogmotestatusendring/kafka/KafkaDialogmoteStatusendringService.kt
@@ -3,8 +3,10 @@ package no.nav.syfo.dialogmotestatusendring.kafka
 import no.nav.syfo.personstatus.infrastructure.database.DatabaseInterface
 import no.nav.syfo.dialogmote.avro.KDialogmoteStatusEndring
 import no.nav.syfo.dialogmotestatusendring.domain.DialogmoteStatusendring
+import no.nav.syfo.personstatus.infrastructure.database.queries.createPersonOversiktStatus
 import no.nav.syfo.personstatus.infrastructure.kafka.KafkaConsumerService
-import no.nav.syfo.personstatus.db.*
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
+import no.nav.syfo.personstatus.infrastructure.database.queries.updatePersonOversiktStatusMotestatus
 import org.apache.kafka.clients.consumer.ConsumerRecords
 import org.apache.kafka.clients.consumer.KafkaConsumer
 import org.slf4j.LoggerFactory

diff --git a/src/main/kotlin/no/nav/syfo/frisktilarbeid/kafka/FriskTilArbeidVedtakConsumer.kt b/src/main/kotlin/no/nav/syfo/frisktilarbeid/kafka/FriskTilArbeidVedtakConsumer.kt
@@ -1,10 +1,10 @@
 package no.nav.syfo.frisktilarbeid.kafka
 
 import no.nav.syfo.personstatus.infrastructure.database.DatabaseInterface
+import no.nav.syfo.personstatus.infrastructure.database.queries.createPersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
+import no.nav.syfo.personstatus.infrastructure.database.queries.updatePersonOversiktStatusFriskmeldtTilArbeid
 import no.nav.syfo.personstatus.infrastructure.kafka.KafkaConsumerService
-import no.nav.syfo.personstatus.db.createPersonOversiktStatus
-import no.nav.syfo.personstatus.db.getPersonOversiktStatusList
-import no.nav.syfo.personstatus.db.updatePersonOversiktStatusFriskmeldtTilArbeid
 import org.apache.kafka.clients.consumer.ConsumerRecords
 import org.apache.kafka.clients.consumer.KafkaConsumer
 import org.slf4j.LoggerFactory

diff --git a/src/main/kotlin/no/nav/syfo/identhendelse/IdenthendelseService.kt b/src/main/kotlin/no/nav/syfo/identhendelse/IdenthendelseService.kt
@@ -9,8 +9,8 @@ import no.nav.syfo.identhendelse.database.updatePersonOversiktStatusVeileder
 import no.nav.syfo.identhendelse.kafka.KafkaIdenthendelseDTO
 import no.nav.syfo.personstatus.application.IPdlClient
 import no.nav.syfo.personstatus.infrastructure.COUNT_KAFKA_CONSUMER_PDL_AKTOR_UPDATES
-import no.nav.syfo.personstatus.db.getPersonOversiktStatusList
 import no.nav.syfo.personstatus.domain.PPersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 

diff --git a/src/main/kotlin/no/nav/syfo/oppfolgingsoppgave/OppfolgingsoppgaveService.kt b/src/main/kotlin/no/nav/syfo/oppfolgingsoppgave/OppfolgingsoppgaveService.kt
@@ -6,11 +6,11 @@ import kotlinx.coroutines.runBlocking
 import no.nav.syfo.personstatus.infrastructure.database.DatabaseInterface
 import no.nav.syfo.personstatus.application.PersonBehandlendeEnhetService
 import no.nav.syfo.personstatus.domain.PersonIdent
+import no.nav.syfo.personstatus.infrastructure.database.queries.createPersonOversiktStatus
 import no.nav.syfo.oppfolgingsoppgave.domain.Oppfolgingsoppgave
 import no.nav.syfo.oppfolgingsoppgave.kafka.COUNT_KAFKA_CONSUMER_TRENGER_OPPFOLGING_READ
-import no.nav.syfo.personstatus.db.createPersonOversiktStatus
-import no.nav.syfo.personstatus.db.getPersonOversiktStatusList
-import no.nav.syfo.personstatus.db.updateOppfolgingsoppgave
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
+import no.nav.syfo.personstatus.infrastructure.database.queries.updateOppfolgingsoppgave
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 

diff --git a/src/main/kotlin/no/nav/syfo/personstatus/application/PersonoversiktStatusService.kt b/src/main/kotlin/no/nav/syfo/personstatus/application/PersonoversiktStatusService.kt
@@ -5,17 +5,7 @@ import no.nav.syfo.personoppgavehendelse.kafka.COUNT_KAFKA_CONSUMER_PERSONOPPGAV
 import no.nav.syfo.personoppgavehendelse.kafka.COUNT_KAFKA_CONSUMER_PERSONOPPGAVEHENDELSE_READ
 import no.nav.syfo.personoppgavehendelse.kafka.COUNT_KAFKA_CONSUMER_PERSONOPPGAVEHENDELSE_UPDATED_PERSONOVERSIKT_STATUS
 import no.nav.syfo.personoppgavehendelse.kafka.KPersonoppgavehendelse
-import no.nav.syfo.personstatus.db.createPersonOversiktStatus
-import no.nav.syfo.personstatus.db.getPersonOppfolgingstilfelleVirksomhetMap
-import no.nav.syfo.personstatus.db.getPersonOversiktStatusList
-import no.nav.syfo.personstatus.db.hentUbehandledePersonerTilknyttetEnhet
-import no.nav.syfo.personstatus.db.updateBehandlerBerOmBistand
-import no.nav.syfo.personstatus.db.updatePersonOversiktMotebehov
-import no.nav.syfo.personstatus.db.updatePersonOversiktStatusBehandlerdialogAvvist
-import no.nav.syfo.personstatus.db.updatePersonOversiktStatusBehandlerdialogSvar
-import no.nav.syfo.personstatus.db.updatePersonOversiktStatusBehandlerdialogUbesvart
-import no.nav.syfo.personstatus.db.updatePersonOversiktStatusDialogmotesvar
-import no.nav.syfo.personstatus.db.updatePersonOversiktStatusLPS
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOppfolgingstilfelleVirksomhetMap
 import no.nav.syfo.personstatus.domain.*
 import no.nav.syfo.personstatus.domain.addPersonName
 import no.nav.syfo.personstatus.domain.applyHendelse
@@ -25,6 +15,16 @@ import no.nav.syfo.personstatus.domain.toPersonOversiktStatus
 import no.nav.syfo.personstatus.infrastructure.clients.pdl.model.fodselsdato
 import no.nav.syfo.personstatus.infrastructure.clients.pdl.model.fullName
 import no.nav.syfo.personstatus.infrastructure.database.DatabaseInterface
+import no.nav.syfo.personstatus.infrastructure.database.queries.createPersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
+import no.nav.syfo.personstatus.infrastructure.database.queries.hentUbehandledePersonerTilknyttetEnhet
+import no.nav.syfo.personstatus.infrastructure.database.queries.updateBehandlerBerOmBistand
+import no.nav.syfo.personstatus.infrastructure.database.queries.updatePersonOversiktMotebehov
+import no.nav.syfo.personstatus.infrastructure.database.queries.updatePersonOversiktStatusBehandlerdialogAvvist
+import no.nav.syfo.personstatus.infrastructure.database.queries.updatePersonOversiktStatusBehandlerdialogSvar
+import no.nav.syfo.personstatus.infrastructure.database.queries.updatePersonOversiktStatusBehandlerdialogUbesvart
+import no.nav.syfo.personstatus.infrastructure.database.queries.updatePersonOversiktStatusDialogmotesvar
+import no.nav.syfo.personstatus.infrastructure.database.queries.updatePersonOversiktStatusLPS
 import java.sql.Connection
 import kotlin.collections.associateBy
 import kotlin.collections.filter

diff --git a/...otlin/no/nav/syfo/personstatus/infrastructure/cronjob/preloadcache/PreloadCacheCronjob.kt b/...otlin/no/nav/syfo/personstatus/infrastructure/cronjob/preloadcache/PreloadCacheCronjob.kt
@@ -6,9 +6,9 @@ import no.nav.syfo.personstatus.infrastructure.database.DatabaseInterface
 import no.nav.syfo.personstatus.infrastructure.clients.veiledertilgang.VeilederTilgangskontrollClient
 import no.nav.syfo.personstatus.infrastructure.cronjob.Cronjob
 import no.nav.syfo.personstatus.infrastructure.cronjob.CronjobResult
-import no.nav.syfo.personstatus.db.hentUbehandledePersonerTilknyttetEnhet
 import no.nav.syfo.personstatus.domain.hasActiveOppgave
 import no.nav.syfo.personstatus.domain.toPersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.hentUbehandledePersonerTilknyttetEnhet
 import org.slf4j.LoggerFactory
 import java.time.*
 

diff --git a/src/main/kotlin/no/nav/syfo/personstatus/infrastructure/cronjob/reaper/ReaperQueries.kt b/src/main/kotlin/no/nav/syfo/personstatus/infrastructure/cronjob/reaper/ReaperQueries.kt
@@ -2,8 +2,8 @@ package no.nav.syfo.personstatus.infrastructure.cronjob.reaper
 
 import no.nav.syfo.personstatus.infrastructure.database.DatabaseInterface
 import no.nav.syfo.personstatus.infrastructure.database.toList
-import no.nav.syfo.personstatus.db.toPPersonOversiktStatus
 import no.nav.syfo.personstatus.domain.PPersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.toPPersonOversiktStatus
 import java.util.UUID
 
 const val queryGetPersonerWithOutdatedVeiledertildeling =

diff --git a/...rsonOppfolgingstilfelleVirksomhetQuery.kt → ...rsonOppfolgingstilfelleVirksomhetQuery.kt b/...rsonOppfolgingstilfelleVirksomhetQuery.kt → ...rsonOppfolgingstilfelleVirksomhetQuery.kt
@@ -1,4 +1,4 @@
-package no.nav.syfo.personstatus.db
+package no.nav.syfo.personstatus.infrastructure.database.queries
 
 import no.nav.syfo.personstatus.infrastructure.database.toList
 import no.nav.syfo.oppfolgingstilfelle.domain.PersonOppfolgingstilfelleVirksomhet
@@ -8,6 +8,14 @@ import java.sql.Connection
 import java.sql.ResultSet
 import java.time.OffsetDateTime
 import java.util.*
+import kotlin.collections.filter
+import kotlin.collections.forEach
+import kotlin.collections.groupBy
+import kotlin.collections.intersect
+import kotlin.collections.map
+import kotlin.collections.toTypedArray
+import kotlin.jvm.java
+import kotlin.use
 
 const val queryCreatePersonOppfolgingstilfelleVirksomhet =
     """

diff --git a/...us/db/UpdatePersonOversiktStatusColumn.kt → ...eries/UpdatePersonOversiktStatusColumn.kt b/...us/db/UpdatePersonOversiktStatusColumn.kt → ...eries/UpdatePersonOversiktStatusColumn.kt
@@ -1,4 +1,4 @@
-package no.nav.syfo.personstatus.db
+package no.nav.syfo.personstatus.infrastructure.database.queries
 
 import no.nav.syfo.dialogmotestatusendring.domain.DialogmoteStatusendring
 import no.nav.syfo.personstatus.domain.PersonIdent

diff --git a/.../db/createOrUpdatePersonOversiktStatus.kt → ...ies/createOrUpdatePersonOversiktStatus.kt b/.../db/createOrUpdatePersonOversiktStatus.kt → ...ies/createOrUpdatePersonOversiktStatus.kt
@@ -1,4 +1,4 @@
-package no.nav.syfo.personstatus.db
+package no.nav.syfo.personstatus.infrastructure.database.queries
 
 import no.nav.syfo.personstatus.infrastructure.database.toList
 import no.nav.syfo.personstatus.domain.*

diff --git a/...nstatus/db/getFromPersonOversiktStatus.kt → ...se/queries/getFromPersonOversiktStatus.kt b/...nstatus/db/getFromPersonOversiktStatus.kt → ...se/queries/getFromPersonOversiktStatus.kt
@@ -1,4 +1,4 @@
-package no.nav.syfo.personstatus.db
+package no.nav.syfo.personstatus.infrastructure.database.queries
 
 import no.nav.syfo.personstatus.infrastructure.database.DatabaseInterface
 import no.nav.syfo.personstatus.infrastructure.database.toList

diff --git a/...av/syfo/personstatus/infrastructure/database/repository/PersonOversiktStatusRepository.kt b/...av/syfo/personstatus/infrastructure/database/repository/PersonOversiktStatusRepository.kt
@@ -3,9 +3,10 @@ package no.nav.syfo.personstatus.infrastructure.database.repository
 import no.nav.syfo.oppfolgingstilfelle.domain.Oppfolgingstilfelle
 import no.nav.syfo.personstatus.api.v2.model.VeilederTildelingHistorikkDTO
 import no.nav.syfo.personstatus.application.IPersonOversiktStatusRepository
-import no.nav.syfo.personstatus.db.*
 import no.nav.syfo.personstatus.domain.*
 import no.nav.syfo.personstatus.infrastructure.database.DatabaseInterface
+import no.nav.syfo.personstatus.infrastructure.database.queries.createPersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.updatePersonOppfolgingstilfelleVirksomhetList
 import no.nav.syfo.personstatus.infrastructure.database.toList
 import no.nav.syfo.util.nowUTC
 import java.lang.RuntimeException

diff --git a/...t/kotlin/no/nav/syfo/aktivitetskravvurdering/kafka/AktivitetskravVurderingConsumerSpek.kt b/...t/kotlin/no/nav/syfo/aktivitetskravvurdering/kafka/AktivitetskravVurderingConsumerSpek.kt
@@ -3,8 +3,9 @@ package no.nav.syfo.aktivitetskravvurdering.kafka
 import io.mockk.*
 import kotlinx.coroutines.runBlocking
 import no.nav.syfo.aktivitetskravvurdering.domain.AktivitetskravStatus
-import no.nav.syfo.personstatus.db.*
 import no.nav.syfo.personstatus.domain.PersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
+import no.nav.syfo.personstatus.infrastructure.database.queries.createPersonOversiktStatus
 import no.nav.syfo.personstatus.infrastructure.kafka.mockPollConsumerRecords
 import no.nav.syfo.testutil.*
 import no.nav.syfo.testutil.generator.*

diff --git a/src/test/kotlin/no/nav/syfo/cronjob/behandlendeenhet/PersonBehandlendeEnhetCronjobSpek.kt b/src/test/kotlin/no/nav/syfo/cronjob/behandlendeenhet/PersonBehandlendeEnhetCronjobSpek.kt
@@ -1,9 +1,9 @@
 package no.nav.syfo.cronjob.behandlendeenhet
 
 import kotlinx.coroutines.runBlocking
-import no.nav.syfo.personstatus.db.getPersonOversiktStatusList
 import no.nav.syfo.personstatus.domain.PersonIdent
 import no.nav.syfo.personstatus.domain.PersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import no.nav.syfo.testutil.*
 import no.nav.syfo.testutil.UserConstants.ARBEIDSTAKER_ENHET_ERROR_PERSONIDENT
 import no.nav.syfo.testutil.UserConstants.ARBEIDSTAKER_ENHET_NOT_FOUND_PERSONIDENT

diff --git a/src/test/kotlin/no/nav/syfo/cronjob/reaper/ReaperCronjobSpek.kt b/src/test/kotlin/no/nav/syfo/cronjob/reaper/ReaperCronjobSpek.kt
@@ -1,11 +1,11 @@
 package no.nav.syfo.cronjob.reaper
 
 import kotlinx.coroutines.runBlocking
-import no.nav.syfo.personstatus.db.getPersonOversiktStatusList
 import no.nav.syfo.personstatus.domain.PersonOversiktStatus
 import no.nav.syfo.personstatus.domain.toPersonOversiktStatus
 import no.nav.syfo.personstatus.infrastructure.cronjob.reaper.ReaperCronjob
 import no.nav.syfo.personstatus.infrastructure.cronjob.reaper.ReaperService
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import no.nav.syfo.testutil.*
 import no.nav.syfo.testutil.generator.generatePPersonOversiktStatus
 import org.amshove.kluent.shouldBeEqualTo

diff --git a/...o/nav/syfo/cronjob/virksomhetsnavn/PersonOppfolgingstilfelleVirksomhetsnavnCronjobSpek.kt b/...o/nav/syfo/cronjob/virksomhetsnavn/PersonOppfolgingstilfelleVirksomhetsnavnCronjobSpek.kt
@@ -7,10 +7,10 @@ import no.nav.syfo.personstatus.domain.PersonIdent
 import no.nav.syfo.personstatus.domain.Virksomhetsnummer
 import no.nav.syfo.personoppgavehendelse.kafka.KPersonoppgavehendelse
 import no.nav.syfo.personstatus.domain.OversikthendelseType
-import no.nav.syfo.personstatus.db.getPersonOppfolgingstilfelleVirksomhetList
-import no.nav.syfo.personstatus.db.*
 import no.nav.syfo.personstatus.domain.PersonOversiktStatus
 import no.nav.syfo.personstatus.domain.applyHendelse
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOppfolgingstilfelleVirksomhetList
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import no.nav.syfo.testutil.*
 import no.nav.syfo.testutil.UserConstants.ARBEIDSTAKER_FNR
 import no.nav.syfo.testutil.UserConstants.VIRKSOMHETSNUMMER_DEFAULT

diff --git a/.../kotlin/no/nav/syfo/dialogmotekandidat/kafka/KafkaDialogmotekandidatEndringServiceSpek.kt b/.../kotlin/no/nav/syfo/dialogmotekandidat/kafka/KafkaDialogmotekandidatEndringServiceSpek.kt
@@ -2,7 +2,7 @@ package no.nav.syfo.dialogmotekandidat.kafka
 
 import io.mockk.*
 import kotlinx.coroutines.runBlocking
-import no.nav.syfo.personstatus.db.*
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import no.nav.syfo.testutil.*
 import no.nav.syfo.testutil.generator.*
 import no.nav.syfo.util.nowUTC

diff --git a/...tlin/no/nav/syfo/dialogmotestatusendring/kafka/KafkaDialogmoteStatusendringServiceSpek.kt b/...tlin/no/nav/syfo/dialogmotestatusendring/kafka/KafkaDialogmoteStatusendringServiceSpek.kt
@@ -4,7 +4,7 @@ import io.mockk.*
 import kotlinx.coroutines.runBlocking
 import no.nav.syfo.dialogmotestatusendring.domain.DialogmoteStatusendring
 import no.nav.syfo.dialogmotestatusendring.domain.DialogmoteStatusendringType
-import no.nav.syfo.personstatus.db.*
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import no.nav.syfo.testutil.*
 import no.nav.syfo.testutil.generator.*
 import no.nav.syfo.util.nowUTC

diff --git a/src/test/kotlin/no/nav/syfo/frisktilarbeid/kafka/KafkaFriskTilArbeidServiceSpek.kt b/src/test/kotlin/no/nav/syfo/frisktilarbeid/kafka/KafkaFriskTilArbeidServiceSpek.kt
@@ -4,8 +4,8 @@ import io.mockk.clearMocks
 import io.mockk.every
 import io.mockk.verify
 import kotlinx.coroutines.runBlocking
-import no.nav.syfo.personstatus.db.getPersonOversiktStatusList
 import no.nav.syfo.personstatus.domain.PersonIdent
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import no.nav.syfo.testutil.*
 import no.nav.syfo.testutil.TestKafkaModule.kafkaConsumerFriskTilArbeid
 import no.nav.syfo.testutil.generator.friskTilArbeidConsumerRecord

diff --git a/src/test/kotlin/no/nav/syfo/identhendelse/IdenthendelseServiceSpek.kt b/src/test/kotlin/no/nav/syfo/identhendelse/IdenthendelseServiceSpek.kt
@@ -3,10 +3,10 @@ package no.nav.syfo.identhendelse
 import kotlinx.coroutines.*
 import no.nav.syfo.personstatus.infrastructure.clients.pdl.PdlClient
 import no.nav.syfo.personstatus.domain.PersonIdent
-import no.nav.syfo.personstatus.db.createPersonOversiktStatus
-import no.nav.syfo.personstatus.db.getPersonOversiktStatusList
 import no.nav.syfo.personstatus.domain.PersonOversiktStatus
 import no.nav.syfo.personstatus.infrastructure.clients.azuread.AzureAdClient
+import no.nav.syfo.personstatus.infrastructure.database.queries.createPersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import no.nav.syfo.testutil.ExternalMockEnvironment
 import no.nav.syfo.testutil.UserConstants
 import no.nav.syfo.testutil.dropData

diff --git a/src/test/kotlin/no/nav/syfo/oppfolgingsoppgave/kafka/OppfolgingsoppgaveConsumerSpek.kt b/src/test/kotlin/no/nav/syfo/oppfolgingsoppgave/kafka/OppfolgingsoppgaveConsumerSpek.kt
@@ -6,8 +6,8 @@ import io.mockk.mockk
 import io.mockk.verify
 import no.nav.syfo.oppfolgingsoppgave.OppfolgingsoppgaveService
 import kotlinx.coroutines.runBlocking
-import no.nav.syfo.personstatus.db.getPersonOversiktStatusList
 import no.nav.syfo.personstatus.domain.PersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import no.nav.syfo.testutil.*
 import no.nav.syfo.testutil.generator.generateKafkaHuskelapp
 import no.nav.syfo.testutil.generator.huskelappConsumerRecord

diff --git a/src/test/kotlin/no/nav/syfo/oppfolgingstilfelle/kafka/OppfolgingstilfelleConsumerSpek.kt b/src/test/kotlin/no/nav/syfo/oppfolgingstilfelle/kafka/OppfolgingstilfelleConsumerSpek.kt
@@ -6,10 +6,11 @@ import kotlinx.coroutines.runBlocking
 import no.nav.syfo.personstatus.domain.PersonIdent
 import no.nav.syfo.personstatus.domain.Virksomhetsnummer
 import no.nav.syfo.personoppgavehendelse.kafka.KPersonoppgavehendelse
-import no.nav.syfo.personstatus.db.*
 import no.nav.syfo.personstatus.domain.OversikthendelseType
 import no.nav.syfo.personstatus.domain.PersonOversiktStatus
 import no.nav.syfo.personstatus.domain.applyHendelse
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOppfolgingstilfelleVirksomhetList
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import no.nav.syfo.testutil.*
 import no.nav.syfo.testutil.UserConstants.ARBEIDSTAKER_FNR
 import no.nav.syfo.testutil.UserConstants.VIRKSOMHETSNUMMER

diff --git a/src/test/kotlin/no/nav/syfo/pdlpersonhendelse/PersonhendelseServiceSpek.kt b/src/test/kotlin/no/nav/syfo/pdlpersonhendelse/PersonhendelseServiceSpek.kt
@@ -1,9 +1,9 @@
 package no.nav.syfo.pdlpersonhendelse
 
 import kotlinx.coroutines.*
-import no.nav.syfo.personstatus.db.createPersonOversiktStatus
-import no.nav.syfo.personstatus.db.getPersonOversiktStatusList
 import no.nav.syfo.personstatus.domain.PersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.createPersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import no.nav.syfo.testutil.ExternalMockEnvironment
 import no.nav.syfo.testutil.dropData
 import no.nav.syfo.testutil.generator.generateKafkaPersonhendelse

diff --git a/src/test/kotlin/no/nav/syfo/personoppgavehendelse/kafka/PersonoppgavehendelseConsumerSpek.kt b/src/test/kotlin/no/nav/syfo/personoppgavehendelse/kafka/PersonoppgavehendelseConsumerSpek.kt
@@ -3,7 +3,7 @@ package no.nav.syfo.personoppgavehendelse.kafka
 import io.mockk.every
 import kotlinx.coroutines.runBlocking
 import no.nav.syfo.personstatus.domain.*
-import no.nav.syfo.personstatus.db.*
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import no.nav.syfo.testutil.*
 import no.nav.syfo.testutil.generator.generateKPersonoppgavehendelse
 import org.amshove.kluent.*

diff --git a/src/test/kotlin/no/nav/syfo/personstatus/api/v2/PersonoversiktStatusApiV2Spek.kt b/src/test/kotlin/no/nav/syfo/personstatus/api/v2/PersonoversiktStatusApiV2Spek.kt
@@ -13,7 +13,7 @@ import no.nav.syfo.personoppgavehendelse.kafka.KPersonoppgavehendelse
 import no.nav.syfo.personstatus.api.v2.endpoints.personOversiktApiV2Path
 import no.nav.syfo.personstatus.api.v2.model.PersonOversiktStatusDTO
 import no.nav.syfo.personstatus.application.manglendemedvirkning.ManglendeMedvirkningVurderingType
-import no.nav.syfo.personstatus.db.createPersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.createPersonOversiktStatus
 import no.nav.syfo.personstatus.domain.*
 import no.nav.syfo.personstatus.domain.PersonIdent
 import no.nav.syfo.personstatus.domain.Virksomhetsnummer

diff --git a/src/test/kotlin/no/nav/syfo/personstatus/api/v2/PersontildelingApiV2Spek.kt b/src/test/kotlin/no/nav/syfo/personstatus/api/v2/PersontildelingApiV2Spek.kt
@@ -9,8 +9,8 @@ import no.nav.syfo.personstatus.api.v2.endpoints.personTildelingApiV2Path
 import no.nav.syfo.personstatus.api.v2.model.VeilederBrukerKnytningDTO
 import no.nav.syfo.personstatus.api.v2.model.VeilederTildelingHistorikkDTO
 import no.nav.syfo.personstatus.domain.VeilederBrukerKnytning
-import no.nav.syfo.personstatus.db.*
 import no.nav.syfo.personstatus.domain.PersonIdent
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import no.nav.syfo.testutil.*
 import no.nav.syfo.testutil.UserConstants.ARBEIDSTAKER_2_FNR
 import no.nav.syfo.testutil.UserConstants.ARBEIDSTAKER_FNR

diff --git a/...in/no/nav/syfo/personstatus/infrastructure/database/PersonOversiktStatusRepositorySpek.kt b/...in/no/nav/syfo/personstatus/infrastructure/database/PersonOversiktStatusRepositorySpek.kt
@@ -1,10 +1,10 @@
 package no.nav.syfo.personstatus.infrastructure.database
 
 import no.nav.syfo.personstatus.api.v2.model.SearchQueryDTO
-import no.nav.syfo.personstatus.db.createPersonOversiktStatus
-import no.nav.syfo.personstatus.db.getPersonOversiktStatusList
 import no.nav.syfo.personstatus.domain.PersonIdent
 import no.nav.syfo.personstatus.domain.PersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.createPersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import no.nav.syfo.personstatus.infrastructure.database.repository.PersonOversiktStatusRepository
 import no.nav.syfo.testutil.ExternalMockEnvironment
 import no.nav.syfo.testutil.UserConstants

diff --git a/...tlin/no/nav/syfo/personstatus/infrastructure/kafka/ArbeidsuforhetvurderingConsumerSpek.kt b/...tlin/no/nav/syfo/personstatus/infrastructure/kafka/ArbeidsuforhetvurderingConsumerSpek.kt
@@ -5,10 +5,10 @@ import io.mockk.clearMocks
 import io.mockk.every
 import io.mockk.mockk
 import kotlinx.coroutines.runBlocking
-import no.nav.syfo.personstatus.db.createPersonOversiktStatus
-import no.nav.syfo.personstatus.db.getPersonOversiktStatusList
 import no.nav.syfo.personstatus.domain.PersonIdent
 import no.nav.syfo.personstatus.domain.PersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.createPersonOversiktStatus
+import no.nav.syfo.personstatus.infrastructure.database.queries.getPersonOversiktStatusList
 import no.nav.syfo.testutil.ExternalMockEnvironment
 import no.nav.syfo.testutil.UserConstants
 import no.nav.syfo.testutil.dropData