feat: cycles filtering

globalfund · Jun 20, 2024 · ae89a98 · ae89a98
1 parent c7a570c
commit ae89a98
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/utils/filtering/eligibility.ts b/src/utils/filtering/eligibility.ts
@@ -6,6 +6,7 @@ const MAPPING = {
   geography: ['geography/name', 'geography/code'],
   component: 'activityArea/name',
   year: 'eligibilityYear',
+  cycle: 'fundingStream',
 };
 
 export function filterEligibility(
@@ -53,6 +54,16 @@ export function filterEligibility(
     }(${years.join(filtering.multi_param_separator)})`;
   }
 
+  const cycles = _.filter(
+    _.get(params, 'cycles', '').split(','),
+    (o: string) => o.length > 0,
+  ).map((cycle: string) => `'${cycle}'`);
+  if (cycles.length > 0) {
+    str += `${str.length > 0 ? ' AND ' : ''}${MAPPING.cycle}${
+      filtering.in
+    }(${cycles.join(filtering.multi_param_separator)})`;
+  }
+
   // const search = _.get(params, 'q', '');
   // if (search.length > 0) {
   //   str += `${str.length > 0 ? ' AND ' : ''}${MAPPING.search.replace(

diff --git a/src/utils/filtering/financialIndicators.ts b/src/utils/filtering/financialIndicators.ts
@@ -23,6 +23,7 @@ const MAPPING = {
   principalRecipientType:
     'implementationPeriod/grant/principalRecipient/type/parent/name',
   period: 'periodCovered',
+  cycle: 'periodCovered',
   year: 'implementationPeriod/periodFrom',
   yearTo: 'implementationPeriod/periodTo',
   grantIP: 'implementationPeriod/code',
@@ -108,9 +109,12 @@ export function filterFinancialIndicators(
   }
 
   const periods = _.filter(
-    _.get(params, 'periods', '').split(','),
+    [
+      ..._.get(params, 'periods', '').split(','),
+      ..._.get(params, 'cycles', '').split(','),
+    ],
     (o: string) => o.length > 0,
-  ).map((period: string) => `'${period.replace(/ /g, '')}'`);
+  ).map((period: string) => `'${period.replace(/ /g, '').replace(' - ', '')}'`);
   if (periods.length > 0) {
     str += `${str.length > 0 ? ' AND ' : ''}${MAPPING.period}${
       filtering.in