Bedre feilhåndtering hvis fil ikke finnes og lagt til hjelper for å h…

…ente dagens dato
navikt · Nov 21, 2023 · 2e53334 · 2e53334
1 parent e30ad45
commit 2e53334
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/kotlin/no/nav/pdfgen/core/Environment.kt b/src/main/kotlin/no/nav/pdfgen/core/Environment.kt
@@ -80,7 +80,8 @@ data class PDFGenResource(val path: String) {
         val filePath = filename?.let { _path.resolve(it) } ?: _path
         log.trace { "Reading file from path $filePath. File exists on path = ${filePath.exists()}" }
         return if (filePath.exists()) filePath
-        else Path.of(Environment::class.java.classLoader.getResource(filePath.pathString)!!.toURI())
+        else Environment::class.java.classLoader.getResource(filePath.pathString)?.let{
+            Path.of(it.toURI()) } ?: throw RuntimeException("Could not find file at path $filePath")
     }
 }
 

diff --git a/src/main/kotlin/no/nav/pdfgen/core/template/Helpers.kt b/src/main/kotlin/no/nav/pdfgen/core/template/Helpers.kt
@@ -10,6 +10,7 @@ import no.nav.pdfgen.core.domain.Periode
 import no.nav.pdfgen.core.domain.PeriodeMapper
 import no.nav.pdfgen.core.objectMapper
 import java.time.LocalDate
+import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
 import java.util.Locale
@@ -384,6 +385,17 @@ fun registerNavHelpers(
             "stringify",
             Helper<Any> { value, _ -> objectMapper.writeValueAsString(value) },
         )
+
+        registerHelper(
+            "now",
+            Helper<Any> { _, _ -> LocalDateTime.now().toString()}
+        )
+
+        registerHelper(
+            "now_date",
+            Helper<Any> { _, _ -> LocalDate.now().toString()}
+        )
+
         additionalHelpers.forEach { (t, u) -> registerHelper(t, u) }
     }
 }