fix: bug in DS to get champ in repetitionChamp by id

dnum-mi · Mar 11, 2024 · 053d6f1 · 053d6f1
1 parent d5b20a1
commit 053d6f1
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 10 deletions.
diff --git a/src/dossier/dossier.ts b/src/dossier/dossier.ts
@@ -1,5 +1,6 @@
 import { GraphQLClient } from "graphql-request";
 import {
+  Champ,
   Dossier,
   DossierModifierAnnotationTextInput,
   File,
@@ -86,22 +87,23 @@ export const getOneFileFromDossier = async (
   client: GraphQLClient,
   idDossier: number,
   idChamp: string,
+  //TODO: Bug dans DS
+  idChampParent?: string,
 ): Promise<File[]> => {
   const dossier = await graphQlRequest<getDossierType>(
     client,
     getOneFileFromDossierQuery,
     {
       dossierNumber: idDossier,
-      champId: idChamp,
+      champId: idChampParent ?? idChamp,
       includeAnnotations: true,
       includeChamps: true,
       includeMessages: true,
     },
   );
 
   const dossier1 = getDossierMergeFileInFiles(dossier.dossier);
-
-  const champ: Partial<PieceJustificativeChamp> = [
+  const champ: Partial<Champ | PieceJustificativeChamp> = [
     ...(dossier1.annotations || []),
     ...(dossier1.champs || []),
     ...(dossier1.messages.map((mes) => ({
@@ -110,7 +112,21 @@ export const getOneFileFromDossier = async (
     })) || []),
   ].flat()[0];
 
-  return champ.files;
+  if (champ.__typename === "RepetitionChamp") {
+    if (!idChampParent)
+      throw new Error("L'identifiant du champ parent est manquant");
+
+    return (champ as RepetitionChamp).rows.flatMap((row) =>
+      row.champs
+        .filter(
+          (ch: Champ) =>
+            ch.__typename === "PieceJustificativeChamp" && idChamp === ch.id,
+        )
+        .flatMap((ch: PieceJustificativeChamp) => ch.files),
+    );
+  }
+
+  return (champ as PieceJustificativeChamp).files;
 };
 
 export const getAttestationFromDossier = async (

diff --git a/src/ds-api-client.ts b/src/ds-api-client.ts
@@ -88,8 +88,17 @@ export class DsApiClient {
   async DossierFiles(idDossier) {
     return await getFilesFromDossier(this.client, idDossier);
   }
-  async dossierFile(idDossier: number, idChamp: string) {
-    return await getOneFileFromDossier(this.client, idDossier, idChamp);
+  async dossierFile(
+    idDossier: number,
+    idChamp: string,
+    idChampParent?: string,
+  ) {
+    return await getOneFileFromDossier(
+      this.client,
+      idDossier,
+      idChamp,
+      idChampParent,
+    );
   }
 
   async dossierAttestation(idDossier: number) {

diff --git a/src/graphql/getFilesFromDossier.ts b/src/graphql/getFilesFromDossier.ts
@@ -8,8 +8,11 @@ export default gql`
       id
       number
       annotations {
+        __typename
         ...PieceJustificativeFragment
         ... on RepetitionChamp {
+          __typename
+          id
           rows {
             champs {
               ...PieceJustificativeFragment
@@ -20,8 +23,11 @@ export default gql`
       champs {
         ...PieceJustificativeFragment
         ... on RepetitionChamp {
+          __typename
+          id
           rows {
             champs {
+              __typename
               ...PieceJustificativeFragment
             }
           }

diff --git a/src/graphql/getOneFileFromDossier.ts b/src/graphql/getOneFileFromDossier.ts
@@ -15,12 +15,36 @@ export default gql`
       id
       number
       annotations(id: $champId) @include(if: $includeAnnotations) {
-        ...PieceJustificativeFragment
+        ... on RepetitionChamp {
+          __typename
+          rows {
+            champs {
+              __typename
+              ... on PieceJustificativeChamp {
+                ...PieceJustificativeFragment
+              }
+            }
+          }
+        }
+        ... on PieceJustificativeChamp {
+          __typename
+          ...PieceJustificativeFragment
+        }
       }
       attestation @include(if: $includeAttestation) {
+        __typename
         ...FileFragment
       }
       champs(id: $champId) @include(if: $includeChamps) {
+        __typename
+        ... on RepetitionChamp {
+          rows {
+            champs {
+              __typename
+              ...PieceJustificativeFragment
+            }
+          }
+        }
         ...PieceJustificativeFragment
       }
       messages(id: $champId) @include(if: $includeMessages) {

diff --git a/test/ds-api.e2e-spec.ts b/test/ds-api.e2e-spec.ts
@@ -2,7 +2,7 @@ import { DsApiClient } from "../src/index";
 
 const { API_URL, API_TOKEN } = process.env;
 
-describe.skip("ds api", () => {
+describe("ds api", () => {
   let dsApiClient;
 
   beforeAll(() => {
@@ -37,16 +37,17 @@ describe.skip("ds api", () => {
 
   it("get one files from dossiers in annatation", async () => {
     const response = await dsApiClient.dossierFile(221, "Q2hhbXAtMTQ1MA==");
-    console.log(response);
     expect(response).toHaveLength(1);
   });
 
   it("get one files from dossiers in repetable of annotation ", async () => {
     const response = await dsApiClient.dossierFile(
       221,
-      "Q2hhbXAtMTQ1OHwwMUhOWVkyMENWR1pNMUtUOEI2RTk5Q1QyMg==",
+      "Q2hhbXAtMTQ1MnwwMUhOWVk0OVFLRkpTMTFGMFdRRk1RSDVWRw==",
+      "Q2hhbXAtMTQ1MQ==",
     );
     expect(response).toHaveLength(1);
+    expect(response[0]).toHaveProperty("checksum", "LFOK4lV89YdX1f3iNHxWrg==");
   });
 
   it("get one files from dossiers in message ", async () => {