From b3a548b48bb6fdea7d8a329d0b062da428550bce Mon Sep 17 00:00:00 2001
From: Jesper Paulsen <jesper.gayosso.paulsen@nav.no>
Date: Mon, 11 Dec 2023 12:29:36 +0100
Subject: [PATCH] [KAIZEN-0] Oppdatere v2 paths

---
 .../FortsettDialogContainer.tsx               |  2 +-
 .../fortsettDialog/useOpprettHenvendelse.tsx  |  2 +-
 .../sendMelding/SendNyMeldingContainer.tsx    |  2 +-
 src/mock/dialoger/sf-dialoger-mock.ts         | 10 +++++-----
 src/mock/index.ts                             | 19 +++++++++++++++++--
 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       |  2 +-
 src/rest/resources/sykepengerResource.tsx     |  2 +-
 .../resources/tildelteoppgaverResource.tsx    |  2 +-
 .../resources/tilgangskontrollResource.tsx    |  2 +-
 src/rest/resources/utbetalingerResource.tsx   |  2 +-
 src/rest/resources/varselResource.tsx         |  6 +++---
 17 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogContainer.tsx b/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogContainer.tsx
index f40470059..b742db193 100644
--- a/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogContainer.tsx
+++ b/src/app/personside/dialogpanel/fortsettDialog/FortsettDialogContainer.tsx
@@ -142,7 +142,7 @@ function FortsettDialogContainer(props: Props) {
             oppgaveId: oppgaveId,
             avsluttet: state.avsluttet
         };
-        const url = isOn ? `${apiBaseUri}/dialog/sendmelding` : `${apiBaseUri}/dialog/${fnr}/sendmelding`;
+        const url = isOn ? `${apiBaseUri}/v2/dialog/sendmelding` : `${apiBaseUri}/dialog/${fnr}/sendmelding`;
 
         if (FortsettDialogValidator.erGyldigSamtalereferat(state)) {
             setDialogStatus({ type: DialogPanelStatus.POSTING });
diff --git a/src/app/personside/dialogpanel/fortsettDialog/useOpprettHenvendelse.tsx b/src/app/personside/dialogpanel/fortsettDialog/useOpprettHenvendelse.tsx
index b2726772f..24ce1a76b 100644
--- a/src/app/personside/dialogpanel/fortsettDialog/useOpprettHenvendelse.tsx
+++ b/src/app/personside/dialogpanel/fortsettDialog/useOpprettHenvendelse.tsx
@@ -49,7 +49,7 @@ function useOpprettHenvendelse(traad: Traad): OpprettHenvendelseReturns {
         };
 
         const request = isOn ? opprettHenvendelseRequestV2 : opprettHenvendelseRequest;
-        const url = isOn ? `${apiBaseUri}/dialog/fortsett/opprett` : `${apiBaseUri}/dialog/${fnr}/fortsett/opprett`;
+        const url = isOn ? `${apiBaseUri}/v2/dialog/fortsett/opprett` : `${apiBaseUri}/dialog/${fnr}/fortsett/opprett`;
         postWithConflictVerification(
             url,
             request,
diff --git a/src/app/personside/dialogpanel/sendMelding/SendNyMeldingContainer.tsx b/src/app/personside/dialogpanel/sendMelding/SendNyMeldingContainer.tsx
index d716ad471..f72a55e9c 100644
--- a/src/app/personside/dialogpanel/sendMelding/SendNyMeldingContainer.tsx
+++ b/src/app/personside/dialogpanel/sendMelding/SendNyMeldingContainer.tsx
@@ -125,7 +125,7 @@ function SendNyMeldingContainer(props: Props) {
             enhet: valgtEnhet,
             fritekst: state.tekst
         };
-        const url = isOn ? `${apiBaseUri}/dialog/sendmelding` : `${apiBaseUri}/dialog/${fnr}/sendmelding`;
+        const url = isOn ? `${apiBaseUri}/v2/dialog/sendmelding` : `${apiBaseUri}/dialog/${fnr}/sendmelding`;
 
         if (MeldingValidator.erGyldigReferat(state) && state.tema) {
             const temagruppe = state.tema;
diff --git a/src/mock/dialoger/sf-dialoger-mock.ts b/src/mock/dialoger/sf-dialoger-mock.ts
index e7d987402..71914fece 100644
--- a/src/mock/dialoger/sf-dialoger-mock.ts
+++ b/src/mock/dialoger/sf-dialoger-mock.ts
@@ -68,7 +68,7 @@ function simulateSf(trader: Traad[]): Traad[] {
 
 function setupOpprettHenvendelseMock(mock: FetchMock) {
     mock.post(
-        apiBaseUri + '/dialog/fortsett/opprett',
+        apiBaseUri + '/v2/dialog/fortsett/opprett',
         withDelayedResponse(randomDelay(), STATUS_OK, (request) =>
             meldingerBackendMock.opprettHenvendelse(request.body)
         )
@@ -77,7 +77,7 @@ function setupOpprettHenvendelseMock(mock: FetchMock) {
 
 function setupSendMeldingMock(mock: FetchMock) {
     mock.post(
-        apiBaseUri + '/dialog/sendmelding',
+        apiBaseUri + '/v2/dialog/sendmelding',
         withDelayedResponse(randomDelay() * 2, STATUS_OK, (request) => {
             return meldingerBackendMock.sendMelding(request.body);
         })
@@ -86,18 +86,18 @@ function setupSendMeldingMock(mock: FetchMock) {
 
 function merkFeilsendtMock(mock: FetchMock) {
     mock.post(
-        apiBaseUri + '/dialogmerking/feilsendt',
+        apiBaseUri + '/v2/dialogmerking/feilsendt',
         withDelayedResponse(randomDelay(), STATUS_OK, () => ({}))
     );
 }
 
 function sladdingMock(mock: FetchMock) {
     mock.post(
-        apiBaseUri + '/dialogmerking/sladding',
+        apiBaseUri + '/v2/dialogmerking/sladding',
         withDelayedResponse(randomDelay(), STATUS_OK, () => ({}))
     );
     mock.get(
-        apiBaseUri + '/dialogmerking/sladdearsaker/:kjedeId',
+        apiBaseUri + '/v2/dialogmerking/sladdearsaker/:kjedeId',
         withDelayedResponse(randomDelay(), STATUS_OK, () => [
             'Sendt til feil bruker',
             'Innholder sensitiv informasjon',
diff --git a/src/mock/index.ts b/src/mock/index.ts
index 883d5b1e7..c991e622a 100644
--- a/src/mock/index.ts
+++ b/src/mock/index.ts
@@ -89,7 +89,7 @@ function setupTilgangskontroll(mock: FetchMock) {
 
 function setupPersondataMock(mock: FetchMock) {
     mock.post(
-        apiBaseUri + '/v2/person',
+        apiBaseUri + '/v3/person',
         withDelayedResponse(
             randomDelay(),
             fodselsNummerErGyldigStatus,
@@ -100,7 +100,7 @@ function setupPersondataMock(mock: FetchMock) {
 
 function setupAktorIdMock(mock: FetchMock) {
     mock.post(
-        apiBaseUri + '/v2/person/aktorid',
+        apiBaseUri + '/v3/person/aktorid',
         withDelayedResponse(
             randomDelay(),
             fodselsNummerErGyldigStatus,
@@ -137,6 +137,20 @@ function setupSaksoversiktV2Mock(mock: FetchMock) {
     );
 }
 
+function setupSaksoversiktV3Mock(mock: FetchMock) {
+    mock.post(
+        apiBaseUri + '/v2/saker/v2/sakstema',
+        verify(
+            harEnhetIdSomQueryParam,
+            withDelayedResponse(
+                randomDelay(),
+                fodselsNummerErGyldigStatus,
+                mockGeneratorMedFodselsnummer(getMockSaksoversiktV2)
+            )
+        )
+    );
+}
+
 function setupUtbetalingerMock(mock: FetchMock) {
     mock.get(
         apiBaseUri + '/utbetaling/:fodselsnummer',
@@ -351,6 +365,7 @@ setupPersondataMock(mock);
 setupTilgangskontroll(mock);
 setupSaksoversiktMock(mock);
 setupSaksoversiktV2Mock(mock);
+setupSaksoversiktV3Mock(mock);
 setupUtbetalingerMock(mock);
 setupSykepengerMock(mock);
 setupForeldrepengerMock(mock);
diff --git a/src/rest/resources/aktoridResource.tsx b/src/rest/resources/aktoridResource.tsx
index 7232e658d..0e1356066 100644
--- a/src/rest/resources/aktoridResource.tsx
+++ b/src/rest/resources/aktoridResource.tsx
@@ -12,7 +12,7 @@ function url(fnr: String) {
 }
 
 function urlUtenFnrIPath() {
-    return `${apiBaseUri}/v2/person/aktorid`;
+    return `${apiBaseUri}/v3/person/aktorid`;
 }
 
 const resource = {
diff --git a/src/rest/resources/dialogResource.tsx b/src/rest/resources/dialogResource.tsx
index f2eea4f04..09f040fec 100644
--- a/src/rest/resources/dialogResource.tsx
+++ b/src/rest/resources/dialogResource.tsx
@@ -18,7 +18,7 @@ function url(fnr: string, enhet: string | undefined): string {
 
 function urlUtenFnrIPath(enhet?: string) {
     const header = enhet ? `?enhet=${enhet}` : '';
-    return `${apiBaseUri}/dialog/meldinger/${header}`;
+    return `${apiBaseUri}/v2/dialog/meldinger/${header}`;
 }
 
 const defaults: DefaultConfig = {
diff --git a/src/rest/resources/foreldrepengerResource.tsx b/src/rest/resources/foreldrepengerResource.tsx
index 4e234cc6e..59e64f3af 100644
--- a/src/rest/resources/foreldrepengerResource.tsx
+++ b/src/rest/resources/foreldrepengerResource.tsx
@@ -14,7 +14,7 @@ function url(fnr: string): string {
 }
 
 function urlV2(): string {
-    return `${apiBaseUri}/ytelse/foreldrepenger`;
+    return `${apiBaseUri}/v2/ytelse/foreldrepenger`;
 }
 const resource = {
     useFetch(): UseQueryResult<ForeldrepengerResponse, FetchError> {
diff --git a/src/rest/resources/oppfolgingResource.tsx b/src/rest/resources/oppfolgingResource.tsx
index 7daa78e8d..110cf8eb7 100644
--- a/src/rest/resources/oppfolgingResource.tsx
+++ b/src/rest/resources/oppfolgingResource.tsx
@@ -21,7 +21,7 @@ function url(fnr: string, periode: VisOppfolgingFraTilDato): string {
 
 function urlUtenFnrIPath(periode: VisOppfolgingFraTilDato): string {
     const queryParams = `?startDato=${periode.fra}&sluttDato=${periode.til}`;
-    return `${apiBaseUri}/oppfolging/ytelserogkontrakter${queryParams}`;
+    return `${apiBaseUri}/v2/oppfolging/ytelserogkontrakter${queryParams}`;
 }
 
 const defaults: DefaultConfig = {
diff --git a/src/rest/resources/persondataResource.tsx b/src/rest/resources/persondataResource.tsx
index 20ac7b08e..0f90b3f90 100644
--- a/src/rest/resources/persondataResource.tsx
+++ b/src/rest/resources/persondataResource.tsx
@@ -14,7 +14,7 @@ function url(fnr: String) {
 }
 
 function urlUtenFnrIPath() {
-    return `${apiBaseUri}/v2/person`;
+    return `${apiBaseUri}/v3/person`;
 }
 
 const resource = {
diff --git a/src/rest/resources/pleiepengerResource.tsx b/src/rest/resources/pleiepengerResource.tsx
index 5d8652877..b2232759f 100644
--- a/src/rest/resources/pleiepengerResource.tsx
+++ b/src/rest/resources/pleiepengerResource.tsx
@@ -15,7 +15,7 @@ function url(fnr: string): string {
 }
 
 function urlV2(): string {
-    return `${apiBaseUri}/ytelse/pleiepenger`;
+    return `${apiBaseUri}/v2/ytelse/pleiepenger`;
 }
 
 const resource = {
diff --git a/src/rest/resources/sakstemaResource.tsx b/src/rest/resources/sakstemaResource.tsx
index c8a0bfe63..3218878db 100644
--- a/src/rest/resources/sakstemaResource.tsx
+++ b/src/rest/resources/sakstemaResource.tsx
@@ -41,7 +41,7 @@ function urlUtenFnrIPath(enhet?: string) {
 
 function urlUtenFnrIPathV2(enhet?: string) {
     const header = enhet ? `?enhet=${enhet}` : '';
-    return `${apiBaseUri}/saker/v2/sakstema/${header}`;
+    return `${apiBaseUri}/v2/saker/v2/sakstema/${header}`;
 }
 
 function useFnrEnhet(): [string, string | undefined] {
diff --git a/src/rest/resources/sykepengerResource.tsx b/src/rest/resources/sykepengerResource.tsx
index 0b6770109..0171d4de0 100644
--- a/src/rest/resources/sykepengerResource.tsx
+++ b/src/rest/resources/sykepengerResource.tsx
@@ -14,7 +14,7 @@ function url(fnr: string): string {
 }
 
 function urlV2(): string {
-    return `${apiBaseUri}/ytelse/sykepenger`;
+    return `${apiBaseUri}/v2/ytelse/sykepenger`;
 }
 const resource = {
     useFetch(): UseQueryResult<SykepengerResponse, FetchError> {
diff --git a/src/rest/resources/tildelteoppgaverResource.tsx b/src/rest/resources/tildelteoppgaverResource.tsx
index ef98aac2b..5c50e6309 100644
--- a/src/rest/resources/tildelteoppgaverResource.tsx
+++ b/src/rest/resources/tildelteoppgaverResource.tsx
@@ -18,7 +18,7 @@ function url(fnr: string): string {
 }
 
 function urlUtenFnrIPath(): string {
-    return `${apiBaseUri}/oppgaver/tildelt`;
+    return `${apiBaseUri}/v2/oppgaver/tildelt`;
 }
 
 const defaults: DefaultConfig = {
diff --git a/src/rest/resources/tilgangskontrollResource.tsx b/src/rest/resources/tilgangskontrollResource.tsx
index 962d5a41b..2acdf1e1f 100644
--- a/src/rest/resources/tilgangskontrollResource.tsx
+++ b/src/rest/resources/tilgangskontrollResource.tsx
@@ -53,7 +53,7 @@ function url(fnr: string | undefined, enhet: string | undefined) {
 
 function urlV2(enhet: string | undefined) {
     const params = enhet ? `?enhet=${enhet}` : '';
-    return `${apiBaseUri}/tilgang${params}`;
+    return `${apiBaseUri}/v2/tilgang${params}`;
 }
 
 const resource = {
diff --git a/src/rest/resources/utbetalingerResource.tsx b/src/rest/resources/utbetalingerResource.tsx
index b62349af8..c7767ecca 100644
--- a/src/rest/resources/utbetalingerResource.tsx
+++ b/src/rest/resources/utbetalingerResource.tsx
@@ -28,7 +28,7 @@ function url(fnr: string, periode: Periode<string>): string {
 }
 
 function urlV2(periode: Periode<string>): string {
-    return `${apiBaseUri}/utbetaling?startDato=${periode.fra}&sluttDato=${periode.til}`;
+    return `${apiBaseUri}/v2/utbetaling?startDato=${periode.fra}&sluttDato=${periode.til}`;
 }
 
 const defaults: DefaultConfig = {
diff --git a/src/rest/resources/varselResource.tsx b/src/rest/resources/varselResource.tsx
index 37899c9c0..b87f6be71 100644
--- a/src/rest/resources/varselResource.tsx
+++ b/src/rest/resources/varselResource.tsx
@@ -14,15 +14,15 @@ function url(fnr: string): string {
     return `${apiBaseUri}/v2/varsler/${fnr}`;
 }
 
-function urlV2(): string {
-    return `${apiBaseUri}/v2/varsler`;
+function urlV3(): string {
+    return `${apiBaseUri}/v3/varsler`;
 }
 const resource = {
     useFetch(): UseQueryResult<VarslerResult, FetchError> {
         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(urlV3(), { fnr }) : get(url(fnr))));
     }
 };
 export default resource;