[TRA-15655] Correction de la mise à jour des numéros d'identification…

… sur le bsvhu (#3876)
MTES-MCT · Jan 9, 2025 · d4b0125 · d4b0125
2 parents 8ecc230 + 8949788
commit d4b0125
Show file tree

Hide file tree

Showing 17 changed files with 242 additions and 106 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -27,6 +27,10 @@ et le projet suit un schéma de versionning inspiré de [Calendar Versioning](ht
 
 - Pour le Bsvhu lors d'un transport routier, la plaque d'immatriculation est désormais obligatoire et les poids de déchets sont limités à 40 T (50 kT pour les autres modes) [PR 3719](https://github.com/MTES-MCT/trackdechets/pull/3719)
 
+#### :bug: Corrections de bugs
+
+- Correction de la mise à jour des numéros d'identification sur le bsvhu [PR 3876](https://github.com/MTES-MCT/trackdechets/pull/3876)
+
 # [2024.12.1] 17/12/2024
 
 #### :rocket: Nouvelles fonctionnalités

diff --git a/back/src/bsvhu/converter.ts b/back/src/bsvhu/converter.ts
@@ -150,6 +150,7 @@ export function expandVhuFormFromDb(form: PrismaVhuForm): GraphqlVhuForm {
         mail: form.transporterCompanyMail,
         vatNumber: form.transporterCompanyVatNumber
       }),
+      customInfo: form.transporterCustomInfo,
       recepisse: nullIfNoValues<BsvhuRecepisse>({
         number: form.transporterRecepisseNumber,
         department: form.transporterRecepisseDepartment,
@@ -370,6 +371,7 @@ function flattenVhuTransporterInput({
     transporterCompanyVatNumber: chain(transporter, t =>
       chain(t.company, c => c.vatNumber)
     ),
+    transporterCustomInfo: chain(transporter, t => t.customInfo),
     transporterRecepisseNumber: chain(transporter, t =>
       chain(t.recepisse, r => r.number)
     ),

diff --git a/back/src/bsvhu/resolvers/mutations/__tests__/updateBsvhu.integration.ts b/back/src/bsvhu/resolvers/mutations/__tests__/updateBsvhu.integration.ts
@@ -50,6 +50,10 @@ const UPDATE_VHU_FORM = gql`
           validityLimit
           isExempted
         }
+        customInfo
+        transport {
+          plates
+        }
       }
       intermediaries {
         siret
@@ -312,7 +316,9 @@ describe("Mutation.Vhu.update", () => {
     const { mutate } = makeClient(user);
     const input = {
       transporter: {
-        company: { vatNumber: foreignTransporter.vatNumber }
+        company: { vatNumber: foreignTransporter.vatNumber },
+        customInfo: "lorem",
+        transport: { plates: ["SD-34-PO"] }
       }
     };
     const { data } = await mutate<Pick<Mutation, "updateBsvhu">>(
@@ -325,6 +331,10 @@ describe("Mutation.Vhu.update", () => {
     expect(data.updateBsvhu.transporter!.company!.vatNumber).toBe(
       foreignTransporter.vatNumber
     );
+    expect(data.updateBsvhu.transporter!.customInfo).toBe("lorem");
+    expect(data.updateBsvhu.transporter!.transport!.plates).toStrictEqual([
+      "SD-34-PO"
+    ]);
   });
 
   it("should update transporter recepisse with data pulled from db", async () => {

diff --git a/back/src/bsvhu/typeDefs/bsvhu.inputs.graphql b/back/src/bsvhu/typeDefs/bsvhu.inputs.graphql
@@ -282,6 +282,8 @@ input BsvhuTransporterInput {
   company: CompanyInput
   "Récépissé transporteur"
   recepisse: BsvhuRecepisseInput
+  "Champ libre"
+  customInfo: String
   "Informations liés au transport"
   transport: BsvhuTransportInput
 }

diff --git a/back/src/bsvhu/typeDefs/bsvhu.objects.graphql b/back/src/bsvhu/typeDefs/bsvhu.objects.graphql
@@ -107,6 +107,8 @@ type BsvhuTransporter {
   company: FormCompany
   "Récépissé transporteur"
   recepisse: BsvhuRecepisse
+  "Champ libre"
+  customInfo: String
   "Informations liés au transport"
   transport: BsvhuTransport
 }

diff --git a/back/src/bsvhu/validation/rules.ts b/back/src/bsvhu/validation/rules.ts
@@ -25,7 +25,6 @@ export type BsvhuEditableFields = Required<
     | "emitterCustomInfo"
     | "emitterNotOnTD"
     | "destinationCustomInfo"
-    | "transporterCustomInfo"
     | "emitterEmissionSignatureDate"
     | "emitterEmissionSignatureAuthor"
     | "transporterTransportSignatureDate"
@@ -541,6 +540,11 @@ export const bsvhuEditionRules: BsvhuEditionRules = {
       }
     }
   },
+  transporterCustomInfo: {
+    readableFieldName:
+      "les champs d'informations complémentaires du transporteur",
+    sealed: { from: "TRANSPORT" }
+  },
   ecoOrganismeName: {
     readableFieldName: "le nom de l'éco-organisme",
     sealed: { from: "OPERATION" },

diff --git a/back/src/bsvhu/validation/schema.ts b/back/src/bsvhu/validation/schema.ts
@@ -210,7 +210,6 @@ const rawBsvhuSchema = z.object({
     )
     .max(2, "Un maximum de 2 plaques d'immatriculation est accepté")
     .default([]),
-
   ecoOrganismeName: z.string().nullish(),
   ecoOrganismeSiret: siretSchema(CompanyRole.EcoOrganisme).nullish(),
   brokerCompanyName: z.string().nullish(),

diff --git a/front/src/Apps/Dashboard/Components/BsdCardList/BsdCardList.tsx b/front/src/Apps/Dashboard/Components/BsdCardList/BsdCardList.tsx
@@ -461,6 +461,7 @@ function BsdCardList({
           const hasAutomaticSignature = siretsWithAutomaticSignature?.includes(
             node?.emitter?.company?.siret
           );
+
           return (
             <li className="bsd-card-list__item" key={key}>
               <BsdCard

diff --git a/front/src/Apps/Dashboard/Components/TransporterInfoEditModal/TransporterInfoEditModal.tsx b/front/src/Apps/Dashboard/Components/TransporterInfoEditModal/TransporterInfoEditModal.tsx
@@ -7,7 +7,8 @@ import {
   MutationUpdateBsdasriArgs,
   MutationUpdateBsffArgs,
   MutationUpdateBspaohArgs,
-  MutationUpdateFormTransporterArgs
+  MutationUpdateFormTransporterArgs,
+  MutationUpdateBsvhuArgs
 } from "@td/codegen-ui";
 import TdModal from "../../../common/Components/Modal/Modal";
 import { NotificationError } from "../../../common/Components/Error/Error";
@@ -20,6 +21,7 @@ import { UPDATE_BSDD_TRANSPORTER } from "../../../common/queries/bsdd/queries";
 import { UPDATE_BSFF_FORM } from "../../../common/queries/bsff/queries";
 import { UPDATE_BSDASRI } from "../../../common/queries/bsdasri/queries";
 import { UPDATE_BSPAOH } from "../../../common/queries/bspaoh/queries";
+import { UPDATE_VHU_FORM } from "../../../common/queries/bsvhu/queries";
 import TransporterInfoEditForm from "./TransporterInfoEditForm";
 import { Loader } from "../../../common/Components";
 
@@ -73,6 +75,13 @@ const TransporterInfoEditModal = ({
     UPDATE_BSPAOH
   );
 
+  const [
+    updateTransporterInfoBsvhu,
+    { error: errorBsvhu, loading: loadingBsvhu }
+  ] = useMutation<Pick<Mutation, "updateBsvhu">, MutationUpdateBsvhuArgs>(
+    UPDATE_VHU_FORM
+  );
+
   const onSubmitForm = async data => {
     if (bsd.type === BsdType.Bsdd) {
       await updateTransporterInfoBsdd({
@@ -140,17 +149,35 @@ const TransporterInfoEditModal = ({
           }
         }
       });
+    } else if (bsd.type === BsdType.Bsvhu) {
+      await updateTransporterInfoBsvhu({
+        variables: {
+          id: bsd.id,
+          input: {
+            transporter: {
+              customInfo: data.customInfo,
+              transport: { plates: formattedPlates }
+            }
+          }
+        }
+      });
     }
   };
 
   const error =
-    errorBsdd || errorBsda || errorBsdasri || errorBsff || errorBspaoh;
+    errorBsdd ||
+    errorBsda ||
+    errorBsdasri ||
+    errorBsff ||
+    errorBspaoh ||
+    errorBsvhu;
   const loading =
     loadingBsdd ||
     loadingBsda ||
     loadingBsdasri ||
     loadingBsff ||
-    loadingBspaoh;
+    loadingBspaoh ||
+    loadingBsvhu;
 
   return (
     <TdModal

diff --git a/front/src/Apps/Dashboard/Validation/BSPaoh/WorkflowAction/SignTransport.tsx b/front/src/Apps/Dashboard/Validation/BSPaoh/WorkflowAction/SignTransport.tsx
@@ -23,7 +23,7 @@ import { useForm, FormProvider } from "react-hook-form";
 import { datetimeToYYYYMMDDHHSS } from "../paohUtils";
 import { SignatureTimestamp } from "./components/Signature";
 
-import { RhfTagsInputWrapper } from "../../../../../Apps/Forms/Components/TagsInput/TagsInputWrapper";
+import { RhfTagsInputWrapper } from "../../../../Forms/Components/TagsInput/TagsInputWrapper";
 
 // instanciate schema in component to have an up-to-date max datetime validaton
 const getSchema = () =>