feat(contribs): publish contributions in the new format

shared/elasticsearch-document-adapter/package.json

@@ -10,7 +10,6 @@
     "@socialgouv/cdtn-monolog": "^1.5.11",
     "@socialgouv/cdtn-slugify": "^4.52.1",
     "@socialgouv/cdtn-sources": "^4.52.1",
-    "@socialgouv/contributions-data-types": "^3.27.0",
     "nctx": "^1.2.0",
     "node-fetch": "^2.6.5",
     "p-map": "5.2.0",

shared/elasticsearch-document-adapter/src/cdtnDocuments.ts

@@ -1,6 +1,7 @@
 import type {
   AgreementDoc,
-  ContributionCompleteDoc,
+  ContributionGenericDoc,
+  ContributionWithCCDoc,
   EditorialContentDoc,
   FicheTravailEmploiDoc,
 } from "@shared/types";
@@ -167,10 +168,9 @@ export async function* cdtnDocumentsGen() {
   };
 
   logger.info("=== Contributions ===");
-  const contributions = await getDocumentBySource<ContributionCompleteDoc>(
-    SOURCES.CONTRIBUTIONS,
-    getBreadcrumbs
-  );
+  const contributions = await getDocumentBySource<
+    ContributionGenericDoc | ContributionWithCCDoc
+  >(SOURCES.CONTRIBUTIONS, getBreadcrumbs);
 
   const ccnData = await getDocumentBySource<AgreementDoc>(SOURCES.CCN);
 

shared/graphql-client/src/index.ts

@@ -14,6 +14,7 @@ export const client = createClient({
       "x-hasura-admin-secret": HASURA_GRAPHQL_ADMIN_SECRET,
     },
   },
+  maskTypename: true,
   requestPolicy: "network-only",
   url: HASURA_GRAPHQL_ENDPOINT,
 });

shared/types/index.ts

@@ -9,13 +9,14 @@ import type {
   IndexedAgreement,
 } from "@socialgouv/kali-data-types";
 import type {
-  Prequalified,
-  Highlight,
   EditorialContent,
+  Highlight,
+  Prequalified,
 } from "./EditorialContent";
+import type { BaseHasuraDocument } from "./Base";
+
 export * from "./EditorialContent";
 export * from "./utils";
-import type { BaseHasuraDocument } from "./Base";
 
 export enum DOCUMENT_SOURCE {
   fiches_ministere_travail = "fiches_ministere_travail",
@@ -37,12 +38,12 @@ export type FicheTravailEmploi = BaseHasuraDocument & {
 
 export type ContributionComplete = BaseHasuraDocument & {
   source: "contributions";
-  document: ContributionCompleteDoc;
+  document: ContributionGenericDoc;
 };
 
 export type ContributionFiltered = BaseHasuraDocument & {
   source: "contributions";
-  document: ContributionFilteredDoc;
+  document: ContributionWithCCDoc;
 };
 
 export type LaborCodeArticle = BaseHasuraDocument & {
@@ -133,28 +134,17 @@ export interface TravailEmploiReference {
   url: string;
 }
 
-export interface ContributionCompleteDoc {
-  index: number;
-  split: false;
+export interface ContributionGenericDoc {
   description: string;
-  answers: CCMultipleAnswers;
+  answer: Answer;
+  agreementsWithAnswer: string[];
 }
 
-export interface ContributionFilteredDoc {
-  index: number;
-  split: true;
+export interface ContributionWithCCDoc {
   description: string;
-  answers: CCSingleAnswer;
-}
-
-export interface CCMultipleAnswers {
-  generic: GenericAnswer;
-  conventions: Answer[];
-}
-
-export interface CCSingleAnswer {
-  generic: GenericAnswer;
-  conventionAnswer: Answer;
+  answer: Answer;
+  idcc: string;
+  shortName: string;
 }
 
 export type LaborCodeDoc = Pick<CodeArticleData, "cid" | "dateDebut" | "id"> & {
@@ -203,7 +193,7 @@ export interface AgreementContribAnswer {
   index: string;
   answer: string;
   question: string;
-  references: ContributionReference[];
+  references: ExternalRef[];
 }
 
 export interface ArticleTheme {
@@ -458,46 +448,31 @@ export interface ExportEsStatus {
   user?: User;
 }
 
-export type Question = {
-  id: string;
-  index: number;
-  title: string;
-  answers: {
-    generic: GenericAnswer;
-    conventions: Answer[];
-  };
-};
-
 export type Answer = {
   id: string;
-  idcc: string;
-  markdown: string;
-  references: ContributionReference[];
-};
-
-export type GenericAnswer = {
-  id: string;
-  markdown: string;
-  description: string;
-  text: string;
-  references: ContributionReference[];
+  content?: string;
+  contentType: string;
+  references: ExternalRef[];
+  linkedContent: BaseRef[];
 };
 
-export type ContributionReference = BaseRef | DilaRef;
-
 export type DilaRef = {
-  category: "agreement" | "labor_code";
   url: string;
   title: string;
   dila_id: string;
   dila_cid: string;
   dila_container_id: string;
 };
 
+export type ExternalRef = {
+  title: string;
+  url?: string;
+};
+
 export type BaseRef = {
-  category: null;
+  source: string;
   title: string;
-  url: string | null;
+  slug: string;
 };
 
 export type State =

shared/types/package.json

@@ -10,7 +10,6 @@
   },
   "devDependencies": {
     "@socialgouv/cdtn-sources": "^4.52.1",
-    "@socialgouv/contributions-data-types": "^3.27.0",
     "@socialgouv/fiches-travail-data-types": "^4.191.0",
     "@socialgouv/kali-data-types": "^2.127.0",
     "@socialgouv/legi-data-types": "^2.73.1",

targets/alert-cli/package.json

@@ -27,7 +27,6 @@
     "@shared/dila-resolver": "workspace:^",
     "@shared/eslint-config": "workspace:^",
     "@shared/types": "workspace:^",
-    "@socialgouv/contributions-data-types": "3.27.0",
     "@socialgouv/fiches-travail-data-types": "4.191.0",
     "@socialgouv/kali-data-types": "2.127.0",
     "@socialgouv/legi-data-types": "2.73.1",

targets/alert-cli/src/extractDilaReferences/contribution.ts

@@ -28,22 +28,20 @@ export function extractContributionsRef(
         source: SOURCES.CONTRIBUTIONS,
         title: question.title,
       },
-      references: question.document.answers.generic.references.flatMap(
-        (ref) => {
-          if (ref.category === null) {
-            return [];
-          }
-          return [
-            {
-              dila_cid: ref.dila_cid,
-              dila_container_id: ref.dila_container_id,
-              dila_id: ref.dila_id,
-              title: ref.title,
-              url: ref.url,
-            },
-          ];
+      references: question.document.answer.references.flatMap((ref) => {
+        if (ref.category === null) {
+          return [];
         }
-      ),
+        return [
+          {
+            dila_cid: ref.dila_cid,
+            dila_container_id: ref.dila_container_id,
+            dila_id: ref.dila_id,
+            title: ref.title,
+            url: ref.url,
+          },
+        ];
+      }),
     });
     if ("conventionAnswer" in question.document.answers) {
       continue;

targets/ingester/jest.config.js

@@ -13,7 +13,6 @@ const config = {
     "**/__tests__/**/*.+(ts|tsx|js)",
     "**/?(*.)+(spec|test).+(ts|tsx|js)",
   ],
-  transformIgnorePatterns: ["<rootDir>/node_modules/(?!(strip-markdown)/)"],
 };
 
 module.exports = config;

targets/ingester/package.json

@@ -13,17 +13,12 @@
     "p-map": "4.0.0",
     "p-retry": "5.1.1",
     "query-string": "7.0.1",
-    "remark": "13.0.0",
-    "remark-html": "13.0.2",
     "semver": "7.3.5",
-    "strip-markdown": "^5.0.1",
     "tar-fs": "2.1.1",
-    "unist-util-filter": "^2.0.3",
     "unist-util-find": "1.0.2",
     "unist-util-flat-filter": "1.0.0",
     "unist-util-parents": "1.0.3",
     "unist-util-select": "4.0.0",
-    "winston": "3.3.3",
     "yargs": "17.1.1"
   },
   "devDependencies": {
@@ -38,13 +33,10 @@
     "@types/node": "^16.11.11",
     "@types/semver": "^7.3.8",
     "@types/tar-fs": "^2.0.1",
-    "@types/unist": "^2.0.6",
     "@vercel/ncc": "0.34.0",
     "jest": "^27.1.1",
     "lint-staged": "^12.0.0",
-    "prettier": "^2.3.2",
     "ts-jest": "^27.0.5",
-    "ts-node": "10.8.0",
     "typescript": "^4.4.3"
   },
   "license": "MIT",

targets/ingester/src/index.d.ts

@@ -1,11 +1,13 @@
 import type { SourceValues } from "@socialgouv/cdtn-sources";
-import type {
+
+import {
   Answer,
-  BaseRef,
-  DilaRef,
+  ContributionGenericDoc,
+  ContributionWithCCDoc,
+  ExternalRef,
+  FicheServicePublicDoc,
   GenericAnswer,
-  Question,
-} from "@socialgouv/contributions-data-types";
+} from "@shared/types";
 
 export as namespace ingester;
 
@@ -24,17 +26,24 @@ type ExternalDocument = Document & {
   url: string;
 };
 
-type ExtendedQuestion = Omit<Question, "answers"> & {
+type GenericAnswer = Answer & {
+  description: string;
+  text: string;
+  content?: string | FicheServicePublicDoc;
+};
+type AnswerWithCC = Answer & { idcc: string; shortName: string };
+
+export interface Question {
+  id: string;
+  order: number;
+  title: string;
   answers: {
     generic: GenericAnswer;
-    conventionAnswer?: Answer & {
-      shortName: string;
-    };
-    conventions?: Answer[];
+    conventions: AnswerWithCC[];
   };
-};
+}
 
-type Contribution = Document & ExtendedQuestion;
+type Contribution = Document & (ContributionGenericDoc | ContributionWithCCDoc);
 
 type LegiArticle = ExternalDocument & {
   dateDebut: number;
@@ -75,11 +84,12 @@ type AgreementPage = Document & {
 };
 
 interface AgreementAnswer {
-  index: number;
-  references: (BaseRef | DilaRef)[];
-  slug: string;
+  order: number;
+  references: ExternalRef[];
+  genericSlug: string;
   question: string;
-  answer: string;
+  content?: string;
+  contentType: string;
 }
 
 interface AgreementArticleByBlock {