Fixes annexe 1 CTA (#3675)

MTES-MCT · Oct 17, 2024 · 8a1c98c · 8a1c98c
1 parent b89d63f
commit 8a1c98c
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 12 deletions.
diff --git a/front/src/Apps/Dashboard/bsdMapper.ts b/front/src/Apps/Dashboard/bsdMapper.ts
@@ -233,6 +233,7 @@ export const mapBsdd = (bsdd: Form): BsdDisplay => {
     ecoOrganisme: bsdd.ecoOrganisme,
     broker: bsdd.broker,
     trader: bsdd.trader,
+    intermediaries: bsdd.intermediaries,
     updatedAt: bsdd.stateSummary?.lastActionOn,
     emittedByEcoOrganisme: bsdd.emittedByEcoOrganisme,
     grouping: bsdd.grouping,

diff --git a/front/src/Apps/Dashboard/dashboardServices.test.ts b/front/src/Apps/Dashboard/dashboardServices.test.ts
@@ -1557,10 +1557,27 @@ describe("dashboardServices", () => {
       transporter: { company: { siret: "2" } },
       broker: { company: { siret: "4" } },
       trader: { company: { siret: "5" } },
+      intermediaries: [{ siret: "6" }],
       destination: { company: { siret: "3" } },
       ecoOrganisme: { siret: "2" }
     } as BsdDisplay;
 
+    it("should return true if testing for Intermediary, strict", () => {
+      const currentSiret = "6";
+      const result = isSiretActorForBsd(bsd, currentSiret, [
+        { type: ActorType.Intermediary }
+      ]);
+      expect(result).toBe(true);
+    });
+
+    it("should return false if testing for Broker with wrong siret, strict", () => {
+      const currentSiret = "6";
+      const result = isSiretActorForBsd(bsd, currentSiret, [
+        { type: ActorType.Broker }
+      ]);
+      expect(result).toBe(false);
+    });
+
     it("should return true if testing for EcoOrganisme, non-strict", () => {
       const currentSiret = "2";
       const result = isSiretActorForBsd(bsd, currentSiret, [

diff --git a/front/src/Apps/Dashboard/dashboardServices.ts b/front/src/Apps/Dashboard/dashboardServices.ts
@@ -256,8 +256,9 @@ export const isSiretActorForBsd = (
     : actorTypes
         .map(({ type, strict = false }) => {
           return actorTypesForSiret.includes(type) && strict
-            ? actorTypesForSiret.length === 1
-            : true;
+            ? actorTypesForSiret.includes(type) &&
+                actorTypesForSiret.length === 1
+            : actorTypesForSiret.includes(type);
         })
         .reduce((acc, curr) => acc && curr, true);
 };
@@ -592,7 +593,11 @@ export const getSealedBtnLabel = (
     (permissions.includes(UserPermission.BsdCanSignEmission) ||
       permissions.includes(UserPermission.BsdCanSignTransport))
   ) {
-    if (isAppendix1(bsd) && canAddAppendix1(bsd)) {
+    if (
+      isAppendix1(bsd) &&
+      canAddAppendix1(bsd) &&
+      hasAppendix1Cta(bsd, currentSiret)
+    ) {
       return AJOUTER_ANNEXE_1;
     }
 
@@ -678,6 +683,7 @@ export const getSentBtnLabel = (
       if (
         isAppendix1(bsd) &&
         canAddAppendix1(bsd) &&
+        hasAppendix1Cta(bsd, currentSiret) &&
         permissions.includes(UserPermission.BsdCanUpdate)
       ) {
         return AJOUTER_ANNEXE_1;
@@ -1502,20 +1508,26 @@ export const hasAppendix1Cta = (
   bsd: BsdDisplay,
   currentSiret: string
 ): boolean => {
+  const isBroker = isSiretActorForBsd(bsd, currentSiret, [
+    { type: ActorType.Broker, strict: true }
+  ]);
+
+  const isIntermediary = isSiretActorForBsd(bsd, currentSiret, [
+    { type: ActorType.Intermediary, strict: true }
+  ]);
+
+  const isTrader = isSiretActorForBsd(bsd, currentSiret, [
+    { type: ActorType.Trader, strict: true }
+  ]);
+
   return (
     bsd.type === BsdType.Bsdd &&
     bsd?.emitterType === EmitterType.Appendix1 &&
     (BsdStatusCode.Sealed === bsd.status ||
       BsdStatusCode.Sent === bsd.status) &&
-    !isSiretActorForBsd(bsd, currentSiret, [
-      { type: ActorType.Broker, strict: true }
-    ]) &&
-    !isSiretActorForBsd(bsd, currentSiret, [
-      { type: ActorType.Intermediary, strict: true }
-    ]) &&
-    !isSiretActorForBsd(bsd, currentSiret, [
-      { type: ActorType.Trader, strict: true }
-    ])
+    !isBroker &&
+    !isIntermediary &&
+    !isTrader
   );
 };
 

diff --git a/front/src/Apps/common/queries/fragments/bsdd.ts b/front/src/Apps/common/queries/fragments/bsdd.ts
@@ -568,6 +568,15 @@ export const dashboardFormFragment = gql`
     }
     currentTransporterSiret
     nextTransporterSiret
+    intermediaries {
+      ...CompanyFragment
+    }
+    trader {
+      ...TraderFragment
+    }
+    broker {
+      ...BrokerFragment
+    }
     metadata {
       latestRevision {
         id
@@ -583,4 +592,7 @@ export const dashboardFormFragment = gql`
       }
     }
   }
+  ${traderFragment}
+  ${companyFragment}
+  ${brokerFragment}
 `;