wip

Author: eriksson-daniel

frontend/src/redux/session/klage/reducers.ts

@@ -1,6 +1,7 @@
 import type { ISessionCase } from '@app/components/case/uinnlogget/types';
 import { sessionEvent } from '@app/logging/logger';
 import { SessionAction } from '@app/logging/types';
+import type { DyplenkeParams } from '@app/redux-api/case/types';
 import type { State } from '@app/redux/session/type';
 import type { CaseReducer, PayloadAction } from '@reduxjs/toolkit';
 import { createSessionCase, getSessionCaseKey } from './helpers';
@@ -63,11 +64,7 @@ const loadSessionCase: CaseReducer<State, PayloadAction<SessionCaseLoad>> = (sta
     return state;
   }
 
-  return setState(state, sessionKey, {
-    ...savedCase,
-    ...dyplenkeParams,
-    caseIsAtKA: dyplenkeParams.caseIsAtKA === null ? savedCase.caseIsAtKA : dyplenkeParams.caseIsAtKA,
-  });
+  return setState(state, sessionKey, { ...savedCase, ...newDyplenkeParams(savedCase, dyplenkeParams) });
 };
 
 // Read from session storage if it exists, otherwise save to session storage.
@@ -93,16 +90,7 @@ const loadOrCreateSessionCase: CaseReducer<State, PayloadAction<SessionCaseCreat
     sessionEvent(SessionAction.LOAD);
   }
 
-  const internalSaksnummer =
-    dyplenkeParams.internalSaksnummer === null ? savedCase.internalSaksnummer : dyplenkeParams.internalSaksnummer;
-  const sakSakstype = dyplenkeParams.sakSakstype === null ? savedCase.sakSakstype : dyplenkeParams.sakSakstype;
-  const sakFagsaksystem =
-    dyplenkeParams.sakFagsaksystem === null ? savedCase.sakFagsaksystem : dyplenkeParams.sakFagsaksystem;
-  const caseIsAtKA = dyplenkeParams.caseIsAtKA === null ? savedCase.caseIsAtKA : dyplenkeParams.caseIsAtKA;
-
-  const newDyplenkeParams = { internalSaksnummer, sakSakstype, sakFagsaksystem, caseIsAtKA };
-
-  const newCase = { ...savedCase, ...newDyplenkeParams };
+  const newCase = { ...savedCase, ...newDyplenkeParams(savedCase, dyplenkeParams) };
 
   setState(state, sessionKey, newCase);
   saveSessionCase(innsendingsytelse, newCase);
@@ -132,6 +120,17 @@ const deleteSessionCase: CaseReducer<State, PayloadAction<SessionCaseRemove>> =
   return state;
 };
 
+const newDyplenkeParams = (oldCase: ISessionCase, dyplenkeParams: DyplenkeParams): DyplenkeParams => {
+  const internalSaksnummer =
+    dyplenkeParams.internalSaksnummer === null ? oldCase.internalSaksnummer : dyplenkeParams.internalSaksnummer;
+  const sakSakstype = dyplenkeParams.sakSakstype === null ? oldCase.sakSakstype : dyplenkeParams.sakSakstype;
+  const sakFagsaksystem =
+    dyplenkeParams.sakFagsaksystem === null ? oldCase.sakFagsaksystem : dyplenkeParams.sakFagsaksystem;
+  const caseIsAtKA = dyplenkeParams.caseIsAtKA === null ? oldCase.caseIsAtKA : dyplenkeParams.caseIsAtKA;
+
+  return { internalSaksnummer, sakSakstype, sakFagsaksystem, caseIsAtKA };
+};
+
 export const caseReducers = {
   setSessionCase,
   updateSessionCase,