-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
EY-2433: Flytte adopsjonslogikken over til etterlatte-kodebasen #188
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
8827aca
Å konvertere frå etterlattes element-modell til brevbaker-modell gjer…
madsop-nav 2dfe075
Meir high cohesion, low coupling ved å trekkje ut spesifikke request-…
madsop-nav 8eec59b
EY-2433: Teksten med info om klage er oppdatert i malen, så oppdatere…
madsop-nav ba98d25
EY-2433: Adopsjonsmalen treng ikkje å vera så spesiell lell, den kan …
madsop-nav File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
60 changes: 60 additions & 0 deletions
60
...vbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/ElementTilBrevbakerkonvertering.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,60 @@ | ||
| package no.nav.pensjon.etterlatte.maler | ||
|
|
||
| import no.nav.pensjon.brev.template.Language | ||
| import no.nav.pensjon.brev.template.LanguageSupport | ||
| import no.nav.pensjon.brev.template.dsl.OutlineOnlyScope | ||
| import no.nav.pensjon.brev.template.dsl.expression.equalTo | ||
| import no.nav.pensjon.brev.template.dsl.textExpr | ||
| import no.nav.pensjon.etterlatte.maler.ManueltBrevDTOSelectors.ElementSelectors.children | ||
| import no.nav.pensjon.etterlatte.maler.ManueltBrevDTOSelectors.ElementSelectors.type | ||
| import no.nav.pensjon.etterlatte.maler.ManueltBrevDTOSelectors.InnerElementSelectors.children | ||
| import no.nav.pensjon.etterlatte.maler.ManueltBrevDTOSelectors.InnerElementSelectors.text | ||
| import no.nav.pensjon.etterlatte.maler.ManueltBrevDTOSelectors.innhold | ||
|
|
||
| fun <T : Language> OutlineOnlyScope<LanguageSupport.Single<T>, ManueltBrevDTO>.konverterElementerTilBrevbakerformat( | ||
| spraak: T, | ||
| ) { | ||
| forEach(innhold) { element -> | ||
| showIf(element.type.equalTo(ManueltBrevDTO.ElementType.HEADING_TWO)) { | ||
| forEach(element.children) { inner -> | ||
| title1 { | ||
| ifNotNull(inner.text) { | ||
| textExpr(spraak to it) | ||
| } | ||
| } | ||
| } | ||
| }.orShowIf(element.type.equalTo(ManueltBrevDTO.ElementType.HEADING_THREE)) { | ||
| forEach(element.children) { inner -> | ||
| title2 { | ||
| ifNotNull(inner.text) { | ||
| textExpr(spraak to it) | ||
| } | ||
| } | ||
| } | ||
| }.orShowIf(element.type.equalTo(ManueltBrevDTO.ElementType.PARAGRAPH)) { | ||
| paragraph { | ||
| forEach(element.children) { inner -> | ||
| ifNotNull(inner.text) { | ||
| textExpr(spraak to it) | ||
| } | ||
| } | ||
| } | ||
| }.orShowIf(element.type.equalTo(ManueltBrevDTO.ElementType.BULLETED_LIST)) { | ||
| paragraph { | ||
| list { | ||
| forEach(element.children) { inner -> | ||
| item { | ||
| ifNotNull(inner.children) { | ||
| forEach(it) { inner2 -> | ||
| ifNotNull(inner2.text) { text -> | ||
| textExpr(spraak to text) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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
54 changes: 0 additions & 54 deletions
54
...brevbaker/src/main/kotlin/no/nav/pensjon/etterlatte/maler/fraser/barnepensjon/Adopsjon.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
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Vet ikke om jeg er helt fan av å dra DTOer inn i Brevmalen 🤔
Men samtidig synes jeg det fort blir mye rot med alt i en fil (
EtterlatteBrev.kt)... Kanskje heller opprtte nye filer for DTOene og la det som er felles forbli i EtterlatteBrev? Bare en tankeThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Skal røske litt meir i det her når eg tar neste runde på omgjøring av farskap snart, så ser på det da. Trur eg liker tanken på eiga fil per DTO 🤔