fix(fundings): Improve / Correct ES query

Author: annelhote

client/src/boards/financements-par-aap/utils.ts

@@ -4,8 +4,6 @@ const funders = ["ANR", "PIA ANR", "PIA hors ANR", "Horizon 2020", "Horizon Euro
 
 const pattern = { height: 4, path: "M 2 2 l 2 2", width: 4 };
 
-const typologiesExcluded = ["Entreprises", "Infrastructures de recherche", "Structures de recherche"];
-
 const YEAR_MIN = 2009;
 const YEAR_MAX = 2025
 const years: number[] = Array.from(Array(YEAR_MAX - YEAR_MIN + 1).keys()).map((item) => item + YEAR_MIN);
@@ -47,7 +45,6 @@ const getEsQuery = ({ regions, structures, yearMax = years[years.length - 1], ye
           { term: { participant_isFrench: true } },
           { term: { participant_status: "active" } },
           { terms: { "project_type.keyword": funders } },
-          { bool: { must_not: { terms: { "participant_typologie_1.keyword": typologiesExcluded } } } },
         ],
       },
     },
@@ -56,11 +53,12 @@ const getEsQuery = ({ regions, structures, yearMax = years[years.length - 1], ye
   if (structuresNotNull?.length ?? 0 > 0) {
     query.query.bool.filter.push({ term: { participant_is_main_parent: 1 } });
     query.query.bool.filter.push({ term: { participant_type: "institution" } });
+    query.query.bool.filter.push({ terms: { "participant_typologie_1.keyword": ["Ecoles, instituts et assimilés", "Organismes de recherche", "Universités et assimilés"] } });
     query.query.bool.filter.push({ terms: { "participant_id.keyword": structuresNotNull } });
-    query.query.bool.filter.push({ term: { "participant_kind.keyword": "Secteur public" } });
   };
   const regionsNotNull = regions?.filter((region) => region !== null);
   if (regionsNotNull?.length ?? 0 > 0) {
+    query.query.bool.filter.push({ terms: { "participant_typologie_1.keyword": ["Ecoles, instituts et assimilés", "Organismes de recherche", "Structures de recherche", "Universités et assimilés"] } });
     query.query.bool.filter.push({ terms: { "participant_region_with_labs.keyword": regionsNotNull } });
   };
   return query;