Correction validation des plaques sur le bsdd multimodal (#3978)

MTES-MCT · Feb 17, 2025 · 3f3dcf0 · 3f3dcf0
2 parents d0f0d45 + 5d74452
commit 3f3dcf0
Show file tree

Hide file tree

Showing 3 changed files with 134 additions and 4 deletions.
diff --git a/back/src/bsvhu/validation/refinements.ts b/back/src/bsvhu/validation/refinements.ts
@@ -170,7 +170,7 @@ export const v20241201 = new Date(
   process.env.OVERRIDE_V20241201 || "2024-12-18T00:00:00.000"
 );
 
-// Date de la MAJ 2025.01.1 qui modifie les règles de validation du mode de transport, des palques d'immatriculations et la quantité transportée
+// Date de la MAJ 2025.01.1 qui modifie les règles de validation du mode de transport, des plaques d'immatriculations et la quantité transportée
 export const v20250101 = new Date(
   process.env.OVERRIDE_V20250101 || "2025-01-15T00:00:00.000"
 );

diff --git a/back/src/forms/resolvers/mutations/__tests__/updateForm.integration.ts b/back/src/forms/resolvers/mutations/__tests__/updateForm.integration.ts
@@ -5048,11 +5048,12 @@ describe("Mutation.updateForm", () => {
       companyTypes: [CompanyType.WASTEPROCESSOR],
       wasteProcessorTypes: [WasteProcessorType.DANGEROUS_WASTES_INCINERATION]
     });
-    // Create a form that has already been received
+    // Create a form that has already been sent
     const form = await formFactory({
       ownerId: emitter.user.id,
       opt: {
         status: Status.SENT,
+
         emittedAt: new Date(),
         takenOverAt: new Date(),
         emitterCompanySiret: emitter.company.siret,
@@ -5098,7 +5099,7 @@ describe("Mutation.updateForm", () => {
     const transporter1 = await userWithCompanyFactory("MEMBER");
     const transporter2 = await userWithCompanyFactory("MEMBER");
 
-    // Create a form that has already been received
+    // Create a form that has already been sent
     const form = await formFactory({
       ownerId: emitter.user.id,
       opt: {
@@ -5144,6 +5145,130 @@ describe("Mutation.updateForm", () => {
     ]);
   });
 
+  it("Bugifx - It should be possible to add a tranporter on a SENT BSDD when first transporter has invalid plates", async () => {
+    // Adding a transporter to an older SENT bsd with invalid plates used to fail
+
+    const emitter = await userWithCompanyFactory("ADMIN");
+    const transporter1 = await userWithCompanyFactory("MEMBER");
+    const transporter2 = await userWithCompanyFactory("MEMBER");
+
+    // recipient needs appropriate profiles and subprofiles
+    const destination = await companyFactory({
+      companyTypes: [CompanyType.WASTEPROCESSOR],
+      wasteProcessorTypes: [WasteProcessorType.DANGEROUS_WASTES_INCINERATION]
+    });
+    // Create a form that has already been signed by the first transporter
+    const form = await formFactory({
+      ownerId: emitter.user.id,
+      opt: {
+        status: Status.SENT,
+        emittedAt: new Date(),
+        takenOverAt: new Date(),
+        emitterCompanySiret: emitter.company.siret,
+        recipientCompanySiret: destination.siret,
+
+        transporters: {
+          create: {
+            transporterCompanySiret: transporter1.company.siret,
+            number: 1,
+            readyToTakeOver: true,
+            takenOverAt: new Date(),
+            transporterTransportMode: "ROAD",
+            transporterNumberPlate: "X"
+          }
+        }
+      }
+    });
+
+    const bsddTransporter1 = await getFirstTransporter(form);
+
+    //  Transporter n°2 (not signed yet)
+    const bsddTransporter2 = await bsddTransporterFactory({
+      formId: form.id,
+      opts: {
+        transporterCompanySiret: transporter2.company.siret,
+        takenOverAt: null,
+        transporterNumberPlate: "XY-ZE-23"
+      }
+    });
+
+    const updateFormInput: UpdateFormInput = {
+      id: form.id,
+      transporters: [bsddTransporter1!.id, bsddTransporter2.id]
+    };
+    const { mutate } = makeClient(emitter.user);
+
+    const { errors } = await mutate<Pick<Mutation, "updateForm">>(UPDATE_FORM, {
+      variables: { updateFormInput }
+    });
+
+    expect(errors).toBeUndefined();
+  });
+
+  it("Should validate second transporter plate", async () => {
+    const emitter = await userWithCompanyFactory("ADMIN");
+    const transporter1 = await userWithCompanyFactory("MEMBER");
+    const transporter2 = await userWithCompanyFactory("MEMBER");
+
+    // recipient needs appropriate profiles and subprofiles
+    const destination = await companyFactory({
+      companyTypes: [CompanyType.WASTEPROCESSOR],
+      wasteProcessorTypes: [WasteProcessorType.DANGEROUS_WASTES_INCINERATION]
+    });
+    // Create a form that has already been signed by the first transporter
+    const form = await formFactory({
+      ownerId: emitter.user.id,
+      opt: {
+        status: Status.SENT,
+        emittedAt: new Date(),
+        takenOverAt: new Date(),
+        emitterCompanySiret: emitter.company.siret,
+        recipientCompanySiret: destination.siret,
+
+        transporters: {
+          create: {
+            transporterCompanySiret: transporter1.company.siret,
+            number: 1,
+            readyToTakeOver: true,
+            takenOverAt: new Date(),
+            transporterTransportMode: "ROAD",
+            transporterNumberPlate: "XY-23-AZ"
+          }
+        }
+      }
+    });
+
+    const bsddTransporter1 = await getFirstTransporter(form);
+
+    //  Transporter n°2 (not signed yet)
+    const bsddTransporter2 = await bsddTransporterFactory({
+      formId: form.id,
+      opts: {
+        transporterCompanySiret: transporter2.company.siret,
+        takenOverAt: null,
+        transporterNumberPlate: "XY"
+      }
+    });
+
+    // Add second transporter
+    const updateFormInput: UpdateFormInput = {
+      id: form.id,
+      transporters: [bsddTransporter1!.id, bsddTransporter2.id]
+    };
+    const { mutate } = makeClient(emitter.user);
+
+    const { errors } = await mutate<Pick<Mutation, "updateForm">>(UPDATE_FORM, {
+      variables: { updateFormInput }
+    });
+
+    expect(errors).toEqual([
+      expect.objectContaining({
+        message:
+          "Le numéro d'immatriculation doit faire entre 4 et 12 caractères"
+      })
+    ]);
+  });
+
   it("should be possible to add a transporter even if BSD has intermediaries", async () => {
     // Given
     const emitter = await userWithCompanyFactory("ADMIN");

diff --git a/back/src/forms/validation.ts b/back/src/forms/validation.ts
@@ -1061,7 +1061,8 @@ export const transporterSchemaFn: FactorySchemaOf<
         const {
           transporterTransportMode,
           transporterCompanySiret,
-          transporterCompanyVatNumber
+          transporterCompanyVatNumber,
+          takenOverAt
         } = ctx.parent;
 
         if (
@@ -1081,6 +1082,10 @@ export const transporterSchemaFn: FactorySchemaOf<
           return true;
         }
 
+        // Skip if already takenOver, useful for the multimodal because validation may be re-applied on already taken over transporters
+        if (takenOverAt) {
+          return true;
+        }
         return validatePlates(transporterNumberPlate);
       }),
     transporterCompanyName: yup