Merge pull request #263 from navikt/resume-klage-instead-of-create

Add resume klage before create

Author: cskrov

src/api/api.ts

@@ -4,6 +4,7 @@ import { User } from '../user/user';
 import { Attachment } from '../klage/attachment';
 import { environment } from '../environment/environment';
 import { NewKlage, Klage, UpdateKlage, FinalizedKlage } from '../klage/klage';
+import { TemaKey } from '../tema/tema';
 
 export async function getUser() {
     const url = environment.userUrl;
@@ -15,6 +16,11 @@ export async function getUser() {
     }
 }
 
+export async function getDraftKlage(temaKey: TemaKey, ytelse: string, internalSaksnummer: string | null) {
+    const url = environment.draftKlageUrl(temaKey, ytelse, internalSaksnummer);
+    return await getJSON<Klage>(url, 'Ingen påbegynt klage funnet.');
+}
+
 export async function createKlage(klage: NewKlage) {
     const url = environment.klagerUrl;
     try {

src/environment/environment.ts

@@ -1,4 +1,6 @@
+import queryString from 'query-string';
 import { logError } from '../logging/frontendLogger';
+import { TemaKey } from '../tema/tema';
 
 type KlageId = string | number;
 
@@ -80,6 +82,22 @@ export class Environment {
         return `${this.apiUrl}/klager`;
     }
     klageUrl = (klageId: KlageId): string => `${this.klagerUrl}/${klageId}`;
+    draftKlageUrl = (temaKey: TemaKey, ytelse: string, internalSaksnummer: string | null) => {
+        const query = queryString.stringify(
+            {
+                tema: temaKey,
+                ytelse,
+                internalSaksnummer
+            },
+            {
+                skipNull: true,
+                skipEmptyString: true,
+                sort: false,
+                encode: true
+            }
+        );
+        return `${this.klagerUrl}/draft?${query}`;
+    };
     finalizeKlageUrl = (klageId: KlageId) => `${this.klageUrl(klageId)}/finalize`;
     klageJournalpostIdUrl = (klageId: KlageId) => `${this.klageUrl(klageId)}/journalpostid`;
     klagePdfUrl = (klageId: KlageId) => `${this.apiUrl}/klager/${klageId}/pdf`;

src/routes/create-klage.tsx

@@ -2,12 +2,11 @@ import React, { useContext, useEffect, useState } from 'react';
 import { Redirect, useHistory, useLocation } from 'react-router-dom';
 import queryString from 'query-string';
 import { AlertStripeFeil } from 'nav-frontend-alertstriper';
-import { ensureStringIsTema } from '../tema/tema';
+import { ensureStringIsTema, TemaKey } from '../tema/tema';
 import { getQueryValue } from '../query/get-query-value';
-import { createKlage } from '../api/api';
+import { createKlage, getDraftKlage } from '../api/api';
 import { AppContext } from '../app-context/app-context';
 import { getTitle } from '../query/get-title';
-import { NewKlage } from '../klage/klage';
 import LoadingPage from '../loading-page/loading-page';
 
 const CreateKlage = () => {
@@ -31,19 +30,21 @@ const CreateKlage = () => {
 
         const title = getTitle(query, temaKey);
         const saksnummer = getQueryValue(query.saksnummer);
-        const newKlage: NewKlage = {
-            fritekst: '',
-            checkboxesSelected: [],
-            tema: temaKey,
-            ytelse: title,
-            vedtakDate: null,
-            userSaksnummer: null,
-            internalSaksnummer: saksnummer
-        };
 
-        createKlage(newKlage)
+        getDraftKlage(temaKey, title, saksnummer)
+            .catch(() =>
+                createKlage({
+                    fritekst: '',
+                    checkboxesSelected: [],
+                    tema: temaKey,
+                    ytelse: title,
+                    vedtakDate: null,
+                    userSaksnummer: null,
+                    internalSaksnummer: saksnummer
+                })
+            )
             .then(setKlage)
-            .catch(() => setError(formatError(newKlage)));
+            .catch(() => setError(formatError(temaKey, title, saksnummer)));
     }, [search, klage, setKlage, history]);
 
     if (error !== null) {
@@ -57,7 +58,7 @@ const CreateKlage = () => {
     return <Redirect to={`/${klage.id}/begrunnelse`} />;
 };
 
-function formatError({ tema, ytelse, internalSaksnummer }: NewKlage): string {
+function formatError(tema: TemaKey, ytelse: string, internalSaksnummer: string | null): string {
     let error = `Klarte ikke opprette klage med tema "${tema}"`;
     if (internalSaksnummer === null) {
         error += ` og tittel "${ytelse}".`;