diff --git a/src/state/api/utils.ts b/src/state/api/utils.ts index 7180af6e6..bf2ce7893 100644 --- a/src/state/api/utils.ts +++ b/src/state/api/utils.ts @@ -3,6 +3,7 @@ import { parse, format, parseISO } from 'date-fns' import { DATE_BACKEND_FORMAT, DATE_ENDUSER_FORMAT } from '@/utils/dates' import { formatInntektToNumber } from '@/utils/inntekt' import { isLoependeVedtakEndring } from '@/utils/loependeVedtak' +import { checkHarSamboer } from '@/utils/sivilstand' export const getSimuleringstypeFromRadioEllerVedtak = ( loependeVedtak: LoependeVedtak, @@ -152,7 +153,10 @@ export const generateAlderspensjonRequestBody = (args: { afp ), foedselsdato: format(parseISO(foedselsdato), DATE_BACKEND_FORMAT), - epsHarInntektOver2G: !!epsHarInntektOver2G, + epsHarInntektOver2G: + epsHarInntektOver2G === null + ? checkHarSamboer(sivilstand) + : epsHarInntektOver2G, epsHarPensjon: !!epsHarPensjon, aarligInntektFoerUttakBeloep: formatInntektToNumber( aarligInntektFoerUttakBeloep @@ -214,7 +218,10 @@ export const generateAlderspensjonEnkelRequestBody = (args: { afp ), foedselsdato: format(parseISO(foedselsdato), DATE_BACKEND_FORMAT), - epsHarInntektOver2G: !!epsHarInntektOver2G, + epsHarInntektOver2G: + epsHarInntektOver2G === null + ? checkHarSamboer(sivilstand) + : epsHarInntektOver2G, epsHarPensjon: !!epsHarPensjon, aarligInntektFoerUttakBeloep: formatInntektToNumber( aarligInntektFoerUttakBeloep diff --git a/src/utils/__tests__/sivilstand.test.ts b/src/utils/__tests__/sivilstand.test.ts index cf41c2f3b..9e1e73048 100644 --- a/src/utils/__tests__/sivilstand.test.ts +++ b/src/utils/__tests__/sivilstand.test.ts @@ -5,6 +5,7 @@ import { formatSivilstand, getSivilstandTekst, sivilstandOptions, + checkHarSamboer, } from '@/utils/sivilstand' describe('sivilstand-utils', () => { @@ -97,4 +98,21 @@ describe('sivilstand-utils', () => { expect(actual.every((it) => !it)).toBe(true) }) }) + + describe('checkHarSamboer', () => { + it('sivilstand er GIFT og gir true for harSamboer', () => { + const actual = checkHarSamboer('GIFT') + expect(actual).toBe(true) + }) + + it('sivilstand er UGIFT og gir false for harSamboer', () => { + const actual = checkHarSamboer('UGIFT') + expect(actual).toBe(false) + }) + + it('sivilstand er undefined og gir false for harSamboer', () => { + const actual = checkHarSamboer(undefined) + expect(actual).toBe(false) + }) + }) }) diff --git a/src/utils/sivilstand.ts b/src/utils/sivilstand.ts index 30b7cdc42..9f6d6bef6 100644 --- a/src/utils/sivilstand.ts +++ b/src/utils/sivilstand.ts @@ -5,6 +5,12 @@ export function isSivilstandUkjent(sivilstand?: Sivilstand): boolean { return ['UNKNOWN', 'UOPPGITT'].includes(sivilstand) } +export function checkHarSamboer(sivilstand?: Sivilstand | null): boolean { + if (!sivilstand) return false + const samboerSivilstander = ['SAMBOER', 'GIFT', 'REGISTRERT_PARTNER'] + return samboerSivilstander.includes(sivilstand) +} + export const sivilstandOptions = [ 'ENKE_ELLER_ENKEMANN', 'GIFT',