Skip to content
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.

Sign up for GitHub

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

Legg til flere tester for lagring av selvbestemt IM #579

Merged
merged 2 commits into from
Jun 27, 2024
Merged

Legg til flere tester for lagring av selvbestemt IM #579

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69093db
Legg til flere tester for lagring av selvbestemt IM
bjerga Jun 26, 2024
4b5cca1
Merge branch 'main' into sb-lagre-flere-tester
bjerga Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 22 additions & 26 deletions .../no/nav/helsearbeidsgiver/inntektsmelding/api/hentselvbestemtim/HentSelvbestemtImRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,32 +55,28 @@ fun Route.hentSelvbestemtImRoute(
) {
producer.publish(transaksjonId, selvbestemtId)

MdcUtils.withLogFields(
Log.transaksjonId(transaksjonId)
) {
Comment on lines -58 to -60
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fjernet denne. Loggfeltet blir allerede lagt til et par linjer lengre opp.

runCatching {
redisPoller.hent(transaksjonId)
}
.onSuccess {
val result = it.fromJson(ResultJson.serializer())
runCatching {
redisPoller.hent(transaksjonId)
}
.onSuccess {
val result = it.fromJson(ResultJson.serializer())

val inntektsmelding = result.success?.fromJson(Inntektsmelding.serializer())
val inntektsmelding = result.success?.fromJson(Inntektsmelding.serializer())

if (inntektsmelding != null) {
tilgangskontroll.validerTilgangTilOrg(call.request, inntektsmelding.avsender.orgnr.verdi)
sendOkResponse(inntektsmelding)
} else {
val feilmelding = result.failure
?.fromJson(String.serializer())
.orDefault("Ukjent feil.")
if (inntektsmelding != null) {
tilgangskontroll.validerTilgangTilOrg(call.request, inntektsmelding.avsender.orgnr.verdi)
sendOkResponse(inntektsmelding)
} else {
val feilmelding = result.failure
?.fromJson(String.serializer())
.orDefault("Ukjent feil.")

sendErrorResponse(feilmelding)
}
sendErrorResponse(feilmelding)
}
.onFailure {
sendRedisErrorResponse(selvbestemtId, it)
}
}
}
.onFailure {
sendRedisErrorResponse(selvbestemtId, it)
}
}
}
}
Expand All @@ -99,8 +95,8 @@ private suspend fun PipelineContext<Unit, ApplicationCall>.sendOkResponse(inntek

private suspend fun PipelineContext<Unit, ApplicationCall>.sendErrorResponse(feilmelding: String) {
"Klarte ikke hente inntektsmelding pga. feil.".also {
logger.info(it)
sikkerLogger.info("$it Feilmelding: '$feilmelding'")
logger.error(it)
sikkerLogger.error("$it Feilmelding: '$feilmelding'")
}
val response = ResultJson(
failure = HentSelvbestemtImResponseFailure(feilmelding).toJson(HentSelvbestemtImResponseFailure.serializer())
Expand All @@ -110,8 +106,8 @@ private suspend fun PipelineContext<Unit, ApplicationCall>.sendErrorResponse(fei

private suspend fun PipelineContext<Unit, ApplicationCall>.sendRedisErrorResponse(selvbestemtId: UUID, error: Throwable) {
"Klarte ikke hente inntektsmelding pga. feil i Redis.".also {
logger.info(it)
sikkerLogger.info(it, error)
logger.error(it)
sikkerLogger.error(it, error)
}
when (error) {
is RedisPollerTimeoutException -> {
Expand Down
6 changes: 2 additions & 4 deletions ...av/helsearbeidsgiver/inntektsmelding/api/inntektselvbestemt/InntektSelvbestemtProducer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import no.nav.helsearbeidsgiver.inntektsmelding.api.sikkerLogger
import no.nav.helsearbeidsgiver.utils.json.toJson
import no.nav.helsearbeidsgiver.utils.json.toPretty
import no.nav.helsearbeidsgiver.utils.log.MdcUtils
import no.nav.helsearbeidsgiver.utils.wrapper.Fnr
import no.nav.helsearbeidsgiver.utils.wrapper.Orgnr
import java.util.UUID

class InntektSelvbestemtProducer(
Expand All @@ -32,8 +30,8 @@ class InntektSelvbestemtProducer(
Key.EVENT_NAME to EventName.INNTEKT_SELVBESTEMT_REQUESTED.toJson(),
Key.UUID to transaksjonId.toJson(),
Key.DATA to "".toJson(),
Key.FNR to request.sykmeldtFnr.toJson(Fnr.serializer()),
Key.ORGNRUNDERENHET to request.orgnr.toJson(Orgnr.serializer()),
Key.FNR to request.sykmeldtFnr.toJson(),
Key.ORGNRUNDERENHET to request.orgnr.toJson(),
Key.SKJAERINGSTIDSPUNKT to request.inntektsdato.toJson()
)
.also { json ->
Expand Down
31 changes: 17 additions & 14 deletions ...o/nav/helsearbeidsgiver/inntektsmelding/api/lagreselvbestemtim/LagreSelvbestemtImRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package no.nav.helsearbeidsgiver.inntektsmelding.api.lagreselvbestemtim

import io.ktor.http.HttpStatusCode
import io.ktor.server.application.ApplicationCall
import io.ktor.server.application.call
import io.ktor.server.request.receiveText
Expand All @@ -26,9 +25,9 @@ import no.nav.helsearbeidsgiver.inntektsmelding.api.response.RedisTimeoutRespons
import no.nav.helsearbeidsgiver.inntektsmelding.api.response.UkjentErrorResponse
import no.nav.helsearbeidsgiver.inntektsmelding.api.response.ValideringErrorResponse
import no.nav.helsearbeidsgiver.inntektsmelding.api.sikkerLogger
import no.nav.helsearbeidsgiver.inntektsmelding.api.utils.respond
import no.nav.helsearbeidsgiver.inntektsmelding.api.utils.respondBadRequest
import no.nav.helsearbeidsgiver.inntektsmelding.api.utils.respondInternalServerError
import no.nav.helsearbeidsgiver.inntektsmelding.api.utils.respondOk
import no.nav.helsearbeidsgiver.utils.json.fromJson
import no.nav.helsearbeidsgiver.utils.json.parseJson
import no.nav.helsearbeidsgiver.utils.json.serializer.UuidSerializer
Expand All @@ -37,7 +36,6 @@ import no.nav.helsearbeidsgiver.utils.log.MdcUtils
import no.nav.helsearbeidsgiver.utils.pipe.orDefault
import java.util.UUID

// TODO test
fun Route.lagreSelvbestemtImRoute(
rapid: RapidsConnection,
tilgangskontroll: Tilgangskontroll,
Expand Down Expand Up @@ -78,12 +76,11 @@ fun Route.lagreSelvbestemtImRoute(

producer.publish(clientId, skjema, avsenderFnr)

runCatching {
val resultat = runCatching {
redisPoller.hent(clientId)
}
.let {
sendResponse(it)
}

sendResponse(resultat)
}
}
}
Expand Down Expand Up @@ -126,22 +123,28 @@ private suspend fun PipelineContext<Unit, ApplicationCall>.sendResponse(resultat
sikkerLogger.info(it)
}
}
respond(HttpStatusCode.OK, LagreSelvbestemtImResponse(selvbestemtId), LagreSelvbestemtImResponse.serializer())
respondOk(LagreSelvbestemtImResponse(selvbestemtId), LagreSelvbestemtImResponse.serializer())
} else {
val feilmelding = resultat.failure?.fromJson(String.serializer()).orDefault("Tomt resultat i Redis.")
logger.info("Fikk feil under mottagelse av selvbestemt inntektsmelding.")
sikkerLogger.info("Fikk feil under mottagelse av selvbestemt inntektsmelding: $feilmelding")

"Klarte ikke motta selvbestemt inntektsmelding pga. feil.".also {
logger.error(it)
sikkerLogger.error("$it Feilmelding: '$feilmelding'")
}

if ("Mangler arbeidsforhold i perioden" == feilmelding) {
respondBadRequest(ArbeidsforholdErrorResponse(), ArbeidsforholdErrorResponse.serializer())
} else {
respondInternalServerError(UkjentErrorResponse(), UkjentErrorResponse.serializer())
}
}
}
.onFailure {
logger.info("Klarte ikke hente resultat.")
sikkerLogger.info("Klarte ikke hente resultat.", it)
when (it) {
.onFailure { error ->
"Klarte ikke hente resultat fra Redis.".also {
logger.error(it)
sikkerLogger.error(it, error)
}
when (error) {
is RedisPollerTimeoutException ->
respondInternalServerError(RedisTimeoutResponse(), RedisTimeoutResponse.serializer())

Expand Down
2 changes: 1 addition & 1 deletion ...v/helsearbeidsgiver/inntektsmelding/api/hentselvbestemtim/HentSelvbestemtImRouteKtTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class HentSelvbestemtImRouteKtTest : ApiTest() {
}

@Test
fun `gi OK med inntektsmelding`() = testApi {
fun `gir OK med inntektsmelding`() = testApi {
val expectedInntektsmelding = mockInntektsmeldingV1()

coEvery { mockRedisPoller.hent(any()) } returnsMany listOf(
Expand Down
4 changes: 2 additions & 2 deletions ...elsearbeidsgiver/inntektsmelding/api/inntektselvbestemt/InntektSelvbestemtProducerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ class InntektSelvbestemtProducerTest : FunSpec({
Key.EVENT_NAME to EventName.INNTEKT_SELVBESTEMT_REQUESTED.toJson(),
Key.UUID to transaksjonId.toJson(),
Key.DATA to "".toJson(),
Key.FNR to sykmeldtFnr.toJson(Fnr.serializer()),
Key.ORGNRUNDERENHET to orgnr.toJson(Orgnr.serializer()),
Key.FNR to sykmeldtFnr.toJson(),
Key.ORGNRUNDERENHET to orgnr.toJson(),
Key.SKJAERINGSTIDSPUNKT to inntektsdato.toJson()
)
}
Expand Down
Loading