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

EY-4773 Mindre rettinger for oppgave knytt til inntekt #6560

Merged
merged 3 commits into from
Dec 4, 2024
Merged

EY-4773 Mindre rettinger for oppgave knytt til inntekt #6560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e0c857
rette merknad for oppgave som gjelder inntektsendring
andreasbalevik Dec 4, 2024
f7cef2c
7 dager frist oppgave nye inntektsopplysninger
andreasbalevik Dec 4, 2024
69a6afe
7 dager frist oppgave nye inntektsopplysninger
andreasbalevik Dec 4, 2024
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
17 changes: 11 additions & 6 deletions apps/etterlatte-behandling/src/main/kotlin/behandling/BehandlingStatusService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,24 +185,22 @@ class BehandlingStatusServiceImpl(

registrerVedtakHendelse(behandling.id, vedtak.vedtakHendelse, HendelseType.FATTET)

val merknadBehandling =
val merknad =
when (brukerTokenInfo) {
is Saksbehandler -> "Behandlet av ${brukerTokenInfo.ident}"
is Saksbehandler -> genererMerknad(vedtak, "Behandlet av ${brukerTokenInfo.ident}")
is Systembruker -> {
if (behandling.revurderingsaarsak() == Revurderingaarsak.INNTEKTSENDRING) {
"Inntektsendring - automatisk behandlet"
} else {
"Behandlet av systemet"
genererMerknad(vedtak, "Behandlet av systemet")
}
}
}

oppgaveService.tilAttestering(
referanse = vedtak.sakIdOgReferanse.referanse,
type = OppgaveType.fra(behandling.type),
merknad =
listOfNotNull(vedtak.vedtakType.tilLesbarString(), merknadBehandling, vedtak.vedtakHendelse.kommentar)
.joinToString(separator = ": "),
merknad = merknad,
)
}

Expand Down Expand Up @@ -388,4 +386,11 @@ class BehandlingStatusServiceImpl(
private fun hentBehandling(behandlingId: UUID): Behandling =
behandlingService.hentBehandling(behandlingId)
?: throw NotFoundException("Fant ikke behandling med id=$behandlingId")

private fun genererMerknad(
vedtak: VedtakEndringDTO,
merknad: String,
): String =
listOfNotNull(vedtak.vedtakType.tilLesbarString(), merknad, vedtak.vedtakHendelse.kommentar)
.joinToString(separator = ": ")
}
2 changes: 2 additions & 0 deletions .../src/main/kotlin/inntektsjustering/selvbetjening/InntektsjusteringSelvbetjeningService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import no.nav.etterlatte.omregning.OmregningHendelseType
import no.nav.etterlatte.oppgave.OppgaveService
import org.slf4j.LoggerFactory
import java.time.YearMonth
import java.time.temporal.ChronoUnit
import java.util.UUID

class InntektsjusteringSelvbetjeningService(
Expand Down Expand Up @@ -88,6 +89,7 @@ class InntektsjusteringSelvbetjeningService(
kilde = OppgaveKilde.BRUKERDIALOG,
type = OppgaveType.INNTEKTSOPPLYSNING,
merknad = "Ny inntektsopplysning",
frist = Tidspunkt.now().plus(7L, ChronoUnit.DAYS),
referanse = mottattInntektsjustering.journalpostId,
)
}
Expand Down
4 changes: 2 additions & 2 deletions .../test/kotlin/inntektsjustering/selvbetjening/InntektsjusteringSelvbetjeningServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class InntektsjusteringSelvbetjeningServiceTest {
fun beforeEach() {
clearAllMocks()
every { rapid.publiser(any(), any()) } returns Pair(1, 1L)
every { oppgaveService.opprettOppgave(any(), any(), any(), any(), any()) } returns mockk()
every { oppgaveService.opprettOppgave(any(), any(), any(), any(), any(), any()) } returns mockk()
}

@Test
Expand Down Expand Up @@ -285,7 +285,7 @@ class InntektsjusteringSelvbetjeningServiceTest {
type = OppgaveType.INNTEKTSOPPLYSNING,
merknad = "Ny inntektsopplysning",
referanse = "123",
frist = null,
frist = any(),
saksbehandler = null,
)
}
Expand Down