Legger tilbake ettersending

Author: nurrebass1

packages/bygger-backend/src/services/forms/FormsService.ts

@@ -11,7 +11,7 @@ const createFormsService = (formsApiUrl: string): FormsService => {
     const search = select ? new URLSearchParams({ select }) : '';
     const url = `${formsUrl}?${search}`;
     const response = await fetchWithErrorHandling(url, { headers: createHeaders() });
-    return (response.data as Form[]).map(removeInnsendingFromForm);
+    return (response.data as Form[]).map(removeInnsendingTypeFromForm);
   };
 
   const get = async (formPath: string): Promise<Form> => {

packages/bygger-backend/src/services/utils/formsApiUtils.ts

@@ -26,7 +26,7 @@ export const removeInnsendingTypeFromForm = (form: Form): Form => {
         formioFormsApiUtils.mapInnsendingTypeToSubmissionTypes(form.properties.innsending),
       subsequentSubmissionTypes:
         form.properties.subsequentSubmissionTypes ??
-        formioFormsApiUtils.mapInnsendingTypeToSubmissionTypes(form.properties.ettersending),
+        formioFormsApiUtils.mapEttersendingTypeToSubmissionTypes(form.properties.ettersending),
     },
   };
 };

packages/shared-domain/src/utils/forms-api-backwards-compatibility/form.ts

@@ -37,20 +37,35 @@ const mapInnsendingTypeToSubmissionTypes = (innsendingType?: InnsendingType): Su
   }
 };
 
+const mapEttersendingTypeToSubmissionTypes = (ettersending?: InnsendingType): SubmissionType[] => {
+  if (!ettersending) return ['PAPER', 'DIGITAL'];
+
+  switch (ettersending) {
+    case 'PAPIR_OG_DIGITAL':
+      return ['PAPER', 'DIGITAL'];
+    case 'KUN_PAPIR':
+      return ['PAPER'];
+    case 'KUN_DIGITAL':
+      return ['DIGITAL'];
+    default:
+      return [];
+  }
+};
+
 /**
  *
  * Metoden er implementert kun for å støtte bakoverkompatibilitet og skal fjernes ved migrering
  */
 const removeInnsendingFromForm = (form: NavFormType): NavFormType => {
-  const formProperties = (({ innsending, ettersending, ...rest }) => rest)(form.properties);
+  const formProperties = (({ innsending, ...rest }) => rest)(form.properties);
   return {
     ...form,
     properties: {
       ...formProperties,
       submissionTypes:
         form.properties.submissionTypes ?? mapInnsendingTypeToSubmissionTypes(form.properties.innsending),
       subsequentSubmissionTypes:
-        form.properties.subsequentSubmissionTypes ?? mapInnsendingTypeToSubmissionTypes(form.properties.ettersending),
+        form.properties.subsequentSubmissionTypes ?? mapEttersendingTypeToSubmissionTypes(form.properties.ettersending),
     },
   };
 };
@@ -91,4 +106,10 @@ const mapNavFormToForm = (form: NavFormType): Form => {
   };
 };
 
-export { mapFormToNavForm, mapInnsendingTypeToSubmissionTypes, mapNavFormToForm, removeInnsendingFromForm };
+export {
+  mapEttersendingTypeToSubmissionTypes,
+  mapFormToNavForm,
+  mapInnsendingTypeToSubmissionTypes,
+  mapNavFormToForm,
+  removeInnsendingFromForm,
+};

packages/shared-domain/src/utils/forms-api-backwards-compatibility/index.ts

@@ -1,4 +1,5 @@
 import {
+  mapEttersendingTypeToSubmissionTypes,
   mapFormToNavForm,
   mapInnsendingTypeToSubmissionTypes,
   mapNavFormToForm,
@@ -12,6 +13,7 @@ const formioFormsApiUtils = {
   mapPublishedGlobalTranslationsToFormioFormat,
   removeInnsendingFromForm,
   mapInnsendingTypeToSubmissionTypes,
+  mapEttersendingTypeToSubmissionTypes,
 };
 
 export default formioFormsApiUtils;