[KAIZEN-0] optional fom og tom dato til ytelser filter

navikt · Sep 16, 2024 · afa1cc9 · afa1cc9
1 parent b622132
commit afa1cc9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 36 deletions.
diff --git a/proxy/src/main/java/no/nav/modiapersonoversiktproxy/rest/Utils.kt b/proxy/src/main/java/no/nav/modiapersonoversiktproxy/rest/Utils.kt
@@ -3,7 +3,6 @@ package no.nav.modiapersonoversiktproxy.rest
 import kotlinx.serialization.Serializable
 import org.joda.time.format.DateTimeFormat
 import java.time.format.DateTimeFormatter
-import java.time.format.DateTimeFormatterBuilder
 
 @Serializable
 data class RequestBodyContent(
@@ -14,10 +13,3 @@ data class RequestBodyContent(
 
 val JODA_DATOFORMAT: org.joda.time.format.DateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd")
 val DATOFORMAT: DateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE
-val DATO_TID_FORMAT: DateTimeFormatter =
-    DateTimeFormatterBuilder()
-        .append(DateTimeFormatter.ISO_LOCAL_DATE)
-        .appendLiteral("T")
-        .appendPattern("HH:mm:ss")
-        .appendOffsetId()
-        .toFormatter()
diff --git a/...rc/main/java/no/nav/modiapersonoversikt/consumer/arenainfotrygdproxy/ArenaInfotrygdApi.kt b/...rc/main/java/no/nav/modiapersonoversikt/consumer/arenainfotrygdproxy/ArenaInfotrygdApi.kt
@@ -29,20 +29,20 @@ interface ArenaInfotrygdApi {
 
     fun hentSykepenger(
         fnr: String,
-        fom: String,
-        tom: String,
+        fom: String?,
+        tom: String?,
     ): Map<String, Any?>
 
     fun hentForeldrepenger(
         fnr: String,
-        fom: String,
-        tom: String,
+        fom: String?,
+        tom: String?,
     ): Map<String, Any?>
 
     fun hentPleiepenger(
         fnr: String,
-        fom: String,
-        tom: String,
+        fom: String?,
+        tom: String?,
     ): Map<String, Any?>
 
     fun hentOppfolgingssakFraArena(fnr: String): JournalforingSak?
@@ -87,8 +87,8 @@ open class ArenaInfotrygdApiImpl(
     @Cacheable(value = ["sykePengerCache"])
     override fun hentSykepenger(
         fnr: String,
-        fom: String,
-        tom: String,
+        fom: String?,
+        tom: String?,
     ): Map<String, Any?> {
         val requestContent = Json.encodeToString(RequestBodyContent(fnr, fom, tom))
         return sendRequest("sykepenger", requestContent) ?: mapOf()
@@ -97,8 +97,8 @@ open class ArenaInfotrygdApiImpl(
     @Cacheable(value = ["foreldrePengerCache"])
     override fun hentForeldrepenger(
         fnr: String,
-        fom: String,
-        tom: String,
+        fom: String?,
+        tom: String?,
     ): Map<String, Any?> {
         val requestContent = Json.encodeToString(RequestBodyContent(fnr, fom, tom))
         return sendRequest("foreldrepenger", requestContent) ?: mapOf()
@@ -107,8 +107,8 @@ open class ArenaInfotrygdApiImpl(
     @Cacheable(value = ["pleiePengerCache"])
     override fun hentPleiepenger(
         fnr: String,
-        fom: String,
-        tom: String,
+        fom: String?,
+        tom: String?,
     ): Map<String, Any?> {
         val requestContent = Json.encodeToString(RequestBodyContent(fnr, fom, tom))
         return sendRequest("pleiepenger", requestContent) ?: mapOf()

diff --git a/web/src/main/java/no/nav/modiapersonoversikt/consumer/tiltakspenger/TiltakspengerService.kt b/web/src/main/java/no/nav/modiapersonoversikt/consumer/tiltakspenger/TiltakspengerService.kt
@@ -14,8 +14,8 @@ import org.springframework.cache.annotation.Cacheable
 interface TiltakspengerService {
     fun hentVedtakDetaljer(
         fodselsnummer: Fnr,
-        fom: String,
-        tom: String,
+        fom: String?,
+        tom: String?,
     ): List<Vedtak>
 }
 
@@ -27,8 +27,8 @@ open class TiltakspengerServiceImpl(
     @Cacheable
     override fun hentVedtakDetaljer(
         fodselsnummer: Fnr,
-        fom: String,
-        tom: String,
+        fom: String?,
+        tom: String?,
     ): List<Vedtak> = tiltakspengerApi.vedtakDetaljerPost(vedtakReqDTO = VedtakReqDTO(ident = fodselsnummer.get(), fom, tom)).orEmpty()
 
     override fun ping() =

diff --git a/web/src/main/java/no/nav/modiapersonoversikt/rest/Utils.kt b/web/src/main/java/no/nav/modiapersonoversikt/rest/Utils.kt
@@ -1,15 +1,5 @@
 package no.nav.modiapersonoversikt.rest
 
 import org.joda.time.format.DateTimeFormat
-import java.time.format.DateTimeFormatter
-import java.time.format.DateTimeFormatterBuilder
 
 val JODA_DATOFORMAT: org.joda.time.format.DateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd")
-val DATOFORMAT: DateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE
-val DATO_TID_FORMAT: DateTimeFormatter =
-    DateTimeFormatterBuilder()
-        .append(DateTimeFormatter.ISO_LOCAL_DATE)
-        .appendLiteral("T")
-        .appendPattern("HH:mm:ss")
-        .appendOffsetId()
-        .toFormatter()
diff --git a/web/src/main/java/no/nav/modiapersonoversikt/rest/common/FnrRequest.kt b/web/src/main/java/no/nav/modiapersonoversikt/rest/common/FnrRequest.kt
@@ -6,6 +6,6 @@ data class FnrRequest(
 
 data class FnrDatoRangeRequest(
     val fnr: String,
-    val fom: String,
-    val tom: String,
+    val fom: String? = null,
+    val tom: String? = null,
 )