-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Endret til ny kontrakt fra behandlingsflyt
- Loading branch information
Showing
10 changed files
with
97 additions
and
178 deletions.
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
api-kontrakt/src/main/kotlin/no/nav/aap/oppgave/AvklaringsbehovReferanseDto.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| package no.nav.aap.oppgave | ||
|
|
||
| import no.nav.aap.oppgave.opprett.Avklaringsbehovtype | ||
| import no.nav.aap.oppgave.verdityper.AvklaringsbehovKode | ||
| import java.util.UUID | ||
|
|
||
| data class AvklaringsbehovReferanseDto( | ||
| val saksnummer: String? = null, | ||
| val referanse: UUID? = null, | ||
| val journalpostId: Long? = null, | ||
| val avklaringsbehovtype: Avklaringsbehovtype, | ||
| val avklaringsbehovKode: AvklaringsbehovKode, | ||
| ) |
94 changes: 0 additions & 94 deletions
94
api-kontrakt/src/main/kotlin/no/nav/aap/oppgave/opprett/BehandlingshistorikkRequest.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 22 additions & 16 deletions
38
...pprette/BehandlingshistorikkRequestExt.kt → ...rette/BehandlingFlytStoppetHendelseExt.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,66 @@ | ||
| package no.nav.aap.oppgave.opprette | ||
|
|
||
| import no.nav.aap.behandlingsflyt.kontrakt.avklaringsbehov.Status | ||
| import no.nav.aap.behandlingsflyt.kontrakt.hendelse.AvklaringsbehovHendelseDto | ||
| import no.nav.aap.behandlingsflyt.kontrakt.hendelse.BehandlingFlytStoppetHendelse | ||
| import no.nav.aap.oppgave.OppgaveDto | ||
| import no.nav.aap.oppgave.opprett.AvklaringsbehovDto | ||
| import no.nav.aap.oppgave.opprett.Avklaringsbehovstatus | ||
| import no.nav.aap.oppgave.opprett.BehandlingshistorikkRequest | ||
| import no.nav.aap.oppgave.verdityper.AvklaringsbehovKode | ||
| import java.time.LocalDateTime | ||
| import java.util.UUID | ||
|
|
||
|
|
||
| fun BehandlingshistorikkRequest.lagOppgave(ident: String): OppgaveDto? { | ||
| val åpentAvklaringsbehov = this.getÅpentAvklaringsbehov() | ||
| fun BehandlingFlytStoppetHendelse.lagOppgave(ident: String): OppgaveDto? { | ||
| val åpentAvklaringsbehov = this.finnÅpentAvklaringsbehov() | ||
| if (åpentAvklaringsbehov == null) { | ||
| return null | ||
| } | ||
| return when (åpentAvklaringsbehov.status) { | ||
| Avklaringsbehovstatus.OPPRETTET -> | ||
| Status.OPPRETTET -> | ||
| this.opprettNyOppgave(åpentAvklaringsbehov, ident) | ||
| Avklaringsbehovstatus.SENDT_TILBAKE_FRA_KVALITETSSIKRER, Avklaringsbehovstatus.SENDT_TILBAKE_FRA_BESLUTTER -> | ||
| Status.SENDT_TILBAKE_FRA_KVALITETSSIKRER, Status.SENDT_TILBAKE_FRA_BESLUTTER -> | ||
| this.gjenopprettOppgave(åpentAvklaringsbehov, ident) | ||
| else -> return null | ||
| } | ||
| } | ||
|
|
||
| fun BehandlingshistorikkRequest.hvemLøsteForrigeAvklaringsbehov(): String? { | ||
| fun BehandlingFlytStoppetHendelse.hvemLøsteForrigeAvklaringsbehov(): String? { | ||
| val avsluttedeAvklaringsbehov = avklaringsbehov | ||
| .filter { it.status == Avklaringsbehovstatus.AVSLUTTET } | ||
| .filter { it.status == Status.AVSLUTTET } | ||
| val løsteForrigeAvklaringsbehov = avsluttedeAvklaringsbehov | ||
| .map {it.endringer.sortedBy { it.tidsstempel }.last()} | ||
| .sortedBy { it.tidsstempel } | ||
| .lastOrNull()?.endretAv | ||
| return løsteForrigeAvklaringsbehov | ||
| } | ||
|
|
||
| private fun BehandlingshistorikkRequest.opprettNyOppgave(avklaringsbehov: AvklaringsbehovDto, ident: String): OppgaveDto { | ||
| private fun BehandlingFlytStoppetHendelse.opprettNyOppgave(avklaringsbehov: AvklaringsbehovHendelseDto, ident: String): OppgaveDto { | ||
| return OppgaveDto( | ||
| saksnummer = this.saksnummer, | ||
| behandlingRef = UUID.fromString(this.referanse), | ||
| saksnummer = this.saksnummer.toString(), | ||
| behandlingRef = this.referanse.referanse, | ||
| behandlingOpprettet = this.opprettetTidspunkt, | ||
| avklaringsbehovKode = AvklaringsbehovKode(avklaringsbehov.definisjon.type), | ||
| opprettetAv = ident, | ||
| opprettetTidspunkt = LocalDateTime.now() | ||
| ) | ||
| } | ||
|
|
||
| private fun BehandlingshistorikkRequest.gjenopprettOppgave(avklaringsbehov: AvklaringsbehovDto, ident: String): OppgaveDto { | ||
| private fun BehandlingFlytStoppetHendelse.gjenopprettOppgave(avklaringsbehov: AvklaringsbehovHendelseDto, ident: String): OppgaveDto { | ||
| val oppgaveDto = this.opprettNyOppgave(avklaringsbehov, ident) | ||
| val sistEndretAv = avklaringsbehov.sistEndretAv() | ||
| oppgaveDto.copy(reservertAv = sistEndretAv, reservertTidspunkt = LocalDateTime.now()) | ||
| return oppgaveDto | ||
| } | ||
|
|
||
| private fun AvklaringsbehovDto.sistEndretAv(): String? { | ||
| private fun AvklaringsbehovHendelseDto.sistEndretAv(): String? { | ||
| return endringer | ||
| .sortedByDescending { it.tidsstempel } | ||
| .filter { it.status == this.status } | ||
| .map { it.endretAv } | ||
| .firstOrNull() | ||
| } | ||
|
|
||
| fun BehandlingFlytStoppetHendelse.finnÅpentAvklaringsbehov() = avklaringsbehov.firstOrNull { | ||
| it.status in setOf( | ||
| Status.OPPRETTET, | ||
| Status.SENDT_TILBAKE_FRA_BESLUTTER, | ||
| Status.SENDT_TILBAKE_FRA_KVALITETSSIKRER | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.