Erstatt manuelle post fetchers med felles funksjon

Author: betsytraran

apps/dolly-frontend/src/main/js/src/api/index.ts

@@ -35,9 +35,9 @@ export const multiFetcherInst = (miljoUrlListe, headers = null, path = null) =>
 		),
 	)
 
-export const postFetcher = (url, body) =>
+export const postFetcher = (url, body, headers = { 'Content-Type': 'application/json' }) =>
 	axios
-		.post(url, body, { headers: { 'Content-Type': 'application/json' } })
+		.post(url, body, { headers: headers })
 		.then((res) => {
 			if (res.status === 404) {
 				return null

apps/dolly-frontend/src/main/js/src/utils/hooks/useKelvin.tsx

@@ -1,5 +1,5 @@
 import useSWR from 'swr'
-import axios from 'axios'
+import { postFetcher } from '@/api'
 
 const kelvinAapBaseUrl = '/testnav-dolly-proxy/kelvin-aap/api/test/'
 
@@ -8,25 +8,7 @@ export const useKelvinAapBehandlingStatus = (ident: string, harKelvinAapBestilli
 
 	const { data, isLoading, error } = useSWR<any, Error>(
 		shouldFetch ? [`${kelvinAapBaseUrl}behandlingStatus`, ident] : null,
-		async ([url, ident]: [string, string]) => {
-			try {
-				const res = await axios.post(
-					url,
-					{ ident },
-					{
-						headers: {
-							'Content-Type': 'application/json',
-						},
-					},
-				)
-				return res.data
-			} catch (e: unknown) {
-				if (axios.isAxiosError(e) && e.response?.status === 404) {
-					return null
-				}
-				throw e
-			}
-		},
+		([url, ident]: [string, string]) => postFetcher(url, { ident }),
 		{ errorRetryCount: 0, revalidateOnFocus: false },
 	)
 

apps/dolly-frontend/src/main/js/src/utils/hooks/useNom.tsx

@@ -1,26 +1,15 @@
 import useSWR from 'swr'
-import axios from 'axios'
+import { postFetcher } from '@/api'
 
 const baseUrl = '/testnav-nom-proxy'
 
 export const useNomData = (ident: string) => {
 	const { data, isLoading, error } = useSWR<any, Error>(
 		ident ? [`${baseUrl}/api/v1/dolly/hentRessurs`, ident] : null,
-		async ([url, identValue]: [string, string]) => {
-			try {
-				const res = await axios.post(url, identValue, {
-					headers: {
-						'Content-Type': 'text/plain',
-					},
-				})
-				return res.data
-			} catch (e: any) {
-				if (axios.isAxiosError(e) && e.response?.status === 404) {
-					return null
-				}
-				throw e
-			}
-		},
+		([url, identValue]: [string, string]) =>
+			postFetcher(url, identValue, {
+				'Content-Type': 'text/plain',
+			}),
 		{ errorRetryCount: 0, revalidateOnFocus: false },
 	)
 

apps/dolly-frontend/src/main/js/src/utils/hooks/useSkattekort.tsx

@@ -1,8 +1,7 @@
 import useSWR from 'swr'
-import axios from 'axios'
+import { postFetcher } from '@/api'
 
-const skattekortUrl = (miljoe: string) =>
-	`/testnav-dolly-proxy/skattekort/${miljoe}/api/v1/person`
+const skattekortUrl = (miljoe: string) => `/testnav-dolly-proxy/skattekort/${miljoe}/api/v1/person`
 
 const SKATTEKORT_MILJOER = ['q1', 'q2']
 
@@ -71,25 +70,8 @@ const SKATTEKORT_KODEVERK: Record<string, Record<string, string>> = {
 	},
 }
 
-const fetchSkattekortFromMiljoe = async (miljoe: string, fnr: string) => {
-	try {
-		const res = await axios.post(
-			`${skattekortUrl(miljoe)}/hent-skattekort`,
-			{ fnr },
-			{
-				headers: {
-					'Content-Type': 'application/json',
-				},
-			},
-		)
-		return res.data || []
-	} catch (e: unknown) {
-		if (axios.isAxiosError(e) && e.response?.status === 404) {
-			return []
-		}
-		throw e
-	}
-}
+const fetchSkattekortFromMiljoe = async (miljoe: string, fnr: string) =>
+	postFetcher(`${skattekortUrl(miljoe)}/hent-skattekort`, { fnr })
 
 interface MiljoSkattekortData {
 	miljo: string