-
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.
Deler opp flyten i forskjellige steg (#26)
Deler opp flyten i forskjellige steg Mulighet for å stoppe på et gitt steg og tilrettelegger for å kunne gjenoppta kjøring fra et gitt steg. Resultat lagres mellom hvert steg slik at man ikke ruller tilbake mer enn gjeldende steg ved eventuelle feil.
- Loading branch information
1 parent
c760487
commit d4b7570
Showing
22 changed files
with
493 additions
and
27 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
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
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
11 changes: 11 additions & 0 deletions
11
app/src/main/kotlin/no/nav/aap/brev/domene/ProsesseringStatus.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,11 @@ | ||
| package no.nav.aap.brev.domene | ||
|
|
||
| enum class ProsesseringStatus { | ||
| STARTET, | ||
| INNHOLD_HENTET, | ||
| FAKTAGRUNNLAG_HENTET, | ||
| BREV_FERDIGSTILT, | ||
| JOURNALFORT, | ||
| DISTRIBUERT, | ||
| FERDIG | ||
| } |
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
59 changes: 48 additions & 11 deletions
59
app/src/main/kotlin/no/nav/aap/brev/prosessering/ProsesserStegService.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,25 +1,62 @@ | ||
| package no.nav.aap.brev.prosessering | ||
|
|
||
| import no.nav.aap.brev.BrevbestillingRepository | ||
| import no.nav.aap.brev.BrevbestillingRepositoryImpl | ||
| import no.nav.aap.brev.domene.BrevbestillingReferanse | ||
| import no.nav.aap.brev.innhold.BrevinnholdGateway | ||
| import no.nav.aap.brev.domene.ProsesseringStatus | ||
| import no.nav.aap.brev.prosessering.steg.DistribuerJournalpostSteg | ||
| import no.nav.aap.brev.prosessering.steg.FerdigSteg | ||
| import no.nav.aap.brev.prosessering.steg.FerdigstillBrevSteg | ||
| import no.nav.aap.brev.prosessering.steg.HentFaktagrunnlagSteg | ||
| import no.nav.aap.brev.prosessering.steg.HentInnholdSteg | ||
| import no.nav.aap.brev.prosessering.steg.JournalførBrevSteg | ||
| import no.nav.aap.brev.prosessering.steg.StarterSteg | ||
| import no.nav.aap.brev.prosessering.steg.Steg | ||
| import no.nav.aap.komponenter.dbconnect.DBConnection | ||
| import org.slf4j.LoggerFactory | ||
|
|
||
| class ProsesserStegService( | ||
| private val brevbestillingRepository: BrevbestillingRepository, | ||
| private val brevinnholdGateway: BrevinnholdGateway, | ||
| private val connection: DBConnection | ||
| ) { | ||
|
|
||
| companion object { | ||
| fun konstruer(connection: DBConnection): ProsesserStegService { | ||
| return ProsesserStegService(connection) | ||
| } | ||
| } | ||
|
|
||
| private val log = LoggerFactory.getLogger(ProsesserStegService::class.java) | ||
| private val brevbestillingRepository = BrevbestillingRepositoryImpl(connection) | ||
|
|
||
| private val flyt = ProsesseringFlyt.Builder() | ||
| .med(steg = StarterSteg, utfall = ProsesseringStatus.STARTET) | ||
| .med(steg = HentInnholdSteg, utfall = ProsesseringStatus.INNHOLD_HENTET) | ||
| .med(steg = HentFaktagrunnlagSteg, utfall = ProsesseringStatus.FAKTAGRUNNLAG_HENTET) | ||
| .med(steg = FerdigstillBrevSteg, utfall = ProsesseringStatus.BREV_FERDIGSTILT) | ||
| .med(steg = JournalførBrevSteg, utfall = ProsesseringStatus.JOURNALFORT) | ||
| .med(steg = DistribuerJournalpostSteg, utfall = ProsesseringStatus.DISTRIBUERT) | ||
| .med(steg = FerdigSteg, utfall = ProsesseringStatus.FERDIG) | ||
| .build() | ||
|
|
||
| data class Kontekst(val referanse: BrevbestillingReferanse) | ||
| fun prosesserBestilling(referanse: BrevbestillingReferanse) { | ||
|
|
||
| fun prosesserBestilling(kontekst: Kontekst) { | ||
| val referanse = kontekst.referanse | ||
| val bestilling = brevbestillingRepository.hent(referanse) | ||
| val stegene = flyt.fraStatus(bestilling.prosesseringStatus) | ||
|
|
||
| if (stegene.isEmpty()) { | ||
| log.warn("Forsøkte å prosessere bestilling uten flere steg og status ${bestilling.prosesseringStatus}.") | ||
| return | ||
| } | ||
|
|
||
| stegene.forEach { steg -> | ||
| val stegResultat = steg.konstruer(connection).utfør(Steg.Kontekst(referanse)) | ||
|
|
||
| if (stegResultat == Steg.Resultat.STOPP) { | ||
| return | ||
| } | ||
|
|
||
| log.info("Henter brevinnhold for bestillingsreferanse=$referanse") | ||
| val brev = brevinnholdGateway.hentBrevmal(bestilling.brevtype, bestilling.språk) | ||
| brevbestillingRepository.oppdaterProsesseringStatus(referanse, flyt.utfall(steg)) | ||
|
|
||
| brevbestillingRepository.oppdaterBrev(referanse, brev) | ||
| connection.markerSavepoint() | ||
| } | ||
| } | ||
| } | ||
| } |
57 changes: 57 additions & 0 deletions
57
app/src/main/kotlin/no/nav/aap/brev/prosessering/ProsesseringFlyt.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,57 @@ | ||
| package no.nav.aap.brev.prosessering | ||
|
|
||
| import no.nav.aap.brev.domene.ProsesseringStatus | ||
| import no.nav.aap.brev.prosessering.steg.Steg | ||
|
|
||
| class ProsesseringFlyt private constructor( | ||
| private val rekkefølge: List<Steg>, | ||
| private val stegTilUtfall: HashMap<Steg, ProsesseringStatus>, | ||
| private val utfallTilSteg: HashMap<ProsesseringStatus, Steg>, | ||
| ) { | ||
|
|
||
| fun fraStatus(prosesseringStatus: ProsesseringStatus?): List<Steg> { | ||
| if (prosesseringStatus == null) { | ||
| return rekkefølge | ||
| } | ||
| val stegForUtfall = utfallTilSteg[prosesseringStatus] | ||
| ?: throw IllegalStateException("Uforventet oppslag av udefinert steg for status $prosesseringStatus") | ||
| return rekkefølge.dropWhile { it != stegForUtfall }.drop(1) | ||
| } | ||
|
|
||
| fun utfall(steg: Steg): ProsesseringStatus { | ||
| return stegTilUtfall[steg] | ||
| ?: throw IllegalStateException("Uforventet oppslag av udefinert utfall for steg $steg") | ||
| } | ||
|
|
||
| class Builder { | ||
| private val rekkefølge = mutableListOf<Steg>() | ||
| private val stegTilUtfall = mutableMapOf<Steg, ProsesseringStatus>() | ||
| private val utfallTilSteg = mutableMapOf<ProsesseringStatus, Steg>() | ||
|
|
||
| fun med(steg: Steg, utfall: ProsesseringStatus): Builder { | ||
| if (rekkefølge.contains(steg)) { | ||
| throw IllegalArgumentException("Steg $steg er allerede lagt til.") | ||
| } | ||
| if (utfallTilSteg.keys.contains(utfall)) { | ||
| throw IllegalArgumentException("Utfall $utfall er allerede lagt til.") | ||
| } | ||
| rekkefølge.add(steg) | ||
| stegTilUtfall.put(steg, utfall) | ||
| utfallTilSteg.put(utfall, steg) | ||
|
|
||
| return this | ||
| } | ||
|
|
||
| fun build(): ProsesseringFlyt { | ||
| if (rekkefølge.isEmpty()) { | ||
| throw IllegalStateException("Ingen steg å prosessere.") | ||
| } | ||
|
|
||
| return ProsesseringFlyt( | ||
| rekkefølge = rekkefølge, | ||
| stegTilUtfall = HashMap(stegTilUtfall), | ||
| utfallTilSteg = HashMap(utfallTilSteg), | ||
| ) | ||
| } | ||
| } | ||
| } |
18 changes: 18 additions & 0 deletions
18
app/src/main/kotlin/no/nav/aap/brev/prosessering/steg/DistribuerJournalpostSteg.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,18 @@ | ||
| package no.nav.aap.brev.prosessering.steg | ||
|
|
||
| import no.nav.aap.komponenter.dbconnect.DBConnection | ||
| import org.slf4j.LoggerFactory | ||
|
|
||
| class DistribuerJournalpostSteg() : Steg.Utfører { | ||
| private val log = LoggerFactory.getLogger(DistribuerJournalpostSteg::class.java) | ||
| override fun utfør(kontekst: Steg.Kontekst): Steg.Resultat { | ||
| log.info("DistribuerJournalpostSteg") | ||
| return Steg.Resultat.FULLFØRT | ||
| } | ||
|
|
||
| companion object : Steg { | ||
| override fun konstruer(connection: DBConnection): Steg.Utfører { | ||
| return DistribuerJournalpostSteg() | ||
| } | ||
| } | ||
| } |
18 changes: 18 additions & 0 deletions
18
app/src/main/kotlin/no/nav/aap/brev/prosessering/steg/FerdigSteg.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,18 @@ | ||
| package no.nav.aap.brev.prosessering.steg | ||
|
|
||
| import no.nav.aap.komponenter.dbconnect.DBConnection | ||
| import org.slf4j.LoggerFactory | ||
|
|
||
| class FerdigSteg() : Steg.Utfører { | ||
| private val log = LoggerFactory.getLogger(FerdigSteg::class.java) | ||
| override fun utfør(kontekst: Steg.Kontekst): Steg.Resultat { | ||
| log.info("Prosessering er ferdig.") | ||
| return Steg.Resultat.FULLFØRT | ||
| } | ||
|
|
||
| companion object : Steg { | ||
| override fun konstruer(connection: DBConnection): Steg.Utfører { | ||
| return FerdigSteg() | ||
| } | ||
| } | ||
| } |
18 changes: 18 additions & 0 deletions
18
app/src/main/kotlin/no/nav/aap/brev/prosessering/steg/FerdigstillBrevSteg.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,18 @@ | ||
| package no.nav.aap.brev.prosessering.steg | ||
|
|
||
| import no.nav.aap.komponenter.dbconnect.DBConnection | ||
| import org.slf4j.LoggerFactory | ||
|
|
||
| class FerdigstillBrevSteg() : Steg.Utfører { | ||
| private val log = LoggerFactory.getLogger(FerdigstillBrevSteg::class.java) | ||
| override fun utfør(kontekst: Steg.Kontekst): Steg.Resultat { | ||
| log.info("FerdigstillBrevSteg") | ||
| return Steg.Resultat.FULLFØRT | ||
| } | ||
|
|
||
| companion object : Steg { | ||
| override fun konstruer(connection: DBConnection): Steg.Utfører { | ||
| return FerdigstillBrevSteg() | ||
| } | ||
| } | ||
| } |
18 changes: 18 additions & 0 deletions
18
app/src/main/kotlin/no/nav/aap/brev/prosessering/steg/HentFaktagrunnlagSteg.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,18 @@ | ||
| package no.nav.aap.brev.prosessering.steg | ||
|
|
||
| import no.nav.aap.komponenter.dbconnect.DBConnection | ||
| import org.slf4j.LoggerFactory | ||
|
|
||
| class HentFaktagrunnlagSteg() : Steg.Utfører { | ||
| private val log = LoggerFactory.getLogger(HentFaktagrunnlagSteg::class.java) | ||
| override fun utfør(kontekst: Steg.Kontekst): Steg.Resultat { | ||
| log.info("HentFaktagrunnlagSteg") | ||
| return Steg.Resultat.FULLFØRT | ||
| } | ||
|
|
||
| companion object : Steg { | ||
| override fun konstruer(connection: DBConnection): Steg.Utfører { | ||
| return HentFaktagrunnlagSteg() | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.