From a23133ac4d5040ee4db33c09406bb1a6c8f1a213 Mon Sep 17 00:00:00 2001
From: Benoit Guigal <benoit.guigal@protonmail.com>
Date: Thu, 6 Feb 2025 14:46:00 +0100
Subject: [PATCH] refacto : create a helpers file for emptypackaging and
 cleanPackagings function

---
 .../forms/__tests__/validation.integration.ts | 14 ++++++
 back/src/forms/validation.ts                  |  8 +++-
 .../common/utils/packagingsBsddSummary.ts     |  2 +-
 .../FormWasteTransportSummary.tsx             | 11 ++++-
 .../SignEmissionFormModalContent.tsx          | 29 +++++-------
 .../SignTransportFormModalContent.tsx         | 13 +++--
 front/src/form/bsdd/StepList.tsx              | 15 +-----
 front/src/form/bsdd/WasteInfo.tsx             |  3 +-
 .../bsdd/components/packagings/helpers.ts     | 47 +++++++++++++++++++
 front/src/form/bsdd/utils/initial-state.ts    |  6 +--
 10 files changed, 104 insertions(+), 44 deletions(-)
 create mode 100644 front/src/form/bsdd/components/packagings/helpers.ts

diff --git a/back/src/forms/__tests__/validation.integration.ts b/back/src/forms/__tests__/validation.integration.ts
index b70fa30cd3..d558551173 100644
--- a/back/src/forms/__tests__/validation.integration.ts
+++ b/back/src/forms/__tests__/validation.integration.ts
@@ -1702,6 +1702,20 @@ describe("draftFormSchema", () => {
     );
   });
 
+  it.each([-1, 0])(
+    "should not validate when packaging volume is %p (not strictly positive)",
+    async volume => {
+      const validateFn = () =>
+        draftFormSchema.validate({
+          wasteDetailsPackagingInfos: [{ type: "FUT", weight: 1, volume }]
+        });
+
+      await expect(validateFn()).rejects.toThrow(
+        "Le volume doit être un nombre positif"
+      );
+    }
+  );
+
   it("should not be valid when passing eco-organisme as emitter", async () => {
     const ecoOrganisme = await ecoOrganismeFactory({
       siret: siretify(),
diff --git a/back/src/forms/validation.ts b/back/src/forms/validation.ts
index a1e242ccba..a1f62e1956 100644
--- a/back/src/forms/validation.ts
+++ b/back/src/forms/validation.ts
@@ -688,7 +688,13 @@ export const packagingInfoFn = ({
               "Le nombre de benne ou de citerne ne peut être supérieur à 2."
             )
           : schema
-      )
+      ),
+    volume: yup
+      .number()
+      .optional()
+      .nullable()
+      .moreThan(0, "Le volume doit être un nombre positif"),
+    identificationNumbers: yup.array(yup.string()).optional().notRequired()
   });
 
 const parcelCommonInfos = yup
diff --git a/front/src/Apps/common/utils/packagingsBsddSummary.ts b/front/src/Apps/common/utils/packagingsBsddSummary.ts
index 29050ac5eb..4e40ba7c8f 100644
--- a/front/src/Apps/common/utils/packagingsBsddSummary.ts
+++ b/front/src/Apps/common/utils/packagingsBsddSummary.ts
@@ -43,7 +43,7 @@ export function getPackagingInfosSummary(packagingInfos: PackagingInfo[]) {
         summary += ` de ${packagingInfo.volume} ${volumeUnit}`;
       }
 
-      if (packagingInfo.identificationNumbers) {
+      if (packagingInfo.identificationNumbers?.length) {
         summary += ` (n° ${packagingInfo.identificationNumbers.join(", ")})`;
       }
 
diff --git a/front/src/dashboard/components/BSDList/BSDD/WorkflowAction/FormWasteTransportSummary.tsx b/front/src/dashboard/components/BSDList/BSDD/WorkflowAction/FormWasteTransportSummary.tsx
index 68b7094988..31e2066229 100644
--- a/front/src/dashboard/components/BSDList/BSDD/WorkflowAction/FormWasteTransportSummary.tsx
+++ b/front/src/dashboard/components/BSDList/BSDD/WorkflowAction/FormWasteTransportSummary.tsx
@@ -23,6 +23,7 @@ import { useEffect } from "react";
 import { getTransportModeLabel } from "../../../../constants";
 import { getFormWasteDetailsADRMention } from "@td/constants";
 import PackagingList from "../../../../../form/bsdd/components/packagings/PackagingList";
+import { emptyPackaging } from "../../../../../form/bsdd/components/packagings/helpers";
 
 interface FormWasteTransportSummaryProps {
   form: Form;
@@ -202,7 +203,15 @@ export function FormWasteTransportSummary({
               {form.emitter?.type === EmitterType.Appendix1Producer && (
                 <button
                   type="button"
-                  onClick={() => addField("packagingInfos")}
+                  onClick={() => {
+                    addField("packagingInfos");
+                    setFieldValue(
+                      "update.packagingInfos",
+                      form.wasteDetails?.packagingInfos?.length
+                        ? form.wasteDetails?.packagingInfos
+                        : [emptyPackaging]
+                    );
+                  }}
                   className="tw-ml-2"
                 >
                   <IconPaperWrite color="blue" />
diff --git a/front/src/dashboard/components/BSDList/BSDD/WorkflowAction/SignEmissionFormModalContent.tsx b/front/src/dashboard/components/BSDList/BSDD/WorkflowAction/SignEmissionFormModalContent.tsx
index 436938309a..ec11093862 100644
--- a/front/src/dashboard/components/BSDList/BSDD/WorkflowAction/SignEmissionFormModalContent.tsx
+++ b/front/src/dashboard/components/BSDList/BSDD/WorkflowAction/SignEmissionFormModalContent.tsx
@@ -23,6 +23,10 @@ import SignatureCodeInput from "../../../../../form/common/components/custom-inp
 import DateInput from "../../../../../form/common/components/custom-inputs/DateInput";
 import { subMonths } from "date-fns";
 import { GET_FORM } from "../../../../../Apps/common/queries/bsdd/queries";
+import {
+  cleanPackagings,
+  emptyPackaging
+} from "../../../../../form/bsdd/components/packagings/helpers";
 
 interface SignEmissionFormModalProps {
   title: string;
@@ -114,23 +118,12 @@ function SignEmissionFormModalContent({
     emittedByType: EmitterType.Emitter,
     securityCode: "",
     emitter: { type: form?.emitter?.type },
-    ...(form.status === FormStatus.Resealed
-      ? {
-          packagingInfos:
-            form.temporaryStorageDetail?.wasteDetails?.packagingInfos,
-          quantity: form.temporaryStorageDetail?.wasteDetails?.quantity ?? 0,
-          onuCode: form.temporaryStorageDetail?.wasteDetails?.onuCode ?? "",
-          transporterNumberPlate:
-            form.temporaryStorageDetail?.transporter?.numberPlate ?? ""
-        }
-      : {
-          packagingInfos: form.wasteDetails?.packagingInfos?.length
-            ? form.wasteDetails?.packagingInfos
-            : [{ type: "", quantity: "", volume: "" }],
-          quantity: form.wasteDetails?.quantity ?? 0,
-          onuCode: form.wasteDetails?.onuCode ?? "",
-          transporterNumberPlate: form.transporter?.numberPlate ?? ""
-        })
+    packagingInfos: form.wasteDetails?.packagingInfos?.length
+      ? form.wasteDetails?.packagingInfos
+      : [emptyPackaging],
+    quantity: form.wasteDetails?.quantity ?? 0,
+    onuCode: form.wasteDetails?.onuCode ?? "",
+    transporterNumberPlate: form.transporter?.numberPlate ?? ""
   };
 
   const handlesubmit = async values => {
@@ -141,7 +134,7 @@ function SignEmissionFormModalContent({
           input: {
             quantity: values.quantity,
             onuCode: values.onuCode,
-            packagingInfos: values.packagingInfos,
+            packagingInfos: cleanPackagings(values.packagingInfos),
             transporterNumberPlate: values.transporterNumberPlate,
             emittedAt: values.emittedAt,
             emittedBy: values.emittedBy,
diff --git a/front/src/dashboard/components/BSDList/BSDD/WorkflowAction/SignTransportFormModalContent.tsx b/front/src/dashboard/components/BSDList/BSDD/WorkflowAction/SignTransportFormModalContent.tsx
index 34c6d3e247..8f0b530cdd 100644
--- a/front/src/dashboard/components/BSDList/BSDD/WorkflowAction/SignTransportFormModalContent.tsx
+++ b/front/src/dashboard/components/BSDList/BSDD/WorkflowAction/SignTransportFormModalContent.tsx
@@ -29,6 +29,10 @@ import {
   GET_FORM,
   UPDATE_FORM
 } from "../../../../../Apps/common/queries/bsdd/queries";
+import {
+  cleanPackagings,
+  emptyPackaging
+} from "../../../../../form/bsdd/components/packagings/helpers";
 
 const validationSchema = yup.object({
   takenOverAt: yup.date().required("La date de prise en charge est requise"),
@@ -141,19 +145,18 @@ export default function SignTransportFormModalContent({
         update: {
           quantity: form.wasteDetails?.quantity ?? 0,
           sampleNumber: form.wasteDetails?.sampleNumber ?? "",
-          packagingInfos: form.wasteDetails?.packagingInfos?.length
-            ? form.wasteDetails?.packagingInfos
-            : [{ type: "", quantity: "", volume: "" } as any]
+          packagingInfos: form.wasteDetails?.packagingInfos ?? []
         }
       }}
       validationSchema={validationSchema}
       onSubmit={async values => {
         try {
           const { update } = values;
+          const packagingsInfoUpdate = cleanPackagings(update.packagingInfos);
           if (
             update.sampleNumber ||
             (form.emitter?.type === EmitterType.Appendix1Producer &&
-              (update.quantity || update.packagingInfos.length > 0))
+              (update.quantity || packagingsInfoUpdate.length > 0))
           ) {
             await updateForm({
               variables: {
@@ -165,7 +168,7 @@ export default function SignTransportFormModalContent({
                       sampleNumber: update.sampleNumber
                     }),
                     ...(update.packagingInfos.length > 0 && {
-                      packagingInfos: update.packagingInfos
+                      packagingInfos: packagingsInfoUpdate
                     })
                   }
                 }
diff --git a/front/src/form/bsdd/StepList.tsx b/front/src/form/bsdd/StepList.tsx
index 664c03b64a..e1287d5c99 100644
--- a/front/src/form/bsdd/StepList.tsx
+++ b/front/src/form/bsdd/StepList.tsx
@@ -33,6 +33,7 @@ import {
   GET_FORM,
   UPDATE_FORM
 } from "../../Apps/common/queries/bsdd/queries";
+import { cleanPackagings } from "./components/packagings/helpers";
 const GenericStepList = lazy(() => import("../common/stepper/GenericStepList"));
 interface Props {
   children: (form: Form | undefined) => ReactElement;
@@ -187,19 +188,7 @@ export default function StepsList(props: Props) {
       return;
     }
 
-    const packagingInfos = (wasteDetails?.packagingInfos ?? [])
-      .filter(
-        // Supprime le conditionnement vide par défaut ajouté dans l'état intitial
-        // Formik si celui-ci n'a pas été complété.
-        p => !!p.type
-      )
-      .map(p => ({
-        ...p,
-        // Convertit "" vers 0 dans le cas où l'input est laissé vide
-        quantity: (p.quantity as any) === "" ? Number(p.quantity) : p.quantity,
-        // Convertit "" vers null dans le cas où l'input est laissé vide
-        volume: (p.volume as any) === "" ? null : p.volume
-      }));
+    const packagingInfos = cleanPackagings(wasteDetails?.packagingInfos ?? []);
 
     const formInput: FormInput = {
       ...rest,
diff --git a/front/src/form/bsdd/WasteInfo.tsx b/front/src/form/bsdd/WasteInfo.tsx
index 518e943c8d..3a3378cdc1 100644
--- a/front/src/form/bsdd/WasteInfo.tsx
+++ b/front/src/form/bsdd/WasteInfo.tsx
@@ -22,6 +22,7 @@ import Alert from "@codegouvfr/react-dsfr/Alert";
 import { FormFormikValues } from "./utils/initial-state";
 import PackagingList from "./components/packagings/PackagingList";
 import { Packagings } from "@td/codegen-ui";
+import { emptyPackaging } from "./components/packagings/helpers";
 
 const SOIL_CODES = [
   "17 05 03*",
@@ -190,7 +191,7 @@ export default function WasteInfo({ disabled }) {
           onChange={checked => {
             const updatedPackagings = checked
               ? [{ type: Packagings.Pipeline, quantity: 1 }]
-              : [{ type: "", quantity: "", volume: "" }];
+              : [emptyPackaging];
             setFieldValue("wasteDetails.packagingInfos", updatedPackagings);
           }}
         />
diff --git a/front/src/form/bsdd/components/packagings/helpers.ts b/front/src/form/bsdd/components/packagings/helpers.ts
new file mode 100644
index 0000000000..426ac5f2e3
--- /dev/null
+++ b/front/src/form/bsdd/components/packagings/helpers.ts
@@ -0,0 +1,47 @@
+import { PackagingInfoInput, Packagings } from "@td/codegen-ui";
+
+export const emptyPackaging: PackagingInfoInput = {
+  // On force le typage ici pour pouvoir afficher un champ
+  // de formulaire vide tout en étant compatible avec l'input
+  // PackagingInfoInput sur lequel `type` et `quantity` sont des champs requis.
+  // Il faudra en revanche bien s'assurer d'utiliser la fonction
+  // `cleanPackagings` ci-dessous avant d'envoyer les données à l'API
+  // pour éviter des erreurs GraphQL.
+  type: "" as Packagings,
+  quantity: "" as any as number
+};
+
+/**
+ * On souhaite que le formulaire de conditionnement s'affiche par défaut
+ * avec un seul conditionnement dont tous les inputs sont vides. Pour ce faire
+ * il suffit d'initialiser l'état du formulaire avec la valeur `[emptyPackaging]`.
+ * Le problème est que si l'utilisateur essaye d'enregistrer le formulaire sans
+ * avoir modifier les conditionnements on prend les erreurs suivantes :
+ *
+ * Variable "$input" got invalid value "" at "input.packagingInfos[0].type"; Value
+ * "" does not exist in "Packagings" enum.
+ *
+ * Variable "$input" got invalid value "" at "input.packagingInfos[0].quantity";
+ * Int cannot represent non-integer value: ""
+ *
+ * Variable "$updateFormInput" got invalid value "" at "input.packagingInfos[0].volume";
+ * Float cannot represent non numeric value: ""
+ *
+ * Il est donc nécessaire de nettoyer les données avant de les envoyer au serveur
+ */
+export function cleanPackagings(packagings: PackagingInfoInput[]) {
+  return packagings
+    .filter(
+      // Supprime le conditionnement vide par défaut ajouté dans l'état initial
+      // si celui-ci n'a pas été complété.
+      p => !!p.type
+    )
+    .map(p => ({
+      ...p,
+      // Convertit "" vers 0 dans le cas où l'input est laissé vide
+      // car le champ `quantity` est requis sur PackagingInfoInput
+      quantity: Number(p.quantity),
+      // Convertit "" vers null dans le cas où l'input est laissé vide
+      volume: (p.volume as any) === "" ? null : p.volume
+    }));
+}
diff --git a/front/src/form/bsdd/utils/initial-state.ts b/front/src/form/bsdd/utils/initial-state.ts
index d078d50b91..e4588881e3 100644
--- a/front/src/form/bsdd/utils/initial-state.ts
+++ b/front/src/form/bsdd/utils/initial-state.ts
@@ -14,6 +14,7 @@ import {
   TransportMode
 } from "@td/codegen-ui";
 import { getInitialCompany } from "../../../Apps/common/data/initialState";
+import { emptyPackaging } from "../components/packagings/helpers";
 
 /**
  * Computes initial values for trader fields in Formik's form
@@ -189,10 +190,7 @@ export function getInitialState(f?: Form | null): FormFormikValues {
         f?.wasteDetails?.nonRoadRegulationMention ?? null,
       packagingInfos: f?.wasteDetails?.packagingInfos?.length
         ? f.wasteDetails.packagingInfos
-        : [
-            // affiche un formulaire de conditionnement vide par défaut
-            { type: "", quantity: "", volume: "" } as any
-          ],
+        : [emptyPackaging],
       quantity: f?.wasteDetails?.quantity ?? null,
       quantityType: f?.wasteDetails?.quantityType ?? QuantityType.Estimated,
       consistence: f?.wasteDetails?.consistence ?? Consistence.Solid,