Skip to content

Commit

Permalink
Rydd i mocks for stillingssøk og standardsøk
Browse files Browse the repository at this point in the history
  • Loading branch information
Kjetil Svalestuen committed Jul 5, 2023
1 parent 33d1154 commit 5b7459d
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 326 deletions.
File renamed without changes.
6 changes: 5 additions & 1 deletion mock/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,21 @@ import { setupWorker } from 'msw';
import { modiaContextHolderMock } from './modiaContextHolderMock';
import { innloggetBrukerMock } from './innloggetBrukerMock';
import { kandidatApiMock } from './kandidat-api/kandidatApiMock';
import { kandidatsøkMock } from './kandidatsøk/kandidatsøkMock';
import { kandidatsøkMock } from './kandidatsok-proxy/kandidatsøkMock';
import { forespørselOmDelingAvCvMock } from './forespørsel-om-deling-av-cv-api/forespørselOmDelingAvCvMock';
import { statistikkApiMock } from './statistikk-api/statistikkApiMock';
import { stillingApiMock } from './stilling-api/stillingApiMock';
import { stillingssøkMock } from './stillingssok-proxy/stillingssøkMock';

const handlers = [
...innloggetBrukerMock,
...kandidatApiMock,
...statistikkApiMock,
...forespørselOmDelingAvCvMock,
...stillingApiMock,
...(import.meta.env.VITE_MOCK_MODIA ? modiaContextHolderMock : []),
...(import.meta.env.VITE_MOCK_AIVEN ? kandidatsøkMock : []),
...(import.meta.env.VITE_MOCK_AIVEN ? stillingssøkMock : []),
];

const worker = setupWorker(...handlers);
Expand Down
17 changes: 17 additions & 0 deletions mock/stilling-api/mockStandardsøk.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { RestRequest } from 'msw';
import StandardsøkDto from '../../src/stillingssok/filter/standardsøk/Standardsøk';

export const mockStandardsøk: StandardsøkDto = {
søk: 'statuser=publisert%2Cutl%C3%B8pt&q=Rektor',
navIdent: 'A123456',
tidspunkt: '2021-03-26T10:19:50.601956',
};

export const mockPutStandardsøk = async (request: RestRequest): Promise<StandardsøkDto> => {
const nyttSøk = await request.json();

return {
...mockStandardsøk,
søk: nyttSøk.søk,
};
};
7 changes: 7 additions & 0 deletions mock/stilling-api/stillingApiMock.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
import { rest } from 'msw';
import { mockStilling } from './mockStilling';
import { api } from '../../src/felles/api';
import { mockPutStandardsøk, mockStandardsøk } from './mockStandardsøk';

export const stillingApiMock = [
rest.get(`${api.stilling}/rekrutteringsbistandstilling/:stillingsId`, (_, res, ctx) =>
res(ctx.json(mockStilling))
),

rest.get(`${api.stilling}/standardsok`, (_, res, ctx) => res(ctx.json(mockStandardsøk))),

rest.put(`${api.stilling}/standardsok`, (req, res, ctx) =>
res(ctx.json(mockPutStandardsøk(req)))
),
];
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Respons } from '../../domene/elasticSearchTyper';
import { Ansettelsesform, Omfang, Søknadsfrist } from '../../domene/Stilling';
import { Ansettelsesform, Søknadsfrist, Omfang } from '../../src/stillingssok/domene/Stilling';
import { Respons } from '../../src/stillingssok/domene/elasticSearchTyper';

export const resultat: Respons = {
export const mockStillingssøk: Respons = {
took: 5,
timed_out: false,
_shards: { total: 3, successful: 3, skipped: 0, failed: 0 },
Expand Down
9 changes: 9 additions & 0 deletions mock/stillingssok-proxy/stillingssøkMock.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { rest } from 'msw';
import { api } from '../../src/felles/api';
import { mockStillingssøk } from './mockStillingssøk';

export const stillingssøkMock = [
rest.post(`${api.stillingssøk}/stilling/_search`, (_, res, ctx) =>
res(ctx.json(mockStillingssøk))
),
];
216 changes: 0 additions & 216 deletions src/stilling/mock/data/mineStillingerOpenSearch.ts

This file was deleted.

3 changes: 0 additions & 3 deletions src/stilling/mock/mock-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ import municipals from './data/municipals.json';
import categoriesWithAltnames from './data/categories-with-altnames.json';
import postdata from './data/postdata.json';
import search from './data/search.json';
import mineStillingerFraOpenSearch from './data/mineStillingerOpenSearch';

const reporteeUrl = `${api.stilling}/rekrutteringsbistand/api/v1/reportee`;
const mineStillingerOpenSearchUrl = `express:${api.stillingssøk}/stilling/_search`;
const opprettStillingUrl = `express:${api.stilling}/rekrutteringsbistandstilling`;
const kopierStillingUrl = `express:${api.stilling}/rekrutteringsbistandstilling/kopier/:stillingsId`;
const slettStillingUrl = `express:${api.stilling}/rekrutteringsbistandstilling/:stillingsId`;
Expand Down Expand Up @@ -87,7 +85,6 @@ const putStilling = (_: string, options: MockRequest): Rekrutteringsbistandstill
};

fetchMock
.post(mineStillingerOpenSearchUrl, log(mineStillingerFraOpenSearch))
.post(opprettStillingUrl, log(rekrutteringsbistandStilling))
.post(kopierStillingUrl, log(rekrutteringsbistandStilling))
.get(reporteeUrl, log(reportee))
Expand Down
4 changes: 0 additions & 4 deletions src/stillingssok/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ import { useParams } from 'react-router-dom';
import Stillingssøk from './Stillingssøk';
import { StandardsøkProvider } from './standardsøk/StandardsøkContext';

if (import.meta.env.VITE_MOCK) {
await import('./mock-api/mock-api');
}

export const Component = () => {
const { fnr } = useParams();

Expand Down
Loading

0 comments on commit 5b7459d

Please sign in to comment.