fix: alerts dares

targets/alert-cli/src/dares/__mocks__/getAgreementsData.ts

@@ -0,0 +1,22 @@
+import { GetAgreementData } from "../getAgreementsData";
+
+export async function getAgreements(): Promise<GetAgreementData[]> {
+  return Promise.resolve([
+    {
+      name: "Convention collective nationale des transports routiers et activités auxiliaires du transport",
+      num: 16,
+    },
+    {
+      name: "Convention collective nationale de l'industrie textile du 1er  février 1951.  Etendue par arrêté du 17 décembre 1951, rectificatif du 13 janvier 1952, mise à jour le 29 mai 1979, en vigueur le 1er octobre 1979. Etendue par arrêté du 23 octobre 1979. JONC 12 janvier 1980 ",
+      num: 18,
+    },
+    {
+      name: "Convention collective nationale des établissements privés d'hospitalisation, de soins, de cure et de garde à but non lucratif (FEHAP, convention de 1951)",
+      num: 29,
+    },
+    {
+      name: "Convention collective nationale des industries chimiques et connexes",
+      num: 44,
+    },
+  ]);
+}

targets/alert-cli/src/dares/__mocks__/getDaresData.ts

@@ -0,0 +1,19 @@
+import { Agreement } from "../types";
+
+export const getDaresData = async (): Promise<Agreement[]> => {
+  return Promise.resolve([
+    {
+      name: "Convention collective nationale des transports routiers et activités auxiliaires du transport",
+      num: 16,
+    },
+    { name: "Convention collective nationale de l'industrie textile", num: 18 },
+    {
+      name: "Convention collective nationale des établissements privés d'hospitalisation, de soins, de cure et de garde à but non lucratif (FEHAP, convention de 1951)",
+      num: 29,
+    },
+    {
+      name: "Convention collective nationale de l'Import-export et du Commerce international",
+      num: 43,
+    },
+  ]);
+};

targets/alert-cli/src/dares/__tests__/difference.test.ts

@@ -0,0 +1,24 @@
+import { getDifferenceBetweenIndexAndDares } from "../difference";
+
+jest.mock("../getAgreementsData");
+jest.mock("../getDaresData");
+
+describe("getDifferenceBetweenIndexAndDares", () => {
+  it("should work", async () => {
+    const result = await getDifferenceBetweenIndexAndDares();
+    expect(result).toEqual({
+      addedAgreementsFromDares: [
+        {
+          name: "Convention collective nationale de l'Import-export et du Commerce international",
+          num: 43,
+        },
+      ],
+      removedAgreementsFromDares: [
+        {
+          name: "Convention collective nationale des industries chimiques et connexes",
+          num: 44,
+        },
+      ],
+    });
+  });
+});

targets/alert-cli/src/dares/__tests__/getDaresData.test.ts

@@ -0,0 +1,53 @@
+import { getDaresData } from "../getDaresData";
+
+jest.mock("../fetchDaresXlsx", () => {
+  return {
+    fetchDaresXlsx: () => {
+      return [
+        {
+          name: "Liste IDCC-Publication",
+          data: [
+            ["IDENTIFIANT DE CONVENTION COLLECTIVE (IDCC) : "],
+            [
+              null,
+              "CODES EN VIGUEUR POUR LE REMPLISSAGE de la DADS-U et de la DSN",
+            ],
+            [],
+            ["IDCC", "TITRE DE LA CONVENTION"],
+            [
+              "0016",
+              "Convention collective nationale des transports routiers et activités auxiliaires du transport",
+            ],
+            ["0018", "Convention collective nationale de l'industrie textile"],
+            [
+              "0029",
+              "Convention collective nationale des établissements privés d'hospitalisation, de soins, de cure et de garde à but non lucratif (FEHAP, convention de 1951)",
+            ],
+            ["9998", "___Convention non encore en vigueur___"],
+            ["9999", "___Sans convention collective___"],
+          ],
+        },
+      ];
+    },
+  };
+});
+
+describe("getDaresData", () => {
+  it("should work", async () => {
+    const result = await getDaresData();
+    expect(result).toEqual([
+      {
+        name: "Convention collective nationale des transports routiers et activités auxiliaires du transport",
+        num: 16,
+      },
+      {
+        name: "Convention collective nationale de l'industrie textile",
+        num: 18,
+      },
+      {
+        name: "Convention collective nationale des établissements privés d'hospitalisation, de soins, de cure et de garde à but non lucratif (FEHAP, convention de 1951)",
+        num: 29,
+      },
+    ]);
+  });
+});

targets/alert-cli/src/dares/difference.ts

@@ -1,46 +1,22 @@
-import xlsx from "node-xlsx";
 import { Diff, Agreement } from "./types";
-import fs from "fs";
-
-export function getDifferenceBetweenIndexAndDares(
-  pathDares: string,
-  pathIndex: string
-): Diff {
-  const workSheetsFromFile = xlsx.parse(pathDares);
-
-  const supportedCcXlsx: Agreement[] = [];
-
-  workSheetsFromFile[0].data.forEach((row: string[]) => {
-    const ccNumber = parseInt(row[0]);
-    const ccName = row[1];
-    if (ccNumber && ccName) {
-      const ccNameWithoutParenthesis = ccName
-        .replace(/\(.*annexée.*\)/gi, "")
-        .trim();
-      supportedCcXlsx.push({
-        name: ccNameWithoutParenthesis,
-        num: ccNumber,
-      });
-    }
-  });
-
-  const dataJson = JSON.parse(fs.readFileSync(pathIndex, "utf8"));
-
-  const supportedCcIndexJson: Agreement[] = dataJson.map((cc: any) => {
-    return {
-      name: cc.title,
-      num: cc.num,
-    };
-  });
-
-  const missingAgreementsFromDares: Agreement[] = supportedCcXlsx.filter(
-    (ccIndex) =>
-      !supportedCcIndexJson.find((ccXlsx) => ccXlsx.num === ccIndex.num)
+import { getDaresData } from "./getDaresData";
+import { getAgreements } from "./getAgreementsData";
+
+export async function getDifferenceBetweenIndexAndDares(): Promise<Diff> {
+  const daresDataList = await getDaresData();
+  const AgreementDataList = await getAgreements();
+
+  const addedAgreementsFromDares: Agreement[] = daresDataList.filter(
+    (daresData) =>
+      !AgreementDataList.find(
+        (agreementData) => agreementData.num === daresData.num
+      )
   );
 
-  const exceedingAgreementsFromKali = supportedCcIndexJson.filter(
-    (ccXlsx) => !supportedCcXlsx.find((ccIndex) => ccIndex.num === ccXlsx.num)
+  const removedAgreementsFromDares = AgreementDataList.filter(
+    (agreementData) =>
+      !daresDataList.find((daresData) => daresData.num === agreementData.num)
   );
 
-  return { missingAgreementsFromDares, exceedingAgreementsFromKali };
+  return { addedAgreementsFromDares, removedAgreementsFromDares };
 }

targets/alert-cli/src/dares/fetchDaresXlsx.ts

@@ -0,0 +1,13 @@
+import { extractDaresXlsxFromMT } from "./scrapping";
+import { downloadFileInTempFolder } from "./download";
+import xlsx from "node-xlsx";
+
+export const fetchDaresXlsx = async () => {
+  const xlsxUrl = await extractDaresXlsxFromMT();
+  const xlsxPath = await downloadFileInTempFolder(xlsxUrl, "dares.xlsx");
+  const workSheetsFromFile: {
+    name: string;
+    data: any[][];
+  }[] = xlsx.parse(xlsxPath);
+  return workSheetsFromFile;
+};

targets/alert-cli/src/dares/getAgreementsData.ts

@@ -0,0 +1,37 @@
+import { gqlClient } from "@shared/utils";
+
+const getAgreementQuery = `
+query queryAgreements {
+  agreements: agreement_agreements(
+  where: { id : { _neq: "0000" }},
+  order_by: { id: asc }) {
+    id
+    name
+  }
+}
+`;
+
+export interface GetAgreementData {
+  num: number;
+  name: string;
+}
+
+interface GetAgreementQueryResult {
+  agreements: {
+    id: string;
+    name: string;
+  }[];
+}
+
+export async function getAgreements(): Promise<GetAgreementData[]> {
+  const client = gqlClient();
+  const result = await client
+    .query<GetAgreementQueryResult>(getAgreementQuery, {})
+    .toPromise();
+  if (!result || !result.data || !result.data?.agreements) {
+    throw new Error("An error occured on hasura agreement loading");
+  }
+  return result.data.agreements.map(({ name, id }) => {
+    return { name, num: parseInt(id) };
+  });
+}

targets/alert-cli/src/dares/getDaresData.ts

@@ -0,0 +1,30 @@
+import { Agreement } from "./types";
+import { fetchDaresXlsx } from "./fetchDaresXlsx";
+
+export const getDaresData = async () => {
+  const workSheetsFromFile: {
+    name: string;
+    data: any[][];
+  }[] = await fetchDaresXlsx();
+
+  return workSheetsFromFile[0].data.reduce<Agreement[]>((arr, row) => {
+    const ccNumber = parseInt(row[0]);
+    if ([9998, 9999].indexOf(ccNumber) !== -1) {
+      return arr;
+    }
+    const ccName = row[1] as string;
+    if (ccNumber && ccName) {
+      const ccNameWithoutParenthesis = ccName
+        .replace(/\(.*annexée.*\)/gi, "")
+        .trim();
+      return [
+        ...arr,
+        {
+          name: ccNameWithoutParenthesis,
+          num: ccNumber,
+        },
+      ];
+    }
+    return arr;
+  }, []);
+};

targets/alert-cli/src/dares/index.ts

@@ -1,13 +1,7 @@
-import { URL_KALI } from "./config";
 import { getDifferenceBetweenIndexAndDares } from "./difference";
-import { downloadFileInTempFolder } from "./download";
 import { saveDiff } from "./save";
-import { extractDaresXlsxFromMT } from "./scrapping";
 
 export const runDares = async () => {
-  const xlsxUrl = await extractDaresXlsxFromMT();
-  const xlsxPath = await downloadFileInTempFolder(xlsxUrl, "dares.xlsx");
-  const indexPath = await downloadFileInTempFolder(URL_KALI, "index.json");
-  const diff = await getDifferenceBetweenIndexAndDares(xlsxPath, indexPath);
+  const diff = await getDifferenceBetweenIndexAndDares();
   await saveDiff(diff);
 };

targets/alert-cli/src/dares/save.ts

@@ -6,7 +6,7 @@ export const saveDiff = async (diff: Diff) => {
   const alertRepository = new AlertRepository(gqlClient());
 
   const alertsRemovedToSave: DaresAlertInsert[] =
-    diff.exceedingAgreementsFromKali.map((agreement) => ({
+    diff.removedAgreementsFromDares.map((agreement) => ({
       info: {
         id: agreement.num,
       },
@@ -31,7 +31,7 @@ export const saveDiff = async (diff: Diff) => {
     }));
 
   const alertsAddedToSave: DaresAlertInsert[] =
-    diff.missingAgreementsFromDares.map((agreement) => ({
+    diff.addedAgreementsFromDares.map((agreement) => ({
       info: {
         id: agreement.num,
       },

targets/alert-cli/src/dares/types.ts

@@ -1,8 +1,8 @@
 import { DaresAlert } from "@socialgouv/cdtn-types";
 
 export interface Diff {
-  missingAgreementsFromDares: Agreement[];
-  exceedingAgreementsFromKali: Agreement[];
+  addedAgreementsFromDares: Agreement[];
+  removedAgreementsFromDares: Agreement[];
 }
 
 export interface Agreement {

targets/alert-cli/src/index.ts

@@ -53,17 +53,17 @@ export async function run(
 
 async function main() {
   await runDares();
-  const githubToken = process.env.GITHUB_TOKEN;
-  if (!githubToken) {
-    throw new Error("GITHUB_TOKEN is not defined");
-  }
-  const api = new GithubApi(githubToken);
-  const sourceRepository = new SourcesRepository(gqlClient());
-  const alertRepository = new AlertRepository(gqlClient());
-  const ficheSPRepository = new FicheSPRepository(gqlClient());
-  const ficheSpIds = await ficheSPRepository.getFicheServicePublicIds();
-  const alertDetector = new AlertDetector(api, ficheSpIds);
-  await run(api, sourceRepository, alertRepository, alertDetector);
+  // const githubToken = process.env.GITHUB_TOKEN;
+  // if (!githubToken) {
+  //   throw new Error("GITHUB_TOKEN is not defined");
+  // }
+  // const api = new GithubApi(githubToken);
+  // const sourceRepository = new SourcesRepository(gqlClient());
+  // const alertRepository = new AlertRepository(gqlClient());
+  // const ficheSPRepository = new FicheSPRepository(gqlClient());
+  // const ficheSpIds = await ficheSPRepository.getFicheServicePublicIds();
+  // const alertDetector = new AlertDetector(api, ficheSpIds);
+  // await run(api, sourceRepository, alertRepository, alertDetector);
 }
 
 main().catch((error) => {

targets/hasura/migrations/default/1727689859510_add_table_to_audit/down.sql

@@ -0,0 +1,10 @@
+DROP TRIGGER IF EXISTS audit_trigger_row on search.prequalified_documents;
+DROP TRIGGER IF EXISTS audit_trigger_row on search.prequalified;
+DROP TRIGGER IF EXISTS audit_trigger_row on information.informations_references;
+DROP TRIGGER IF EXISTS audit_trigger_row on information.informations_contents_references;
+DROP TRIGGER IF EXISTS audit_trigger_row on information.informations_contents_blocks_contents;
+DROP TRIGGER IF EXISTS audit_trigger_row on information.informations_contents_blocks;
+DROP TRIGGER IF EXISTS audit_trigger_row on information.informations_contents;
+DROP TRIGGER IF EXISTS audit_trigger_row on information.informations;
+DROP TRIGGER IF EXISTS audit_trigger_row on agreement.agreements;
+

targets/hasura/migrations/default/1727689859510_add_table_to_audit/up.sql

@@ -0,0 +1,9 @@
+select audit.audit_table('agreement.agreements'::regclass, true, true);
+select audit.audit_table('information.informations'::regclass, true, true);
+select audit.audit_table('information.informations_contents'::regclass, true, true);
+select audit.audit_table('information.informations_contents_blocks'::regclass, true, true);
+select audit.audit_table('information.informations_contents_blocks_contents'::regclass, true, true);
+select audit.audit_table('information.informations_contents_references'::regclass, true, true);
+select audit.audit_table('information.informations_references'::regclass, true, true);
+select audit.audit_table('search.prequalified'::regclass, true, true);
+select audit.audit_table('search.prequalified_documents'::regclass, true, true);

targets/hasura/migrations/default/1727795072418_clean_dares_alerts/up.sql

@@ -0,0 +1,3 @@
+delete from alerts
+where repository = 'dares'
+and status = 'todo';