Skip to content

Commit

Permalink
oppdaterer noen url-er til å følge backend uten redirect
Browse files Browse the repository at this point in the history
  • Loading branch information
@di0nys1us
di0nys1us committed Feb 21, 2024
1 parent fb4b5d4 commit 4fa6bca
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 32 deletions.
35 changes: 14 additions & 21 deletions client/src/io/http.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ export const hentBrukerdataMedPost: any = async ([
}
}

export const postTildeling = async (oppgavereferanse: number | string) => {
return post(`${baseUrl}/api/tildeling/${oppgavereferanse}`, {})
export const postTildeling = async (sakId: number | string) => {
return post(`${baseUrl}/api/sak/${sakId}/tildeling`, {})
}

// Nytt oppgave API
Expand Down Expand Up @@ -197,47 +197,40 @@ export const putOppdaterVilkår = async (
return put(`${baseUrl}/api/sak/${sakId}/vilkar/${vilkårId}`, oppdaterVilkårData)
}

export const tildelBestilling = async (sakId: string) => {
return post(`${baseUrl}/api/bestilling/tildeling/${sakId}`, {})
}

export const deleteFjernOppgaveTildeling = async (oppgaveId: string) => {
return del(`${baseUrl}/api/oppgaver-v2/${oppgaveId}/tildeling`, {})
}

export const deleteFjernTildeling = async (sakId: number | string) => {
return del(`${baseUrl}/api/tildeling/${sakId}`, {})
return del(`${baseUrl}/api/sak/${sakId}/tildeling`, {})
}

export const putVedtak = async (
sakId: number | string,
status: VedtakStatusType,
vedtaksgrunnlag: Vedtaksgrunnlag[]
) => {
return put(`${baseUrl}/api/vedtak-v2/${sakId}`, { status, vedtaksgrunnlag })
return put(`${baseUrl}/api/sak/${sakId}/vedtak`, { status, vedtaksgrunnlag })
}

export const putFerdigstillBestilling = async (bestillingsnummer: number | string, status: OppgaveStatusType) => {
return put(`${baseUrl}/api/bestilling/ferdigstill/${bestillingsnummer}`, { status })
export const putFerdigstillBestilling = async (sakId: number | string, status: OppgaveStatusType) => {
return put(`${baseUrl}/api/bestilling/${sakId}/ferdigstilling`, { status })
}

export const putSendTilGosys = async (sakId: number | string, tilbakemelding: OverforGosysTilbakemelding) => {
return put(`${baseUrl}/api/tilbakefoer/${sakId}`, { tilbakemelding })
export const putAvvisBestilling = async (sakId: number | string, tilbakemelding: AvvisBestilling) => {
return put(`${baseUrl}/api/bestilling/${sakId}/avvisning`, { tilbakemelding })
}

export const putAvvisBestilling = async (sakId: number | string, tilbakemelding: AvvisBestilling) => {
return put(`${baseUrl}/api/bestilling/avvis/${sakId}`, { tilbakemelding })
export const putEndreHjelpemiddel = async (sakId: number | string, endreHjelpemiddel: EndreHjelpemiddelRequest) => {
return put(`${baseUrl}/api/bestilling/${sakId}`, endreHjelpemiddel)
}

export const postEndringslogginnslagLest = async (endringslogginnslagId: string) => {
return post(`${baseUrl}/api/endringslogg/leste`, { endringslogginnslagId })
export const putSendTilGosys = async (sakId: number | string, tilbakemelding: OverforGosysTilbakemelding) => {
return put(`${baseUrl}/api/sak/${sakId}/tilbakeforing`, { tilbakemelding })
}

export const putEndreHjelpemiddel = async (
saksnummer: number | string,
endreHjelpemiddel: EndreHjelpemiddelRequest
) => {
return put(`${baseUrl}/api/bestilling/v2/${saksnummer}`, endreHjelpemiddel)
export const postEndringslogginnslagLest = async (endringslogginnslagId: string) => {
return post(`${baseUrl}/api/endringslogg/leste`, { endringslogginnslagId })
}

export const postSaksnotat = async (sakId: string, type: 'INTERNT', innhold: string) => {
Expand Down
25 changes: 14 additions & 11 deletions client/src/mocks/handlers/saksbehandling.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import type { StoreHandlersFactory } from '../data'

export const saksbehandlingHandlers: StoreHandlersFactory = ({ sakStore, barnebrillesakStore, journalpostStore }) => [
rest.post<any, { sakId: string }, any>(`/api/tildeling/:sakId`, async (req, res, ctx) => {
rest.post<any, { sakId: string }, any>(`/api/sak/:sakId/tildeling`, async (req, res, ctx) => {
const { sakId } = req.params
if (await sakStore.tildel(sakId)) {
return res(ctx.delay(500), ctx.status(200))
Expand All @@ -20,7 +20,7 @@ export const saksbehandlingHandlers: StoreHandlersFactory = ({ sakStore, barnebr
}
return res(ctx.delay(500), ctx.status(404))
}),
rest.delete<any, { sakId: string }, any>(`/api/tildeling/:sakId`, async (req, res, ctx) => {
rest.delete<any, { sakId: string }, any>(`/api/sak/:sakId/tildeling`, async (req, res, ctx) => {
const { sakId } = req.params
if (await sakStore.frigi(sakId)) {
return res(ctx.status(200))
Expand Down Expand Up @@ -100,18 +100,21 @@ export const saksbehandlingHandlers: StoreHandlersFactory = ({ sakStore, barnebr
return res(ctx.status(200), ctx.json(saksdokumenter))
}
}),
rest.put<VedtakPayload, { sakId: string }, any>('/api/vedtak-v2/:sakId', async (req, res, ctx) => {
rest.put<VedtakPayload, { sakId: string }, any>('/api/sak/:sakId/vedtak', async (req, res, ctx) => {
const sakId = req.params.sakId
const status = req.body.status

sakStore.fattVedtak(sakId, OppgaveStatusType.VEDTAK_FATTET, status)
return res(/*ctx.delay(500),*/ ctx.status(200), ctx.json({}))
}),
rest.put<{ søknadsbeskrivelse: any }, { sakId: string }, any>('/api/tilbakefoer/:sakId', async (req, res, ctx) => {
const sakId = req.params.sakId
sakStore.oppdaterStatus(sakId, OppgaveStatusType.SENDT_GOSYS)
return res(/*ctx.delay(500),*/ ctx.status(200), ctx.json({}))
}),
rest.put<{ søknadsbeskrivelse: any }, { sakId: string }, any>(
'/api/sak/:sakId/tilbakeforing',
async (req, res, ctx) => {
const sakId = req.params.sakId
sakStore.oppdaterStatus(sakId, OppgaveStatusType.SENDT_GOSYS)
return res(/*ctx.delay(500),*/ ctx.status(200), ctx.json({}))
}
),
rest.put<{ status: OppgaveStatusType }, { sakId: string }, any>('/api/sak/:sakId/status', async (req, res, ctx) => {
const sakId = req.params.sakId
const status = req.body.status
Expand All @@ -120,7 +123,7 @@ export const saksbehandlingHandlers: StoreHandlersFactory = ({ sakStore, barnebr
return res(/*ctx.delay(300),*/ ctx.status(200))
}),
rest.put<{ tilbakemelding: any; begrunnelse: any }, { sakId: string }>(
'/api/bestilling/avvis/:sakId',
'/api/bestilling/:sakId/avvisning',
async (req, res, ctx) => {
sakStore.oppdaterStatus(req.params.sakId, OppgaveStatusType.AVVIST)
return res(/*ctx.delay(500),*/ ctx.status(200), ctx.json({}))
Expand Down Expand Up @@ -163,11 +166,11 @@ export const saksbehandlingHandlers: StoreHandlersFactory = ({ sakStore, barnebr

return res(/*ctx.delay(200),*/ ctx.status(200), ctx.json(response))
}),
rest.put<any, { sakId: string }, any>('/api/bestilling/ferdigstill/:sakId', (req, res, ctx) => {
rest.put<any, { sakId: string }, any>('/api/bestilling/:sakId/ferdigstilling', (req, res, ctx) => {
sakStore.oppdaterStatus(req.params.sakId, OppgaveStatusType.FERDIGSTILT)
return res(/*ctx.delay(500),*/ ctx.status(200), ctx.json({}))
}),
rest.put<EndreHjelpemiddelRequest, { sakId: string }, any>('/api/bestilling/v2/:sakId', async (req, res, ctx) => {
rest.put<EndreHjelpemiddelRequest, { sakId: string }, any>('/api/bestilling/:sakId', async (req, res, ctx) => {
await req.json<EndreHjelpemiddelRequest>()
return res(ctx.status(200), ctx.json({}))
}),
Expand Down

0 comments on commit 4fa6bca

Please sign in to comment.