-
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
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
47a4cc5
commit 7de87f2
Showing
18 changed files
with
306 additions
and
17 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
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
103 changes: 95 additions & 8 deletions
103
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,112 @@ | ||
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.brev.prosessering.steg.StegResultat | ||
import no.nav.aap.brev.prosessering.steg.StegUtfører | ||
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 | ||
) { | ||
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(kontekst: Kontekst) { | ||
|
||
val referanse = kontekst.referanse | ||
val bestilling = brevbestillingRepository.hent(referanse) | ||
|
||
log.info("Henter brevinnhold for bestillingsreferanse=$referanse") | ||
val brev = brevinnholdGateway.hentBrevmal(bestilling.brevtype, bestilling.språk) | ||
prosesserTilStop( | ||
kontekst = StegUtfører.Kontekst(referanse), | ||
stegene = flyt.fraStatus(bestilling.prosesseringStatus), | ||
) | ||
} | ||
|
||
private fun prosesserTilStop(kontekst: StegUtfører.Kontekst, stegene: List<Steg>) { | ||
stegene.forEach { steg -> | ||
val stegResultat = steg.konstruer(connection).utfør(kontekst) | ||
|
||
if (stegResultat == StegResultat.STOPP) { | ||
return | ||
} | ||
|
||
brevbestillingRepository.oppdaterProsesseringStatus(kontekst.referanse, flyt.utfall(steg)) | ||
|
||
connection.markerSavepoint() | ||
} | ||
} | ||
|
||
} | ||
|
||
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 IllegalStateException("Steg $steg er allerede lagt til: $rekkefølge") | ||
} | ||
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.") | ||
} | ||
|
||
brevbestillingRepository.oppdaterBrev(referanse, brev) | ||
return ProsesseringFlyt( | ||
rekkefølge = rekkefølge, | ||
stegTilUtfall = HashMap(stegTilUtfall), | ||
utfallTilSteg = HashMap(utfallTilSteg), | ||
) | ||
} | ||
} | ||
} | ||
} |
19 changes: 19 additions & 0 deletions
19
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,19 @@ | ||
package no.nav.aap.brev.prosessering.steg | ||
|
||
import no.nav.aap.brev.prosessering.steg.StegUtfører.Kontekst | ||
import no.nav.aap.komponenter.dbconnect.DBConnection | ||
import org.slf4j.LoggerFactory | ||
|
||
class DistribuerJournalpostSteg() : StegUtfører { | ||
private val log = LoggerFactory.getLogger(DistribuerJournalpostSteg::class.java) | ||
override fun utfør(kontekst: Kontekst): StegResultat { | ||
log.info("DistribuerJournalpostSteg") | ||
return StegResultat.FULLFØRT | ||
} | ||
|
||
companion object : Steg { | ||
override fun konstruer(connection: DBConnection): StegUtfører { | ||
return DistribuerJournalpostSteg() | ||
} | ||
} | ||
} |
19 changes: 19 additions & 0 deletions
19
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,19 @@ | ||
package no.nav.aap.brev.prosessering.steg | ||
|
||
import no.nav.aap.brev.prosessering.steg.StegUtfører.Kontekst | ||
import no.nav.aap.komponenter.dbconnect.DBConnection | ||
import org.slf4j.LoggerFactory | ||
|
||
class FerdigSteg() : StegUtfører { | ||
private val log = LoggerFactory.getLogger(FerdigSteg::class.java) | ||
override fun utfør(kontekst: Kontekst): StegResultat { | ||
log.info("Prosessering er ferdig.") | ||
return StegResultat.FULLFØRT | ||
} | ||
|
||
companion object : Steg { | ||
override fun konstruer(connection: DBConnection): StegUtfører { | ||
return FerdigSteg() | ||
} | ||
} | ||
} |
19 changes: 19 additions & 0 deletions
19
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,19 @@ | ||
package no.nav.aap.brev.prosessering.steg | ||
|
||
import no.nav.aap.brev.prosessering.steg.StegUtfører.Kontekst | ||
import no.nav.aap.komponenter.dbconnect.DBConnection | ||
import org.slf4j.LoggerFactory | ||
|
||
class FerdigstillBrevSteg() : StegUtfører { | ||
private val log = LoggerFactory.getLogger(FerdigstillBrevSteg::class.java) | ||
override fun utfør(kontekst: Kontekst): StegResultat { | ||
log.info("FerdigstillBrevSteg") | ||
return StegResultat.FULLFØRT | ||
} | ||
|
||
companion object : Steg { | ||
override fun konstruer(connection: DBConnection): StegUtfører { | ||
return FerdigstillBrevSteg() | ||
} | ||
} | ||
} |
19 changes: 19 additions & 0 deletions
19
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,19 @@ | ||
package no.nav.aap.brev.prosessering.steg | ||
|
||
import no.nav.aap.brev.prosessering.steg.StegUtfører.Kontekst | ||
import no.nav.aap.komponenter.dbconnect.DBConnection | ||
import org.slf4j.LoggerFactory | ||
|
||
class HentFaktagrunnlagSteg() : StegUtfører { | ||
private val log = LoggerFactory.getLogger(HentFaktagrunnlagSteg::class.java) | ||
override fun utfør(kontekst: Kontekst): StegResultat { | ||
log.info("HentFaktagrunnlagSteg") | ||
return StegResultat.FULLFØRT | ||
} | ||
|
||
companion object : Steg { | ||
override fun konstruer(connection: DBConnection): StegUtfører { | ||
return HentFaktagrunnlagSteg() | ||
} | ||
} | ||
} |
35 changes: 35 additions & 0 deletions
35
app/src/main/kotlin/no/nav/aap/brev/prosessering/steg/HentInnholdSteg.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,35 @@ | ||
package no.nav.aap.brev.prosessering.steg | ||
|
||
import no.nav.aap.brev.BrevbestillingRepository | ||
import no.nav.aap.brev.BrevbestillingRepositoryImpl | ||
import no.nav.aap.brev.innhold.BrevinnholdGateway | ||
import no.nav.aap.brev.innhold.SanityBrevinnholdGateway | ||
import no.nav.aap.brev.prosessering.steg.StegUtfører.Kontekst | ||
import no.nav.aap.komponenter.dbconnect.DBConnection | ||
import org.slf4j.LoggerFactory | ||
|
||
class HentInnholdSteg( | ||
private val brevinnholdGateway: BrevinnholdGateway, | ||
private val brevbestillingRepository: BrevbestillingRepository | ||
) : StegUtfører { | ||
private val log = LoggerFactory.getLogger(HentInnholdSteg::class.java) | ||
override fun utfør(kontekst: Kontekst): StegResultat { | ||
log.info("Henter brevinnhold for bestillingsreferanse=${kontekst.referanse}") | ||
|
||
val bestilling = brevbestillingRepository.hent(kontekst.referanse) | ||
val brev = brevinnholdGateway.hentBrevmal(bestilling.brevtype, bestilling.språk) | ||
|
||
brevbestillingRepository.oppdaterBrev(bestilling.referanse, brev) | ||
|
||
return StegResultat.FULLFØRT | ||
} | ||
|
||
companion object : Steg { | ||
override fun konstruer(connection: DBConnection): StegUtfører { | ||
return HentInnholdSteg( | ||
brevinnholdGateway = SanityBrevinnholdGateway(), | ||
brevbestillingRepository = BrevbestillingRepositoryImpl(connection), | ||
) | ||
} | ||
} | ||
} |
19 changes: 19 additions & 0 deletions
19
app/src/main/kotlin/no/nav/aap/brev/prosessering/steg/JournalførBrevSteg.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,19 @@ | ||
package no.nav.aap.brev.prosessering.steg | ||
|
||
import no.nav.aap.brev.prosessering.steg.StegUtfører.Kontekst | ||
import no.nav.aap.komponenter.dbconnect.DBConnection | ||
import org.slf4j.LoggerFactory | ||
|
||
class JournalførBrevSteg() : StegUtfører { | ||
private val log = LoggerFactory.getLogger(JournalførBrevSteg::class.java) | ||
override fun utfør(kontekst: Kontekst): StegResultat { | ||
log.info("JournalførBrevSteg") | ||
return StegResultat.FULLFØRT | ||
} | ||
|
||
companion object : Steg { | ||
override fun konstruer(connection: DBConnection): StegUtfører { | ||
return JournalførBrevSteg() | ||
} | ||
} | ||
} |
19 changes: 19 additions & 0 deletions
19
app/src/main/kotlin/no/nav/aap/brev/prosessering/steg/StarterSteg.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,19 @@ | ||
package no.nav.aap.brev.prosessering.steg | ||
|
||
import no.nav.aap.brev.prosessering.steg.StegUtfører.Kontekst | ||
import no.nav.aap.komponenter.dbconnect.DBConnection | ||
import org.slf4j.LoggerFactory | ||
|
||
class StarterSteg() : StegUtfører { | ||
private val log = LoggerFactory.getLogger(StarterSteg::class.java) | ||
override fun utfør(kontekst: Kontekst): StegResultat { | ||
log.info("Prosessering har startet.") | ||
return StegResultat.FULLFØRT | ||
} | ||
|
||
companion object : Steg { | ||
override fun konstruer(connection: DBConnection): StegUtfører { | ||
return StarterSteg() | ||
} | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
app/src/main/kotlin/no/nav/aap/brev/prosessering/steg/Steg.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,7 @@ | ||
package no.nav.aap.brev.prosessering.steg | ||
|
||
import no.nav.aap.komponenter.dbconnect.DBConnection | ||
|
||
sealed interface Steg { | ||
fun konstruer(connection: DBConnection): StegUtfører | ||
} |
Oops, something went wrong.