feat(alert-cli): ajout du support des fiche-sp au niveau des contribu…

…tions (#1205) * one * one * one * one * one * one * Update targets/frontend/src/components/changes/ChangesFicheSp.tsx Co-authored-by: Caroline <[email protected]> * Update targets/frontend/src/components/changes/ChangesFicheSp.tsx Co-authored-by: Caroline <[email protected]> * one * one * one * feat: add tu * fix: conv --------- Co-authored-by: Caroline <[email protected]>
SocialGouv · Dec 22, 2023 · add9832 · add9832
1 parent aa428d7
commit add9832
Show file tree

Hide file tree

Showing 81 changed files with 728 additions and 301 deletions.
diff --git a/shared/types/contributions.ts b/shared/types/contributions.ts
@@ -1,3 +1,6 @@
+import { FicheServicePublicDoc } from "./index";
+import { Document } from "./documents";
+
 export type ContributionsAnswers = {
   id: string;
   content: string | null;
@@ -6,7 +9,7 @@ export type ContributionsAnswers = {
   kali_references: ContributionKaliReferences[];
   legi_references: ContributionLegiReferences[];
   other_references: ContributionOtherReferences[];
-  cdtn_references: ContributionCdtnReferences[];
+  cdtn_references: Partial<ContributionCdtnReferences>[];
   content_fiche_sp: ContributionContentFicheSp | null;
   message_block_generic_no_CDT: string | null;
   agreement: ContributionAgreement;
@@ -42,14 +45,15 @@ export type ContributionAgreement = {
 };
 
 export type ContributionCdtnReferences = {
-  document: {
-    cdtn_id: string;
-  };
+  cdtn_id: string;
+  answer: ContributionsAnswers;
+  answer_id: string;
+  document: Partial<Document<any>>;
 };
 
 export type ContributionContentFicheSp = {
   initial_id: string;
-  document: Record<string, any>;
+  document: FicheServicePublicDoc;
 };
 
 export type ContributionLegiReferences = {

diff --git a/shared/types/index.ts b/shared/types/index.ts
@@ -322,6 +322,7 @@ export type DocumentInfo = Pick<HasuraDocument, "source" | "title"> & {
 };
 export type DocumentInfoWithCdtnRef = DocumentInfo & {
   ref: Pick<DocumentInfo, "id" | "title">;
+  url?: string;
 };
 
 /** Fiche travail alert changes */

diff --git a/targets/alert-cli/src/ccn-list.ts b/targets/alert-cli/src/ccn-list.ts
diff --git a/targets/alert-cli/src/diff/dila/CompareDilaContent.ts b/targets/alert-cli/src/diff/dila/CompareDilaContent.ts
@@ -19,8 +19,8 @@ import type {
 import parents from "unist-util-parents";
 import { selectAll } from "unist-util-select";
 
-import type { AgreementFileChange } from "./Agreement/types";
-import type { CodeFileChange } from "./Code/types";
+import type { AgreementFileChange } from "./kali/types";
+import type { CodeFileChange } from "./legi/types";
 import type {
   Article,
   ArticleWithParent,

diff --git a/...rt-cli/src/diff/dila/ReleventDocuments.ts → ...rt-cli/src/diff/dila/RelevantDocuments.ts b/...rt-cli/src/diff/dila/ReleventDocuments.ts → ...rt-cli/src/diff/dila/RelevantDocuments.ts
@@ -1,7 +1,7 @@
-import getContribReferences from "../../extractDilaReferences/contribution";
-import getEditorialContentReferences from "../../extractDilaReferences/editorialContents";
-import getTravailEmploiReferences from "../../extractDilaReferences/ficheTravailEmploi";
-import getMailTemplateReferences from "../../extractDilaReferences/mailTemplates";
+import getContribReferences from "./extractReferences/contribution";
+import getEditorialContentReferences from "./extractReferences/editorialContents";
+import getTravailEmploiReferences from "./extractReferences/ficheTravailEmploi";
+import getMailTemplateReferences from "./extractReferences/mailTemplates";
 import { DilaChanges } from "./types";
 import { DocumentReferences } from "@shared/types";
 

diff --git a/...tests__/RelevantDocumentsExtractorStub.ts → ...tests__/RelevantDocumentsExtractorStub.ts b/...tests__/RelevantDocumentsExtractorStub.ts → ...tests__/RelevantDocumentsExtractorStub.ts
@@ -1,4 +1,4 @@
-import { RelevantDocumentsExtractor } from "../dila/ReleventDocuments";
+import { RelevantDocumentsExtractor } from "../RelevantDocuments";
 import { DilaChanges, DocumentReferences } from "@shared/types";
 
 export class RelevantDocumentsExtractorStub

diff --git a/...cli/src/__tests__/relevantContent.test.ts → ...ff/dila/__tests__/relevantContent.test.ts b/...cli/src/__tests__/relevantContent.test.ts → ...ff/dila/__tests__/relevantContent.test.ts
@@ -1,11 +1,11 @@
 import { describe, expect, it } from "@jest/globals";
 import type { DilaChanges } from "@shared/types";
-import { RelevantDocumentsExtractorImpl } from "../diff/dila/ReleventDocuments";
+import { RelevantDocumentsExtractorImpl } from "../RelevantDocuments";
 
-jest.mock("../extractDilaReferences/ficheTravailEmploi", () => () => []);
-jest.mock("../extractDilaReferences/mailTemplates", () => () => []);
-jest.mock("../extractDilaReferences/editorialContents", () => () => []);
-jest.mock("../extractDilaReferences/contribution", () => () => [
+jest.mock("../extractReferences/ficheTravailEmploi", () => () => []);
+jest.mock("../extractReferences/mailTemplates", () => () => []);
+jest.mock("../extractReferences/editorialContents", () => () => []);
+jest.mock("../extractReferences/contribution", () => () => [
   {
     document: {
       id: "id-generic",

diff --git a/...ences/__tests__/editorialContents.test.ts → ...ences/__tests__/editorialContents.test.ts b/...ences/__tests__/editorialContents.test.ts → ...ences/__tests__/editorialContents.test.ts
diff --git a/...nces/__tests__/ficheTravailEmploi.test.ts → ...nces/__tests__/ficheTravailEmploi.test.ts b/...nces/__tests__/ficheTravailEmploi.test.ts → ...nces/__tests__/ficheTravailEmploi.test.ts
@@ -3,7 +3,7 @@ import { expect, test } from "@jest/globals";
 import type { FicheTravail } from "../ficheTravailEmploi";
 import main, { extractFicheTravailEmploiRef } from "../ficheTravailEmploi";
 
-jest.mock("../getAllDocumentsBySource", () => {
+jest.mock("../../../shared/getAllDocumentsBySource", () => {
   return {
     getAllDocumentsBySource: () => mockFiches,
   };

diff --git a/...eferences/__tests__/mailTemplates.test.ts → ...eferences/__tests__/mailTemplates.test.ts b/...eferences/__tests__/mailTemplates.test.ts → ...eferences/__tests__/mailTemplates.test.ts
diff --git a/...sts__/mocks/editorialContent.payload.json → ...sts__/mocks/editorialContent.payload.json b/...sts__/mocks/editorialContent.payload.json → ...sts__/mocks/editorialContent.payload.json
diff --git a/...__tests__/mocks/mailTemplate.payload.json → ...__tests__/mocks/mailTemplate.payload.json b/...__tests__/mocks/mailTemplate.payload.json → ...__tests__/mocks/mailTemplate.payload.json
diff --git a/...ests__/getContributionsReferences.test.ts → ...ests__/getContributionsReferences.test.ts b/...ests__/getContributionsReferences.test.ts → ...ests__/getContributionsReferences.test.ts
diff --git a/...tribution/__tests__/getOldContrib.test.ts → ...tribution/__tests__/getOldContrib.test.ts b/...tribution/__tests__/getOldContrib.test.ts → ...tribution/__tests__/getOldContrib.test.ts
@@ -3,7 +3,7 @@ import { expect, test } from "@jest/globals";
 import type { Contrib } from "../getOldContribRef";
 import { extractContributionsRef, getOldContribRef } from "../getOldContribRef";
 
-jest.mock("../../getAllDocumentsBySource", () => {
+jest.mock("../../../../shared/getAllDocumentsBySource", () => {
   return {
     getAllDocumentsBySource: () => mockContributions,
   };

diff --git a/...ontribution/getContributionsReferences.ts → ...ontribution/getContributionsReferences.ts b/...ontribution/getContributionsReferences.ts → ...ontribution/getContributionsReferences.ts
diff --git a/...ferences/contribution/getOldContribRef.ts → ...ferences/contribution/getOldContribRef.ts b/...ferences/contribution/getOldContribRef.ts → ...ferences/contribution/getOldContribRef.ts
@@ -5,7 +5,7 @@ import type {
 } from "@shared/types";
 import { SOURCES } from "@socialgouv/cdtn-sources";
 
-import { getAllDocumentsBySource } from "../getAllDocumentsBySource";
+import { getAllDocumentsBySource } from "../../../shared/getAllDocumentsBySource";
 
 export type Contrib = Pick<
   ContributionComplete | ContributionFiltered,

diff --git a/...tractDilaReferences/contribution/index.ts → ...a/extractReferences/contribution/index.ts b/...tractDilaReferences/contribution/index.ts → ...a/extractReferences/contribution/index.ts
diff --git a/...tribution/queryContributionsReferences.ts → ...tribution/queryContributionsReferences.ts b/...tribution/queryContributionsReferences.ts → ...tribution/queryContributionsReferences.ts
diff --git a/...xtractDilaReferences/editorialContents.ts → ...la/extractReferences/editorialContents.ts b/...xtractDilaReferences/editorialContents.ts → ...la/extractReferences/editorialContents.ts
@@ -12,8 +12,8 @@ import { DilaApiClient } from "@socialgouv/dila-api-client";
 import memoizee from "memoizee";
 import pMap from "p-map";
 
-import { getAllDocumentsBySource } from "./getAllDocumentsBySource";
-import { WarningRepository } from "../repositories/WarningRepository";
+import { getAllDocumentsBySource } from "../../shared/getAllDocumentsBySource";
+import { WarningRepository } from "../../../repositories/WarningRepository";
 import { gqlClient } from "@shared/utils";
 
 export type EditorialContentSubset = Pick<

diff --git a/...tractDilaReferences/ficheTravailEmploi.ts → ...a/extractReferences/ficheTravailEmploi.ts b/...tractDilaReferences/ficheTravailEmploi.ts → ...a/extractReferences/ficheTravailEmploi.ts
@@ -2,7 +2,7 @@ import type { DocumentReferences, FicheTravailEmploi } from "@shared/types";
 import { SOURCES } from "@socialgouv/cdtn-sources";
 import memoizee from "memoizee";
 
-import { getAllDocumentsBySource } from "./getAllDocumentsBySource";
+import { getAllDocumentsBySource } from "../../shared/getAllDocumentsBySource";
 
 let references: DocumentReferences[] = [];
 

diff --git a/...rc/extractDilaReferences/mailTemplates.ts → ...f/dila/extractReferences/mailTemplates.ts b/...rc/extractDilaReferences/mailTemplates.ts → ...f/dila/extractReferences/mailTemplates.ts
@@ -8,8 +8,8 @@ import { DilaApiClient } from "@socialgouv/dila-api-client";
 import memoizee from "memoizee";
 import pMap from "p-map";
 
-import { getAllDocumentsBySource } from "./getAllDocumentsBySource";
-import { WarningRepository } from "../repositories/WarningRepository";
+import { getAllDocumentsBySource } from "../../shared/getAllDocumentsBySource";
+import { WarningRepository } from "../../../repositories/WarningRepository";
 import { gqlClient } from "@shared/utils";
 
 export type MailTemplateSubset = Pick<

diff --git a/targets/alert-cli/src/diff/dila/index.ts b/targets/alert-cli/src/diff/dila/index.ts
@@ -1,3 +1,3 @@
-export * from "./Agreement";
-export * from "./Code";
+export * from "./kali";
+export * from "./legi";
 export * from "./CompareDilaContent";
diff --git a/...dila/Agreement/ProcessAgreementChanges.ts → ...diff/dila/kali/ProcessAgreementChanges.ts b/...dila/Agreement/ProcessAgreementChanges.ts → ...diff/dila/kali/ProcessAgreementChanges.ts
@@ -8,7 +8,7 @@ import {
 } from "../CompareDilaContent";
 import type { Diff, DilaChanges } from "../types";
 import type { AgreementFileChange } from "./types";
-import { RelevantDocumentsExtractor } from "../ReleventDocuments";
+import { RelevantDocumentsExtractor } from "../RelevantDocuments";
 
 function extractChanges(fileChange: AgreementFileChange): {
   changes: Diff;

diff --git a/...ila/Agreement/ProcessAgreementDataDiff.ts → ...iff/dila/kali/ProcessAgreementDataDiff.ts b/...ila/Agreement/ProcessAgreementDataDiff.ts → ...iff/dila/kali/ProcessAgreementDataDiff.ts
@@ -1,7 +1,7 @@
-import type { DataDiffFunction } from "../../type";
+import type { DataDiffFunction } from "../../../types";
 import processAgreementChanges from "./ProcessAgreementChanges";
 import processAgreementFileChanges from "./ProcessAgreementFileChanges";
-import { RelevantDocumentsExtractorImpl } from "../ReleventDocuments";
+import { RelevantDocumentsExtractorImpl } from "../RelevantDocuments";
 
 const processAgreementDataDiff: DataDiffFunction = async ({
   tag,

diff --git a/.../Agreement/ProcessAgreementFileChanges.ts → .../dila/kali/ProcessAgreementFileChanges.ts b/.../Agreement/ProcessAgreementFileChanges.ts → .../dila/kali/ProcessAgreementFileChanges.ts
@@ -1,8 +1,8 @@
 import type { Agreement } from "@socialgouv/kali-data-types";
 
-import { createToJson, getFilename } from "../../../node-git.helpers";
+import { createToJson, getFilename } from "../../../utils/node-git.helpers";
 import type { AgreementFileChange } from "./types";
-import { Diff, DiffFile, LoadFileFn } from "../../type";
+import { Diff, DiffFile, LoadFileFn } from "../../../types";
 import { GitTagData } from "../../../types";
 
 const agreementFileChange = async (

diff --git a/...set/filechanges_kali_agreement_added.json → ...set/filechanges_kali_agreement_added.json b/...set/filechanges_kali_agreement_added.json → ...set/filechanges_kali_agreement_added.json
diff --git a/...es_kali_agreement_irrevelant_changes.json → ...es_kali_agreement_irrevelant_changes.json b/...es_kali_agreement_irrevelant_changes.json → ...es_kali_agreement_irrevelant_changes.json
diff --git a/...ilechanges_kali_agreement_no_changes.json → ...ilechanges_kali_agreement_no_changes.json b/...ilechanges_kali_agreement_no_changes.json → ...ilechanges_kali_agreement_no_changes.json
diff --git a/...t/filechanges_kali_agreement_removed.json → ...t/filechanges_kali_agreement_removed.json b/...t/filechanges_kali_agreement_removed.json → ...t/filechanges_kali_agreement_removed.json
diff --git a/...nges_kali_agreement_revelant_changes.json → ...nges_kali_agreement_revelant_changes.json b/...nges_kali_agreement_revelant_changes.json → ...nges_kali_agreement_revelant_changes.json
diff --git a/.../Agreement/__tests__/dilaDataDiff.spec.ts → .../dila/kali/__tests__/dilaDataDiff.spec.ts b/.../Agreement/__tests__/dilaDataDiff.spec.ts → .../dila/kali/__tests__/dilaDataDiff.spec.ts
@@ -8,7 +8,7 @@ import noChanges from "./dataset/filechanges_kali_agreement_no_changes.json";
 import removed from "./dataset/filechanges_kali_agreement_removed.json";
 import revelantChanges from "./dataset/filechanges_kali_agreement_revelant_changes.json";
 import { Commit } from "../../../../types";
-import { RelevantDocumentsExtractorStub } from "../../../__tests__/RelevantDocumentsExtractorStub";
+import { RelevantDocumentsExtractorStub } from "../../__tests__/RelevantDocumentsExtractorStub";
 
 describe("Calcul des différences sur les conventions collectives (kali-data)", () => {
   describe("Aucun changement dans une convention collective", () => {

diff --git a/...sts__/processAgreementFileChanges.spec.ts → ...sts__/processAgreementFileChanges.spec.ts b/...sts__/processAgreementFileChanges.spec.ts → ...sts__/processAgreementFileChanges.spec.ts
@@ -1,7 +1,7 @@
 import { describe, expect } from "@jest/globals";
 
 import processAgreementFileChanges from "../ProcessAgreementFileChanges";
-import { DiffFile, LoadFileFn, PatchStatus } from "../../../type";
+import { DiffFile, LoadFileFn, PatchStatus } from "../../../../types";
 
 describe("Creation des AgreementFileChange à partir d'un patch", () => {
   const createPatch = (status: PatchStatus): DiffFile => {

diff --git a/...lert-cli/src/diff/dila/Agreement/index.ts → ...ets/alert-cli/src/diff/dila/kali/index.ts b/...lert-cli/src/diff/dila/Agreement/index.ts → ...ets/alert-cli/src/diff/dila/kali/index.ts
diff --git a/...lert-cli/src/diff/dila/Agreement/types.ts → ...ets/alert-cli/src/diff/dila/kali/types.ts b/...lert-cli/src/diff/dila/Agreement/types.ts → ...ets/alert-cli/src/diff/dila/kali/types.ts
diff --git a/.../src/diff/dila/Code/ProcessCodeChanges.ts → .../src/diff/dila/legi/ProcessCodeChanges.ts b/.../src/diff/dila/Code/ProcessCodeChanges.ts → .../src/diff/dila/legi/ProcessCodeChanges.ts
@@ -4,7 +4,7 @@ import type { GitTagData } from "../../../types";
 import { compareDilaContent } from "../CompareDilaContent";
 import type { DilaChanges } from "../types";
 import type { CodeFileChange } from "./types";
-import { RelevantDocumentsExtractor } from "../ReleventDocuments";
+import { RelevantDocumentsExtractor } from "../RelevantDocuments";
 
 const processCodeChanges = async (
   tag: GitTagData,

diff --git a/...src/diff/dila/Code/ProcessCodeDataDiff.ts → ...src/diff/dila/legi/ProcessCodeDataDiff.ts b/...src/diff/dila/Code/ProcessCodeDataDiff.ts → ...src/diff/dila/legi/ProcessCodeDataDiff.ts
@@ -1,7 +1,7 @@
-import type { DataDiffFunction } from "../../type";
+import type { DataDiffFunction } from "../../../types";
 import processCodeChanges from "./ProcessCodeChanges";
 import processCodeFileChanges from "./ProcessCodeFileChanges";
-import { RelevantDocumentsExtractorImpl } from "../ReleventDocuments";
+import { RelevantDocumentsExtractorImpl } from "../RelevantDocuments";
 
 const processCodeDataDiff: DataDiffFunction = async ({
   tag,

diff --git a/.../diff/dila/Code/ProcessCodeFileChanges.ts → .../diff/dila/legi/ProcessCodeFileChanges.ts b/.../diff/dila/Code/ProcessCodeFileChanges.ts → .../diff/dila/legi/ProcessCodeFileChanges.ts
@@ -1,8 +1,8 @@
 import type { Code } from "@socialgouv/legi-data-types";
 
-import { createToJson } from "../../../node-git.helpers";
+import { createToJson } from "../../../utils/node-git.helpers";
 import type { CodeFileChange } from "./types";
-import { Diff, DiffFile, LoadFileFn } from "../../type";
+import { Diff, DiffFile, LoadFileFn } from "../../../types";
 import { GitTagData } from "../../../types";
 
 const codeFileChanges = async (

diff --git a/...changes_legi_code_irrevelant_changes.json → ...changes_legi_code_irrevelant_changes.json b/...changes_legi_code_irrevelant_changes.json → ...changes_legi_code_irrevelant_changes.json
diff --git a/...set/filechanges_legi_code_no_changes.json → ...set/filechanges_legi_code_no_changes.json b/...set/filechanges_legi_code_no_changes.json → ...set/filechanges_legi_code_no_changes.json
diff --git a/...lechanges_legi_code_revelant_changes.json → ...lechanges_legi_code_revelant_changes.json b/...lechanges_legi_code_revelant_changes.json → ...lechanges_legi_code_revelant_changes.json
diff --git a/.../dila/Code/__tests__/dilaDataDiff.spec.ts → .../dila/legi/__tests__/dilaDataDiff.spec.ts b/.../dila/Code/__tests__/dilaDataDiff.spec.ts → .../dila/legi/__tests__/dilaDataDiff.spec.ts
@@ -6,7 +6,7 @@ import irrevelantChanges from "./dataset/filechanges_legi_code_irrevelant_change
 import noChanges from "./dataset/filechanges_legi_code_no_changes.json";
 import revelantChanges from "./dataset/filechanges_legi_code_revelant_changes.json";
 import { Commit } from "../../../../types";
-import { RelevantDocumentsExtractorStub } from "../../../__tests__/RelevantDocumentsExtractorStub";
+import { RelevantDocumentsExtractorStub } from "../../__tests__/RelevantDocumentsExtractorStub";
 
 describe("Calcul des différences sur les code (legi-data)", () => {
   describe("Aucun changement", () => {

diff --git a/...ets/alert-cli/src/diff/dila/Code/index.ts → ...ets/alert-cli/src/diff/dila/legi/index.ts b/...ets/alert-cli/src/diff/dila/Code/index.ts → ...ets/alert-cli/src/diff/dila/legi/index.ts
diff --git a/...ets/alert-cli/src/diff/dila/Code/types.ts → ...ets/alert-cli/src/diff/dila/legi/types.ts b/...ets/alert-cli/src/diff/dila/Code/types.ts → ...ets/alert-cli/src/diff/dila/legi/types.ts
diff --git a/targets/alert-cli/src/diff/dila/types.ts b/targets/alert-cli/src/diff/dila/types.ts
@@ -13,8 +13,8 @@ import type {
 } from "@socialgouv/kali-data-types";
 import type { CodeArticle, CodeSection } from "@socialgouv/legi-data-types";
 
-import type { AgreementFileChange } from "./Agreement/types";
-import type { CodeFileChange } from "./Code/types";
+import type { AgreementFileChange } from "./kali/types";
+import type { CodeFileChange } from "./legi/types";
 
 export type DilaChanges = CommonDilaChanges & {
   file: string;

diff --git a/targets/alert-cli/src/diff/index.ts b/targets/alert-cli/src/diff/index.ts
@@ -1,11 +1,11 @@
-import { ccns } from "../ccn-list";
-import { DataDiffFunction } from "./type";
+import { DataDiffFunction } from "../types";
 import { processAgreementDataDiff, processCodeDataDiff } from "./dila";
-import { processVddDiff } from "./fiches-vdd";
-import { processTravailDataDiff } from "./fiches-travail-data";
+import { processVddDiff } from "./sp";
+import { processTravailDataDiff } from "./travail-data";
 import { GitTagData } from "../types";
 import { AlertChanges } from "@shared/types";
-import { GithubApi } from "../APIs/api";
+import { GithubApi } from "../utils/github";
+import { getAgreements } from "./shared/getAgreements";
 
 export class AlertDetector {
   githubApi: GithubApi;
@@ -19,14 +19,15 @@ export class AlertDetector {
   private async getFileFilter(
     repository: string
   ): Promise<(path: string) => boolean> {
+    const ccns = await getAgreements();
     switch (repository) {
       case "socialgouv/legi-data":
         // only code-du-travail
         return (path: string) => path.endsWith("LEGITEXT000006072050.json");
       case "socialgouv/kali-data":
         // only a ccn matching our list
         return (path: string) =>
-          ccns.some((ccn) => new RegExp(ccn.id).test(path));
+          ccns.some((ccn) => new RegExp(ccn.kali_id).test(path));
       case "socialgouv/fiches-vdd": {
         /** @type {string[]} */
         const ficheVddIDs = this.fichesServicePublicIds;