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.

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

Fjern overflødige felt fra refusjon #311

Merged
merged 1 commit into from
Oct 10, 2023

Conversation

bjerga
Copy link
Contributor

@bjerga bjerga commented Oct 9, 2023

No description provided.

@bjerga bjerga requested a review from a team as a code owner October 9, 2023 12:04
Comment on lines -46 to +55
// TODO gjør denne sjekken ved opprettelse
if (it.fullLønnIArbeidsgiverPerioden?.utbetalerFullLønn == true) {
it.copy(
fullLønnIArbeidsgiverPerioden = FullLonnIArbeidsgiverPerioden(
utbetalerFullLønn = true,
begrunnelse = null,
utbetalt = null
val request = Jackson.fromJson<InnsendingRequest>(call.receiveText())
.let {
// TODO gjør denne sjekken ved opprettelse
if (it.fullLønnIArbeidsgiverPerioden?.utbetalerFullLønn == true) {
it.copy(
fullLønnIArbeidsgiverPerioden = FullLonnIArbeidsgiverPerioden(
utbetalerFullLønn = true,
begrunnelse = null,
utbetalt = null
)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Endret bare indent. Trodde dette skulle vises bedre -.-

@@ -117,6 +126,91 @@ class InnsendingRouteKtTest : ApiTest() {
assertEquals(InnsendingResponse(Mock.forespoerselId).toJsonStr(InnsendingResponse.serializer()), response.bodyAsText())
}

@Test
fun `fjern ugyldige verdier ved utbetaling av full lønn i arbeisdgiverperioden`() = testApi {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Denne tester ikke endringen fra denne commiten, men testen mangla og var lik den andre, så da hev jeg den med.

@bjerga bjerga merged commit 37c2002 into main Oct 10, 2023
6 checks passed
@bjerga bjerga deleted the dev/fjern-overfloedige-refusjon-felt branch October 10, 2023 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants