refactor: idcc using metadata file provided by API (#802)

Co-authored-by: Johan Girod <[email protected]>
annuaire-entreprises-data-gouv-fr · Dec 11, 2023 · 092715a · 092715a
1 parent 77fcc01
commit 092715a
Show file tree

Hide file tree

Showing 14 changed files with 239 additions and 3,942 deletions.
diff --git a/clients/matomo/index.ts b/clients/matomo/index.ts
@@ -1,4 +1,5 @@
 import routes from '#clients/routes';
+import constants from '#models/constants';
 import { FetchRessourceException } from '#models/exceptions';
 import { readFromGrist } from '#utils/integrations/grist';
 import { httpGet } from '#utils/network';
@@ -145,9 +146,15 @@ export const clientMatomoStats = async (): Promise<IMatomoStats> => {
       matomoEventsCategory,
       npsRecords,
     ] = await Promise.all([
-      httpGet<IMatomoMonthlyStat[]>(createPageViewUrl()),
-      httpGet<IMatomoEventStat[]>(createCopyPasteEventUrl()),
-      httpGet<IMatomoEventStat[][]>(createEventsCategoryUrl()),
+      httpGet<IMatomoMonthlyStat[]>(createPageViewUrl(), {
+        timeout: constants.timeout.XXL,
+      }),
+      httpGet<IMatomoEventStat[]>(createCopyPasteEventUrl(), {
+        timeout: constants.timeout.XXL,
+      }),
+      httpGet<IMatomoEventStat[][]>(createEventsCategoryUrl(), {
+        timeout: constants.timeout.XXL,
+      }),
       getNpsRecords(),
     ]);
 

diff --git a/clients/recherche-entreprise/idcc-metadata.ts b/clients/recherche-entreprise/idcc-metadata.ts
@@ -0,0 +1,64 @@
+import { HttpNotFound, HttpServerError } from '#clients/exceptions';
+import routes from '#clients/routes';
+import { ICCWithMetadata } from '#models/conventions-collectives-list';
+import { httpGet } from '#utils/network';
+
+type IIdccMetadata = {
+  [idcc: string]: {
+    'titre de la convention': string; //Convention collective na… des cabinets d'avocats"
+    id_kali: string; //KALICONT000005635185"
+    cc_ti: string; //IDCC"
+    nature: string; //CONVENTION COLLECTIVE NATIONALE"
+    etat: string; //VIGUEUR_ETEN"
+    debut: string; //1979-03-01 00:00:00"
+    fin: string | null;
+    url: string; //https://www.legifrance.g…/id/KALICONT000005635185"
+  };
+};
+
+class IdCCMetadataClient {
+  private _idccMetadata = null as {
+    [idcc: string]: ICCWithMetadata;
+  } | null;
+
+  get = async (idcc: string) => {
+    if (!this._idccMetadata) {
+      const response = await httpGet<IIdccMetadata>(
+        routes.conventionsCollectives.metadata
+      );
+
+      this._idccMetadata = this.mapToDomainObject(response);
+    }
+
+    if (Object.values(this._idccMetadata).length === 0) {
+      throw new HttpServerError('Empty Idcc metadata list');
+    }
+
+    if (idcc in this._idccMetadata) {
+      return this._idccMetadata[idcc] || {};
+    } else {
+      throw new HttpNotFound('Convention collective not found');
+    }
+  };
+
+  mapToDomainObject = (response: IIdccMetadata) => {
+    return Object.entries(response).reduce(
+      (idccMetadatas, [idcc, metadata]) => {
+        const { id_kali, url, nature, etat } = metadata;
+        idccMetadatas[idcc] = {
+          idKali: id_kali,
+          legifrance: url,
+          title: metadata['titre de la convention'],
+          nature,
+          etat,
+          idcc,
+        };
+        return idccMetadatas;
+      },
+      {} as { [idcc: string]: ICCWithMetadata }
+    );
+  };
+}
+const client = new IdCCMetadataClient();
+
+export const clientIdccMetadata = async (idcc: string) => client.get(idcc);
diff --git a/clients/recherche-entreprise/index.ts b/clients/recherche-entreprise/index.ts
@@ -2,17 +2,17 @@ import { HttpNotFound } from '#clients/exceptions';
 import routes from '#clients/routes';
 import stubClientWithSnapshots from '#clients/stub-client-with-snaphots';
 import constants from '#models/constants';
+import { IConventionsCollectives } from '#models/conventions-collectives-list';
 import { createEtablissementsList } from '#models/etablissements-list';
 import { IETATADMINSTRATIF, estActif } from '#models/etat-administratif';
 import { IEtatCivil, IPersonneMorale } from '#models/immatriculation';
 import {
-  IConventionCollective,
   IEtablissement,
   NotEnoughParamsException,
   createDefaultEtablissement,
   createDefaultUniteLegale,
 } from '#models/index';
-import { ISearchResult, ISearchResults } from '#models/search';
+import { ISearchResults } from '#models/search';
 import SearchFilterParams from '#models/search-filter-params';
 import {
   extractNicFromSiret,
@@ -23,7 +23,6 @@ import {
   verifySiret,
 } from '#utils/helpers';
 import {
-  getConventionCollectives,
   libelleFromCategoriesJuridiques,
   libelleFromCodeNAFWithoutNomenclature,
 } from '#utils/helpers/formatting/labels';
@@ -120,10 +119,7 @@ const mapToDomainObjectNew = (
   };
 };
 
-const mapToUniteLegale = (
-  result: IResult,
-  pageEtablissements: number
-): ISearchResult => {
+const mapToUniteLegale = (result: IResult, pageEtablissements: number) => {
   const {
     nature_juridique,
     siege,
@@ -245,8 +241,14 @@ const mapToUniteLegale = (
     colter,
     dateCreation: parseDateCreationInsee(date_creation),
     dateDerniereMiseAJour: date_mise_a_jour,
-    conventionsCollectives: etablissementsList.all.flatMap(
-      (e) => e.conventionsCollectives
+    conventionsCollectives: etablissements.reduce(
+      (idccSiretPair, { siret, liste_idcc }) => {
+        (liste_idcc || []).forEach((idcc) => {
+          idccSiretPair[idcc] = [...(idccSiretPair[idcc] || []), siret];
+        });
+        return idccSiretPair;
+      },
+      {} as IConventionsCollectives
     ),
   };
 };
@@ -312,7 +314,6 @@ const mapToEtablissement = (
     activite_principale = '',
     date_creation = '',
     date_debut_activite = '',
-    liste_idcc,
     tranche_effectif_salarie = '',
     annee_tranche_effectif_salarie = '',
   } = etablissement;
@@ -352,11 +353,6 @@ const mapToEtablissement = (
     activitePrincipale: activite_principale,
     dateCreation: parseDateCreationInsee(date_creation),
     dateDebutActivite: date_debut_activite,
-    conventionsCollectives: (liste_idcc || [])
-      .map((idcc) => {
-        return getConventionCollectives(idcc, siret);
-      })
-      .filter((cc): cc is IConventionCollective => !!cc),
   };
 };
 

diff --git a/clients/routes.ts b/clients/routes.ts
@@ -33,6 +33,8 @@ const routes = {
     },
   },
   conventionsCollectives: {
+    metadata:
+      'https://recherche-entreprises.api.gouv.fr/metadata/conventions_collectives',
     site: 'https://code.travail.gouv.fr/outils/convention-collective',
     details: 'https://code.travail.gouv.fr/convention-collective/',
   },

diff --git a/components/conventions-collectives-section/index.tsx b/components/conventions-collectives-section/index.tsx
@@ -4,22 +4,21 @@ import ButtonLink from '#components-ui/button';
 import FAQLink from '#components-ui/faq-link';
 import { Tag } from '#components-ui/tag';
 import { MTPEI } from '#components/administrations';
-import { Section } from '#components/section';
+import { DataSection } from '#components/section/data-section';
 import { FullTable } from '#components/table/full';
 import { EAdministration } from '#models/administrations';
-import { formatSiret } from '#utils/helpers';
-import { IUniteLegale } from '#models/index';
+import { IAPINotRespondingError } from '#models/api-not-responding';
+import { ICCWithMetadata } from '#models/conventions-collectives-list';
+import { capitalize, formatSiret } from '#utils/helpers';
 
 const ConventionsCollectivesSection: React.FC<{
-  uniteLegale: IUniteLegale;
-}> = ({ uniteLegale }) => {
-  const conventionsCollectives = uniteLegale?.conventionsCollectives || [];
-
-  const plural = conventionsCollectives.length > 0 ? 's' : '';
-
+  ccWithMetadata: ICCWithMetadata[] | IAPINotRespondingError;
+}> = ({ ccWithMetadata }) => {
   return (
-    <Section title="Conventions collectives" sources={[EAdministration.MTPEI]}>
-      {conventionsCollectives.length === 0 ? (
+    <DataSection
+      title="Conventions collectives"
+      sources={[EAdministration.MTPEI]}
+      notFoundInfo={
         <div>
           Cette structure n’a pas de{' '}
           <a
@@ -31,50 +30,83 @@ const ConventionsCollectivesSection: React.FC<{
           </a>{' '}
           auprès du <MTPEI />.
         </div>
-      ) : (
-        <>
-          Cette structure possède {conventionsCollectives.length}{' '}
-          <FAQLink
-            to="/faq/convention-collective"
-            tooltipLabel={`convention${plural} collective${plural}`}
-          >
-            Qu’est-ce qu’une convention collective ?
-          </FAQLink>{' '}
-          enregistrée{plural}.
-          <p>
-            Pour en savoir plus sur une convention collective en particulier,
-            consultez{' '}
-            <a
-              rel="noreferrer noopener"
-              target="_blank"
-              href="https://code.travail.gouv.fr/outils/convention-collective"
+      }
+      data={ccWithMetadata}
+    >
+      {(ccWithMetadata) => {
+        const plural = ccWithMetadata.length > 0 ? 's' : '';
+        return (
+          <>
+            Cette structure possède {ccWithMetadata.length}{' '}
+            <FAQLink
+              to="/faq/convention-collective"
+              tooltipLabel={`convention${plural} collective${plural}`}
             >
-              le site du Code du Travail Numérique.
-            </a>
-          </p>
-          <FullTable
-            head={['SIRET', 'N°IDCC', 'Détails', 'Explications']}
-            body={conventionsCollectives.map((convention) => [
-              <a href={`/etablissement/${convention.siret}`}>
-                {formatSiret(convention.siret)}
-              </a>,
-              <Tag>IDCC {convention.idcc}</Tag>,
-              <i className="font-small">{convention.title}</i>,
-              convention.CdTN ? (
-                <ButtonLink
-                  target="_blank"
-                  to={`${routes.conventionsCollectives.details}${convention.idcc}`}
-                  alt
-                  small
-                >
-                  ⇢&nbsp;Consulter
-                </ButtonLink>
-              ) : null,
-            ])}
-          />
-        </>
-      )}
-    </Section>
+              Qu’est-ce qu’une convention collective ?
+            </FAQLink>{' '}
+            enregistrée{plural}.
+            <p>
+              Pour en savoir plus sur une convention collective en particulier,
+              consultez{' '}
+              <a
+                rel="noreferrer noopener"
+                target="_blank"
+                href="https://code.travail.gouv.fr/outils/convention-collective"
+              >
+                le site du Code du Travail Numérique.
+              </a>
+            </p>
+            {ccWithMetadata && ccWithMetadata.length > 0 && (
+              <FullTable
+                head={['N°IDCC', 'Détails', 'Etablissement(s)', 'Explications']}
+                body={ccWithMetadata.map(
+                  ({ idcc, sirets = [], nature, title }) => [
+                    <Tag>IDCC {idcc}</Tag>,
+                    <>
+                      {nature && (
+                        <>
+                          <b className="font-small">{capitalize(nature)}</b>
+                          <br />
+                        </>
+                      )}
+                      <span className="font-small">
+                        {title || <i>Non renseigné</i>}
+                      </span>
+                    </>,
+                    <ul>
+                      {(sirets || []).map((siret) => (
+                        <li>
+                          <a href={`/etablissement/${siret}`}>
+                            {formatSiret(siret)}
+                          </a>
+                        </li>
+                      ))}
+                    </ul>,
+                    <>
+                      {idcc === '9999' ? (
+                        <i>Non renseigné</i>
+                      ) : (
+                        <ButtonLink
+                          target="_blank"
+                          to={`${routes.conventionsCollectives.details}${idcc}`}
+                          alt
+                          aria-label={`Convention collective ${
+                            title || idcc
+                          }, consulter les informations`}
+                          small
+                        >
+                          ⇢&nbsp;Consulter
+                        </ButtonLink>
+                      )}
+                    </>,
+                  ]
+                )}
+              />
+            )}
+          </>
+        );
+      }}
+    </DataSection>
   );
 };
 export default ConventionsCollectivesSection;
diff --git a/components/title-section/tabs.tsx b/components/title-section/tabs.tsx
@@ -122,7 +122,8 @@ export const Tabs: React.FC<{
       label: 'Conventions collectives',
       pathPrefix: '/divers/',
       noFollow: false,
-      shouldDisplay: (uniteLegale.conventionsCollectives || []).length > 0,
+      shouldDisplay:
+        Object.keys(uniteLegale.conventionsCollectives || {}).length > 0,
       width: '130px',
     },
   ];

diff --git a/components/unite-legale-section/index.tsx b/components/unite-legale-section/index.tsx
@@ -27,8 +27,8 @@ const UniteLegaleSection: React.FC<{
 }> = ({ uniteLegale, session }) => {
   const hasLabelsAndCertificates = checkHasLabelsAndCertificates(uniteLegale);
 
-  const conventionsCollectives = Array.from(
-    new Set((uniteLegale.conventionsCollectives || []).map((cc) => cc.idcc))
+  const conventionsCollectives = Object.keys(
+    uniteLegale.conventionsCollectives || {}
   );
 
   const data = [