refactor: etablissement fetching logic

annuaire-entreprises-data-gouv-fr · Aug 14, 2024 · 5d773dd · 5d773dd
1 parent 468dd23
commit 5d773dd
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 51 deletions.
diff --git a/clients/sirene-insee/siren.ts b/clients/sirene-insee/siren.ts
@@ -77,7 +77,6 @@ type TmpUniteLegale = {
     denomination: string;
     denominationUsuelle: string;
     sigle: string;
-    allSiegesSiret: Siret[];
   };
 };
 
@@ -114,7 +113,8 @@ const clientUniteLegaleInsee = async (
 
   const etablissementsList = allEtablissements?.list || [siege];
   etablissementsList.forEach(
-    (e) => (e.ancienSiege = tmpUniteLegale.allSiegesSiret.indexOf(e.siret) > -1)
+    (e) =>
+      (e.ancienSiege = uniteLegale.anciensSiegesSirets.indexOf(e.siret) > -1)
   );
 
   const etablissements = createEtablissementsList(
@@ -241,6 +241,13 @@ const mapToDomainObject = (
       siren,
       oldSiren: originalSiren,
       siege,
+      anciensSiegesSirets: Array.from(
+        new Set(
+          periodesUniteLegale
+            .map((e) => (siren + e.nicSiegeUniteLegale) as Siret)
+            .filter((e) => e !== siege.siret)
+        )
+      ),
       natureJuridique: categorieJuridiqueUniteLegale || '',
       libelleNatureJuridique: libelleFromCategoriesJuridiques(
         categorieJuridiqueUniteLegale
@@ -280,13 +287,6 @@ const mapToDomainObject = (
       denominationUsuelle: denominationUsuelleUniteLegale,
       denomination: denominationUniteLegale || names || 'Nom inconnu',
       sigle: sigleUniteLegale,
-      allSiegesSiret: Array.from(
-        new Set(
-          periodesUniteLegale.map(
-            (e) => (siren + e.nicSiegeUniteLegale) as Siret
-          )
-        )
-      ),
     },
   };
 };

diff --git a/models/core/etablissement.ts b/models/core/etablissement.ts
@@ -15,13 +15,17 @@ import {
   verifySiret,
 } from '#utils/helpers';
 import { isProtectedSiren } from '#utils/helpers/is-protected-siren-or-siret';
-import logErrorInSentry, { logFatalErrorInSentry } from '#utils/sentry';
+import logErrorInSentry, {
+  logFatalErrorInSentry,
+  logWarningInSentry,
+} from '#utils/sentry';
 import getSession from '#utils/server-side-helper/app/get-session';
 import { shouldUseInsee } from '.';
 import { EAdministration } from '../administrations/EAdministration';
 import {
   APINotRespondingFactory,
   IAPINotRespondingError,
+  isAPI404,
   isAPINotResponding,
 } from '../api-not-responding';
 import { FetchRessourceException, IExceptionContext } from '../exceptions';
@@ -81,6 +85,9 @@ const fetchFromClients = async (
   );
 
   if (!useInsee) {
+    if (isAPI404(etablissementRechercheEntreprise)) {
+      throw new SiretNotFoundError(siret);
+    }
     if (isAPINotResponding(etablissementRechercheEntreprise)) {
       throw new HttpServerError('Recherche failed, return 500');
     }
@@ -92,35 +99,57 @@ const fetchFromClients = async (
     useCache,
   });
 
+  /**
+   * Nowhere to be found
+   */
+  if (
+    isAPI404(etablissementRechercheEntreprise) &&
+    isAPI404(etablissementInsee)
+  ) {
+    throw new SiretNotFoundError(siret);
+  }
+
   if (isAPINotResponding(etablissementInsee)) {
-    if (isAPINotResponding(etablissementRechercheEntreprise)) {
-      const etablissmentInseeFallbacked = await fetchEtablissmentFromInsee(
-        siret,
-        {
-          useFallback: true,
-          useCache,
-        }
-      );
-      if (isAPINotResponding(etablissmentInseeFallbacked)) {
-        throw new HttpServerError('Sirene Insee fallback failed, return 500');
-      }
-      return etablissmentInseeFallbacked;
+    /***
+     * Sirene Insee failed
+     */
+    if (isAPI404(etablissementRechercheEntreprise)) {
+      throw new SiretNotFoundError(siret);
+    } else if (isAPINotResponding(etablissementRechercheEntreprise)) {
+      throw new HttpServerError('Both API failed');
     } else {
       return etablissementRechercheEntreprise;
     }
   } else {
-    if (isAPINotResponding(etablissementRechercheEntreprise)) {
+    /**
+     * Sirene succeed but siret is not in recherhce or recherche failed
+     */
+    if (
+      isAPINotResponding(etablissementRechercheEntreprise) ||
+      isAPI404(etablissementRechercheEntreprise)
+    ) {
+      logWarningInSentry(
+        new FetchRessourceException({
+          ressource: 'UniteLegaleRecherche',
+          administration: EAdministration.DINUM,
+          message: 'Fail to find siret in recherche API',
+          context: {
+            siret,
+          },
+        })
+      );
       return etablissementInsee;
-    } else {
-      return {
-        ...etablissementInsee,
-        complements: {
-          ...etablissementInsee?.complements,
-          ...etablissementRechercheEntreprise.complements,
-        },
-      };
     }
   }
+
+  // default case
+  return {
+    ...etablissementInsee,
+    complements: {
+      ...etablissementInsee?.complements,
+      ...etablissementRechercheEntreprise.complements,
+    },
+  };
 };
 
 const fetchEtablissmentFromInsee = async (
@@ -137,6 +166,13 @@ const fetchEtablissmentFromInsee = async (
       throw new SiretNotFoundError(siret);
     }
 
+    if (!options.useFallback) {
+      return await clientEtablissementInsee(siret, {
+        ...options,
+        useFallback: true,
+      });
+    }
+
     logErrorInSentry(
       new FetchEtablissementException({
         message: 'Fail to fetch from INSEE API',
@@ -211,20 +247,28 @@ const getEtablissementWithUniteLegaleFromSlug = async (
   const etablissement = await getEtablissementFromSlug(slug, {
     isBot,
   });
+
   const uniteLegale = await getUniteLegaleFromSlug(etablissement.siren, {
     isBot,
   });
 
+  // only for insee as recherche already holds ancienSiege at etablissement level
+  if (uniteLegale.anciensSiegesSirets.indexOf(etablissement.siret)) {
+    etablissement.ancienSiege = true;
+  }
+
   return { etablissement, uniteLegale };
 };
 
 /**
  * Download Etablissement and the Latitude/longitude
+ *
  */
 const getEtablissementWithLatLongFromSlug = async (
   slug: string
 ): Promise<IEtablissement> => {
   const etablissement = await getEtablissementFromSlug(slug);
+
   if (!etablissement.latitude || !etablissement.longitude) {
     const { lat, long } = await getGeoLoc(etablissement);
     etablissement.latitude = lat;

diff --git a/models/core/types.ts b/models/core/types.ts
@@ -88,6 +88,8 @@ export interface IUniteLegale extends IEtablissementsList {
   oldSiren: Siren;
   tva: ITVAIntracommunautaire | null;
   siege: IEtablissement;
+  // only used to pass information from unitelegale to the etablissement in insee response. Prefer etablissement.ancienSiege
+  anciensSiegesSirets: Siret[];
   natureJuridique: string;
   libelleNatureJuridique: string;
   activitePrincipale: string;
@@ -124,6 +126,7 @@ export const createDefaultUniteLegale = (siren: Siren): IUniteLegale => {
     oldSiren: siren,
     siege,
     tva: null,
+    anciensSiegesSirets: [],
     statutDiffusion: ISTATUTDIFFUSION.DIFFUSIBLE,
     etatAdministratif: IETATADMINSTRATIF.INCONNU,
     nomComplet: '',

diff --git a/models/core/unite-legale.ts b/models/core/unite-legale.ts
@@ -161,34 +161,37 @@ class UniteLegaleBuilder {
       return uniteLegaleRechercheEntreprise;
     }
 
-    /**
-     * Siren in Sirene API, not in stocks
-     */
-    if (
-      isAPI404(uniteLegaleRechercheEntreprise) &&
-      !isAPINotResponding(uniteLegaleInsee)
-    ) {
-      return uniteLegaleInsee;
-    }
-
-    /***
-     * Sirene Insee failed
-     */
     if (isAPINotResponding(uniteLegaleInsee)) {
+      /***
+       * Sirene Insee failed
+       */
       if (isAPI404(uniteLegaleRechercheEntreprise)) {
         throw new SirenNotFoundError(this._siren);
       } else if (isAPINotResponding(uniteLegaleRechercheEntreprise)) {
         throw new HttpServerError('Both API failed');
       } else {
         return uniteLegaleRechercheEntreprise;
       }
-    }
-
-    /**
-     * Recherche failed
-     */
-    if (isAPINotResponding(uniteLegaleRechercheEntreprise)) {
-      return uniteLegaleInsee;
+    } else {
+      /**
+       * Sirene succeed but siren not in recherhce or recherche failed
+       */
+      if (
+        isAPINotResponding(uniteLegaleRechercheEntreprise) ||
+        isAPI404(uniteLegaleRechercheEntreprise)
+      ) {
+        logWarningInSentry(
+          new FetchRessourceException({
+            ressource: 'UniteLegaleRecherche',
+            administration: EAdministration.DINUM,
+            message: 'Fail to find siren in recherche API',
+            context: {
+              siren: this._siren,
+            },
+          })
+        );
+        return uniteLegaleInsee;
+      }
     }
 
     /**
@@ -295,6 +298,13 @@ const fetchUniteLegaleFromInsee = async (
       return APINotRespondingFactory(EAdministration.INSEE, 404);
     }
 
+    if (!inseeOptions.useFallback) {
+      return await clientUniteLegaleInsee(siren, page, {
+        ...inseeOptions,
+        useFallback: true,
+      });
+    }
+
     logWarningInSentry(
       new FetchRessourceException({
         ressource: 'UniteLegaleInsee',