Merge pull request #14 from navikt/dev/v1

Tilpasser til ny versjon av lps-api

Author: mortenbyhring

lps-client-backend/src/main/kotlin/no/nav/helsearbeidsgiver/lps/LpsClient.kt

@@ -12,12 +12,12 @@ import no.nav.helsearbeidsgiver.maskinporten.MaskinportenService
 import no.nav.helsearbeidsgiver.maskinporten.createHttpClient
 import no.nav.helsearbeidsgiver.utils.logger
 
-private const val LPS_API_ENDPOINT = "https://sykepenger-im-lps-api.ekstern.dev.nav.no/"
+private const val LPS_API_ENDPOINT = "https://sykepenger-im-lps-api.ekstern.dev.nav.no/v1/"
 
 class LpsClient(
     var maskinportenService: MaskinportenService,
 ) {
-    suspend fun hentInntektsmeldinger(consumerOrgNr: String): List<Inntektsmelding> {
+    suspend fun hentInntektsmeldinger(consumerOrgNr: String): List<InnsendtInntektsmelding> {
         val fetchNewAccessToken =
             maskinportenService.getMaskinportenTokenForOrgNr(consumerOrgNr).fetchNewAccessToken()
         val response =
@@ -26,7 +26,7 @@ class LpsClient(
                 bearerAuth(fetchNewAccessToken.tokenResponse.accessToken)
                 contentType(ContentType.Application.Json)
             }
-        return response.body<List<Inntektsmelding>>()
+        return response.body<List<InnsendtInntektsmelding>>()
     }
 
     suspend fun filtrerInntektsmeldinger(

lps-client-backend/src/main/kotlin/no/nav/helsearbeidsgiver/lps/LpsSchema.kt

@@ -7,62 +7,72 @@ import kotlinx.serialization.UseSerializers
 import kotlinx.serialization.json.JsonObject
 import no.nav.helsearbeidsgiver.utils.LocalDateSerializer
 import no.nav.helsearbeidsgiver.utils.LocalDateTimeSerializer
+import java.time.LocalDate
 import java.time.LocalDateTime
 
+@Serializable
+data class Forespoersel(
+    val forespoersel_id: String,
+    val orgnr: String,
+    val fnr: String,
+    val status: Status,
+    val sykmeldingsperioder: List<Periode>,
+    val egenmeldingsperioder: List<Periode>,
+    val arbeidsgiverperiode_paakrevd: Boolean,
+    val inntekt_paakrevd: Boolean,
+)
+
+@Serializable
+enum class Status {
+    AKTIV,
+    MOTTATT,
+    FORKASTET,
+}
+
+enum class Type {
+    KOMPLETT,
+    BEGRENSET,
+}
+
 @Serializable
 data class ForespoerselRequest(
     val fnr: String? = null,
-    val forespoerselId: String? = null,
+    val forespoersel_id: String? = null,
     val status: Status? = null,
 )
 
 @Serializable
 data class ForespoerselResponse(
-    val antallForespoersler: Int,
-    val forespoerseler: List<Forespoersel>,
+    val antall: Int,
+    val forespoersler: List<Forespoersel>,
+)
+
+@Serializable
+data class Periode(
+    val fom: LocalDate,
+    val tom: LocalDate,
 )
 
 @Serializable
-data class Inntektsmelding(
+data class InnsendtInntektsmelding(
     val dokument: JsonObject,
     val orgnr: String,
     val fnr: String,
-    val foresporselid: String?,
-    val innsendt: String,
-    val mottattEvent: String,
+    val foresporsel_id: String?,
+    val innsendt_tid: String,
+    val mottatt_tid: String,
 )
 
 @Serializable
 data class InntektsmeldingRequest(
     val fnr: String? = null,
-    val foresporselid: String? = null,
-    val datoFra: LocalDateTime? = null,
-    val datoTil: LocalDateTime? = null,
+    val foresporsel_id: String? = null,
+    val fra_dato: LocalDateTime? = null,
+    val til_dato: LocalDateTime? = null,
 )
 
 @Serializable
 data class InntektsmeldingResponse(
-    val antallInntektsmeldinger: Int = 0,
-    val inntektsmeldinger: List<Inntektsmelding>,
+    val antall: Int = 0,
+    val inntektsmeldinger: List<InnsendtInntektsmelding>,
 )
-
-@Serializable
-data class Forespoersel(
-    val forespoerselId: String,
-    val orgnr: String,
-    val fnr: String,
-    val status: Status,
-    val dokument: JsonObject,
-)
-
-@Serializable
-enum class Status {
-    AKTIV,
-    MOTTATT,
-    FORKASTET,
-}
-
-enum class Type {
-    KOMPLETT,
-    BEGRENSET,
-}