Skip to content

Legge inn lenker på tidligere oppgaver #52

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

Merged
merged 2 commits into from
May 23, 2025
Merged

Legge inn lenker på tidligere oppgaver #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
191bd9b
Lagt inn lenker på tidligere oppgaver
Amirhlotfi Apr 10, 2025
f5433d1
rydde opp
Amirhlotfi Apr 10, 2025
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
3 changes: 1 addition & 2 deletions src/main/kotlin/no/nav/tms/varsel/api/varsel/alleVarsler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@ data class Varsel(
companion object {
fun fromVarsel(varsel: VarselAuthority.Varsel): Varsel {
val isMasked = varsel.innhold == null
val isInaktivertOppgave = varsel.type == VarselType.oppgave && !varsel.aktiv

return Varsel(
eventId = varsel.varselId,
forstBehandlet = varsel.opprettet,
isMasked = isMasked,
spraakkode = varsel.innhold?.spraakkode,
tekst = varsel.innhold?.tekst,
link = if(isInaktivertOppgave) null else varsel.innhold?.link,
link = varsel.innhold?.link,
eksternVarslingSendt = varsel.eksternVarslingSendt,
eksternVarslingKanaler = varsel.eksternVarslingKanaler,
type = if (varsel.type == VarselType.oppgave) VarselType.oppgave else VarselType.beskjed,
Expand Down
25 changes: 0 additions & 25 deletions src/test/kotlin/no/nav/tms/varsel/api/varsel/AlleVarslerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,31 +70,6 @@ class AlleVarslerTest {
}
}

@Test
fun `Ikke sende med lenke på inaktive oppgaver`() {
val incomingVarselList = listOf(
AlleVarslerTestData.incomingVarsel(type = VarselType.beskjed),
AlleVarslerTestData.incomingVarsel(type = VarselType.innboks),
AlleVarslerTestData.incomingVarsel(type = VarselType.oppgave),
AlleVarslerTestData.incomingVarsel(type = VarselType.oppgave, aktiv = false),
AlleVarslerTestData.incomingVarsel(type = VarselType.beskjed, aktiv = false),
AlleVarslerTestData.incomingVarsel(type = VarselType.innboks, aktiv = false)
)

AlleVarsler.fromVarsler(incomingVarselList).apply {
aktive.oppgaver[0].link shouldBe "www.nav.no/test"
aktive.beskjeder.forEach() {
it.link shouldBe "www.nav.no/test"
}
inaktive.forEach() {
if(it.type == VarselType.oppgave) {
it.link shouldBe null
} else {
it.link shouldBe "www.nav.no/test"
}
}

}
}

}
Loading