Skip to content

Commit

Permalink
f dagpengerStatus: returner antallDagerSidenDagpengerStanset
Browse files Browse the repository at this point in the history
  • Loading branch information
jstnhlj committed Nov 23, 2022
1 parent 020b559 commit 959c0a8
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { DagpengeStatus, Vedtak } from './typer';
import { dagerFraDato } from './beregnArbeidssokerPerioder';

const sorterEtterNyesteVedtak = (a: Vedtak, b: Vedtak) =>
new Date(b.datoFattet).getTime() - new Date(a.datoFattet).getTime();

function beregnAntallDagerSidenDagpengerStanset(dagpengerStatus: DagpengeStatus, dagpengeVedtak: Vedtak[]) {
const sisteDagpengevedtak = dagpengeVedtak
.filter((vedtak) => vedtak.status === 'INNVILGET')
.sort(sorterEtterNyesteVedtak)[0];

const antallDagerSidenDagpengerStanset =
sisteDagpengevedtak?.tilDato && dagpengerStatus === 'stanset'
? dagerFraDato(new Date(sisteDagpengevedtak.tilDato))
: undefined;

return antallDagerSidenDagpengerStanset;
}

export default beregnAntallDagerSidenDagpengerStanset;
9 changes: 8 additions & 1 deletion src/api/data/dagpengerStatus/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Auth, getTokenFromCookie } from '../../../auth/tokenDings';
import beregnDagpengeStatus from './beregnDagpengeStatus';
import beregnArbeidssokerperioder from './beregnArbeidssokerPerioder';
import logger from '../../../logger';
import beregnAntallDagerSidenDagpengerStanset from './beregnAntallDagerSidenDagpengerStanset';

function dagpengerStatus(
tokenDings: Auth,
Expand Down Expand Up @@ -74,7 +75,13 @@ function dagpengerStatus(
arbeidssokerperioder,
});

return res.status(200).send({ dagpengerStatus });
const antallDagerSidenDagpengerStanset =
beregnAntallDagerSidenDagpengerStanset(dagpengerStatus, dagpengeVedtak) || 'N/A';

return res.status(200).send({
dagpengerStatus,
antallDagerSidenDagpengerStanset,
});
} catch (err) {
logger.error(`Feil med /dagpenger-status kall: ${err}`);
return res.status(500).end();
Expand Down

0 comments on commit 959c0a8

Please sign in to comment.