Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flytter brevutsending til egen pakke #6613

Merged
merged 1 commit into from
Dec 13, 2024
Merged

Flytter brevutsending til egen pakke #6613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...andling/jobs/brevjobber/Brevutsendelse.kt → ...handling/brevutsendelse/Brevutsendelse.kt
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
2 changes: 1 addition & 1 deletion .../jobs/brevjobber/BrevutsendelseDaoTest.kt → ...g/brevutsendelse/BrevutsendelseDaoTest.kt
View file
Open in desktop
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 io.kotest.matchers.shouldBe
import io.mockk.mockk
Expand Down
2 changes: 1 addition & 1 deletion ...revjobber/BrevutsendelseJobServiceTest.kt → ...tsendelse/BrevutsendelseJobServiceTest.kt
View file
Open in desktop
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 io.kotest.matchers.shouldBe
import io.mockk.every
Expand Down
6 changes: 3 additions & 3 deletions ...s/brevjobber/BrevutsendelseServiceTest.kt → ...evutsendelse/BrevutsendelseServiceTest.kt
View file
Open in desktop
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 io.mockk.coEvery
import io.mockk.coVerifyOrder
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.SjekkGyldigBrevMottakerResultat.GYLDIG_MOTTAKER
import no.nav.etterlatte.behandling.brevutsendelse.SjekkGyldigBrevMottakerResultat.UGYLDIG_MOTTAKER_UTDATERT_IDENT
import no.nav.etterlatte.behandling.klienter.BrevApiKlient
import no.nav.etterlatte.brev.model.Status
import no.nav.etterlatte.libs.common.Enhetsnummer
Expand Down