-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7e986b8
commit 0752242
Showing
20 changed files
with
230 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
apps/omsorgspengesoknad/src/app/api/endpoints/barnEndpoint.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
import { ISODateToDate } from '@navikt/sif-common-utils'; | ||
import { isObject, isString } from 'formik'; | ||
import { isArray } from 'lodash'; | ||
import { RegistrertBarn } from '../../types/RegistrertBarn'; | ||
import api, { ApiEndpoint } from '../api'; | ||
|
||
export interface BarnDTO { | ||
barn: Array<{ | ||
aktørId: string; | ||
fornavn: string; | ||
etternavn: string; | ||
mellomnavn?: string; | ||
fødselsdato: string; | ||
}>; | ||
} | ||
export const isValidRegistrertBarnResponse = (response: any): response is RegistrertBarn => { | ||
if ( | ||
isObject(response) && | ||
isString(response.aktørId) && | ||
isString(response.fornavn) && | ||
isString(response.etternavn) && | ||
isString(response.fødselsdato) | ||
) { | ||
return true; | ||
} else { | ||
return false; | ||
} | ||
}; | ||
|
||
const barnEndpoint = { | ||
fetch: async (): Promise<RegistrertBarn[]> => { | ||
const { data } = await api.get<BarnDTO>(ApiEndpoint.barn); | ||
const registrerteBarn: RegistrertBarn[] = []; | ||
|
||
let hasInvalidBarnRespons = false; | ||
if (data?.barn && isArray(data.barn)) { | ||
data.barn.forEach((barn) => { | ||
if (isValidRegistrertBarnResponse(barn)) { | ||
registrerteBarn.push({ | ||
...barn, | ||
fødselsdato: ISODateToDate(barn.fødselsdato), | ||
}); | ||
} else { | ||
hasInvalidBarnRespons = true; | ||
} | ||
}); | ||
} | ||
if (hasInvalidBarnRespons) { | ||
return Promise.reject('Invalid barn respons'); | ||
} | ||
return Promise.resolve(registrerteBarn); | ||
}, | ||
}; | ||
|
||
export default barnEndpoint; |
29 changes: 29 additions & 0 deletions
29
apps/omsorgspengesoknad/src/app/api/endpoints/søkerEndpoint.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
import { isValidSøkerResponse, Søker } from '../../types/Søker'; | ||
import api, { ApiEndpoint } from '../api'; | ||
|
||
type SøkerDTO = { | ||
etternavn: string; | ||
fornavn: string; | ||
mellomnavn?: string; | ||
kjønn: string; | ||
fødselsnummer: string; | ||
}; | ||
|
||
const søkerEndpoint = { | ||
fetch: async (): Promise<Søker> => { | ||
const { data } = await api.get<SøkerDTO>(ApiEndpoint.soker); | ||
if (!isValidSøkerResponse(data)) { | ||
return Promise.reject(`Invalid søkerdata`); | ||
} | ||
return Promise.resolve(data); | ||
}, | ||
fetchId: async (): Promise<string> => { | ||
const { data } = await api.get<SøkerDTO>(ApiEndpoint.soker); | ||
if (!isValidSøkerResponse(data)) { | ||
return Promise.reject(`Invalid søkerdata`); | ||
} | ||
return Promise.resolve(data.fødselsnummer); | ||
}, | ||
}; | ||
|
||
export default søkerEndpoint; |
3 changes: 1 addition & 2 deletions
3
apps/omsorgspengesoknad/src/app/api/endpoints/søknadStateEndpoint.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
apps/omsorgspengesoknad/src/app/hooks/useInnvilgedeVedtakForRegistrerteBarn.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
apps/omsorgspengesoknad/src/app/søknad/__tests__/søknadStepConfig.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
apps/omsorgspengesoknad/src/app/søknad/steps/oppsummering/parts/OmSøkerOppsummering.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
// export interface RegistrertBarn { | ||
// aktørId: string; | ||
// fornavn: string; | ||
// etternavn: string; | ||
// mellomnavn?: string; | ||
// fødselsdato: Date; | ||
// } | ||
export interface RegistrertBarn { | ||
aktørId: string; | ||
fornavn: string; | ||
etternavn: string; | ||
mellomnavn?: string; | ||
fødselsdato: Date; | ||
} |
Oops, something went wrong.