Skip to content

Commit

Permalink
Flytter brevutsending til egen pakke
Browse files Browse the repository at this point in the history
  • Loading branch information
@henrikg
henrikg committed Dec 13, 2024
1 parent ea4c354 commit 02c3b79
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 17 deletions.
2 changes: 1 addition & 1 deletion ...andling/jobs/brevjobber/Brevutsendelse.kt → ...handling/brevutsendelse/Brevutsendelse.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package no.nav.etterlatte.behandling.jobs.brevjobber
package no.nav.etterlatte.behandling.brevutsendelse

import no.nav.etterlatte.libs.common.behandling.SakType
import no.nav.etterlatte.libs.common.sak.SakId
Expand Down
2 changes: 1 addition & 1 deletion ...ling/jobs/brevjobber/BrevutsendelseDao.kt → ...dling/brevutsendelse/BrevutsendelseDao.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package no.nav.etterlatte.behandling.jobs.brevjobber
package no.nav.etterlatte.behandling.brevutsendelse

import no.nav.etterlatte.common.ConnectionAutoclosing
import no.nav.etterlatte.libs.common.sak.SakId
Expand Down
3 changes: 1 addition & 2 deletions ...tlin/behandling/jobs/BrevutsendelseJob.kt → ...dling/brevutsendelse/BrevutsendelseJob.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package no.nav.etterlatte.behandling.jobs
package no.nav.etterlatte.behandling.brevutsendelse

import no.nav.etterlatte.Context
import no.nav.etterlatte.Self
import no.nav.etterlatte.behandling.jobs.brevjobber.BrevutsendelseJobService
import no.nav.etterlatte.common.DatabaseContext
import no.nav.etterlatte.jobs.LoggerInfo
import no.nav.etterlatte.jobs.fixedRateCancellableTimer
Expand Down
8 changes: 4 additions & 4 deletions ...bs/brevjobber/BrevutsendelseJobService.kt → ...revutsendelse/BrevutsendelseJobService.kt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package no.nav.etterlatte.behandling.jobs.brevjobber
package no.nav.etterlatte.behandling.brevutsendelse

import no.nav.etterlatte.Context
import no.nav.etterlatte.Kontekst
import no.nav.etterlatte.behandling.jobs.brevjobber.BrevutsendelseStatus.FEILET
import no.nav.etterlatte.behandling.jobs.brevjobber.BrevutsendelseStatus.FERDIG
import no.nav.etterlatte.behandling.jobs.brevjobber.BrevutsendelseStatus.PAAGAAENDE
import no.nav.etterlatte.behandling.brevutsendelse.BrevutsendelseStatus.FEILET
import no.nav.etterlatte.behandling.brevutsendelse.BrevutsendelseStatus.FERDIG
import no.nav.etterlatte.behandling.brevutsendelse.BrevutsendelseStatus.PAAGAAENDE
import no.nav.etterlatte.inTransaction
import no.nav.etterlatte.libs.common.sak.SakId
import no.nav.etterlatte.libs.ktor.token.BrukerTokenInfo
Expand Down
4 changes: 2 additions & 2 deletions .../jobs/brevjobber/BrevutsendelseService.kt → ...g/brevutsendelse/BrevutsendelseService.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package no.nav.etterlatte.behandling.jobs.brevjobber
package no.nav.etterlatte.behandling.brevutsendelse

import kotlinx.coroutines.runBlocking
import no.nav.etterlatte.behandling.jobs.brevjobber.SjekkGyldigBrevMottakerResultat.GYLDIG_MOTTAKER
import no.nav.etterlatte.behandling.brevutsendelse.SjekkGyldigBrevMottakerResultat.GYLDIG_MOTTAKER
import no.nav.etterlatte.behandling.klienter.BrevApiKlient
import no.nav.etterlatte.brev.BrevParametre
import no.nav.etterlatte.brev.SaksbehandlerOgAttestant
Expand Down
10 changes: 5 additions & 5 deletions ...bs/brevjobber/SjekkBrevMottakerService.kt → ...revutsendelse/SjekkBrevMottakerService.kt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package no.nav.etterlatte.behandling.jobs.brevjobber
package no.nav.etterlatte.behandling.brevutsendelse

import kotlinx.coroutines.runBlocking
import no.nav.etterlatte.behandling.BehandlingService
import no.nav.etterlatte.behandling.GrunnlagService
import no.nav.etterlatte.behandling.brevutsendelse.SjekkGyldigBrevMottakerResultat.GYLDIG_MOTTAKER
import no.nav.etterlatte.behandling.brevutsendelse.SjekkGyldigBrevMottakerResultat.UGYLDIG_MOTTAKER_UTDATERTE_PERSON_OPPLYSNINGER
import no.nav.etterlatte.behandling.brevutsendelse.SjekkGyldigBrevMottakerResultat.UGYLDIG_MOTTAKER_UTDATERT_IDENT
import no.nav.etterlatte.behandling.brevutsendelse.SjekkGyldigBrevMottakerResultat.UGYLDIG_MOTTAKER_VERGEMAAL
import no.nav.etterlatte.behandling.domain.Behandling
import no.nav.etterlatte.behandling.jobs.brevjobber.SjekkGyldigBrevMottakerResultat.GYLDIG_MOTTAKER
import no.nav.etterlatte.behandling.jobs.brevjobber.SjekkGyldigBrevMottakerResultat.UGYLDIG_MOTTAKER_UTDATERTE_PERSON_OPPLYSNINGER
import no.nav.etterlatte.behandling.jobs.brevjobber.SjekkGyldigBrevMottakerResultat.UGYLDIG_MOTTAKER_UTDATERT_IDENT
import no.nav.etterlatte.behandling.jobs.brevjobber.SjekkGyldigBrevMottakerResultat.UGYLDIG_MOTTAKER_VERGEMAAL
import no.nav.etterlatte.common.klienter.PdlTjenesterKlient
import no.nav.etterlatte.libs.common.behandling.SakType
import no.nav.etterlatte.libs.common.feilhaandtering.InternfeilException
Expand Down
4 changes: 4 additions & 0 deletions ...etterlatte-behandling/src/test/kotlin/behandling/jobs/brevjobber/BrevutsendelseDaoTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ import io.kotest.matchers.shouldBe
import io.mockk.mockk
import no.nav.etterlatte.ConnectionAutoclosingTest
import no.nav.etterlatte.DatabaseExtension
import no.nav.etterlatte.behandling.brevutsendelse.Brevutsendelse
import no.nav.etterlatte.behandling.brevutsendelse.BrevutsendelseDao
import no.nav.etterlatte.behandling.brevutsendelse.BrevutsendelseType
import no.nav.etterlatte.behandling.brevutsendelse.opprettNyBrevutsendelse
import no.nav.etterlatte.common.Enheter
import no.nav.etterlatte.libs.common.behandling.SakType
import no.nav.etterlatte.libs.common.sak.Sak
Expand Down
7 changes: 7 additions & 0 deletions ...tte-behandling/src/test/kotlin/behandling/jobs/brevjobber/BrevutsendelseJobServiceTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ import no.nav.etterlatte.Context
import no.nav.etterlatte.DatabaseContextTest
import no.nav.etterlatte.DatabaseExtension
import no.nav.etterlatte.Self
import no.nav.etterlatte.behandling.brevutsendelse.Brevutsendelse
import no.nav.etterlatte.behandling.brevutsendelse.BrevutsendelseDao
import no.nav.etterlatte.behandling.brevutsendelse.BrevutsendelseJobService
import no.nav.etterlatte.behandling.brevutsendelse.BrevutsendelseService
import no.nav.etterlatte.behandling.brevutsendelse.BrevutsendelseStatus
import no.nav.etterlatte.behandling.brevutsendelse.BrevutsendelseType
import no.nav.etterlatte.behandling.brevutsendelse.opprettNyBrevutsendelse
import no.nav.etterlatte.libs.common.Enhetsnummer
import no.nav.etterlatte.libs.common.behandling.SakType
import no.nav.etterlatte.libs.common.sak.SakId
Expand Down
9 changes: 7 additions & 2 deletions ...rlatte-behandling/src/test/kotlin/behandling/jobs/brevjobber/BrevutsendelseServiceTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ import io.mockk.confirmVerified
import io.mockk.every
import io.mockk.mockk
import io.mockk.verifyOrder
import no.nav.etterlatte.behandling.jobs.brevjobber.SjekkGyldigBrevMottakerResultat.GYLDIG_MOTTAKER
import no.nav.etterlatte.behandling.jobs.brevjobber.SjekkGyldigBrevMottakerResultat.UGYLDIG_MOTTAKER_UTDATERT_IDENT
import no.nav.etterlatte.behandling.brevutsendelse.Brevutsendelse
import no.nav.etterlatte.behandling.brevutsendelse.BrevutsendelseService
import no.nav.etterlatte.behandling.brevutsendelse.BrevutsendelseType
import no.nav.etterlatte.behandling.brevutsendelse.SjekkBrevMottakerService
import no.nav.etterlatte.behandling.brevutsendelse.SjekkGyldigBrevMottakerResultat.GYLDIG_MOTTAKER
import no.nav.etterlatte.behandling.brevutsendelse.SjekkGyldigBrevMottakerResultat.UGYLDIG_MOTTAKER_UTDATERT_IDENT
import no.nav.etterlatte.behandling.brevutsendelse.opprettNyBrevutsendelse
import no.nav.etterlatte.behandling.klienter.BrevApiKlient
import no.nav.etterlatte.brev.model.Status
import no.nav.etterlatte.libs.common.Enhetsnummer
Expand Down

0 comments on commit 02c3b79

Please sign in to comment.