fix(alerting): urls correctes des fiches SP dans les alerts (#1420)

Author: carolineBda

docker-compose.yml

@@ -97,6 +97,7 @@ services:
     volumes:
       - elastic_data:/usr/share/elasticsearch/data
     environment:
+      - ES_JAVA_OPTS=-Xmx4g
       - cluster.name=code-du-travail-data-elasticsearch
       - node.name=code-du-travail-data-elasticsearch-single-node
       - network.host=0.0.0.0

shared/types/src/utility.ts

@@ -7,3 +7,5 @@ export type KeysToCamelCase<T> = {
     ? KeysToCamelCase<T[K]>
     : T[K];
 };
+
+export type Audience = "associations" | "particuliers" | "professionnels"

shared/utils/src/__tests__/url-generator.test.ts

@@ -0,0 +1,7 @@
+import { generateFichesSpRef } from "../url-generator";
+
+describe("url-generator", () => {
+  test("generateFichesSpRef with audience camel case", () => {
+    expect(generateFichesSpRef("associations", "article")).toEqual("https://www.service-public.fr/associations/vosdroits/article");
+  });
+});

shared/utils/src/url-generator.ts

@@ -1,4 +1,5 @@
 import { slugify } from "@socialgouv/cdtn-utils";
+import type { Audience } from "@socialgouv/cdtn-types";
 
 export const generateKaliRef = (
   kaliArticleId: string,
@@ -17,24 +18,15 @@ export const generateLegiRef = (
 };
 
 export const generateFichesSpRef = (
-  audience: "Associations" | "Particuliers" | "Professionnels",
+  audience: Audience,
   ficheSpInitialId: string
-) => {
+): string => {
   switch (audience) {
-    case "Associations":
+    case "associations":
       return `https://www.service-public.fr/associations/vosdroits/${ficheSpInitialId}`;
-    case "Particuliers":
+    case "particuliers":
       return `https://www.service-public.fr/particuliers/vosdroits/${ficheSpInitialId}`;
-    case "Professionnels":
+    case "professionnels":
       return `https://entreprendre.service-public.fr/vosdroits/${ficheSpInitialId}`;
   }
 };
-
-export const generateFichesSpRefLocal = (
-  urlSlug: string,
-  withPrefix = true
-) => {
-  return `${
-    withPrefix ? "https://code.travail.gouv.fr" : ""
-  }/fiche-service-public/${urlSlug}`;
-};

targets/frontend/src/components/changes/ChangeGroup.tsx

@@ -1,5 +1,5 @@
 import type {
-  AlertChanges,
+  AlertChanges, Audience,
   DilaAddedNode,
   DilaAlertChanges,
   DilaModifiedNode,
@@ -22,6 +22,7 @@ import { jsxJoin } from "../../lib/jsx";
 import { Stack } from "../layout/Stack";
 import { ViewDiff } from "./ViewDiff";
 import { theme } from "src/theme";
+import { generateFichesSpRef } from "@shared/utils";
 
 type Props = {
   label: string;
@@ -536,14 +537,17 @@ function FicheLink({ change, documents = [] }: FicheLinkProps) {
       </>
     );
   }
-  const url = `https://www.service-public.fr/${change.type}/vosdroits/${change.id}`;
+
   return (
     <>
       <a
         target="_blank"
         aria-label={`${change.title} (nouvelle fenêtre)`}
         rel="noreferrer noopener"
-        href={url}
+        href={generateFichesSpRef(
+          change.type.toLowerCase() as Audience,
+          change.id
+        )}
       >
         {change.title}
       </a>

targets/ingester/src/transform/fichesServicePublic/format.ts

@@ -1,12 +1,12 @@
 import { SOURCES } from "@socialgouv/cdtn-sources";
 import type { RawJson } from "@socialgouv/fiches-vdd-types";
-import type { IndexedAgreement } from "@socialgouv/kali-data-types";
 
 import type { FicheServicePublic } from "../..";
 import type { ReferenceResolver } from "../../lib/referenceResolver";
 import { parseReferences } from "./parseReference";
 import { generateFichesSpRef } from "@shared/utils";
 import { ShortAgreement } from "./fetchAgreementsWithKaliId";
+import { Audience } from "@socialgouv/cdtn-types";
 
 function getChild(element: RawJson, name: string) {
   // RawJson children not exist on text node
@@ -53,10 +53,9 @@ export function format(
   const [year, month, day] = dateRaw.split(" ")[1].split("-");
   const date = `${day}/${month}/${year}`;
 
-  const audience = getText(getChild(publication, "Audience")) as
-    | "Associations"
-    | "Particuliers"
-    | "Professionnels";
+  const audience = getText(
+    getChild(publication, "Audience")
+  ).toLowerCase() as Audience;
 
   const url = generateFichesSpRef(audience, id);