From 7ccf50868f5607f275eaddbb0455f0c26727ff04 Mon Sep 17 00:00:00 2001 From: abrha Date: Tue, 5 Dec 2023 12:51:11 +0100 Subject: [PATCH] [KAIZEN-0] Sende fnr som json objekt --- src/models/meldinger/meldinger.ts | 14 -------------- src/rest/resources/aktoridResource.tsx | 2 +- src/rest/resources/dialogResource.tsx | 2 +- src/rest/resources/foreldrepengerResource.tsx | 2 +- src/rest/resources/oppfolgingResource.tsx | 2 +- src/rest/resources/persondataResource.tsx | 2 +- src/rest/resources/pleiepengerResource.tsx | 2 +- src/rest/resources/sakstemaResource.tsx | 4 ++-- src/rest/resources/sykepengerResource.tsx | 2 +- src/rest/resources/tildelteoppgaverResource.tsx | 2 +- src/rest/resources/tilgangskontrollResource.tsx | 2 +- src/rest/resources/utbetalingerResource.tsx | 4 +++- src/rest/resources/varselResource.tsx | 2 +- 13 files changed, 15 insertions(+), 27 deletions(-) diff --git a/src/models/meldinger/meldinger.ts b/src/models/meldinger/meldinger.ts index a8b30458e..b63cfbde2 100644 --- a/src/models/meldinger/meldinger.ts +++ b/src/models/meldinger/meldinger.ts @@ -143,17 +143,3 @@ export interface SendMeldingRequestV2 { oppgaveId?: string; avsluttet?: boolean; } - -export interface SendMeldingRequestV2 { - fnr: string; - traadId?: string; - traadType: TraadType; - enhet: string; - fritekst: string; - sak?: JournalforingsSak; - temagruppe?: Temagruppe; - erOppgaveTilknyttetAnsatt?: boolean; - behandlingsId?: string; - oppgaveId?: string; - avsluttet?: boolean; -} diff --git a/src/rest/resources/aktoridResource.tsx b/src/rest/resources/aktoridResource.tsx index 70abd9376..7232e658d 100644 --- a/src/rest/resources/aktoridResource.tsx +++ b/src/rest/resources/aktoridResource.tsx @@ -19,7 +19,7 @@ const resource = { useFetch(fnr: string): UseQueryResult { const { isOn } = useFeatureToggle(FeatureToggles.IkkeFnrIPath); - return useQuery(queryKey(fnr), () => (isOn ? post(urlUtenFnrIPath(), fnr) : get(url(fnr)))); + return useQuery(queryKey(fnr), () => (isOn ? post(urlUtenFnrIPath(), { fnr }) : get(url(fnr)))); } }; export default resource; diff --git a/src/rest/resources/dialogResource.tsx b/src/rest/resources/dialogResource.tsx index 9d433b385..f2eea4f04 100644 --- a/src/rest/resources/dialogResource.tsx +++ b/src/rest/resources/dialogResource.tsx @@ -40,7 +40,7 @@ export const resource = { const { isOn } = useFeatureToggle(FeatureToggles.IkkeFnrIPath); return useQuery(this.queryKey(fnr, enhetId), () => - isOn ? post(urlUtenFnrIPath(enhetId), fnr) : get(url(fnr, enhetId)) + isOn ? post(urlUtenFnrIPath(enhetId), { fnr }) : get(url(fnr, enhetId)) ); }, useRenderer(renderer: RendererOrConfig) { diff --git a/src/rest/resources/foreldrepengerResource.tsx b/src/rest/resources/foreldrepengerResource.tsx index f1a89baae..4e234cc6e 100644 --- a/src/rest/resources/foreldrepengerResource.tsx +++ b/src/rest/resources/foreldrepengerResource.tsx @@ -21,7 +21,7 @@ const resource = { const fnr = useFodselsnummer(); const { isOn } = useFeatureToggle(FeatureToggles.IkkeFnrIPath); - return useQuery(queryKey(fnr), () => (isOn ? post(urlV2(), fnr) : get(url(fnr)))); + return useQuery(queryKey(fnr), () => (isOn ? post(urlV2(), { fnr }) : get(url(fnr)))); } }; export default resource; diff --git a/src/rest/resources/oppfolgingResource.tsx b/src/rest/resources/oppfolgingResource.tsx index ecc9887eb..7daa78e8d 100644 --- a/src/rest/resources/oppfolgingResource.tsx +++ b/src/rest/resources/oppfolgingResource.tsx @@ -37,7 +37,7 @@ const resource = { useFetch(): UseQueryResult { const [fnr, periode] = useReduxData(); const { isOn } = useFeatureToggle(FeatureToggles.IkkeFnrIPath); - return useQuery(queryKey(fnr), () => (isOn ? post(urlUtenFnrIPath(periode), fnr) : get(url(fnr, periode)))); + return useQuery(queryKey(fnr), () => (isOn ? post(urlUtenFnrIPath(periode), { fnr }) : get(url(fnr, periode)))); }, useRenderer(renderer: RendererOrConfig) { const response = this.useFetch(); diff --git a/src/rest/resources/persondataResource.tsx b/src/rest/resources/persondataResource.tsx index a53da5a3e..20ac7b08e 100644 --- a/src/rest/resources/persondataResource.tsx +++ b/src/rest/resources/persondataResource.tsx @@ -21,7 +21,7 @@ const resource = { useFetch(): UseQueryResult { const fnr = useFodselsnummer(); const { isOn } = useFeatureToggle(FeatureToggles.IkkeFnrIPath); - return useQuery(queryKey(fnr), () => (isOn ? post(urlUtenFnrIPath(), fnr) : get(url(fnr)))); + return useQuery(queryKey(fnr), () => (isOn ? post(urlUtenFnrIPath(), { fnr }) : get(url(fnr)))); } }; export default resource; diff --git a/src/rest/resources/pleiepengerResource.tsx b/src/rest/resources/pleiepengerResource.tsx index 32ebc75ff..5d8652877 100644 --- a/src/rest/resources/pleiepengerResource.tsx +++ b/src/rest/resources/pleiepengerResource.tsx @@ -24,7 +24,7 @@ const resource = { const { isOn } = useFeatureToggle(FeatureToggles.IkkeFnrIPath); - return useQuery(queryKey(fnr), () => (isOn ? post(urlV2(), fnr) : get(url(fnr)))); + return useQuery(queryKey(fnr), () => (isOn ? post(urlV2(), { fnr }) : get(url(fnr)))); } }; export default resource; diff --git a/src/rest/resources/sakstemaResource.tsx b/src/rest/resources/sakstemaResource.tsx index 639224bbd..c8a0bfe63 100644 --- a/src/rest/resources/sakstemaResource.tsx +++ b/src/rest/resources/sakstemaResource.tsx @@ -58,7 +58,7 @@ const resource = { let fetchFn = () => get(url(fnr, enhet)); if (isOn) { - fetchFn = () => post(urlUtenFnrIPath(enhet), fnr); + fetchFn = () => post(urlUtenFnrIPath(enhet), { fnr }); } return useQuery(queryKey(fnr, enhet), fetchFn); @@ -77,7 +77,7 @@ export const sakstemaResourceV2 = { let fetchFn = () => get(urlV2(fnr, enhet)); if (isOn) { - fetchFn = () => post(urlUtenFnrIPathV2(enhet), fnr); + fetchFn = () => post(urlUtenFnrIPathV2(enhet), { fnr }); } return useQuery(queryKeyV2(fnr, enhet), fetchFn); diff --git a/src/rest/resources/sykepengerResource.tsx b/src/rest/resources/sykepengerResource.tsx index 52a1842b9..0b6770109 100644 --- a/src/rest/resources/sykepengerResource.tsx +++ b/src/rest/resources/sykepengerResource.tsx @@ -22,7 +22,7 @@ const resource = { const { isOn } = useFeatureToggle(FeatureToggles.IkkeFnrIPath); - return useQuery(queryKey(fnr), () => (isOn ? post(urlV2(), fnr) : get(url(fnr)))); + return useQuery(queryKey(fnr), () => (isOn ? post(urlV2(), { fnr }) : get(url(fnr)))); } }; export default resource; diff --git a/src/rest/resources/tildelteoppgaverResource.tsx b/src/rest/resources/tildelteoppgaverResource.tsx index 47c042442..ef98aac2b 100644 --- a/src/rest/resources/tildelteoppgaverResource.tsx +++ b/src/rest/resources/tildelteoppgaverResource.tsx @@ -31,7 +31,7 @@ const resource = { const fnr = useFodselsnummer(); const { isOn } = useFeatureToggle(FeatureToggles.IkkeFnrIPath); - return useQuery(queryKey(fnr), () => (isOn ? post(urlUtenFnrIPath(), fnr) : get(url(fnr)))); + return useQuery(queryKey(fnr), () => (isOn ? post(urlUtenFnrIPath(), { fnr }) : get(url(fnr)))); }, useRenderer(renderer: RendererOrConfig) { const response = this.useFetch(); diff --git a/src/rest/resources/tilgangskontrollResource.tsx b/src/rest/resources/tilgangskontrollResource.tsx index b04edd9e1..962d5a41b 100644 --- a/src/rest/resources/tilgangskontrollResource.tsx +++ b/src/rest/resources/tilgangskontrollResource.tsx @@ -61,7 +61,7 @@ const resource = { const fnr = useGjeldendeBruker(); const enhet = useValgtenhet().enhetId; const { isOn } = useFeatureToggle(FeatureToggles.IkkeFnrIPath); - return useQuery(queryKey(fnr), () => (isOn ? post(urlV2(enhet), fnr) : get(url(fnr, enhet)))); + return useQuery(queryKey(fnr), () => (isOn ? post(urlV2(enhet), { fnr }) : get(url(fnr, enhet)))); }, useRenderer(renderer: RendererOrConfig) { const response = this.useFetch(); diff --git a/src/rest/resources/utbetalingerResource.tsx b/src/rest/resources/utbetalingerResource.tsx index 345cabe67..b62349af8 100644 --- a/src/rest/resources/utbetalingerResource.tsx +++ b/src/rest/resources/utbetalingerResource.tsx @@ -57,7 +57,9 @@ const resource = { const { isOn } = useFeatureToggle(FeatureToggles.IkkeFnrIPath); - return useQuery(queryKey(fnr, limit30Dager), () => (isOn ? post(urlV2(periode), fnr) : get(url(fnr, periode)))); + return useQuery(queryKey(fnr, limit30Dager), () => + isOn ? post(urlV2(periode), { fnr }) : get(url(fnr, periode)) + ); }, useOversiktRenderer(renderer: RendererOrConfig) { const response = this.useFetch(true); diff --git a/src/rest/resources/varselResource.tsx b/src/rest/resources/varselResource.tsx index db26b5141..37899c9c0 100644 --- a/src/rest/resources/varselResource.tsx +++ b/src/rest/resources/varselResource.tsx @@ -22,7 +22,7 @@ const resource = { const fnr = useFodselsnummer(); const { isOn } = useFeatureToggle(FeatureToggles.IkkeFnrIPath); - return useQuery(queryKey(fnr), () => (isOn ? post(urlV2(), fnr) : get(url(fnr)))); + return useQuery(queryKey(fnr), () => (isOn ? post(urlV2(), { fnr }) : get(url(fnr)))); } }; export default resource;