diff --git a/src/main/kotlin/no/nav/familie/ef/mottak/repository/domain/FeltMap.kt b/src/main/kotlin/no/nav/familie/ef/mottak/repository/domain/FeltMap.kt index c1bb9a47..2da62e05 100644 --- a/src/main/kotlin/no/nav/familie/ef/mottak/repository/domain/FeltMap.kt +++ b/src/main/kotlin/no/nav/familie/ef/mottak/repository/domain/FeltMap.kt @@ -8,6 +8,7 @@ data class FeltMap( val label: String, @field:NotNull(message = "Verdiliste kan ikke være null") val verdiliste: List, + val pdfConfig: PdfConfig? = null, ) @JsonInclude(JsonInclude.Include.NON_NULL) @@ -18,3 +19,13 @@ data class VerdilisteElement( val verdiliste: List? = null, val alternativer: String? = null, ) + +data class PdfConfig( + val harInnholdsfortegnelse: Boolean, + val språk: Språk, +) + +enum class Språk { + NB, + EN, +} diff --git "a/src/main/kotlin/no/nav/familie/ef/mottak/service/S\303\270knadTilFeltMap.kt" "b/src/main/kotlin/no/nav/familie/ef/mottak/service/S\303\270knadTilFeltMap.kt" index e7788266..d6d72d06 100644 --- "a/src/main/kotlin/no/nav/familie/ef/mottak/service/S\303\270knadTilFeltMap.kt" +++ "b/src/main/kotlin/no/nav/familie/ef/mottak/service/S\303\270knadTilFeltMap.kt" @@ -92,7 +92,7 @@ object SøknadTilFeltMap { ), ) val vedleggMap = mapTilVedlegg(vedleggTitler, "Dokumenter vedlagt") - return FeltMap("Ettersending", listOf(infoMap, vedleggMap)) + return FeltMap("Ettersending", verdiliste = listOf(infoMap, vedleggMap)) } private fun finnFelter(entitet: Any): List { diff --git a/src/test/resources/json/pdf_generated_barnetilsyn.json b/src/test/resources/json/pdf_generated_barnetilsyn.json index 0738bf55..2ce34099 100644 --- a/src/test/resources/json/pdf_generated_barnetilsyn.json +++ b/src/test/resources/json/pdf_generated_barnetilsyn.json @@ -592,5 +592,6 @@ } ] } - ] + ], + "pdfConfig" : null } \ No newline at end of file diff --git a/src/test/resources/json/pdf_generated_barnetilsyn_med_typer.json b/src/test/resources/json/pdf_generated_barnetilsyn_med_typer.json index 82da98f8..f4e4aeb2 100644 --- a/src/test/resources/json/pdf_generated_barnetilsyn_med_typer.json +++ b/src/test/resources/json/pdf_generated_barnetilsyn_med_typer.json @@ -594,5 +594,6 @@ } ] } - ] + ], + "pdfConfig" : null } diff --git a/src/test/resources/json/pdf_generated_ettersending.json b/src/test/resources/json/pdf_generated_ettersending.json index 58df1d25..eca5ca1a 100644 --- a/src/test/resources/json/pdf_generated_ettersending.json +++ b/src/test/resources/json/pdf_generated_ettersending.json @@ -26,5 +26,6 @@ } ] } - ] + ], + "pdfConfig" : null } \ No newline at end of file diff --git a/src/test/resources/json/pdf_generated_ettersending_med_typer.json b/src/test/resources/json/pdf_generated_ettersending_med_typer.json index ce9ab53c..0b996c28 100644 --- a/src/test/resources/json/pdf_generated_ettersending_med_typer.json +++ b/src/test/resources/json/pdf_generated_ettersending_med_typer.json @@ -19,5 +19,6 @@ "label" : "Vedlegg", "verdi" : "Lærlingkontrakt\n\nUtgifter til pass av barn" } ] - } ] + } ], + "pdfConfig" : null } \ No newline at end of file diff --git "a/src/test/resources/json/pdf_generated_overgangsst\303\270nad.json" "b/src/test/resources/json/pdf_generated_overgangsst\303\270nad.json" index d036b290..65bbc277 100644 --- "a/src/test/resources/json/pdf_generated_overgangsst\303\270nad.json" +++ "b/src/test/resources/json/pdf_generated_overgangsst\303\270nad.json" @@ -620,5 +620,6 @@ } ] } - ] + ], + "pdfConfig" : null } \ No newline at end of file diff --git "a/src/test/resources/json/pdf_generated_overgangsst\303\270nad_med_typer.json" "b/src/test/resources/json/pdf_generated_overgangsst\303\270nad_med_typer.json" index c684c42b..7e876443 100644 --- "a/src/test/resources/json/pdf_generated_overgangsst\303\270nad_med_typer.json" +++ "b/src/test/resources/json/pdf_generated_overgangsst\303\270nad_med_typer.json" @@ -624,5 +624,6 @@ } ] } - ] + ], + "pdfConfig" : null } diff --git a/src/test/resources/json/pdf_generated_skolepenger.json b/src/test/resources/json/pdf_generated_skolepenger.json index 43cb3766..376c4cf1 100644 --- a/src/test/resources/json/pdf_generated_skolepenger.json +++ b/src/test/resources/json/pdf_generated_skolepenger.json @@ -386,5 +386,6 @@ } ] } - ] + ], + "pdfConfig" : null } \ No newline at end of file diff --git a/src/test/resources/json/pdf_generated_skolepenger_med_typer.json b/src/test/resources/json/pdf_generated_skolepenger_med_typer.json index 104ba8a6..cee29c53 100644 --- a/src/test/resources/json/pdf_generated_skolepenger_med_typer.json +++ b/src/test/resources/json/pdf_generated_skolepenger_med_typer.json @@ -271,5 +271,6 @@ "label" : "Vedlegg", "verdi" : "Utgifter til utdanning" } ] - } ] + } ], + "pdfConfig" : null } \ No newline at end of file