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

Fagsak fjern behandlingstema #65

Merged
merged 2 commits into from
May 19, 2021
Merged

Fagsak fjern behandlingstema #65

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
6f91477
Change to Fagsak for internal saksnummer, remove standard behandlings…
oyvind-wedoe May 10, 2021
794032f
Wrong sakstype in previous commit.
oyvind-wedoe May 10, 2021
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
7 changes: 3 additions & 4 deletions src/main/kotlin/no/nav/klage/clients/JoarkClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ class JoarkClient(
private const val KLAGE_ID_KEY = "klage_id"
private const val KLAGE_TITTEL = "Klage/Anke"
private const val BREVKODE_KLAGESKJEMA = "NAV 90-00.08"
private const val BEHANDLINGSTEMA_KLAGE_UNDERINSTANS = "ab0019"
private const val BEHANDLINGSTEMA_LONNSKOMPENSASJON = "ab0438"
}

Expand Down Expand Up @@ -81,7 +80,7 @@ class JoarkClient(

private fun getSak(klage: Klage): Sak? =
if (klage.tema == "FOR" && klage.internalSaksnummer?.toIntOrNull() != null) {
Sak(sakstype = "ARKIVSAK", arkivsaksystem = "GSAK", arkivsaksnummer = klage.internalSaksnummer)
Sak(sakstype = Sakstype.FAGSAK, fagsaksystem = FagsaksSystem.FS36, fagsakid = klage.internalSaksnummer)
} else {
null
}
Expand Down Expand Up @@ -124,11 +123,11 @@ class JoarkClient(
return jacksonObjectMapper().writeValueAsString(journalpostCopyWithoutFileData)
}

private fun getBehandlingstema(klage: Klage): String {
private fun getBehandlingstema(klage: Klage): String? {
return if (klage.isLonnskompensasjon())
BEHANDLINGSTEMA_LONNSKOMPENSASJON
else
BEHANDLINGSTEMA_KLAGE_UNDERINSTANS
null
}

private fun Klage.isLonnskompensasjon(): Boolean {
Expand Down
31 changes: 28 additions & 3 deletions src/main/kotlin/no/nav/klage/domain/Journalpost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package no.nav.klage.domain
data class Journalpost(
val journalposttype: String = "INNGAAENDE",
val tema: String,
val behandlingstema: String,
val behandlingstema: String? = null,
val kanal: String = "NAV_NO",
val tittel: String,
val avsenderMottaker: AvsenderMottaker,
Expand All @@ -28,13 +28,38 @@ data class DokumentVariant(
)

data class Sak(
val sakstype: String,
val fagsaksystem: String? = null,
val sakstype: Sakstype,
val fagsaksystem: FagsaksSystem? = null,
val fagsakid: String? = null,
val arkivsaksystem: String? = null,
val arkivsaksnummer: String? = null
)

enum class Sakstype {
FAGSAK,
GENERELL_SAK,
ARKIVSAK
}

enum class FagsaksSystem {
AO01,
AO11,
BISYS,
FS36,
FS38,
IT01,
K9,
OB36,
OEBS,
PP01,
UFM,
BA,
EF,
KONT,
SUPSTONAD,
OMSORGSPENGER
}

//Always use FNR according to #team_dokumentløsninger
private const val ID_TYPE = "FNR"

Expand Down