Skip to content

Commit

Permalink
Fikser tester etter at lagreStatus(id, status, tidspunkt) er private
Browse files Browse the repository at this point in the history
  • Loading branch information
@oyvindsh
oyvindsh committed Dec 12, 2024
1 parent 01dec33 commit 8e51c9a
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 45 deletions.
2 changes: 1 addition & 1 deletion apps/etterlatte-behandling/src/test/kotlin/behandling/BehandlingDaoTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ internal class BehandlingDaoTest(
behandlingRepo.lagreNyttVirkningstidspunkt(it.id, it.virkningstidspunkt!!)
behandlingRepo.lagreGyldighetsproeving(it.id, it.gyldighetsproeving())
kommerBarnetTilGodeDao.lagreKommerBarnetTilGode(it.kommerBarnetTilgode!!)
behandlingRepo.lagreStatus(it.id, it.status, it.sistEndret)
behandlingRepo.lagreStatus(it)
}

with(behandlingRepo.hentBehandling(foerstegangsbehandling.id) as Foerstegangsbehandling) {
Expand Down
8 changes: 4 additions & 4 deletions apps/etterlatte-behandling/src/test/kotlin/behandling/BehandlingFactoryTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ internal class BehandlingFactoryTest {
every { hendelseDaoMock.behandlingOpprettet(any()) } returns Unit
every { behandlingDaoMock.lagreGyldighetsproeving(any(), any()) } returns Unit
every { behandlingDaoMock.hentBehandlingerForSak(any()) } returns emptyList()
every { behandlingDaoMock.lagreStatus(any(), any(), any()) } returns Unit
every { behandlingDaoMock.lagreStatus(any()) } returns Unit
every {
behandlingHendelserKafkaProducerMock.sendMeldingForHendelseStatisitkk(
any(),
Expand Down Expand Up @@ -392,7 +392,7 @@ internal class BehandlingFactoryTest {
every {
behandlingDaoMock.hentBehandlingerForSak(any())
} returns emptyList()
every { behandlingDaoMock.lagreStatus(any(), any(), any()) } returns Unit
every { behandlingDaoMock.lagreStatus(any()) } returns Unit
every { hendelseDaoMock.behandlingOpprettet(any()) } returns Unit
every {
behandlingHendelserKafkaProducerMock.sendMeldingForHendelseStatisitkk(
Expand Down Expand Up @@ -765,7 +765,7 @@ internal class BehandlingFactoryTest {
every {
behandlingDaoMock.hentBehandlingerForSak(any())
} returns emptyList()
every { behandlingDaoMock.lagreStatus(any(), any(), any()) } returns Unit
every { behandlingDaoMock.lagreStatus(any()) } returns Unit
every { hendelseDaoMock.behandlingOpprettet(any()) } returns Unit
every {
behandlingHendelserKafkaProducerMock.sendMeldingForHendelseStatisitkk(
Expand Down Expand Up @@ -935,7 +935,7 @@ internal class BehandlingFactoryTest {
every {
behandlingDaoMock.hentBehandlingerForSak(any())
} returns emptyList()
every { behandlingDaoMock.lagreStatus(any(), any(), any()) } returns Unit
every { behandlingDaoMock.lagreStatus(any()) } returns Unit
every { hendelseDaoMock.behandlingOpprettet(any()) } returns Unit
every {
behandlingHendelserKafkaProducerMock.sendMeldingForHendelseStatisitkk(
Expand Down
2 changes: 1 addition & 1 deletion apps/etterlatte-behandling/src/test/kotlin/behandling/BehandlingServiceImplTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@ internal class BehandlingServiceImplTest {
coEvery { grunnlagKlientMock.hentPersongalleri(behandling.id, TOKEN) } returns mockPersongalleri()
coEvery { grunnlagServiceMock.leggTilNyeOpplysninger(behandling.id, any(), any()) } just runs
coEvery { grunnlagServiceMock.oppdaterGrunnlag(behandling.id, behandling.sak.id, any()) } just runs
every { behandlingDaoMock.lagreStatus(any(), any(), any()) } just runs
every { behandlingDaoMock.lagreStatus(any()) } just runs
every { behandlingDaoMock.lagreStatus(any()) } just runs

val annenForelderInRequest =
Expand Down
2 changes: 1 addition & 1 deletion apps/etterlatte-behandling/src/test/kotlin/behandling/BehandlingStatusServiceImplTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class BehandlingStatusServiceImplTest {
vedtakType = VedtakType.ENDRING,
)

every { behandlingDao.lagreStatus(any(), any(), any()) } just runs
every { behandlingDao.lagreStatus(any()) } just runs
every { behandlingService.registrerVedtakHendelse(any(), any(), any()) } just runs
every { oppgaveService.tilUnderkjent(any(), any(), any()) } returns mockk()
every { behandlingService.endreProsesstype(any(), any()) } just runs
Expand Down
16 changes: 8 additions & 8 deletions apps/etterlatte-behandling/src/test/kotlin/behandling/BehandlingStatusServiceTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ internal class BehandlingStatusServiceTest {
}

verify {
behandlingdao.lagreStatus(behandlingId, BehandlingStatus.FATTET_VEDTAK, any())
behandlingdao.lagreStatus(any())
behandlingService.registrerVedtakHendelse(behandlingId, vedtakHendelse, HendelseType.FATTET)
oppgaveService.tilAttestering(
behandlingId.toString(),
Expand All @@ -166,7 +166,7 @@ internal class BehandlingStatusServiceTest {
}

verify {
behandlingdao.lagreStatus(behandlingId, BehandlingStatus.IVERKSATT, any())
behandlingdao.lagreStatus(any())
behandlingService.hentBehandling(behandlingId)
behandlingService.registrerVedtakHendelse(behandlingId, iverksettVedtak, HendelseType.IVERKSATT)
behandlingInfoDao.hentBrevutfall(behandlingId)
Expand All @@ -190,7 +190,7 @@ internal class BehandlingStatusServiceTest {
}

verify {
behandlingdao.lagreStatus(behandlingId, BehandlingStatus.RETURNERT, any())
behandlingdao.lagreStatus(any())
behandlingService.registrerVedtakHendelse(behandlingId, vedtakHendelse, HendelseType.UNDERKJENT)
oppgaveService.tilUnderkjent(behandlingId.toString(), OppgaveType.FOERSTEGANGSBEHANDLING, any())
}
Expand Down Expand Up @@ -231,7 +231,7 @@ internal class BehandlingStatusServiceTest {
}

verify {
behandlingdao.lagreStatus(behandlingId, BehandlingStatus.IVERKSATT, any())
behandlingdao.lagreStatus(any())
behandlingService.hentBehandling(behandlingId)
behandlingService.registrerVedtakHendelse(behandlingId, iverksattVedtak, HendelseType.IVERKSATT)
generellBehandlingService.opprettBehandling(any(), any())
Expand Down Expand Up @@ -276,7 +276,7 @@ internal class BehandlingStatusServiceTest {
}

verify {
behandlingdao.lagreStatus(behandlingId, BehandlingStatus.AVSLAG, any())
behandlingdao.lagreStatus(any())
behandlingService.registrerVedtakHendelse(behandlingId, vedtakHendelse, HendelseType.ATTESTERT)
generellBehandlingService.opprettBehandling(any(), any())
oppgaveService.ferdigStillOppgaveUnderBehandling(
Expand Down Expand Up @@ -318,7 +318,7 @@ internal class BehandlingStatusServiceTest {
}

verify {
behandlingdao.lagreStatus(behandlingId, BehandlingStatus.ATTESTERT, any())
behandlingdao.lagreStatus(any())
behandlingService.registrerVedtakHendelse(behandlingId, vedtakHendelse, HendelseType.ATTESTERT)
oppgaveService.ferdigStillOppgaveUnderBehandling(
behandlingId.toString(),
Expand Down Expand Up @@ -358,7 +358,7 @@ internal class BehandlingStatusServiceTest {
}

verify {
behandlingdao.lagreStatus(behandlingId, BehandlingStatus.IVERKSATT, any())
behandlingdao.lagreStatus(any())
behandlingService.hentBehandling(behandlingId)
behandlingService.registrerVedtakHendelse(behandlingId, iverksettVedtak, HendelseType.IVERKSATT)
behandlingInfoDao.hentBrevutfall(behandlingId)
Expand Down Expand Up @@ -401,7 +401,7 @@ internal class BehandlingStatusServiceTest {
}

verify {
behandlingdao.lagreStatus(behandlingId, BehandlingStatus.IVERKSATT, any())
behandlingdao.lagreStatus(any())
behandlingService.hentBehandling(behandlingId)
behandlingService.registrerVedtakHendelse(behandlingId, iverksettVedtak, HendelseType.IVERKSATT)
behandlingInfoDao.hentBrevutfall(behandlingId)
Expand Down
40 changes: 17 additions & 23 deletions ...rlatte-behandling/src/test/kotlin/behandling/revurdering/ManuellRevurderingServiceTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ import no.nav.etterlatte.behandling.BehandlingsHendelserKafkaProducerImpl
import no.nav.etterlatte.behandling.GrunnlagService
import no.nav.etterlatte.behandling.aktivitetsplikt.AktivitetspliktDao
import no.nav.etterlatte.behandling.aktivitetsplikt.AktivitetspliktKopierService
import no.nav.etterlatte.behandling.domain.AutomatiskRevurdering
import no.nav.etterlatte.behandling.domain.Behandling
import no.nav.etterlatte.behandling.domain.Foerstegangsbehandling
import no.nav.etterlatte.behandling.domain.GrunnlagsendringStatus
import no.nav.etterlatte.behandling.domain.GrunnlagsendringsType
import no.nav.etterlatte.behandling.domain.Grunnlagsendringshendelse
import no.nav.etterlatte.behandling.domain.ManuellRevurdering
import no.nav.etterlatte.behandling.domain.Revurdering
import no.nav.etterlatte.behandling.domain.SamsvarMellomKildeOgGrunnlag
import no.nav.etterlatte.behandling.domain.toStatistikkBehandling
Expand All @@ -48,7 +50,6 @@ import no.nav.etterlatte.libs.common.oppgave.OppgaveType
import no.nav.etterlatte.libs.common.oppgave.Status
import no.nav.etterlatte.libs.common.sak.Sak
import no.nav.etterlatte.libs.common.tidspunkt.Tidspunkt
import no.nav.etterlatte.libs.common.tidspunkt.toLocalDatetimeUTC
import no.nav.etterlatte.nyKontekstMedBrukerOgDatabase
import no.nav.etterlatte.oppgave.OppgaveService
import no.nav.etterlatte.persongalleri
Expand Down Expand Up @@ -243,11 +244,7 @@ class ManuellRevurderingServiceTest : BehandlingIntegrationTest() {
}

inTransaction {
applicationContext.behandlingDao.lagreStatus(
revurdering.id,
BehandlingStatus.IVERKSATT,
LocalDateTime.now(),
)
iverksett(revurdering, "saksbehandler")
}

assertThrows<BehandlingKanIkkeEndres> {
Expand Down Expand Up @@ -534,11 +531,7 @@ class ManuellRevurderingServiceTest : BehandlingIntegrationTest() {
}

inTransaction {
applicationContext.behandlingDao.lagreStatus(
behandling!!.id,
BehandlingStatus.IVERKSATT,
Tidspunkt.now().toLocalDatetimeUTC(),
)
iverksett(behandling!!)
ferdigstillOppgaver(behandling, saksbehandler)
}
val revurderingen =
Expand Down Expand Up @@ -738,11 +731,7 @@ class ManuellRevurderingServiceTest : BehandlingIntegrationTest() {
}

inTransaction {
applicationContext.behandlingDao.lagreStatus(
nonNullBehandling.id,
BehandlingStatus.IVERKSATT,
Tidspunkt.now().toLocalDatetimeUTC(),
)
applicationContext.behandlingDao.lagreStatus(nonNullBehandling.copy(status = BehandlingStatus.IVERKSATT))
ferdigstillOppgaver(behandling, saksbehandler)
}

Expand Down Expand Up @@ -908,13 +897,18 @@ class ManuellRevurderingServiceTest : BehandlingIntegrationTest() {
}
}

private fun iverksett(behandling: Behandling) {
applicationContext.behandlingDao.lagreStatus(
behandling.id,
BehandlingStatus.IVERKSATT,
Tidspunkt.now().toLocalDatetimeUTC(),
)
ferdigstillOppgaver(behandling)
private fun iverksett(
behandling: Behandling,
saksbehandlerId: String = "sbh",
) {
val iverksatt =
when (behandling) {
is Foerstegangsbehandling -> behandling.copy(status = BehandlingStatus.IVERKSATT)
is ManuellRevurdering -> behandling.copy(status = BehandlingStatus.IVERKSATT)
is AutomatiskRevurdering -> behandling.copy(status = BehandlingStatus.IVERKSATT)
}
applicationContext.behandlingDao.lagreStatus(iverksatt)
ferdigstillOppgaver(behandling, saksbehandlerId)
}

private fun ferdigstillOppgaver(
Expand Down
9 changes: 2 additions & 7 deletions ...ehandling/src/test/kotlin/behandling/revurdering/OmgjoeringKlageRevurderingServiceTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ import no.nav.etterlatte.libs.common.behandling.VedtaketKlagenGjelder
import no.nav.etterlatte.libs.common.oppgave.OppgaveType
import no.nav.etterlatte.libs.common.oppgave.Status
import no.nav.etterlatte.libs.common.sak.Sak
import no.nav.etterlatte.libs.common.tidspunkt.Tidspunkt
import no.nav.etterlatte.libs.common.tidspunkt.toLocalDatetimeUTC
import no.nav.etterlatte.libs.common.vedtak.VedtakType
import no.nav.etterlatte.libs.testdata.grunnlag.SOEKER_FOEDSELSNUMMER
import no.nav.etterlatte.nyKontekstMedBrukerOgDatabase
Expand Down Expand Up @@ -121,11 +119,8 @@ class OmgjoeringKlageRevurderingServiceTest : BehandlingIntegrationTest() {
)
}
inTransaction {
applicationContext.behandlingDao.lagreStatus(
behandling!!.id,
BehandlingStatus.IVERKSATT,
Tidspunkt.now().toLocalDatetimeUTC(),
)
val iverksatt = behandling!!.copy(status = BehandlingStatus.IVERKSATT)
applicationContext.behandlingDao.lagreStatus(iverksatt)
}
val klage =
inTransaction {
Expand Down

0 comments on commit 8e51c9a

Please sign in to comment.