Skip to content

Expand mock #554

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

Merged
merged 3 commits into from
Mar 31, 2022
Merged

Expand mock #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b51f80
Expand mock controller flexibility.
oyvind-wedoe Mar 30, 2022
ba4513b
Allows more specific mock data creation.
oyvind-wedoe Mar 30, 2022
7255a91
Removes unnecessary default null.
oyvind-wedoe Mar 31, 2022
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
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ dependencies {

implementation("org.redundent:kotlin-xml-builder:$kotlinXmlBuilderVersion")

implementation("com.github.navikt:kabal-kodeverk:2022.03.02-15.01.6bc39524870d")
implementation("com.github.navikt:kabal-kodeverk:2022.03.30-09.20.c312bfe1af7a")

implementation("no.nav.security:token-validation-spring:$tokenValidationVersion")
implementation("no.nav.security:token-client-spring:$tokenValidationVersion")
Expand Down
65 changes: 25 additions & 40 deletions src/main/kotlin/no/nav/klage/oppgave/api/controller/MockDataController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ package no.nav.klage.oppgave.api.controller
import no.nav.klage.kodeverk.Type
import no.nav.klage.kodeverk.Ytelse
import no.nav.klage.kodeverk.hjemmel.Hjemmel
import no.nav.klage.kodeverk.hjemmel.ytelseTilHjemler
import no.nav.klage.oppgave.api.view.*
import no.nav.klage.oppgave.clients.saf.graphql.SafGraphQlClient
import no.nav.klage.oppgave.domain.klage.MottakDokumentType
import no.nav.klage.oppgave.service.MottakService
import no.nav.security.token.support.core.api.Unprotected
import org.springframework.context.annotation.Profile
import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.RequestBody
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RestController
import java.time.LocalDate
Expand Down Expand Up @@ -164,14 +166,18 @@ class MockDataController(

@Unprotected
@PostMapping("/randomklage")
fun sendInnRandomKlage(): MockDataResponse {
return createKlanke(Type.KLAGE)
fun sendInnRandomKlage(
@RequestBody(required = false) input: MockInput? = null
): MockDataResponse {
return createKlanke(Type.KLAGE, input)
}

@Unprotected
@PostMapping("/randomanke")
fun sendInnRandomAnke(): MockDataResponse {
return createKlanke(Type.ANKE)
fun sendInnRandomAnke(
@RequestBody(required = false) input: MockInput? = null
): MockDataResponse {
return createKlanke(Type.ANKE, input)
}

data class MockDataResponse(
Expand All @@ -181,7 +187,7 @@ class MockDataController(
val hjemmelId: String,
)

private fun createKlanke(type: Type): MockDataResponse {
private fun createKlanke(type: Type, input: MockInput?): MockDataResponse {
val dollyDoc = listOf(
SyntheticWithDoc("02446701749", "510534792"),
SyntheticWithDoc("29437117843", "510534815"),
Expand All @@ -202,55 +208,28 @@ class MockDataController(

val dato = LocalDate.of(Year.now().value - 1, (1..12).random(), (1..28).random())

val randomYtelse = listOf(
Ytelse.SYK_SYK,
// Ytelse.OMS_OLP,
// Ytelse.OMS_OMP,
// Ytelse.OMS_PLS,
// Ytelse.OMS_PSB
).random()
val randomYtelse = if (input == null) Ytelse.SYK_SYK else input.ytelse ?: ytelseTilHjemler.keys.random()
val klager = input?.klager ?: OversendtKlager(
id = OversendtPartId(OversendtPartIdType.PERSON, fnr)
)

val randomHjemmelList = if (randomYtelse == Ytelse.SYK_SYK) {
listOf(
listOf(
Hjemmel.FTRL_8_2,
Hjemmel.FTRL_8_3,
Hjemmel.FTRL_8_4,
Hjemmel.FTRL_8_8,
Hjemmel.FTRL_8_13,
)
.random()
)
} else {
listOf(
listOf(
Hjemmel.FTRL_8_13,
Hjemmel.FTRL_9_2,
Hjemmel.FTRL_9_3,
Hjemmel.FTRL_9_11,
Hjemmel.FTRL_9_14,
Hjemmel.FTRL_22_13
)
.random()
)
}
val sakenGjelder = input?.sakenGjelder

val behandling = mottakService.createMottakForKlageAnkeV3ForE2ETests(
OversendtKlageAnkeV3(
ytelse = randomYtelse,
type = type,
klager = OversendtKlager(
id = OversendtPartId(OversendtPartIdType.PERSON, fnr)
),
klager = klager,
fagsak = journalpost?.sak?.let {
OversendtSak(
fagsakId = it.fagsakId ?: "UKJENT",
fagsystem = KildeFagsystem.AO01
)
},
sakenGjelder = sakenGjelder,
kildeReferanse = UUID.randomUUID().toString(),
innsynUrl = "https://nav.no",
hjemler = randomHjemmelList,
hjemler = listOf(ytelseTilHjemler[randomYtelse]!!.random()),
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice :)

forrigeBehandlendeEnhet = "4295", //NAV Klageinstans nord
tilknyttedeJournalposter = listOf(
OversendtDokumentReferanse(
Expand Down Expand Up @@ -284,4 +263,10 @@ class MockDataController(
val fnr: String,
val journalpost: String
)

data class MockInput(
val ytelse: Ytelse?,
val klager: OversendtKlager?,
val sakenGjelder: OversendtSakenGjelder?,
)
}