-
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.
Lagt på kall til tilgang ved reservasjon og trukket ut felles reserva…
…sjonskode i egen service.
- Loading branch information
Showing
9 changed files
with
79 additions
and
58 deletions.
There are no files selected for viewing
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
2 changes: 1 addition & 1 deletion
2
api-kontrakt/src/main/kotlin/no/nav/aap/oppgave/FlyttOppgaveDto.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,6 +1,6 @@ | ||
package no.nav.aap.oppgave | ||
|
||
data class FlyttOppgaveDto( | ||
val oppgaveReferanseDto: OppgaveReferanseDto, | ||
val avklaringsbehovReferanse: AvklaringsbehovReferanseDto, | ||
val flyttTilIdent: String | ||
) |
7 changes: 2 additions & 5 deletions
7
api-kontrakt/src/main/kotlin/no/nav/aap/oppgave/plukk/NesteOppgaveDto.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,12 +1,9 @@ | ||
package no.nav.aap.oppgave.plukk | ||
|
||
import no.nav.aap.oppgave.AvklaringsbehovReferanseDto | ||
import no.nav.aap.oppgave.verdityper.OppgaveId | ||
import java.util.UUID | ||
|
||
data class NesteOppgaveDto( | ||
val oppgaveId: OppgaveId, | ||
val saksnummer: String?, | ||
val behandlingRef: UUID?, | ||
val journalpostId: Long?, | ||
val avklaringsbehovKode: String | ||
val avklaringsbehovReferanse: AvklaringsbehovReferanseDto, | ||
) |
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
32 changes: 32 additions & 0 deletions
32
app/src/main/kotlin/no/nav/aap/oppgave/plukk/ReserverOppgaveService.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 |
---|---|---|
@@ -0,0 +1,32 @@ | ||
package no.nav.aap.oppgave.plukk | ||
|
||
import no.nav.aap.komponenter.dbconnect.DBConnection | ||
import no.nav.aap.komponenter.httpklient.httpclient.tokenprovider.OidcToken | ||
import no.nav.aap.oppgave.AvklaringsbehovReferanseDto | ||
import no.nav.aap.oppgave.OppgaveRepository | ||
import no.nav.aap.oppgave.verdityper.OppgaveId | ||
import tilgang.Operasjon | ||
import tilgang.TilgangRequest | ||
|
||
class ReserverOppgaveService(val connection: DBConnection) { | ||
|
||
fun reserverOppgave(avklaringsbehovReferanse: AvklaringsbehovReferanseDto, ident: String, token: OidcToken): List<OppgaveId> { | ||
val oppgaveRepo = OppgaveRepository(connection) | ||
val oppgaverSomSkalReserveres = oppgaveRepo.hentOppgaver(avklaringsbehovReferanse) | ||
val tilgangRequest = TilgangRequest( | ||
saksnummer = avklaringsbehovReferanse.saksnummer, | ||
behandlingsreferanse = avklaringsbehovReferanse.referanse?.toString(), | ||
avklaringsbehovKode = avklaringsbehovReferanse.avklaringsbehovtype.kode, | ||
operasjon = Operasjon.SAKSBEHANDLE | ||
) | ||
if (TilgangGateway.harTilgang(tilgangRequest, token)) { | ||
val oppgaveRepo = OppgaveRepository(connection) | ||
oppgaverSomSkalReserveres.forEach { | ||
oppgaveRepo.reserverOppgave(OppgaveId(it.id), ident, ident) | ||
} | ||
return oppgaverSomSkalReserveres | ||
} | ||
return listOf() | ||
} | ||
|
||
} |
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