fix(backend): fix infinite loop in soliguide's import

SocialGouv · Nov 8, 2024 · 67106bd · 67106bd
1 parent 3db2b8f
commit 67106bd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/packages/backend/src/open-data-places/load-data-inclusion.ts b/packages/backend/src/open-data-places/load-data-inclusion.ts
@@ -92,7 +92,7 @@ const getFromDataInclusion = async (structureType: "CCAS" | "CIAS") => {
       }
     }
 
-    if (datInclusionData.length >= 500) {
+    if (datInclusionData?.length >= 500) {
       appLogger.warn(
         "Import 'data-inclusion' data N°" +
           page +

diff --git a/packages/backend/src/open-data-places/load-soliguide.ts b/packages/backend/src/open-data-places/load-soliguide.ts
@@ -17,6 +17,8 @@ let nbResults = 0;
 let newPlaces = 0;
 let updatedPlaces = 0;
 
+const RESULTS_BY_PAGE = 50;
+
 const getFromSoliguide = async () => {
   let soliguideData: SoliguidePlace[] = [];
 
@@ -31,7 +33,7 @@ const getFromSoliguide = async () => {
           geoValue: "france",
         },
         options: {
-          limit: 50,
+          limit: RESULTS_BY_PAGE,
           page,
         },
       },
@@ -43,7 +45,10 @@ const getFromSoliguide = async () => {
     );
 
     soliguideData = response.data.places;
-    nbResults = response.data.nbResults;
+
+    if (!nbResults) {
+      nbResults = response.data.nbResults;
+    }
 
     for await (const place of soliguideData) {
       let soliguidePlace = await openDataPlaceRepository.findOneBy({
@@ -114,7 +119,7 @@ const getFromSoliguide = async () => {
       }
     }
 
-    if (soliguideData.length * page < nbResults) {
+    if (soliguideData?.length === RESULTS_BY_PAGE) {
       appLogger.warn(
         `Import 'soliguide' data page N°${page} : ${
           soliguideData.length * page

diff --git a/packages/backend/src/run-app.ts b/packages/backend/src/run-app.ts
@@ -19,14 +19,12 @@ import { domifaConfig } from "./config";
       appLogger.warn(`[${__filename}] Application listening on port 3000`);
 
       if (
-        (domifaConfig().envId === "prod" ||
-          domifaConfig().envId === "preprod" ||
-          domifaConfig().envId === "local") &&
+        (domifaConfig().envId === "prod" || domifaConfig().envId === "local") &&
         domifaConfig().cron.enable
       ) {
         await loadDomifaData();
-        await loadMssData();
         await loadSoliguideData();
+        await loadMssData();
       }
     } catch (error) {
       const err = error as Error;

diff --git a/...rofil/components/_documents/profil-structure-documents/profil-structure-docs.component.ts b/...rofil/components/_documents/profil-structure-documents/profil-structure-docs.component.ts
@@ -115,14 +115,14 @@ export class ProfilStructureDocsComponent implements OnInit, OnDestroy {
           }
 
           if (this.usager.decision.statut !== "RADIE") {
-            this.docs.filter(
-              (doc) => doc.customDocType === "courrier_radiation"
+            this.docs = this.docs.filter(
+              (doc) => doc.customDocType !== "courrier_radiation"
             );
           }
 
           if (!this.usager.echeanceInfos.isActif) {
-            this.docs.filter(
-              (doc) => doc.customDocType === "attestation_postale"
+            this.docs = this.docs.filter(
+              (doc) => doc.customDocType !== "attestation_postale"
             );
           }
         },